Changeset 2759

Timestamp:

Oct 16, 2008, 2:53:15 AM (16 years ago)

Author:

rvelices

Message:

merge r 2758 from branch 2.0 to trunk

Location:

trunk

Files:

• language/de_DE/common.lang.php (modified) (1 diff)
• language/en_UK/common.lang.php (modified) (1 diff)
• language/es_ES/common.lang.php (modified) (1 diff)
• language/fr_FR/common.lang.php (modified) (1 diff)
• language/it_IT/common.lang.php (modified) (1 diff)
• language/nl_NL/common.lang.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• template/yoga/picture.tpl (modified) (3 diffs)
• template/yoga/slideshow.tpl (modified) (1 diff)

trunk/language/de_DE/common.lang.php

@@ -161 +161 @@
 $lang['comments'] = 'Kommentare';
 $lang['comments_add'] = 'Kommentar hinzufügen';
-$lang['comments_title'] = 'Kommentare von Benutzern';
 $lang['created after %s (%s)'] = 'erstellt nach dem %s (%s)';
 $lang['created before %s (%s)'] = 'erstellt vor dem %s (%s)';

trunk/language/en_UK/common.lang.php

@@ -161 +161 @@
 $lang['comments'] = 'Comments';
 $lang['comments_add'] = 'Add a comment';
-$lang['comments_title'] = 'Comments from the users of the site';
 $lang['created after %s (%s)'] = 'created after %s (%s)';
 $lang['created before %s (%s)'] = 'created before %s (%s)';

trunk/language/es_ES/common.lang.php

@@ -161 +161 @@
 $lang['comments'] = 'Comentarios';
 $lang['comments_add'] = 'Agregar comentario';
-$lang['comments_title'] = 'Comentarios de usuarios';
 $lang['created after %s (%s)'] = 'Creado después del %s (%s)';
 $lang['created before %s (%s)'] = 'creado antes del %s (%s)';

trunk/language/fr_FR/common.lang.php

@@ -161 +161 @@
 $lang['comments'] = 'Commentaires';
 $lang['comments_add'] = 'Ajouter un commentaire';
-$lang['comments_title'] = 'Commentaires des utilisateurs';
 $lang['created after %s (%s)'] = 'créée après le %s (%s)';
 $lang['created before %s (%s)'] = 'créée avant le %s (%s)';

trunk/language/it_IT/common.lang.php

@@ -161 +161 @@
 $lang['comments'] = 'Commenti';
 $lang['comments_add'] = 'Aggiunti un commento';
-$lang['comments_title'] = 'Commenti degli utenti';
 $lang['created after %s (%s)'] = 'creata dopo il %s (%s)';
 $lang['created before %s (%s)'] = 'creata prima del %s (%s)';

trunk/language/nl_NL/common.lang.php

@@ -161 +161 @@
 $lang['comments'] = 'Commentaar';
 $lang['comments_add'] = 'voeg commentaar toe';
-$lang['comments_title'] = 'Commentaar van gebruikers van deze website';
 $lang['created after %s (%s)'] = 'Gemaakt na %s (%s)';
 $lang['created before %s (%s)'] = 'Gemaakt voor %s (%s)';

trunk/picture.php

@@ -687 +687 @@
     'PHOTO' => $title_nb,
     'SHOW_PICTURE_NAME_ON_TITLE' => $conf['show_picture_name_on_title'],
+    'IS_HOME' => ('categories'==$page['section'] and !isset($page['category']) ),
 
     'LEVEL_SEPARATOR' => $conf['level_separator'],
-
-    'FILE_PICTURE_NAV_BUTTONS' => 'picture_nav_buttons.tpl',
 
     'U_HOME' => make_index_url(),

trunk/template/yoga/picture.tpl

@@ -29 +29 @@
   <div class="browsePath">
     <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
-    {if $SECTION_TITLE != 'no_category'|@translate}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
+    {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
     {$LEVEL_SEPARATOR}{$current.TITLE}
   </div>
@@ -81 +81 @@
     {/if}{*caddie management END*}
   </div>
-  {include file=$FILE_PICTURE_NAV_BUTTONS}
+  {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
 </div> <!-- imageToolBar -->
 
@@ -252 +252 @@
 {if isset($COMMENT_COUNT)}
 <div id="comments">
-        <h3>[{$COMMENT_COUNT}] {'comments_title'|@translate}</h3>
+        <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
 
         {if !empty($COMMENT_NAV_BAR)}

trunk/template/yoga/slideshow.tpl

@@ -13 +13 @@
 
 <div id="imageToolBar">
-  {include file=$FILE_PICTURE_NAV_BUTTONS}
+  {include file='picture_nav_buttons.tpl'|@get_extent:'picture_nav_buttons'}
 </div>