language

Minecraft.Client/Common/Consoles_App.cpp

@@ -9579,6 +9579,61 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
 {
 	vector<eMCLang> locales;
 
+#ifdef _WINDOWS64
+	unsigned char forcedLang = GetMinecraftLanguage(0);
+
+	if (forcedLang != MINECRAFT_LANGUAGE_DEFAULT)
+	{
+		switch (forcedLang)
+		{
+		case MINECRAFT_LANGUAGE_ENGLISH		:
+			locales.push_back(eMCLang_enUS);
+			break;
+
+		case MINECRAFT_LANGUAGE_JAPANESE	:
+			locales.push_back(eMCLang_jaJP);
+			break;
+
+		case MINECRAFT_LANGUAGE_GERMAN		:
+			locales.push_back(eMCLang_deDE);
+			break;
+
+		case MINECRAFT_LANGUAGE_FRENCH		:
+			locales.push_back(eMCLang_frFR);
+			break;
+
+		case MINECRAFT_LANGUAGE_SPANISH		:
+			locales.push_back(eMCLang_esES);
+			break;
+
+		case MINECRAFT_LANGUAGE_LATINAMERICANSPANISH	:
+			locales.push_back(eMCLang_laLAS);
+			locales.push_back(eMCLang_esMX);
+			break;
+
+		case MINECRAFT_LANGUAGE_ITALIAN		:
+			locales.push_back(eMCLang_itIT);
+			break;
+
+		case MINECRAFT_LANGUAGE_KOREAN		:
+			locales.push_back(eMCLang_koKR);
+			break;
+
+		case MINECRAFT_LANGUAGE_TCHINESE		:
+			locales.push_back(eMCLang_zhCHT);
+			break;
+
+		case MINECRAFT_LANGUAGE_PORTUGUESE		:
+			locales.push_back(eMCLang_ptPT);
+			break;
+
+		case MINECRAFT_LANGUAGE_BRAZILIAN		:
+			locales.push_back(eMCLang_ptBR);
+			break;
+		}
+	}
+#endif
+
 	DWORD dwSystemLanguage = XGetLanguage( );
 
 	// 4J-PB - restrict the 360 language until we're ready to have them in

Minecraft.Client/Common/UI/UIScene_LanguageSelector.cpp

@@ -18,7 +18,7 @@ const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[]=
 	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)
+	/*HAS_LANGUAGE_DA_DK(IDS_LANG_DANISH)
 	HAS_LANGUAGE_FI_FI(IDS_LANG_FINISH)
 	HAS_LANGUAGE_NL_NL(IDS_LANG_DUTCH)
 	HAS_LANGUAGE_PL_PL(IDS_LANG_POLISH)
@@ -28,7 +28,7 @@ const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[]=
 	HAS_LANGUAGE_SK_SK(IDS_LANG_SLOVAK)
 	HAS_LANGUAGE_CZ_CZ(IDS_LANG_CZECH)
 	HAS_LANGUAGE_EL_GR(IDS_LANG_GREEK)
-	HAS_LANGUAGE_TR_TR(IDS_LANG_TURKISH)
+	HAS_LANGUAGE_TR_TR(IDS_LANG_TURKISH)*/
 };
 
 
@@ -51,10 +51,10 @@ wstring UIScene_LanguageSelector::getMoviePath()
 	else								return L"LanguagesMenu";
 }
 
-void UIScene_LanguageSelector::updateTooltips()
+/*void UIScene_LanguageSelector::updateTooltips() //temporaly removing this
 {
 	ui.SetTooltips( m_iPad, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK);
-}
+}*/
 
 void UIScene_LanguageSelector::updateComponents()
 {
@@ -123,7 +123,11 @@ void UIScene_LanguageSelector::handlePress(F64 controlId, F64 childId)
 
 		app.SetMinecraftLanguage(m_iPad, newLanguage);
 		app.SetMinecraftLocale(m_iPad, newLocale);
-
 		app.CheckGameSettingsChanged(true, m_iPad);
+		#if defined _WINDOWS64 //js in case it breaks console support
+			app.loadStringTable();
+			m_parentLayer->closeAllScenes();
+			m_parentLayer->NavigateToScene(m_iPad, eUIScene_MainMenu, NULL);
+		#endif
 	}
 }

Minecraft.Client/Common/UI/UIScene_LanguageSelector.h

@@ -92,7 +92,7 @@ public:
 
 	virtual EUIScene getSceneType() { return eUIScene_LanguageSelector; }
 	
-	virtual void updateTooltips();
+	//virtual void updateTooltips();
 	virtual void updateComponents();
 
 	virtual void handleReload();

Minecraft.Client/Common/UI/UIScene_SettingsOptionsMenu.cpp

@@ -2,7 +2,7 @@
 #include "UI.h"
 #include "UIScene_SettingsOptionsMenu.h"
 
-#if defined(_XBOX_ONE)
+#if defined(_XBOX_ONE) || defined (_WINDOWS64)
 #define _ENABLE_LANGUAGE_SELECT
 #endif