From d158f116d22a4a5dda945b09a58f2e48c0f3b1ea Mon Sep 17 00:00:00 2001 From: rvelices Date: Thu, 18 Mar 2010 19:21:17 +0000 Subject: [PATCH] -fix language keys problems git-svn-id: http://piwigo.org/svn/trunk@5178 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/intro.php | 4 ++-- admin/themes/default/template/footer.tpl | 2 +- admin/themes/default/template/plugins_list.tpl | 2 +- admin/themes/default/template/site_manager.tpl | 2 +- include/functions_category.inc.php | 2 +- include/functions_html.inc.php | 6 +++--- themes/default/template/comment_list.tpl | 6 +++--- themes/default/template/footer.tpl | 2 +- themes/default/template/menubar_categories.tpl | 2 +- themes/default/template/menubar_menu.tpl | 2 +- themes/default/template/menubar_tags.tpl | 2 +- themes/default/template/month_calendar.tpl | 4 ++-- themes/default/template/picture.tpl | 8 ++++---- themes/default/template/search.tpl | 2 +- themes/default/template/tags.tpl | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/admin/intro.php b/admin/intro.php index 137efe95b..231a86f05 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -198,9 +198,9 @@ $template->assign( 'PHP_VERSION' => phpversion(), 'DB_ENGINE' => $conf['dblayer'], 'DB_VERSION' => $db_version, - 'DB_ELEMENTS' => l10n_dec('%d element', '%d elements', $nb_elements), + 'DB_ELEMENTS' => l10n_dec('%d image', '%d images', $nb_elements), 'DB_CATEGORIES' => - l10n_dec('%d category including ', '%d categories including ', + l10n_dec('%d category including', '%d categories including', $nb_categories). l10n_dec('%d physical', '%d physical', $nb_physical). diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl index f7c83474e..66b0f736e 100644 --- a/admin/themes/default/template/footer.tpl +++ b/admin/themes/default/template/footer.tpl @@ -36,7 +36,7 @@ {'Contact'|@translate} - {'Webmaster'|@translate} + {'Webmaster'|@translate} diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl index 8743d6b6d..74672fadc 100644 --- a/admin/themes/default/template/plugins_list.tpl +++ b/admin/themes/default/template/plugins_list.tpl @@ -69,7 +69,7 @@
  • - + {'Delete'|@translate}
    • diff --git a/admin/themes/default/template/site_manager.tpl b/admin/themes/default/template/site_manager.tpl index 678f177fb..91d888ac0 100644 --- a/admin/themes/default/template/site_manager.tpl +++ b/admin/themes/default/template/site_manager.tpl @@ -38,7 +38,7 @@ {foreach from=$sites item=site name=site} - {$site.NAME}
    ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)}) + {$site.NAME}
    ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d image','%d images',$site.IMAGES)}) [{'synchronize'|@translate}] {if isset($site.U_DELETE)} diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 1aa62ac25..4ce30a75a 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -472,7 +472,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_ } //at least one image direct or indirect - $display_text.= l10n_dec('%d element', '%d elements', $cat_count_images); + $display_text.= l10n_dec('%d image', '%d images', $cat_count_images); if ($cat_count_categories == 0 or $cat_nb_images == $cat_count_images) { diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 70ffe48a5..5d07286c4 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -512,9 +512,9 @@ function register_default_menubar_blocks( $menu_ref_arr ) $menu->register_block( new RegisteredBlock( 'mbLinks', 'Links', 'piwigo')); $menu->register_block( new RegisteredBlock( 'mbCategories', 'Categories', 'piwigo')); $menu->register_block( new RegisteredBlock( 'mbTags', 'Related tags', 'piwigo')); - $menu->register_block( new RegisteredBlock( 'mbSpecials', 'special_categories', 'piwigo')); - $menu->register_block( new RegisteredBlock( 'mbMenu', 'title_menu', 'piwigo')); - $menu->register_block( new RegisteredBlock( 'mbIdentification', 'identification', 'piwigo') ); + $menu->register_block( new RegisteredBlock( 'mbSpecials', 'Specials', 'piwigo')); + $menu->register_block( new RegisteredBlock( 'mbMenu', 'Menu', 'piwigo')); + $menu->register_block( new RegisteredBlock( 'mbIdentification', 'Identification', 'piwigo') ); } ?> \ No newline at end of file diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index f431a1cd5..87da2158d 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -22,7 +22,7 @@ {/if} {if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
  • - + [edit]
    • @@ -41,8 +41,8 @@
    - {'Edit a comment'|@translate} - + Edit a comment + diff --git a/themes/default/template/footer.tpl b/themes/default/template/footer.tpl index 89c034965..e2f3a76bd 100644 --- a/themes/default/template/footer.tpl +++ b/themes/default/template/footer.tpl @@ -15,7 +15,7 @@ {$VERSION} {if isset($CONTACT_MAIL)} - {'Contact'|@translate} - {'Webmaster'|@translate} + {'Webmaster'|@translate} {/if} diff --git a/themes/default/template/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl index 02a9b6668..5f189bcd1 100644 --- a/themes/default/template/menubar_categories.tpl +++ b/themes/default/template/menubar_categories.tpl @@ -35,5 +35,5 @@ {/if} -

    {$pwg->l10n_dec('%d element', '%d elements', $block->data.NB_PICTURE)}

    +

    {$pwg->l10n_dec('%d image', '%d images', $block->data.NB_PICTURE)}

    diff --git a/themes/default/template/menubar_menu.tpl b/themes/default/template/menubar_menu.tpl index 0d6541b97..3905922e4 100644 --- a/themes/default/template/menubar_menu.tpl +++ b/themes/default/template/menubar_menu.tpl @@ -6,7 +6,7 @@

    - + {/if}
      diff --git a/themes/default/template/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl index 220175008..ad7177347 100644 --- a/themes/default/template/menubar_tags.tpl +++ b/themes/default/template/menubar_tags.tpl @@ -5,7 +5,7 @@ {if !empty($tag.U_ADD) } + diff --git a/themes/default/template/month_calendar.tpl b/themes/default/template/month_calendar.tpl index 45d6079e1..85415f459 100644 --- a/themes/default/template/month_calendar.tpl +++ b/themes/default/template/month_calendar.tpl @@ -12,7 +12,7 @@   {else} {foreach from=$bar.items item=item} - + {if isset($item.URL)} {$item.LABEL} {else} @@ -68,7 +68,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
      {$day.DAY}
      {$day.DAY}
      - {$day.IMAGE_ALT} + {$day.IMAGE_ALT}
      {else} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 885d31112..54d3b538b 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -109,7 +109,7 @@ y.callService( {/if} - +
      @@ -177,7 +177,7 @@ y.callService( {if isset($rating)} - + {/foreach}
      {'Author'|@translate} {if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}
      - {if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if} + {if isset($rating.USER_RATE)}{'Update your rating'|@translate}{else}{'Rate this picture'|@translate}{/if}
      @@ -193,7 +193,7 @@ y.callService( @@ -268,7 +268,7 @@ y.callService( {if $comment_add.SHOW_AUTHOR} {/if} - + diff --git a/themes/default/template/search.tpl b/themes/default/template/search.tpl index 390e5f0aa..133d5be1f 100644 --- a/themes/default/template/search.tpl +++ b/themes/default/template/search.tpl @@ -45,7 +45,7 @@
      {$tag.name}{$pwg->l10n_dec('%d element', '%d elements', $tag.counter)}{$pwg->l10n_dec('%d image', '%d images', $tag.counter)}