Changeset 13224

Timestamp:

Feb 17, 2012, 8:30:52 PM (13 years ago)

Author:

mistic100

Message:

feature 2379: option to change comments order: change caption again, fix a bug in config page (induced by r13087)

Location:

trunk

Files:

• admin/configuration.php (modified) (2 diffs)
• include/picture_comment.inc.php (modified) (1 diff)
• language/bg_BG/common.lang.php (modified) (1 diff)
• language/de_DE/common.lang.php (modified) (1 diff)
• language/en_UK/common.lang.php (modified) (2 diffs)
• language/fr_CA/common.lang.php (modified) (1 diff)
• language/uk_UA/common.lang.php (modified) (1 diff)
• language/zh_CN/common.lang.php (modified) (1 diff)
• themes/default/template/picture.tpl (modified) (1 diff)

trunk/admin/configuration.php

@@ -125 +125 @@
   );
   
+$comments_order = array(
+  'ASC' => l10n('Show oldest comments first'),
+  'DESC' => l10n('Show latest comment first'),
+  );
+
 
 //------------------------------ verification and registration of modifications
@@ -360 +365 @@
         'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
         'comments_order'=>$conf['comments_order'],
-        'comments_order_options'=> $sort_directions
+        'comments_order_options'=> $comments_order
         )
       );

trunk/include/picture_comment.inc.php

@@ -135 +135 @@
     $template->assign(array(
       'COMMENTS_ORDER_URL' => add_url_params( duplicate_picture_url(), array('comments_order'=> ($comments_order == 'ASC' ? 'DESC' : 'ASC') ) ),
-      'COMMENTS_ORDER_TITLE' => $comments_order == 'ASC' ? l10n('old → new') : l10n('new → old'),
+      'COMMENTS_ORDER_TITLE' => $comments_order == 'ASC' ? l10n('Show latest comment first') : l10n('Show oldest comments first'),
       ));
         

trunk/language/bg_BG/common.lang.php

@@ -383 +383 @@
 $lang['%d rates'] = '%d оценки';
 
-$lang['new → old'] = 'ново → старо';
-$lang['old → new'] = 'старо → ново';
 ?>

trunk/language/de_DE/common.lang.php

@@ -382 +382 @@
 $lang['xxlarge'] = 'xxgroß';
 $lang['Your username has been successfully changed to : %s'] = 'Dein Benutzername ist jetzt:';
-$lang['new → old'] = 'neu → alt';
-$lang['old → new'] = 'alt → neu';
 $lang['Photo sizes'] = 'Bildgrößen';
 ?>

trunk/language/en_UK/common.lang.php

@@ -230 +230 @@
 $lang['Most visited'] = "Most visited";
 $lang['N/A'] = "N/A";
-$lang['old → new'] = 'old → new';
-$lang['new → old'] = 'new → old';
 $lang['New on %s'] = "New on %s";
 $lang['New password'] = "New password";
@@ -315 +313 @@
 $lang['Show number of comments'] = "Show number of comments";
 $lang['Show number of hits'] = "Show number of hits";
+$lang['Show oldest comments first'] = 'Show oldest comments first';
+$lang['Show latest comment first'] = 'Show latest comment first';
 $lang['show tag cloud'] = "show tags cloud";
 $lang['Since'] = "Since";

trunk/language/fr_CA/common.lang.php

@@ -376 +376 @@
 $lang['Successfully registered, you will soon receive an email with your connection settings. Welcome!'] = 'Inscription réussie, vous recevrez bientôt un email avec vos identifiants. Bienvenue !';
 $lang['Send my connection settings by email'] = 'Recevoir mes identifiants par email';
-
-$lang['new → old'] = 'nouveau → ancien';
-$lang['old → new'] = 'ancien → nouveau';
 ?>

trunk/language/uk_UA/common.lang.php

@@ -381 +381 @@
 $lang['Username: %s'] = 'Ім\'я користувача: %s';
 $lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Якщо Ви думаєте, що Ви отримали цей лист помилково, будь ласка, зв\'яжіться з нами за адресою %s';
-$lang['new → old'] = 'нові → старі';
-$lang['old → new'] = 'старі → нові';
 $lang['Photo sizes'] = 'Розміри фотографій';
 ?>

trunk/language/zh_CN/common.lang.php

@@ -384 +384 @@
 $lang['xxlarge'] = '非常大尺寸';
 $lang['Your username has been successfully changed to : %s'] = '您的用户名成功修改为：%s';
-$lang['new → old'] = '新 → 旧';
-$lang['old → new'] = '旧 → 新';
 $lang['Photo sizes'] = '';
 ?>

trunk/themes/default/template/picture.tpl

@@ -275 +275 @@
                 <h3>{$pwg->l10n_dec('%d comment', '%d comments',$COMMENT_COUNT)}</h3>
         {if $COMMENT_COUNT > 2}
-                {'Sort order'|@translate}: <a href="{$COMMENTS_ORDER_URL}#comments" rel="nofollow">{$COMMENTS_ORDER_TITLE}</a>
+                <a href="{$COMMENTS_ORDER_URL}#comments" rel="nofollow">{$COMMENTS_ORDER_TITLE}</a>
         {/if}
         {/if}