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

git-svn-id: http://piwigo.org/svn/trunk@13224 68402e56-0260-453c-a942-63ccdbb3a9ee

9 files changed, 10 insertions, 16 deletions

diff --git a/admin/configuration.php b/admin/configuration.php
index c71da8d67..671a68a53 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -124,6 +124,11 @@ $sort_fields = array(
   'rank ASC'            => l10n('manual sort order'),
   );
   
+$comments_order = array(
+  'ASC' => l10n('Show oldest comments first'),
+  'DESC' => l10n('Show latest comment first'),
+  );
+
 
 //------------------------------ verification and registration of modifications
 if (isset($_POST['submit']))
@@ -359,7 +364,7 @@ switch ($page['section'])
       array(
         'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
         'comments_order'=>$conf['comments_order'],
-        'comments_order_options'=> $sort_directions
+        'comments_order_options'=> $comments_order
         )
       );
 
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index 6ace8fa3e..0a183f618 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -134,7 +134,7 @@ SELECT
 
     $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'),
       ));
         
     $query = '
diff --git a/language/bg_BG/common.lang.php b/language/bg_BG/common.lang.php
index 86c1cd05c..e76370715 100644
--- a/language/bg_BG/common.lang.php
+++ b/language/bg_BG/common.lang.php
@@ -382,6 +382,4 @@ $lang['xxlarge'] = 'огромен';
 $lang['Your username has been successfully changed to : %s'] = 'Вашетопотребителско име беше успешно промененно на : %s';
 $lang['%d rates'] = '%d оценки';
 
-$lang['new → old'] = 'ново → старо';
-$lang['old → new'] = 'старо → ново';
 ?>
\ No newline at end of file
diff --git a/language/de_DE/common.lang.php b/language/de_DE/common.lang.php
index 2f77adadf..cc40e8a41 100644
--- a/language/de_DE/common.lang.php
+++ b/language/de_DE/common.lang.php
@@ -381,7 +381,5 @@ $lang['Username: %s'] = 'Benutzername: %s';
 $lang['xlarge'] = 'xgroß';
 $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';
 ?>
\ No newline at end of file
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 42a326c08..2ecf6f083 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -229,8 +229,6 @@ $lang['month'][8] = "August";
 $lang['month'][9] = "September";
 $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";
 $lang['Next'] = "Next";
@@ -314,6 +312,8 @@ $lang['set as album representative'] = "set as album thumbnail";
 $lang['Show file metadata'] = "Show file metadata";
 $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";
 $lang['slideshow'] = "slideshow";
diff --git a/language/fr_CA/common.lang.php b/language/fr_CA/common.lang.php
index 2edfb62ac..10322f81e 100644
--- a/language/fr_CA/common.lang.php
+++ b/language/fr_CA/common.lang.php
@@ -375,7 +375,4 @@ $lang['Email: %s'] = 'Email: %s';
 $lang['If you think you\'ve received this email in error, please contact us at %s'] = 'Si vous pensez avoir reçu cet email par erreur, veuillez nous contacter %s';
 $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';
 ?>
\ No newline at end of file
diff --git a/language/uk_UA/common.lang.php b/language/uk_UA/common.lang.php
index d69e02bf3..54c8fcdf8 100644
--- a/language/uk_UA/common.lang.php
+++ b/language/uk_UA/common.lang.php
@@ -380,7 +380,5 @@ $lang['Here are your connection settings'] = 'Ось Ваші налаштува
 $lang['Password: %s'] = 'Пароль: %s';
 $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'] = 'Розміри фотографій';
 ?>
\ No newline at end of file
diff --git a/language/zh_CN/common.lang.php b/language/zh_CN/common.lang.php
index 54dafdae5..29cb9c726 100644
--- a/language/zh_CN/common.lang.php
+++ b/language/zh_CN/common.lang.php
@@ -383,7 +383,5 @@ $lang['Username: %s'] = '用户名：%s';
 $lang['xlarge'] = '很大尺寸';
 $lang['xxlarge'] = '非常大尺寸';
 $lang['Your username has been successfully changed to : %s'] = '您的用户名成功修改为：%s';
-$lang['new → old'] = '新 → 旧';
-$lang['old → new'] = '旧 → 新';
 $lang['Photo sizes'] = '';
 ?>
\ No newline at end of file
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 1c562cc4d..2dfa597f0 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -274,7 +274,7 @@ y.callService(
 	{if $COMMENT_COUNT > 0}
 		<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}
 	{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}