Merge pull request #7617 from SAPlayer/locale-names-rename

redmunds · redmunds · commit 03841db791fb · 2014-04-25T16:40:33.000-07:00
Rename and sort the locales
diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js
@@ -185,13 +185,16 @@ define(function (require, exports, module) {
                         }
                     }
                 });
+                // add English (US), which is the root folder and should be sorted as well
+                languages.push({label: getLocalizedLabel("en"),  language: "en"});
+
                 // 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"});
+                // add system default (which is placed on the very top)
+                languages.unshift({label: Strings.LANGUAGE_SYSTEM_DEFAULT, language: null});
                 
                 var template = Mustache.render(LanguageDialogTemplate, {languages: languages, Strings: Strings});
                 Dialogs.showModalDialogUsingTemplate(template).done(function (id) {
diff --git a/src/nls/root/strings-app.js b/src/nls/root/strings-app.js
@@ -29,31 +29,31 @@ define({
     "APP_NAME"                             : "Brackets",
 
     // Self locales (used by Debug > Switch Language)
-    "LOCALE_CS"                                 : "Česky",
+    "LOCALE_CS"                                 : "čeština",
     "LOCALE_DE"                                 : "Deutsch",
     "LOCALE_EL"                                 : "Ελληνικά",
     "LOCALE_EN"                                 : "English (US)",
     "LOCALE_EN_GB"                              : "English (UK)",
-    "LOCALE_ES"                                 : "Español",
+    "LOCALE_ES"                                 : "español",
+    "LOCALE_FA_IR"                              : "فارسی",
     "LOCALE_FI"                                 : "suomi",
-    "LOCALE_FR"                                 : "Français",
-    "LOCALE_HR"                                 : "Hrvatski",
-    "LOCALE_ID"                                 : "Indonesia",
+    "LOCALE_FR"                                 : "français",
+    "LOCALE_HR"                                 : "hrvatski",
+    "LOCALE_HU"                                 : "magyar",
+    "LOCALE_ID"                                 : "Bahasa Indonesia",
     "LOCALE_IT"                                 : "italiano",
     "LOCALE_JA"                                 : "日本語",
+    "LOCALE_KO"                                 : "한국어",
     "LOCALE_NB"                                 : "norsk",
     "LOCALE_NL"                                 : "Nederlands",
-    "LOCALE_FA_IR"                              : "Persian-پارسی",
     "LOCALE_PL"                                 : "polski",
-    "LOCALE_PT_BR"                              : "Português do Brasil",
-    "LOCALE_PT_PT"                              : "Português",
-    "LOCALE_RO"                                 : "Română",
+    "LOCALE_PT_BR"                              : "português (BR)",
+    "LOCALE_PT_PT"                              : "português (PT)",
+    "LOCALE_RO"                                 : "română",
     "LOCALE_RU"                                 : "русский",
-    "LOCALE_SK"                                 : "Slovenský",
-    "LOCALE_SR"                                 : "српски",
-    "LOCALE_SV"                                 : "Svenska",
+    "LOCALE_SK"                                 : "slovenčina",
+    "LOCALE_SR"                                 : "Српски",
+    "LOCALE_SV"                                 : "svenska",
     "LOCALE_TR"                                 : "Türkçe",
-    "LOCALE_ZH_CN"                              : "简体中文",
-    "LOCALE_HU"                                 : "Magyar",
-    "LOCALE_KO"                                 : "한국어"
+    "LOCALE_ZH_CN"                              : "简体中文"
 });
