From 2e890e9597da29346a1fbe0db45f48e4a2be86e7 Mon Sep 17 00:00:00 2001 From: nikrou Date: Tue, 2 Mar 2010 14:54:22 +0000 Subject: Feature 1451 : localization with gettext Use php-gettext (developpement version rev43, because of php5.3) as fallback Use native language (english) instead of key for translation Keep directory en_UK for english customization Need some refactoring for plurals Todo : managing plugins in the same way git-svn-id: http://piwigo.org/svn/trunk@5021 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/template/goto/admin.tpl | 46 +++++++++++------------ admin/template/goto/advanced_feature.tpl | 2 +- admin/template/goto/cat_list.tpl | 16 ++++---- admin/template/goto/cat_modify.tpl | 28 +++++++------- admin/template/goto/cat_options.tpl | 2 +- admin/template/goto/check_integrity.tpl | 26 ++++++------- admin/template/goto/comments.tpl | 2 +- admin/template/goto/configuration.tpl | 18 ++++----- admin/template/goto/extend_for_templates.tpl | 6 +-- admin/template/goto/footer.tpl | 6 +-- admin/template/goto/group_list.tpl | 8 ++-- admin/template/goto/history.tpl | 16 ++++---- admin/template/goto/install.tpl | 56 ++++++++++++++-------------- admin/template/goto/intro.tpl | 2 +- admin/template/goto/maintenance.tpl | 18 ++++----- admin/template/goto/navigation_bar.tpl | 16 ++++---- admin/template/goto/notification_by_mail.tpl | 46 +++++++++++------------ admin/template/goto/permalinks.tpl | 2 +- admin/template/goto/picture_modify.tpl | 6 +-- admin/template/goto/plugins_list.tpl | 4 +- admin/template/goto/plugins_new.tpl | 2 +- admin/template/goto/plugins_update.tpl | 12 +++--- admin/template/goto/profile_content.tpl | 24 ++++++------ admin/template/goto/rating.tpl | 4 +- admin/template/goto/site_manager.tpl | 20 +++++----- admin/template/goto/site_update.tpl | 46 +++++++++++------------ admin/template/goto/tags.tpl | 2 +- admin/template/goto/thumbnail.tpl | 34 ++++++++--------- admin/template/goto/upgrade.tpl | 6 +-- admin/template/goto/upload.tpl | 10 ++--- admin/template/goto/user_list.tpl | 34 ++++++++--------- 31 files changed, 260 insertions(+), 260 deletions(-) (limited to 'admin/template') diff --git a/admin/template/goto/admin.tpl b/admin/template/goto/admin.tpl index 6fd39dc0c..2376f10b5 100644 --- a/admin/template/goto/admin.tpl +++ b/admin/template/goto/admin.tpl @@ -16,28 +16,28 @@ jQuery().ready(function(){ldelim}
{'Links'|@translate} 
-
{'config'|@translate} 
+
{'Configuration'|@translate} 
@@ -46,10 +46,10 @@ jQuery().ready(function(){ldelim}
@@ -58,32 +58,32 @@ jQuery().ready(function(){ldelim}
{'Pictures'|@translate} 
-
{'identification'|@translate} 
+
{'Identification'|@translate} 
-
{'special_admin_menu'|@translate} 
+
{'Specials'|@translate} 
  • {'History'|@translate}
  • {'Maintenance'|@translate}
    • -
  • {'Advanced_features'|@translate}
    • +
  • {'Advanced features'|@translate}
  • {'Plugins'|@translate} {if !empty($plugin_menu_items)}
      diff --git a/admin/template/goto/advanced_feature.tpl b/admin/template/goto/advanced_feature.tpl index b355036ea..76209387c 100644 --- a/admin/template/goto/advanced_feature.tpl +++ b/admin/template/goto/advanced_feature.tpl @@ -1,5 +1,5 @@
      -

      {'Advanced_features'|@translate}

      +

      {'Advanced features'|@translate}

        diff --git a/admin/template/goto/cat_list.tpl b/admin/template/goto/cat_list.tpl index b5f0250e0..020e5cff1 100644 --- a/admin/template/goto/cat_list.tpl +++ b/admin/template/goto/cat_list.tpl @@ -21,13 +21,13 @@ }); -

        {'title_categories'|@translate}

        +

        {'Categories management'|@translate}

        {$CATEGORIES_NAV}

        - {'cat_add'|@translate} : + {'Add a virtual category'|@translate} : {if count($categories)>9 } @@ -51,16 +51,16 @@ {if cat_admin_access($category.ID)}

      • {'jump to category'|@translate}
        • {/if} -
      • {'edit'|@translate}
        • +
      • {'edit'|@translate}
        • {if isset($category.U_MANAGE_ELEMENTS) } -
      • {'elements'|@translate}
        • +
      • {'elements'|@translate}
        • {/if} -
      • {'sub-categories'|@translate}
        • +
      • {'sub-categories'|@translate}
        • {if isset($category.U_MANAGE_PERMISSIONS) } -
      • {'permissions'|@translate}
        • +
      • {'Permissions'|@translate}
        • {/if} {if isset($category.U_DELETE) } -
      • {'delete'|@translate}
        • +
      • {'delete'|@translate}{'delete'|@translate}
        • {/if}
      @@ -68,7 +68,7 @@ {$category.NAME} {if $category.IS_VIRTUAL} - {'virtual_category'|@translate} + {'Virtual category'|@translate} {/if}

      diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl index 29e7780a9..1878da75c 100644 --- a/admin/template/goto/cat_modify.tpl +++ b/admin/template/goto/cat_modify.tpl @@ -3,7 +3,7 @@ {include file='include/resize.inc.tpl'}
      -

      {'title_edit_cat'|@translate}

      +

      {'Edit a category'|@translate}

      {$CATEGORIES_NAV}

      @@ -13,15 +13,15 @@
    • {'jump to category'|@translate}
      • {/if} {if isset($U_MANAGE_ELEMENTS) } -
    • {'elements'|@translate}
      • -
    • {'ranks'|@translate}
      • +
    • {'elements'|@translate}
      • +
    • {'ranks'|@translate}
      • {/if} -
    • {'sub-categories'|@translate}
      • +
    • {'sub-categories'|@translate}
      • {if isset($U_MANAGE_PERMISSIONS) } -
    • {'permissions'|@translate}
      • +
    • {'Permissions'|@translate}
      • {/if} {if isset($U_DELETE) } -
    • {'delete'|@translate}
      • +
    • {'delete'|@translate}{'delete'|@translate}
      • {/if}
    @@ -33,7 +33,7 @@ {if isset($CAT_FULL_DIR) } - {'storage'|@translate} + {'Directory'|@translate} {$CAT_FULL_DIR} {/if} @@ -68,26 +68,26 @@ {'Options'|@translate} - - - {if isset($SHOW_UPLOADABLE) } - @@ -99,7 +99,7 @@
    {'Sort order'|@translate} - +
    @@ -135,7 +135,7 @@
    - + diff --git a/admin/template/goto/cat_options.tpl b/admin/template/goto/cat_options.tpl index c27254f7f..9c25c1ef0 100644 --- a/admin/template/goto/cat_options.tpl +++ b/admin/template/goto/cat_options.tpl @@ -1,5 +1,5 @@
    -

    {'cat_options_title'|@translate} {$TABSHEET_TITLE}

    +

    {'Properties'|@translate} {$TABSHEET_TITLE}

    diff --git a/admin/template/goto/check_integrity.tpl b/admin/template/goto/check_integrity.tpl index 26b4a3b25..7cf566123 100644 --- a/admin/template/goto/check_integrity.tpl +++ b/admin/template/goto/check_integrity.tpl @@ -1,5 +1,5 @@
    -
    {'c13y_title'|@translate}
    +
    {'Check integrity'|@translate}
      @@ -7,8 +7,8 @@
    {'conf_access'|@translate} + {'Access type'|@translate} {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
    {'lock'|@translate} + {'Lock'|@translate} {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
    {'comments'|@translate} + {'Comments'|@translate} {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
    {'editcat_uploadable'|@translate} + {'Authorize upload'|@translate} {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE} {if $representant.ALLOW_SET_RANDOM } -

    +

    {/if} {if isset($representant.ALLOW_DELETE) } @@ -213,7 +213,7 @@
    {'mail_content'|@translate}{'Mail content'|@translate}
    - - + + {if isset($c13y_list)} {foreach from=$c13y_list item=c13y name=c13y_loop} @@ -22,21 +22,21 @@ {/foreach} diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl index efc5acaa3..470b53558 100644 --- a/admin/template/goto/plugins_update.tpl +++ b/admin/template/goto/plugins_update.tpl @@ -16,13 +16,13 @@ jQuery().ready(function(){ldelim} {if isset($plugins_not_uptodate)}
    -{'plugins_need_update'|@translate} +{'Plugins which need upgrade'|@translate}
    {'c13y_Anomaly'|@translate}{'c13y_Correction'|@translate}{'Anomaly'|@translate}{'Correction'|@translate}
    {$plugin.DATE} {$plugin.AUTHOR} {'plugins_auto_install'|@translate} - / {'plugins_download'|@translate} + / {'Download file'|@translate}
    - - + + @@ -32,7 +32,7 @@ jQuery().ready(function(){ldelim} + / {'Download file'|@translate} {/foreach}
    {'Name'|@translate}{'plugins_actual_version'|@translate}{'plugins_new_version'|@translate}{'Current
    version'|@translate}    		{'Available
    version'|@translate}    		 {'Actions'|@translate}
    {$plugin.VERSION} {$plugin.NEW_VERSION} {'plugins_auto_update'|@translate} - / {'plugins_download'|@translate}
    @@ -41,7 +41,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_uptodate)}
    -{'plugins_dontneed_update'|@translate} +{'Plugins up to date'|@translate} @@ -61,7 +61,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_cant_check)}
    -{'plugins_cant_check'|@translate} +{'Plugin versions can\'t be checked'|@translate}
    diff --git a/admin/template/goto/profile_content.tpl b/admin/template/goto/profile_content.tpl index b81f97d47..fd8841a4e 100644 --- a/admin/template/goto/profile_content.tpl +++ b/admin/template/goto/profile_content.tpl @@ -25,7 +25,7 @@ {/if}
  • - +
    • @@ -40,60 +40,60 @@
    - {'preferences'|@translate} + {'Preferences'|@translate}
    • - +
    • - +
    • - + {html_options id=template name=template options=$template_options selected=$template_selection}
    • - + {html_options id=language name=language options=$language_options selected=$language_selection}
    • - +
    • - {'auto_expand'|@translate} + {'Expand all categories'|@translate} {html_radios name='expand' options=$radio_options selected=$EXPAND}
    • - {'show_nb_comments'|@translate} + {'Show number of comments'|@translate} {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
    • - {'show_nb_hits'|@translate} + {'Show number of hits'|@translate} {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
    • - +
    • - +
      • diff --git a/admin/template/goto/rating.tpl b/admin/template/goto/rating.tpl index cd050f3a7..d7d3a85c9 100644 --- a/admin/template/goto/rating.tpl +++ b/admin/template/goto/rating.tpl @@ -1,4 +1,4 @@ -

      {'Rating'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]

      +

      {'elements'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]

      @@ -58,7 +58,7 @@
    - + {/foreach} {*rates*} {/foreach} {*images*} diff --git a/admin/template/goto/site_manager.tpl b/admin/template/goto/site_manager.tpl index ebabcf7f7..1cbdfbf87 100644 --- a/admin/template/goto/site_manager.tpl +++ b/admin/template/goto/site_manager.tpl @@ -13,11 +13,11 @@ {/if} {if isset($local_listing)} -{'remote_site_local_found'|@translate} {$local_listing.URL} +{'A local listing.xml file has been found for '|@translate} {$local_listing.URL} {if isset($local_listing.CREATE)}

    - {'remote_site_local_create'|@translate}: + {'Create this site'|@translate}: @@ -25,7 +25,7 @@ {/if} {if isset($local_listing.U_SYNCHRONIZE)} - {'site_synchronize'|@translate} + {'synchronize'|@translate}

    {/if} {/if} @@ -33,23 +33,23 @@ {if not empty($sites)}

    {$rate.RATE} {$rate.USER} {$rate.DATE}[{'delete'|@translate}][{'Delete'|@translate}]
    - + {foreach from=$sites item=site name=site}
    {'site_local'|@translate} / {'site_remote'|@translate}{'Remote'|@translate} / {'Remote'|@translate} {'Actions'|@translate}
    {$site.NAME}
    ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})     		- [{'site_synchronize'|@translate}] + [{'synchronize'|@translate}] {if isset($site.U_DELETE)} [{'site_delete'|@translate}] + title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}>{'delete'|@translate}] {/if} {if isset($site.remote)}
    - [{'remote_site_test'|@translate}] - [{'remote_site_generate'|@translate}] - [{'remote_site_clean'|@translate}] + [{'test'|@translate}] + [{'generate listing'|@translate}] + [{'clean'|@translate}] {/if} {if not empty($site.plugin_links)}
    @@ -64,7 +64,7 @@

    - +

    diff --git a/admin/template/goto/site_update.tpl b/admin/template/goto/site_update.tpl index d67dd3f43..90a2562cf 100644 --- a/admin/template/goto/site_update.tpl +++ b/admin/template/goto/site_update.tpl @@ -2,33 +2,33 @@ {include file='include/resize.inc.tpl'}

    -

    {'title_update'|@translate}: {$SITE_URL}

    +

    {'Database synchronization with files'|@translate}: {$SITE_URL}

    {if isset($update_result)}

    {$L_RESULT_UPDATE}

      -
    • {$update_result.NB_NEW_CATEGORIES} {'update_nb_new_categories'|@translate}
      • -
    • {$update_result.NB_NEW_ELEMENTS} {'update_nb_new_elements'|@translate}
      • -
    • {$update_result.NB_DEL_CATEGORIES} {'update_nb_del_categories'|@translate}
      • -
    • {$update_result.NB_DEL_ELEMENTS} {'update_nb_del_elements'|@translate}
      • -
    • {$update_result.NB_UPD_ELEMENTS} {'update_nb_upd_elements'|@translate}
      • -
    • {$update_result.NB_ERRORS} {'update_nb_errors'|@translate}
      • +
    • {$update_result.NB_NEW_CATEGORIES} {'categories added in the database'|@translate}
      • +
    • {$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}
      • +
    • {$update_result.NB_DEL_CATEGORIES} {'categories deleted in the database'|@translate}
      • +
    • {$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}
      • +
    • {$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}
      • +
    • {$update_result.NB_ERRORS} {'errors during synchronization'|@translate}
    {/if} {if isset($metadata_result)}

    {$L_RESULT_METADATA}

      -
    • {$metadata_result.NB_ELEMENTS_DONE} {'update_nb_elements_metadata_sync'|@translate}
      • -
    • {$metadata_result.NB_ELEMENTS_CANDIDATES} {'update_nb_elements_metadata_available'|@translate}
      • -
    • {'update_used_metadata'|@translate} : {$METADATA_LIST}
      • +
    • {$metadata_result.NB_ELEMENTS_DONE} {'elements informations synchronized with files metadata'|@translate}
      • +
    • {$metadata_result.NB_ELEMENTS_CANDIDATES} {'images candidates for metadata synchronization'|@translate}
      • +
    • {'Used metadata'|@translate} : {$METADATA_LIST}
    {/if} {if not empty($sync_errors)} -

    {'update_error_list_title'|@translate}

    +

    {'Error list'|@translate}

      {foreach from=$sync_errors item=error} @@ -36,7 +36,7 @@ {/foreach}
    -

    {'update_errors_caption'|@translate}

    +

    {'Errors caption'|@translate}

      {foreach from=$sync_error_captions item=caption}
    • {$caption.TYPE}: {$caption.LABEL}
      • @@ -45,7 +45,7 @@ {/if} {if not empty($sync_infos)} -

      {'update_infos_title'|@translate}

      +

      {'Detailed informations'|@translate}

        {foreach from=$sync_infos item=info} @@ -56,18 +56,18 @@ {/if} {if isset($introduction)} -

        {'update_default_title'|@translate}

        +

        {'Choose an option'|@translate}

        - {'update_sync_files'|@translate} + {'synchronize files structure with database'|@translate}
          • -
          • +
          • -
        • +
          • -
            • +
          @@ -76,11 +76,11 @@
        - {'update_sync_metadata'|@translate} + {'synchronize files metadata with database elements informations'|@translate}
        • - +
        • @@ -90,11 +90,11 @@
          -
          +
          - {'update_cats_subset'|@translate} + {'reduce to single existing categories'|@translate}
            • -
            • +
          diff --git a/admin/template/goto/tags.tpl b/admin/template/goto/tags.tpl index 3db8417a6..27ee02693 100644 --- a/admin/template/goto/tags.tpl +++ b/admin/template/goto/tags.tpl @@ -46,7 +46,7 @@

          - +

        diff --git a/admin/template/goto/thumbnail.tpl b/admin/template/goto/thumbnail.tpl index c2f490a16..653f07cc3 100644 --- a/admin/template/goto/thumbnail.tpl +++ b/admin/template/goto/thumbnail.tpl @@ -1,15 +1,15 @@
        -

        {'title_thumbnails'|@translate}

        +

        {'Thumbnail creation'|@translate}

        {if isset($results) } -
        {'tn_results_title'|@translate}
        +
        {'Results of miniaturization'|@translate}
        - - - + + + {foreach from=$results.elements item=elt} @@ -25,26 +25,26 @@
        {'Path'|@translate}{'thumbnail'|@translate}{'tn_results_gen_time'|@translate}{'filesize'|@translate}{'Thumbnail'|@translate}{'generated in'|@translate}{'Filesize'|@translate} {'Dimensions'|@translate}
        - + - + - + - + - + - +
        {'tn_stats'|@translate}{'General statistics'|@translate}
        {'tn_stats_nb'|@translate}{'number of miniaturized pictures'|@translate} {$results.TN_NB}
        {'tn_stats_total'|@translate}{'total time'|@translate} {$results.TN_TOTAL}
        {'tn_stats_max'|@translate}{'max time'|@translate} {$results.TN_MAX}
        {'tn_stats_min'|@translate}{'min time'|@translate} {$results.TN_MIN}
        {'tn_stats_mean'|@translate}{'average time'|@translate} {$results.TN_AVERAGE}
        @@ -55,11 +55,11 @@
        - {'tn_params_title'|@translate} + {'Miniaturization parameters'|@translate}
        • - {'tn_params_GD'|@translate} + {'GD version'|@translate} @@ -87,7 +87,7 @@ - +
        @@ -97,12 +97,12 @@ {/if} {*isset params*} {if !empty($remainings) } -
        {$TOTAL_NB_REMAINING} {'tn_alone_title'|@translate}
        +
        {$TOTAL_NB_REMAINING} {'pictures without thumbnail (jpeg and png only)'|@translate}
        - + {foreach from=$remainings item=elt name=remain_loop} @@ -115,5 +115,5 @@ {/foreach}
          {'Path'|@translate}{'filesize'|@translate}{'Filesize'|@translate} {'Dimensions'|@translate}
        {else} -
        [ {'tn_no_missing'|@translate} ]
        +
        [ {'No missing thumbnail'|@translate} ]
        {/if} diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl index 612698593..a5424c9e6 100644 --- a/admin/template/goto/upgrade.tpl +++ b/admin/template/goto/upgrade.tpl @@ -48,7 +48,7 @@ textarea { margin-left: 20px; } - +
        {'language'|@translate}{'Language'|@translate}

        +

        {/if} diff --git a/admin/template/goto/upload.tpl b/admin/template/goto/upload.tpl index 849faee0a..cc56d9a02 100644 --- a/admin/template/goto/upload.tpl +++ b/admin/template/goto/upload.tpl @@ -1,16 +1,16 @@
        -

        {'waiting'|@translate} {$TABSHEET_TITLE}

        +

        {'Waiting'|@translate} {$TABSHEET_TITLE}

        -

        {'title_upload'|@translate}

        +

        {'Pictures waiting for validation'|@translate}

        - + - - + + diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl index 4418e3970..2a7d4c690 100644 --- a/admin/template/goto/user_list.tpl +++ b/admin/template/goto/user_list.tpl @@ -1,5 +1,5 @@
        -

        {'title_liste_users'|@translate}

        +

        {'User list'|@translate}

        @@ -62,10 +62,10 @@ - + - + {if not empty($plugin_user_list_column_titles)} {foreach from=$plugin_user_list_column_titles item=title} @@ -87,7 +87,7 @@ {/foreach} - +
        {'category'|@translate}{'Category'|@translate} {'Date'|@translate}{'file'|@translate}{'thumbnail'|@translate}{'File'|@translate}{'Thumbnail'|@translate} {'Author'|@translate}  
          {'Username'|@translate}{'user_status'|@translate}{'User status'|@translate} {'Email address'|@translate} {'Groups'|@translate}{'properties'|@translate}{'Properties'|@translate}{$title}{$data} - {'permissions'|@translate} + {'Permissions'|@translate} {'Profile'|@translate} {foreach from=$user.plugin_actions item=data} {$data} @@ -123,7 +123,7 @@ {if isset($adviser)}
        {'adviser'|@translate}{'Adviser'|@translate} / {'set to'|@translate} @@ -162,12 +162,12 @@ {* Properties *}
        - {'properties'|@translate} + {'Properties'|@translate} - +
        {'enabled_high'|@translate}{'High definition enabled'|@translate} / {'set to'|@translate} @@ -196,7 +196,7 @@ - + - + - + - + - + - + - + - + - + - +
        {'nb_image_per_row'|@translate}{'Number of images per row'|@translate} @@ -206,7 +206,7 @@
        {'nb_row_per_page'|@translate}{'Number of rows per page'|@translate} @@ -216,7 +216,7 @@
        {'theme'|@translate}{'Interface theme'|@translate} @@ -227,7 +227,7 @@
        {'language'|@translate}{'Language'|@translate} @@ -238,7 +238,7 @@
        {'recent_period'|@translate}{'Recent period'|@translate} @@ -248,7 +248,7 @@
        {'auto_expand'|@translate}{'Expand all categories'|@translate} / {'set to'|@translate} @@ -258,7 +258,7 @@
        {'show_nb_comments'|@translate}{'Show number of comments'|@translate} / {'set to'|@translate} @@ -268,7 +268,7 @@
        {'show_nb_hits'|@translate}{'Show number of hits'|@translate} / {'set to'|@translate} @@ -278,7 +278,7 @@
        {'maxwidth'|@translate}{'Maximum width of the pictures'|@translate} @@ -290,7 +290,7 @@
        {'maxheight'|@translate}{'Maximum height of the pictures'|@translate} -- cgit v1.2.3