From e59f69c3a50dacafede7f966ee23decfd7848d2e Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 9 Mar 2017 11:58:06 +0100 Subject: [PATCH] fixes #300, album sort by date, make obvious we use photo dates --- admin/cat_list.php | 8 ++++---- language/en_UK/admin.lang.php | 3 ++- language/fr_FR/admin.lang.php | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/admin/cat_list.php b/admin/cat_list.php index 642c7aa51..e57ff925f 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -43,10 +43,10 @@ if (!empty($_POST) or isset($_GET['delete'])) $sort_orders = array( 'name ASC' => l10n('Album name, A → Z'), 'name DESC' => l10n('Album name, Z → A'), - 'date_creation DESC' => l10n('Date created, new → old'), - 'date_creation ASC' => l10n('Date created, old → new'), - 'date_available DESC' => l10n('Date posted, new → old'), - 'date_available ASC' => l10n('Date posted, old → new'), + 'date_creation DESC' => l10n('Date created, new → old').' '.l10n('(determined from photos)'), + 'date_creation ASC' => l10n('Date created, old → new').' '.l10n('(determined from photos)'), + 'date_available DESC' => l10n('Date posted, new → old').' '.l10n('(determined from photos)'), + 'date_available ASC' => l10n('Date posted, old → new').' '.l10n('(determined from photos)'), ); // +-----------------------------------------------------------------------+ diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 9a08973e0..a9f0a4f38 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1002,4 +1002,5 @@ $lang['Storage used'] = 'Storage used'; $lang['First photo added'] = 'First photo added'; $lang['No filter on album. Select one or type to search'] = 'No filter on album. Select one or type to search'; $lang['Piwigo Remote Sync is able to upload a whole folder hierarchy. If you run it again, only new photos will be uploaded.'] = 'Piwigo Remote Sync is able to upload a whole folder hierarchy. If you run it again, only new photos will be uploaded.'; -$lang['Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'] = 'Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'; \ No newline at end of file +$lang['Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'] = 'Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'; +$lang['(determined from photos)'] = '(determined from photos)'; \ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index d6923a0eb..7810d7a71 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1004,4 +1004,5 @@ $lang['Storage used'] = 'Stockage utilisé'; $lang['First photo added'] = 'Première photo'; $lang['No filter on album. Select one or type to search'] = 'Aucun filtre. Tapez ici pour chercher un album.'; $lang['Piwigo Remote Sync is able to upload a whole folder hierarchy. If you run it again, only new photos will be uploaded.'] = 'Piwigo Remote Sync vous permet d\'ajouter une arborescence complète de répertoires. Si vous lancez la synchro une nouvelle fois, seules les nouvelles photos seront ajoutées.'; -$lang['Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'] = 'Partager / Envoyez vos photos directement de votre MacOS X (10.10 ou plus récent) vers votre Piwigo.'; \ No newline at end of file +$lang['Share / Send your photos directly from your Mac Os X (10.10 and following) to Piwigo'] = 'Partager / Envoyez vos photos directement de votre MacOS X (10.10 ou plus récent) vers votre Piwigo.'; +$lang['(determined from photos)'] = '(déterminée à partir des photos)'; \ No newline at end of file