From a8a9dafb1f8c76f6b5fffc7222f4e48c48837d09 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 4 Mar 2015 20:21:46 +0100 Subject: [PATCH 1/2] Display languages untranslated in GUI language selection --- Source/Core/DolphinWX/ConfigMain.cpp | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 6f26a692a6..f65aadd4d4 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -297,32 +297,32 @@ void CConfigMain::InitializeGUILists() // GUI language arrayStrings // keep these in sync with the langIds array at the beginning of this file - arrayStringFor_InterfaceLang.Add(_("")); - arrayStringFor_InterfaceLang.Add(_("Arabic")); - arrayStringFor_InterfaceLang.Add(_("Catalan")); - arrayStringFor_InterfaceLang.Add(_("Chinese (Simplified)")); - arrayStringFor_InterfaceLang.Add(_("Chinese (Traditional)")); - arrayStringFor_InterfaceLang.Add(_("Czech")); - arrayStringFor_InterfaceLang.Add(_("Dutch")); - arrayStringFor_InterfaceLang.Add(_("English")); - arrayStringFor_InterfaceLang.Add(_("Farsi")); - arrayStringFor_InterfaceLang.Add(_("French")); - arrayStringFor_InterfaceLang.Add(_("German")); - arrayStringFor_InterfaceLang.Add(_("Greek")); - arrayStringFor_InterfaceLang.Add(_("Hebrew")); - arrayStringFor_InterfaceLang.Add(_("Hungarian")); - arrayStringFor_InterfaceLang.Add(_("Italian")); - arrayStringFor_InterfaceLang.Add(_("Japanese")); - arrayStringFor_InterfaceLang.Add(_("Korean")); - arrayStringFor_InterfaceLang.Add(_("Norwegian Bokmaal")); - arrayStringFor_InterfaceLang.Add(_("Polish")); - arrayStringFor_InterfaceLang.Add(_("Portuguese")); - arrayStringFor_InterfaceLang.Add(_("Portuguese (Brazilian)")); - arrayStringFor_InterfaceLang.Add(_("Russian")); - arrayStringFor_InterfaceLang.Add(_("Serbian")); - arrayStringFor_InterfaceLang.Add(_("Spanish")); - arrayStringFor_InterfaceLang.Add(_("Swedish")); - arrayStringFor_InterfaceLang.Add(_("Turkish")); + arrayStringFor_InterfaceLang.Add(_("")); + arrayStringFor_InterfaceLang.Add(L"\u0627\u0644\u0639\u0631\u0628\u064A\u0629"); // Arabic + arrayStringFor_InterfaceLang.Add(L"Catal\u00E0"); // Catalan + arrayStringFor_InterfaceLang.Add(L"\u7B80\u4F53\u4E2D\u6587"); // Simplified Chinese + arrayStringFor_InterfaceLang.Add(L"\u7E41\u9AD4\u4E2D\u6587"); // Traditional Chinese + arrayStringFor_InterfaceLang.Add(L"\u010Ce\u0161tina"); // Czech + arrayStringFor_InterfaceLang.Add(L"Nederlands"); // Dutch + arrayStringFor_InterfaceLang.Add(L"English"); // English + arrayStringFor_InterfaceLang.Add(L"\u0641\u0627\u0631\u0633\u06CC"); // Farsi + arrayStringFor_InterfaceLang.Add(L"Fran\u00E7ais"); // French + arrayStringFor_InterfaceLang.Add(L"Deutsch"); // German + arrayStringFor_InterfaceLang.Add(L"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC"); // Greek + arrayStringFor_InterfaceLang.Add(L"\u05E2\u05D1\u05E8\u05D9\u05EA"); // Hebrew + arrayStringFor_InterfaceLang.Add(L"Magyar"); // Hungarian + arrayStringFor_InterfaceLang.Add(L"Italiano"); // Italian + arrayStringFor_InterfaceLang.Add(L"\u65E5\u672C\u8A9E"); // Japanese + arrayStringFor_InterfaceLang.Add(L"\uD55C\uAD6D\uC5B4"); // Korean + arrayStringFor_InterfaceLang.Add(L"Norsk bokm\u00E5l"); // Norwegian + arrayStringFor_InterfaceLang.Add(L"Polski"); // Polish + arrayStringFor_InterfaceLang.Add(L"Portugu\u00EAs"); // Portuguese + arrayStringFor_InterfaceLang.Add(L"Portugu\u00EAs (Brasil)"); // Portuguese (Brazil) + arrayStringFor_InterfaceLang.Add(L"\u0420\u0443\u0441\u0441\u043A\u0438\u0439"); // Russian + arrayStringFor_InterfaceLang.Add(L"Srpski"); // Serbian + arrayStringFor_InterfaceLang.Add(L"Espa\u00F1ol"); // Spanish + arrayStringFor_InterfaceLang.Add(L"Svenska"); // Swedish + arrayStringFor_InterfaceLang.Add(L"T\u00FCrk\u00E7e"); // Turkish } void CConfigMain::InitializeGUIValues() From c40e1d972a000a44cb854475013e5be57bc326b6 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 4 Mar 2015 20:34:22 +0100 Subject: [PATCH 2/2] Sort language list alphabetically by new names --- Source/Core/DolphinWX/ConfigMain.cpp | 60 +++++++++++++++------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index f65aadd4d4..f1196b0deb 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -81,31 +81,33 @@ const CPUCore CPUCores[] = { static const wxLanguage langIds[] = { wxLANGUAGE_DEFAULT, - wxLANGUAGE_ARABIC, + wxLANGUAGE_CATALAN, - wxLANGUAGE_CHINESE_SIMPLIFIED, - wxLANGUAGE_CHINESE_TRADITIONAL, wxLANGUAGE_CZECH, - wxLANGUAGE_DUTCH, - wxLANGUAGE_ENGLISH, - wxLANGUAGE_FARSI, - wxLANGUAGE_FRENCH, wxLANGUAGE_GERMAN, - wxLANGUAGE_GREEK, - wxLANGUAGE_HEBREW, - wxLANGUAGE_HUNGARIAN, + wxLANGUAGE_ENGLISH, + wxLANGUAGE_SPANISH, + wxLANGUAGE_FRENCH, wxLANGUAGE_ITALIAN, - wxLANGUAGE_JAPANESE, - wxLANGUAGE_KOREAN, + wxLANGUAGE_HUNGARIAN, + wxLANGUAGE_DUTCH, wxLANGUAGE_NORWEGIAN_BOKMAL, wxLANGUAGE_POLISH, wxLANGUAGE_PORTUGUESE, wxLANGUAGE_PORTUGUESE_BRAZILIAN, - wxLANGUAGE_RUSSIAN, wxLANGUAGE_SERBIAN, - wxLANGUAGE_SPANISH, wxLANGUAGE_SWEDISH, wxLANGUAGE_TURKISH, + + wxLANGUAGE_GREEK, + wxLANGUAGE_RUSSIAN, + wxLANGUAGE_HEBREW, + wxLANGUAGE_ARABIC, + wxLANGUAGE_FARSI, + wxLANGUAGE_KOREAN, + wxLANGUAGE_JAPANESE, + wxLANGUAGE_CHINESE_SIMPLIFIED, + wxLANGUAGE_CHINESE_TRADITIONAL, }; // Strings for Device Selections @@ -298,31 +300,33 @@ void CConfigMain::InitializeGUILists() // GUI language arrayStrings // keep these in sync with the langIds array at the beginning of this file arrayStringFor_InterfaceLang.Add(_("")); - arrayStringFor_InterfaceLang.Add(L"\u0627\u0644\u0639\u0631\u0628\u064A\u0629"); // Arabic + arrayStringFor_InterfaceLang.Add(L"Catal\u00E0"); // Catalan - arrayStringFor_InterfaceLang.Add(L"\u7B80\u4F53\u4E2D\u6587"); // Simplified Chinese - arrayStringFor_InterfaceLang.Add(L"\u7E41\u9AD4\u4E2D\u6587"); // Traditional Chinese arrayStringFor_InterfaceLang.Add(L"\u010Ce\u0161tina"); // Czech - arrayStringFor_InterfaceLang.Add(L"Nederlands"); // Dutch - arrayStringFor_InterfaceLang.Add(L"English"); // English - arrayStringFor_InterfaceLang.Add(L"\u0641\u0627\u0631\u0633\u06CC"); // Farsi - arrayStringFor_InterfaceLang.Add(L"Fran\u00E7ais"); // French arrayStringFor_InterfaceLang.Add(L"Deutsch"); // German - arrayStringFor_InterfaceLang.Add(L"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC"); // Greek - arrayStringFor_InterfaceLang.Add(L"\u05E2\u05D1\u05E8\u05D9\u05EA"); // Hebrew - arrayStringFor_InterfaceLang.Add(L"Magyar"); // Hungarian + arrayStringFor_InterfaceLang.Add(L"English"); // English + arrayStringFor_InterfaceLang.Add(L"Espa\u00F1ol"); // Spanish + arrayStringFor_InterfaceLang.Add(L"Fran\u00E7ais"); // French arrayStringFor_InterfaceLang.Add(L"Italiano"); // Italian - arrayStringFor_InterfaceLang.Add(L"\u65E5\u672C\u8A9E"); // Japanese - arrayStringFor_InterfaceLang.Add(L"\uD55C\uAD6D\uC5B4"); // Korean + arrayStringFor_InterfaceLang.Add(L"Magyar"); // Hungarian + arrayStringFor_InterfaceLang.Add(L"Nederlands"); // Dutch arrayStringFor_InterfaceLang.Add(L"Norsk bokm\u00E5l"); // Norwegian arrayStringFor_InterfaceLang.Add(L"Polski"); // Polish arrayStringFor_InterfaceLang.Add(L"Portugu\u00EAs"); // Portuguese arrayStringFor_InterfaceLang.Add(L"Portugu\u00EAs (Brasil)"); // Portuguese (Brazil) - arrayStringFor_InterfaceLang.Add(L"\u0420\u0443\u0441\u0441\u043A\u0438\u0439"); // Russian arrayStringFor_InterfaceLang.Add(L"Srpski"); // Serbian - arrayStringFor_InterfaceLang.Add(L"Espa\u00F1ol"); // Spanish arrayStringFor_InterfaceLang.Add(L"Svenska"); // Swedish arrayStringFor_InterfaceLang.Add(L"T\u00FCrk\u00E7e"); // Turkish + + arrayStringFor_InterfaceLang.Add(L"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC"); // Greek + arrayStringFor_InterfaceLang.Add(L"\u0420\u0443\u0441\u0441\u043A\u0438\u0439"); // Russian + arrayStringFor_InterfaceLang.Add(L"\u05E2\u05D1\u05E8\u05D9\u05EA"); // Hebrew + arrayStringFor_InterfaceLang.Add(L"\u0627\u0644\u0639\u0631\u0628\u064A\u0629"); // Arabic + arrayStringFor_InterfaceLang.Add(L"\u0641\u0627\u0631\u0633\u06CC"); // Farsi + arrayStringFor_InterfaceLang.Add(L"\uD55C\uAD6D\uC5B4"); // Korean + arrayStringFor_InterfaceLang.Add(L"\u65E5\u672C\u8A9E"); // Japanese + arrayStringFor_InterfaceLang.Add(L"\u7B80\u4F53\u4E2D\u6587"); // Simplified Chinese + arrayStringFor_InterfaceLang.Add(L"\u7E41\u9AD4\u4E2D\u6587"); // Traditional Chinese } void CConfigMain::InitializeGUIValues()