feature 2586: simpler sort order labels on gallery side

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

2 files changed, 29 insertions, 15 deletions

diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 9685d225b..ec61b5c1a 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -219,21 +219,20 @@ SELECT *
 function get_category_preferred_image_orders()
 {
   global $conf, $page;
-
-  return trigger_event('get_category_preferred_image_orders',
-    array(
-    array(l10n('Default'), '', true),
-    array(l10n('Rating score'), 'rating_score DESC', $conf['rate']),
-    array(l10n('Most visited'), 'hit DESC', true),
-    array(l10n('Creation date'), 'date_creation DESC', true),
-    array(l10n('Post date'), 'date_available DESC', true),
-    array(l10n('File name'), 'file ASC', true),
-    array(
-      l10n('Rank'),
-      'rank ASC',
-      ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) )
-      ),
-    array( l10n('Permissions'), 'level DESC', is_admin() )
+    
+  return trigger_event('get_category_preferred_image_orders', array(
+    array(l10n('Default'),                        '',                     true),
+    array(l10n('Photo title, A → Z'),        'name ASC',             true),
+    array(l10n('Photo title, Z → A'),        'name DESC',            true),
+    array(l10n('Date created, new → old'),   'date_creation DESC',   true),
+    array(l10n('Date created, old → new'),   'date_creation ASC',    true), 
+    array(l10n('Date posted, new → old'),    'date_available DESC',  true),
+    array(l10n('Date posted, old → new'),    'date_available ASC',   true),
+    array(l10n('Rating score, high → low'),  'rating_score DESC',    $conf['rate']),
+    array(l10n('Rating score, low → high'),  'rating_score ASC',     $conf['rate']),
+    array(l10n('Visits, high → low'),        'hit DESC',             true),
+    array(l10n('Visits, low → high'),        'hit ASC',              true),
+    array(l10n('Permissions'),                    'level DESC',           is_admin()),
     ));
 }
 
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index a432ecda7..c05f9c424 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -388,4 +388,19 @@ $lang['Photo sizes'] = 'Photo sizes';
 $lang['View in'] = 'View in';
 $lang['Mobile'] = 'Mobile';
 $lang['Desktop'] = 'Desktop';
+$lang['File name, A → Z'] = 'File name, A → Z';
+$lang['File name, Z → A'] = 'File name, Z → A';
+$lang['Photo title, A → Z'] = 'Photo title, A → Z';
+$lang['Photo title, Z → A'] = 'Photo title, Z → A';
+$lang['Date created, new → old'] = 'Date created, new → old';
+$lang['Date created, old → new'] = 'Date created, old → new';
+$lang['Date posted, new → old'] = 'Date posted, new → old';
+$lang['Date posted, old → new'] = 'Date posted, old → new';
+$lang['Rating score, high → low'] = 'Rating score, high → low';
+$lang['Rating score, low → high'] = 'Rating score, low → high';
+$lang['Visits, high → low'] = 'Visits, high → low';
+$lang['Visits, low → high'] = 'Visits, low → high';
+$lang['Numeric identifier, 1 → 9'] = 'Numeric identifier, 1 → 9';
+$lang['Numeric identifier, 9 → 1'] = 'Numeric identifier, 9 → 1';
+$lang['Manual sort order'] = 'Manual sort order';
 ?>
\ No newline at end of file