Merge pull request #7593 from SAPlayer/fix-7516

redmunds · redmunds · commit 4a6174975351 · 2014-04-23T07:29:25.000-07:00
Sort languages via their display names
diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js
@@ -167,12 +167,6 @@ define(function (require, exports, module) {
                     
                     return i18n === undefined ? locale : i18n;
                 };
-
-                // add system default
-                languages.push({label: Strings.LANGUAGE_SYSTEM_DEFAULT, language: null});
-                
-                // add english
-                languages.push({label: getLocalizedLabel("en"),  language: "en"});
                 
                 // inspect all children of dirEntry
                 entries.forEach(function (entry) {
@@ -191,6 +185,13 @@ define(function (require, exports, module) {
                         }
                     }
                 });
+                // sort the languages via their display name
+                languages.sort(function (lang1, lang2) {
+                    return lang1.label.localeCompare(lang2.label);
+                });
+
+                // add system default and english (those should be on the very top)
+                languages.unshift({label: Strings.LANGUAGE_SYSTEM_DEFAULT, language: null}, {label: getLocalizedLabel("en"),  language: "en"});
                 
                 var template = Mustache.render(LanguageDialogTemplate, {languages: languages, Strings: Strings});
                 Dialogs.showModalDialogUsingTemplate(template).done(function (id) {
