diff --git a/admin/cat_move.php b/admin/cat_move.php index b6a793b3e..7c52f684c 100644 --- a/admin/cat_move.php +++ b/admin/cat_move.php @@ -30,7 +30,9 @@ $sort_orders = array( 'date_creation DESC', 'date_creation ASC', 'date_available DESC', - 'date_available ASC' + 'date_available ASC', + 'natural_order DESC', + 'natural_order ASC' ); if (isset($_POST['simpleAutoOrder']) || isset($_POST['recursiveAutoOrder']) ) @@ -98,7 +100,7 @@ SELECT id, name, id_uppercat array_multisort( $sort, - SORT_REGULAR, + $order_by_field === "natural_order" ? SORT_NATURAL : SORT_REGULAR, 'ASC' == $order_by_asc ? SORT_ASC : SORT_DESC, $categories ); diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl index 91a01fce0..1ce05eb70 100644 --- a/admin/themes/default/template/cat_move.tpl +++ b/admin/themes/default/template/cat_move.tpl @@ -72,6 +72,18 @@ var delay_autoOpen = {$delay_before_autoOpen} {'Date posted, old → new'|@translate} + + + + diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index 649387757..1cf9315db 100644 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -415,4 +415,6 @@ $lang['Your authentication key is no longer valid.'] = 'Your authentication key $lang['Invalid username or password!'] = 'Invalid username or password!'; $lang['generate random password'] = 'generate random password'; $lang['Related albums'] = 'Related albums'; +$lang['Natural order, A → Z'] = 'Natural order, A → Z'; +$lang['Natural order, Z → A'] = 'Natural order, Z → A'; ?> diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index 96e4861cf..6b422bd51 100644 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -413,4 +413,6 @@ $lang['Link: %s'] = 'Lien: %s'; $lang['Your authentication key is no longer valid.'] = 'Votre clef d\'identification n\'est plus valide.'; $lang['Invalid username or password!'] = 'Nom d\'utilisateur ou mot de passe invalide !'; $lang['generate random password'] = 'générer un mot de passe aléatoire'; -$lang['Related albums'] = 'Albums liés'; \ No newline at end of file +$lang['Related albums'] = 'Albums liés'; +$lang['Natural order, A → Z'] = 'Ordre naturel, A → Z'; +$lang['Natural order, Z → A'] = 'Ordre naturel, Z → A'; \ No newline at end of file