feature 408: ability to automatically sort sub-categories. The number of SQL

queries is constant, no matter the deepth of your tree.

+ refactor to avoid duplicate code (ascending/desceding should be only a
single parameter in a function, not 20 lines of duplicated code)


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

2 files changed, 8 insertions, 8 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index d4322753f..24b4a60f3 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -633,8 +633,6 @@ $lang['Tools'] = "Tools";
 $lang['Photos'] = "Photos";
 $lang['Themes'] = "Themes";
 $lang['Instructions to use Piwigo'] = "Instructions to use Piwigo";
-$lang['Order alphanumerically'] = "Alphanumerical order";
-$lang['Order alphanumerically reverse'] = "Reverse alphanumerical order";
 $lang['Installed Themes'] = "Installed Themes";
 $lang['Add New Theme'] = "Add a new theme";
 $lang['Forbid this theme to users'] = "Forbid this theme to users";
@@ -683,8 +681,6 @@ $lang['Your configuration settings are saved'] = 'Your configuration settings ar
 $lang['Active Themes'] = 'Active Themes';
 $lang['Add write access to the "%s" directory'] = 'Add write access to the "%s" directory';
 $lang['Administration Home'] = 'Administration Home';
-$lang['Categories ordered alphanumerically'] = 'Categories sorted by alphanumerical order';
-$lang['Categories ordered alphanumerically reverse'] = 'Categories sorted by reverse alphanumeric order';
 $lang['Change Admin Colors'] = 'Change administration colors';
 $lang['Delete this theme'] = 'Delete this theme';
 $lang['Directory does not exist'] = 'Directory does not exist';
@@ -770,4 +766,8 @@ $lang['File upload stopped by extension'] = 'File upload stopped by extension';
 $lang['Unknown upload error'] = 'Unknown upload error';
 $lang['Error on file "%s" : %s'] = 'Error on file "%s" : %s';
 $lang['Menu Management'] = 'Menus';
+$lang['apply to sub-categories'] = 'apply to sub-categories';
+$lang['automatic order'] = 'automatic order';
+$lang['manual order'] = 'manual order';
+$lang['Categories automatically sorted'] = 'Categories automatically sorted';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 74497b831..43f88c277 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -634,8 +634,6 @@ $lang['Tools'] = "Outils";
 $lang['Photos'] = "Photos";
 $lang['Themes'] = "Thèmes";
 $lang['Instructions to use Piwigo'] = "Instructions pour utiliser Piwigo";
-$lang['Order alphanumerically'] = "Ordre alphanumérique";
-$lang['Order alphanumerically reverse'] = "Ordre alphanumérique inverse";
 $lang['Installed Themes'] = "Thèmes installés";
 $lang['Add New Theme'] = "Ajouter un thème";
 $lang['Forbid this theme to users'] = "Interdire ce thème aux utilisateurs";
@@ -685,8 +683,6 @@ $lang['Your configuration settings are saved'] = 'Vos paramètres de configurati
 $lang['Active Themes'] = 'Thèmes activés';
 $lang['Add write access to the "%s" directory'] = 'Ajoutez l\'accès en écriture pour le répertoire "%s"';
 $lang['Administration Home'] = 'Accueil administration';
-$lang['Categories ordered alphanumerically'] = 'Catégories triés par ordre alphanumérique';
-$lang['Categories ordered alphanumerically reverse'] = 'Catégories triés par ordre alphanumérique inverse';
 $lang['Change Admin Colors'] = 'Modifier les couleurs de l\'administration';
 $lang['Delete this theme'] = 'Supprimer ce thème';
 $lang['Directory does not exist'] = 'Le répertoire n\'existe pas';
@@ -775,4 +771,8 @@ $lang['File upload stopped by extension'] = 'Le transfert du fichier a été arr
 $lang['Unknown upload error'] = 'Erreur inconnue survenue lors du transfert';
 $lang['Error on file "%s" : %s'] = 'Erreur sur le fichier "%s" : %s';
 $lang['Menu Management'] = 'Menus';
+$lang['apply to sub-categories'] = 'appliquer aux sous-catégories';
+$lang['automatic order'] = 'ordre automatique';
+$lang['manual order'] = 'ordre manuel';
+$lang['Categories automatically sorted'] = 'Les catégories ont été triées automatiquement';
 ?>