From 76440500901e157ec8fc97e3b617f2afe5dba3ac Mon Sep 17 00:00:00 2001 From: Daryl Borth Date: Fri, 13 Mar 2020 13:42:05 -0600 Subject: [PATCH] skip chinese traditional (no translation). fix language default. --- source/menu.cpp | 11 ++++------- source/preferences.cpp | 6 ++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/source/menu.cpp b/source/menu.cpp index 64e849d..ac16332 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -149,8 +149,7 @@ void ChangeLanguage() { return; } - if(GCSettings.language == LANG_JAPANESE || GCSettings.language == LANG_KOREAN - || GCSettings.language == LANG_SIMP_CHINESE) { + if(GCSettings.language == LANG_JAPANESE || GCSettings.language == LANG_KOREAN || GCSettings.language == LANG_SIMP_CHINESE) { #ifdef HW_RVL char filepath[MAXPATHLEN]; @@ -3889,13 +3888,11 @@ static int MenuSettingsMenu() case 5: GCSettings.language++; - if(GCSettings.language >= LANG_LENGTH) + if(GCSettings.language == LANG_TRAD_CHINESE) // skip (not supported) + GCSettings.language = LANG_KOREAN; + else if(GCSettings.language >= LANG_LENGTH) GCSettings.language = LANG_JAPANESE; - - if(GCSettings.language == LANG_SIMP_CHINESE) - GCSettings.language = LANG_SIMP_CHINESE; break; - case 6: GCSettings.PreviewImage++; if(GCSettings.PreviewImage > 2) diff --git a/source/preferences.cpp b/source/preferences.cpp index b727ed2..a924959 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -440,10 +440,8 @@ DefaultSettings () #ifdef HW_RVL GCSettings.language = CONF_GetLanguage(); - if(GCSettings.language == LANG_JAPANESE || - GCSettings.language == LANG_TRAD_CHINESE || - GCSettings.language == LANG_KOREAN) - GCSettings.language = LANG_ENGLISH; + if(GCSettings.language == LANG_TRAD_CHINESE) + GCSettings.language = LANG_SIMP_CHINESE; #else GCSettings.language = LANG_ENGLISH; #endif