diff --git a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp index c2a30d3c..3db88f88 100644 --- a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp @@ -9,13 +9,14 @@ const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[]= HAS_LANGUAGE_EN_US(IDS_LANG_ENGLISH) HAS_LANGUAGE_DE_DE(IDS_LANG_GERMAN) HAS_LANGUAGE_ES_ES(IDS_LANG_SPANISH_SPAIN) - HAS_LANGUAGE_ES_MX(IDS_LANG_SPANISH_LATIN_AMERICA) +// HAS_LANGUAGE_ES_MX(IDS_LANG_SPANISH_LATIN_AMERICA) HAS_LANGUAGE_FR_FR(IDS_LANG_FRENCH) HAS_LANGUAGE_IT_IT(IDS_LANG_ITALIAN) - HAS_LANGUAGE_PT_PT(IDS_LANG_PORTUGUESE_PORTUGAL) +// HAS_LANGUAGE_PT_PT(IDS_LANG_PORTUGUESE_PORTUGAL) HAS_LANGUAGE_PT_BR(IDS_LANG_PORTUGUESE_BRAZIL) HAS_LANGUAGE_JA_JP(IDS_LANG_JAPANESE) HAS_LANGUAGE_KO_KR(IDS_LANG_KOREAN) +/* HAS_LANGUAGE_CN_TW(IDS_LANG_CHINESE_TRADITIONAL) HAS_LANGUAGE_CN_CN(IDS_LANG_CHINESE_SIMPLIFIED) HAS_LANGUAGE_DA_DK(IDS_LANG_DANISH) @@ -29,9 +30,9 @@ const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[]= HAS_LANGUAGE_CZ_CZ(IDS_LANG_CZECH) HAS_LANGUAGE_EL_GR(IDS_LANG_GREEK) HAS_LANGUAGE_TR_TR(IDS_LANG_TURKISH) +*/ }; - UIScene_LanguageSelector::UIScene_LanguageSelector(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer) { // Setup all the Iggy references we need for this scene @@ -40,15 +41,15 @@ UIScene_LanguageSelector::UIScene_LanguageSelector(int iPad, void *initData, UIL m_buttonListHowTo.init(eControl_Buttons); for(unsigned int i = 0; i < eLanguageSelector_MAX; ++i) - { m_buttonListHowTo.addItem( m_uiHTPButtonNameA[i] , i); - } } wstring UIScene_LanguageSelector::getMoviePath() { - if (app.GetLocalPlayerCount() > 1) return L"LanguagesMenuSplit"; - else return L"LanguagesMenu"; + if (app.GetLocalPlayerCount() > 1) + return L"LanguagesMenuSplit"; + else + return L"LanguagesMenu"; } void UIScene_LanguageSelector::updateTooltips() @@ -76,9 +77,7 @@ void UIScene_LanguageSelector::updateComponents() void UIScene_LanguageSelector::handleReload() { for (unsigned int i = 0; i < eLanguageSelector_MAX; ++i) - { m_buttonListHowTo.addItem( m_uiHTPButtonNameA[i], i); - } } void UIScene_LanguageSelector::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled) diff --git a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.h b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.h index b5c3d4c6..a48c64a5 100644 --- a/Minecraft.Client/Common/UI/UIScene_LanguageSelector.h +++ b/Minecraft.Client/Common/UI/UIScene_LanguageSelector.h @@ -7,15 +7,16 @@ #define HAS_LANGUAGE_EN_US(exp) exp, #define HAS_LANGUAGE_DE_DE(exp) exp, #define HAS_LANGUAGE_ES_ES(exp) exp, -#define HAS_LANGUAGE_ES_MX(exp) exp, +//#define HAS_LANGUAGE_ES_MX(exp) exp, #define HAS_LANGUAGE_FR_FR(exp) exp, #define HAS_LANGUAGE_IT_IT(exp) exp, -#define HAS_LANGUAGE_PT_PT(exp) exp, +//#define HAS_LANGUAGE_PT_PT(exp) exp, #define HAS_LANGUAGE_PT_BR(exp) exp, #define HAS_LANGUAGE_JA_JP(exp) exp, #define HAS_LANGUAGE_KO_KR(exp) exp, -#define HAS_LANGUAGE_CN_TW(exp) exp, +//#define HAS_LANGUAGE_CN_TW(exp) exp, +/* #ifdef _DURANGO #define HAS_LANGUAGE_CN_CN(exp) exp, #define HAS_LANGUAGE_SK_SK(exp) exp, @@ -40,6 +41,7 @@ #else #define HAS_LANGUAGE_TR_TR(exp) #endif +*/ class UIScene_LanguageSelector : public UIScene { @@ -51,13 +53,14 @@ public: HAS_LANGUAGE_EN_US(eLanguageSelector_EN_US) HAS_LANGUAGE_DE_DE(eLanguageSelector_DE_DE) HAS_LANGUAGE_ES_ES(eLanguageSelector_ES_ES) - HAS_LANGUAGE_ES_MX(eLanguageSelector_ES_MX) +// HAS_LANGUAGE_ES_MX(eLanguageSelector_ES_MX) HAS_LANGUAGE_FR_FR(eLanguageSelector_FR_FR) HAS_LANGUAGE_IT_IT(eLanguageSelector_IT_IT) - HAS_LANGUAGE_PT_PT(eLanguageSelector_PT_PT) +// HAS_LANGUAGE_PT_PT(eLanguageSelector_PT_PT) HAS_LANGUAGE_PT_BR(eLanguageSelector_PT_BR) HAS_LANGUAGE_JA_JP(eLanguageSelector_JA_JP) HAS_LANGUAGE_KO_KR(eLanguageSelector_KO_KR) +/* HAS_LANGUAGE_CN_TW(eLanguageSelector_CN_TW) HAS_LANGUAGE_CN_CN(eLanguageSelector_CN_CN) HAS_LANGUAGE_DA_DK(eLanguageSelector_DA_DK) @@ -71,6 +74,7 @@ public: HAS_LANGUAGE_CZ_CZ(eLanguageSelector_CZ_CZ) HAS_LANGUAGE_EL_GR(eLanguageSelector_EL_GR) HAS_LANGUAGE_TR_TR(eLanguageSelector_TR_TR) +*/ eLanguageSelector_MAX }; @@ -112,28 +116,30 @@ const int uiLangMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = { HAS_LANGUAGE_SYSTEM(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_EN_US(XC_LANGUAGE_ENGLISH) - HAS_LANGUAGE_DE_DE(XC_LANGUAGE_GERMAN) + HAS_LANGUAGE_DE_DE(XC_LANGUAGE_GERMAN) HAS_LANGUAGE_ES_ES(XC_LANGUAGE_SPANISH) - HAS_LANGUAGE_ES_MX(XC_LANGUAGE_SPANISH) - HAS_LANGUAGE_FR_FR(XC_LANGUAGE_FRENCH) - HAS_LANGUAGE_IT_IT(XC_LANGUAGE_ITALIAN) - HAS_LANGUAGE_PT_PT(XC_LANGUAGE_PORTUGUESE) +// HAS_LANGUAGE_ES_MX(XC_LANGUAGE_SPANISH) + HAS_LANGUAGE_FR_FR(XC_LANGUAGE_FRENCH) + HAS_LANGUAGE_IT_IT(XC_LANGUAGE_ITALIAN) +// HAS_LANGUAGE_PT_PT(XC_LANGUAGE_PORTUGUESE) HAS_LANGUAGE_PT_BR(XC_LANGUAGE_PORTUGUESE) - HAS_LANGUAGE_JA_JP(XC_LANGUAGE_JAPANESE) - HAS_LANGUAGE_KO_KR(XC_LANGUAGE_KOREAN) - HAS_LANGUAGE_CN_TW(XC_LANGUAGE_TCHINESE) + HAS_LANGUAGE_JA_JP(XC_LANGUAGE_JAPANESE) + HAS_LANGUAGE_KO_KR(XC_LANGUAGE_KOREAN) +/* + HAS_LANGUAGE_CN_TW(XC_LANGUAGE_TCHINESE) HAS_LANGUAGE_CN_CN(XC_LANGUAGE_SCHINESE) HAS_LANGUAGE_DA_DK(XC_LANGUAGE_DANISH) HAS_LANGUAGE_FI_FI(XC_LANGUAGE_FINISH) - HAS_LANGUAGE_NL_NL(XC_LANGUAGE_DUTCH) - HAS_LANGUAGE_PL_PL(XC_LANGUAGE_POLISH) - HAS_LANGUAGE_RU_RU(XC_LANGUAGE_RUSSIAN) - HAS_LANGUAGE_SV_SE(XC_LANGUAGE_SWEDISH) + HAS_LANGUAGE_NL_NL(XC_LANGUAGE_DUTCH) + HAS_LANGUAGE_PL_PL(XC_LANGUAGE_POLISH) + HAS_LANGUAGE_RU_RU(XC_LANGUAGE_RUSSIAN) + HAS_LANGUAGE_SV_SE(XC_LANGUAGE_SWEDISH) HAS_LANGUAGE_NB_NO(XC_LANGUAGE_BNORWEGIAN) HAS_LANGUAGE_SK_SK(XC_LANGUAGE_SLOVAK) - HAS_LANGUAGE_CZ_CZ(XC_LANGUAGE_CZECH) + HAS_LANGUAGE_CZ_CZ(XC_LANGUAGE_CZECH) HAS_LANGUAGE_EL_GR(XC_LANGUAGE_GREEK) HAS_LANGUAGE_TR_TR(XC_LANGUAGE_TURKISH) +*/ }; const int uiLocaleMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = @@ -141,14 +147,15 @@ const int uiLocaleMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = HAS_LANGUAGE_SYSTEM(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_EN_US(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_DE_DE(MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_ES_ES(XC_LOCALE_SPAIN) - HAS_LANGUAGE_ES_MX(XC_LOCALE_LATIN_AMERICA) + HAS_LANGUAGE_ES_ES(XC_LOCALE_SPAIN) +// HAS_LANGUAGE_ES_MX(XC_LOCALE_LATIN_AMERICA) HAS_LANGUAGE_FR_FR(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_IT_IT(MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_PT_PT(XC_LOCALE_PORTUGAL) - HAS_LANGUAGE_PT_BR(XC_LOCALE_BRAZIL) +// HAS_LANGUAGE_PT_PT(XC_LOCALE_PORTUGAL) + HAS_LANGUAGE_PT_BR(XC_LOCALE_BRAZIL) HAS_LANGUAGE_JA_JP(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_KO_KR(MINECRAFT_LANGUAGE_DEFAULT) +/* HAS_LANGUAGE_CN_TW(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_CN_CN(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_DA_DK(MINECRAFT_LANGUAGE_DEFAULT) @@ -162,4 +169,5 @@ const int uiLocaleMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = HAS_LANGUAGE_CZ_CZ(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_EL_GR(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_TR_TR(MINECRAFT_LANGUAGE_DEFAULT) +*/ }; \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/de-DE/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/de-DE/stringsLanguages.xml new file mode 100644 index 00000000..1468a170 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/de-DE/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + System Language + English + + German + + Spanish + Spanish (Spain) + Spanish (Latin America) + + French + + Italian + + Portuguese + Portuguese (Portugal) + Portuguese (Brazil) + + Japanese + + Korean + + Chinese (Traditional) + Chinese (Simplified) + + Danish + Finnish + + Dutch + + Polish + Russian + Swedish + Norwegian + + Greek + + Turkish + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/es-ES/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/es-ES/stringsLanguages.xml new file mode 100644 index 00000000..944cbbf9 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/es-ES/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + Idioma del sistema + Inglés + + Alemán + + Español + Español (España) + Español (Latinoamérica) + + Francés + + Italiano + + Portugués + Portugués (Portugal) + Portugués (Brazil) + + Japonés + + Coreano + + Chino (Tradicional) + Chino (Simplificado) + + Danés + Finés + + Neerlandés + + Polaco + Ruso + Sueco + Noruego + + Griego + + Turco + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/fr-FR/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/fr-FR/stringsLanguages.xml new file mode 100644 index 00000000..1468a170 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/fr-FR/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + System Language + English + + German + + Spanish + Spanish (Spain) + Spanish (Latin America) + + French + + Italian + + Portuguese + Portuguese (Portugal) + Portuguese (Brazil) + + Japanese + + Korean + + Chinese (Traditional) + Chinese (Simplified) + + Danish + Finnish + + Dutch + + Polish + Russian + Swedish + Norwegian + + Greek + + Turkish + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/it-IT/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/it-IT/stringsLanguages.xml new file mode 100644 index 00000000..1468a170 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/it-IT/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + System Language + English + + German + + Spanish + Spanish (Spain) + Spanish (Latin America) + + French + + Italian + + Portuguese + Portuguese (Portugal) + Portuguese (Brazil) + + Japanese + + Korean + + Chinese (Traditional) + Chinese (Simplified) + + Danish + Finnish + + Dutch + + Polish + Russian + Swedish + Norwegian + + Greek + + Turkish + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/ja-JP/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/ja-JP/stringsLanguages.xml new file mode 100644 index 00000000..1468a170 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/ja-JP/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + System Language + English + + German + + Spanish + Spanish (Spain) + Spanish (Latin America) + + French + + Italian + + Portuguese + Portuguese (Portugal) + Portuguese (Brazil) + + Japanese + + Korean + + Chinese (Traditional) + Chinese (Simplified) + + Danish + Finnish + + Dutch + + Polish + Russian + Swedish + Norwegian + + Greek + + Turkish + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/ko-KR/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/ko-KR/stringsLanguages.xml new file mode 100644 index 00000000..1468a170 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/ko-KR/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + System Language + English + + German + + Spanish + Spanish (Spain) + Spanish (Latin America) + + French + + Italian + + Portuguese + Portuguese (Portugal) + Portuguese (Brazil) + + Japanese + + Korean + + Chinese (Traditional) + Chinese (Simplified) + + Danish + Finnish + + Dutch + + Polish + Russian + Swedish + Norwegian + + Greek + + Turkish + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/pt-BR/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/pt-BR/stringsLanguages.xml new file mode 100644 index 00000000..1468a170 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/pt-BR/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + System Language + English + + German + + Spanish + Spanish (Spain) + Spanish (Latin America) + + French + + Italian + + Portuguese + Portuguese (Portugal) + Portuguese (Brazil) + + Japanese + + Korean + + Chinese (Traditional) + Chinese (Simplified) + + Danish + Finnish + + Dutch + + Polish + Russian + Swedish + Norwegian + + Greek + + Turkish + \ No newline at end of file diff --git a/Minecraft.Client/Windows64Media/loc/zh-CHT/stringsLanguages.xml b/Minecraft.Client/Windows64Media/loc/zh-CHT/stringsLanguages.xml new file mode 100644 index 00000000..1468a170 --- /dev/null +++ b/Minecraft.Client/Windows64Media/loc/zh-CHT/stringsLanguages.xml @@ -0,0 +1,40 @@ + + + System Language + English + + German + + Spanish + Spanish (Spain) + Spanish (Latin America) + + French + + Italian + + Portuguese + Portuguese (Portugal) + Portuguese (Brazil) + + Japanese + + Korean + + Chinese (Traditional) + Chinese (Simplified) + + Danish + Finnish + + Dutch + + Polish + Russian + Swedish + Norwegian + + Greek + + Turkish + \ No newline at end of file