Changeset 1722:63591a096fb3 for inc/admin

Timestamp:

09/04/13 15:48:57 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Improved lang combo, updated simpleMenu accordingly, see #1599

File:

• inc/admin/lib.admincombos.php (modified) (1 diff)

inc/admin/lib.admincombos.php

@@ -98 +98 @@
      */   
      public static function getLangsCombo($langs,$with_available=false) {
+          $all_langs = l10n::getISOcodes(0,1);
           if ($with_available) {
-               $all_langs = l10n::getISOcodes(0,1);
-               $lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1));
+               $langs_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1));
                while ($langs->fetch()) {
                     if (isset($all_langs[$langs->post_lang])) {
-                         $lang_combo[__('Most used')][$all_langs[$langs->post_lang]] = $langs->post_lang;
-                         unset($lang_combo[__('Available')][$all_langs[$langs->post_lang]]);
+                         $langs_combo[__('Most used')][$all_langs[$langs->post_lang]] = $langs->post_lang;
+                         unset($langs_combo[__('Available')][$all_langs[$langs->post_lang]]);
                     } else {
-                         $lang_combo[__('Most used')][$langs->post_lang] = $langs->post_lang;
+                         $langs_combo[__('Most used')][$langs->post_lang] = $langs->post_lang;
                     }
                }
-               unset($all_langs);
           } else {
-               $lang_combo = array();
+               $langs_combo = array();
                while ($langs->fetch()) {
-                    $lang_combo[$langs->post_lang] = $langs->post_lang;
+                    $lang_name = isset($all_langs[$langs->post_lang]) ? $all_langs[$langs->post_lang] : $langs->post_lang;
+                    $langs_combo[$lang_name] = $langs->post_lang;
                }
           }
-          return $lang_combo;
+          unset($all_langs);
+          return $langs_combo;
      }