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 --- template/yoga/about.tpl | 2 +- template/yoga/comment_list.tpl | 2 +- template/yoga/comments.tpl | 2 +- template/yoga/footer.tpl | 6 +++--- template/yoga/header.tpl | 12 ++++++------ template/yoga/identification.tpl | 8 ++++---- template/yoga/index.tpl | 16 ++++++++-------- template/yoga/mainpage_categories.tpl | 2 +- template/yoga/menubar_categories.tpl | 6 +++--- template/yoga/menubar_identification.tpl | 18 +++++++++--------- template/yoga/menubar_menu.tpl | 2 +- template/yoga/menubar_specials.tpl | 2 +- template/yoga/menubar_tags.tpl | 2 +- template/yoga/navigation_bar.tpl | 16 ++++++++-------- template/yoga/nbm.tpl | 4 ++-- template/yoga/notification.tpl | 6 +++--- template/yoga/password.tpl | 2 +- template/yoga/picture.tpl | 30 +++++++++++++++--------------- template/yoga/picture_content.tpl | 2 +- template/yoga/picture_nav_buttons.tpl | 22 +++++++++++----------- template/yoga/profile.tpl | 2 +- template/yoga/profile_content.tpl | 26 +++++++++++++------------- template/yoga/redirect.tpl | 2 +- template/yoga/register.tpl | 2 +- template/yoga/search.tpl | 24 ++++++++++++------------ template/yoga/search_rules.tpl | 2 +- template/yoga/slideshow.tpl | 2 +- template/yoga/tags.tpl | 6 +++--- template/yoga/upload.tpl | 18 +++++++++--------- 29 files changed, 123 insertions(+), 123 deletions(-) (limited to 'template/yoga') diff --git a/template/yoga/about.tpl b/template/yoga/about.tpl index 7667fbfdc..370e3ccc3 100644 --- a/template/yoga/about.tpl +++ b/template/yoga/about.tpl @@ -3,7 +3,7 @@ diff --git a/template/yoga/comment_list.tpl b/template/yoga/comment_list.tpl index 9a344685c..f431a1cd5 100644 --- a/template/yoga/comment_list.tpl +++ b/template/yoga/comment_list.tpl @@ -42,7 +42,7 @@
{'Edit a comment'|@translate} - + diff --git a/template/yoga/comments.tpl b/template/yoga/comments.tpl index d6a78387d..68941e03d 100644 --- a/template/yoga/comments.tpl +++ b/template/yoga/comments.tpl @@ -2,7 +2,7 @@
    -
  • {'home'|@translate}
    • +
  • {'Home'|@translate}

{'User comments'|@translate}

diff --git a/template/yoga/footer.tpl b/template/yoga/footer.tpl index 57d8c31d3..89c034965 100644 --- a/template/yoga/footer.tpl +++ b/template/yoga/footer.tpl @@ -1,7 +1,7 @@ @@ -45,7 +45,7 @@ {if $authorize_remembering }
  • - +
    • @@ -57,7 +57,7 @@

    {if isset($U_REGISTER) } - {'Register'|@translate} {'Register'|@translate} + {'Register'|@translate} {'Register'|@translate} {/if} {'Forgot your password?'|@translate} {'Forgot your password?'|@translate}

    diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl index 9ccaa8376..6bad8e319 100644 --- a/template/yoga/index.tpl +++ b/template/yoga/index.tpl @@ -15,15 +15,15 @@ {/if} {if isset($favorite) } -
  • favorite
    • +
  • favorite
    • {/if} {if isset($U_CADDIE) } -
  • {'caddie'|@translate}
    • +
  • {'caddie'|@translate}
    • {/if} {if isset($U_EDIT) } -
  • {'edit'|@translate}
    • +
  • {'edit'|@translate}
    • {/if} {if isset($U_SEARCH_RULES) } @@ -35,19 +35,19 @@ {/if} {if isset($U_MODE_FLAT) } -
  • {'mode_flat_hint'|@translate}
    • +
  • {'display all elements in all sub-categories'|@translate}
    • {/if} {if isset($U_MODE_NORMAL) } -
  • {'mode_normal_hint'|@translate}
    • +
  • {'return to normal view mode'|@translate}
    • {/if} {if isset($U_MODE_POSTED) } -
  • {'mode_posted_hint'|@translate}
    • +
  • {'display a calendar by posted date'|@translate}
    • {/if} {if isset($U_MODE_CREATED) } -
  • {'mode_created_hint'|@translate}
    • +
  • {'display a calendar by creation date'|@translate}
    • {/if} {if !empty($PLUGIN_INDEX_ACTIONS)}{$PLUGIN_INDEX_ACTIONS}{/if} @@ -56,7 +56,7 @@

    {$TITLE}

    {if isset($chronology_views) } -
    {'calendar_view'|@translate}: +
    {'View'|@translate}:
    {/if} @@ -52,7 +52,7 @@
    • {'Forgot your password?'|@translate}
      • {if isset($U_REGISTER)} -
    • {'Register'|@translate}
      • +
    • {'Register'|@translate}
      • {/if}
    diff --git a/template/yoga/menubar_menu.tpl b/template/yoga/menubar_menu.tpl index e0ba44483..0d6541b97 100644 --- a/template/yoga/menubar_menu.tpl +++ b/template/yoga/menubar_menu.tpl @@ -1,4 +1,4 @@ -
    {'title_menu'|@translate}
    +
    {'Menu'|@translate}
    {if isset($block->data.qsearch) and $block->data.qsearch==true} diff --git a/template/yoga/menubar_specials.tpl b/template/yoga/menubar_specials.tpl index e551558f6..1f00a2dc9 100644 --- a/template/yoga/menubar_specials.tpl +++ b/template/yoga/menubar_specials.tpl @@ -1,4 +1,4 @@ -
    {'special_categories'|@translate}
    +
    {'Specials'|@translate}
      {foreach from=$block->data item=link} diff --git a/template/yoga/menubar_tags.tpl b/template/yoga/menubar_tags.tpl index 1decddcbb..220175008 100644 --- a/template/yoga/menubar_tags.tpl +++ b/template/yoga/menubar_tags.tpl @@ -10,7 +10,7 @@ + {/if} - {$tag.name}{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *} + {$tag.name}{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *} {/foreach}
    diff --git a/template/yoga/navigation_bar.tpl b/template/yoga/navigation_bar.tpl index a4c0b3bbc..82c66bd15 100644 --- a/template/yoga/navigation_bar.tpl +++ b/template/yoga/navigation_bar.tpl @@ -1,10 +1,10 @@
    {if isset($navbar.URL_FIRST)} - {'first_page'|@translate} | - | + {'First'|@translate} | + | {else} - {'first_page'|@translate} | - {'previous_page'|@translate} | + {'First'|@translate} | + {'Previous'|@translate} | {/if} {assign var='prev_page' value=0} @@ -19,10 +19,10 @@ {/foreach} {if isset($navbar.URL_NEXT)} - | - | {'last_page'|@translate} + | + | {'Last'|@translate} {else} - | {'next_page'|@translate} - | {'last_page'|@translate} + | {'Next'|@translate} + | {'Last'|@translate} {/if}
    diff --git a/template/yoga/nbm.tpl b/template/yoga/nbm.tpl index 68e523069..646335813 100644 --- a/template/yoga/nbm.tpl +++ b/template/yoga/nbm.tpl @@ -2,9 +2,9 @@
      -
    • {'home'|@translate}
      • +
    • {'Home'|@translate}
    -

    {'nbm_item_notification'|@translate}

    +

    {'Notification'|@translate}

    {if not empty($errors)} diff --git a/template/yoga/notification.tpl b/template/yoga/notification.tpl index e313aff21..8f6dcb680 100644 --- a/template/yoga/notification.tpl +++ b/template/yoga/notification.tpl @@ -1,12 +1,12 @@ {html_head} - + {/html_head}
      -
    • {'home'|@translate}
      • +
    • {'Home'|@translate}

    {'Notification'|@translate}

    @@ -18,7 +18,7 @@ {'Image only RSS feed'|@translate}

    - {'Complete RSS feed'|@translate} + {'Complete RSS feed (images, comments)'|@translate}
    diff --git a/template/yoga/password.tpl b/template/yoga/password.tpl index fec7d53fa..1e0471bd5 100644 --- a/template/yoga/password.tpl +++ b/template/yoga/password.tpl @@ -2,7 +2,7 @@
      -
    • {'home'|@translate}
      • +
    • {'Home'|@translate}

    {'Password forgotten'|@translate}

    diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl index 0572c8e07..25f065868 100644 --- a/template/yoga/picture.tpl +++ b/template/yoga/picture.tpl @@ -28,7 +28,7 @@
    - {'home'|@translate} + {'Home'|@translate} {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if} {$LEVEL_SEPARATOR}{$current.TITLE}
    @@ -44,21 +44,21 @@ {'slideshow'|@translate} {/if} {if isset($U_SLIDESHOW_STOP) } - {'slideshow_stop'|@translate} + {'stop the slideshow'|@translate} {/if} - metadata + metadata {if isset($current.U_DOWNLOAD) } - {'download'|@translate} + {'download'|@translate} {/if} {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if} {if isset($favorite) } favorite {/if} {if !empty($U_SET_AS_REPRESENTATIVE) } - {'representative'|@translate} + {'representative'|@translate} {/if} {if isset($U_ADMIN) } - {'edit'|@translate} + {'edit'|@translate} {/if} {if isset($U_CADDIE) }{*caddie management BEGIN*} - {'caddie'|@translate} + {'caddie'|@translate} {/if}{*caddie management END*}
    {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'} @@ -92,19 +92,19 @@ y.callService( {if isset($U_SLIDESHOW_STOP) }

    - [ {'slideshow_stop'|@translate} ] + [ {'stop the slideshow'|@translate} ]

    {/if}
    {if isset($previous) } - {/if} {if isset($next) } - {/if} @@ -168,7 +168,7 @@ y.callService( {assign var='rate_text' value='%.2f (rated %d times, standard deviation = %.2f)'|@translate } {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) } {else} - {'no_rate'|@translate} + {'no rate'|@translate} {/if} @@ -177,7 +177,7 @@ y.callService( {if isset($rating)} - {if isset($rating.USER_RATE)}{'update_rate'|@translate}{else}{'new_rate'|@translate}{/if} + {if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if} @@ -264,11 +264,11 @@ y.callService( {if isset($comment_add)}
    - {'comments_add'|@translate} + {'Add a comment'|@translate} {if $comment_add.SHOW_AUTHOR} - + {/if} - +
    diff --git a/template/yoga/picture_content.tpl b/template/yoga/picture_content.tpl index 0081cd805..384a9ce1a 100644 --- a/template/yoga/picture_content.tpl +++ b/template/yoga/picture_content.tpl @@ -7,5 +7,5 @@ {/if}> {if isset($high) } -

    {'picture_high'|@translate}

    +

    {'Click on the picture to see it in high definition'|@translate}

    {/if} diff --git a/template/yoga/picture_nav_buttons.tpl b/template/yoga/picture_nav_buttons.tpl index ead51219a..15b6afa40 100644 --- a/template/yoga/picture_nav_buttons.tpl +++ b/template/yoga/picture_nav_buttons.tpl @@ -1,59 +1,59 @@
    {if isset($last)} - {'last_page'|@translate} + {'Last'|@translate} {else} {/if} {if isset($next)} - + {else} {/if} {if isset($slideshow.U_START_PLAY)} - {'start_play'|@translate} + {'Play of slideshow'|@translate} {/if} {if isset($slideshow.U_STOP_PLAY)} - {'stop_play'|@translate} + {'Pause of slideshow'|@translate} {/if} {if isset($U_UP) and !isset($slideshow)} - {'thumbnails'|@translate} + {'Thumbnails'|@translate} {/if} {if isset($previous)} - + {else} {/if} {if isset($first)} - {'first_page'|@translate} + {'First'|@translate} {else} {/if} {if isset($slideshow.U_START_REPEAT)} - {'start_repeat'|@translate} + {'Repeat the slideshow'|@translate} {/if} {if isset($slideshow.U_STOP_REPEAT)} - {'stop_repeat'|@translate} + {'Not repeat the slideshow'|@translate} {/if} {if isset($slideshow)} {if isset($slideshow.U_DEC_PERIOD)} - {'dec_period'|@translate} + {'Accelerate diaporama speed'|@translate} {else} {/if} {if isset($slideshow.U_INC_PERIOD)} - {'inc_period'|@translate} + {'Reduce diaporama speed'|@translate} {else} {/if} diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl index 53fdeab82..b94c3967c 100644 --- a/template/yoga/profile.tpl +++ b/template/yoga/profile.tpl @@ -12,7 +12,7 @@
      -
    • {'home'|@translate}
      • +
    • {'Home'|@translate}

    {'Profile'|@translate}

    diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl index e81a28c63..e6736f078 100644 --- a/template/yoga/profile_content.tpl +++ b/template/yoga/profile_content.tpl @@ -25,7 +25,7 @@ {/if}
  • - +
    • @@ -40,60 +40,60 @@
    - {'preferences'|@translate} + {'Preferences'|@translate}
    • - +
    • - +
    • - + {html_options name=template options=$template_options selected=$template_selection}
    • - + {html_options 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}
    • - +
    • - +
      • @@ -103,7 +103,7 @@

      - +

      diff --git a/template/yoga/redirect.tpl b/template/yoga/redirect.tpl index 65afd2f2d..aa90953ec 100644 --- a/template/yoga/redirect.tpl +++ b/template/yoga/redirect.tpl @@ -8,6 +8,6 @@

      - {'click_to_redirect'|@translate} + {'Click here if your browser does not automatically forward you'|@translate}

      diff --git a/template/yoga/register.tpl b/template/yoga/register.tpl index bd7792617..7e5a31d70 100644 --- a/template/yoga/register.tpl +++ b/template/yoga/register.tpl @@ -4,7 +4,7 @@
        -
      • {'home'|@translate}
        • +
      • {'Home'|@translate}

      {'Registration'|@translate}

      diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl index 76e8ce9ea..57f799e75 100644 --- a/template/yoga/search.tpl +++ b/template/yoga/search.tpl @@ -22,7 +22,7 @@
      • (?)
        • -
      • {'home'|@translate}
        • +
      • {'Home'|@translate}

      {'Search'|@translate}

      @@ -40,18 +40,18 @@
      {'Filter'|@translate} -
      @@ -66,9 +66,9 @@ {/if}
      - {'search_date'|@translate} + {'Search by Date'|@translate}
        -
        • +
        • @@ -77,7 +77,7 @@
        -
        • +
      • @@ -117,14 +117,14 @@
      - {'search_options'|@translate} -