mirrors/SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

N3DS: Fix locale name and early return.

Browse Source 
- The name for simplified Chinese should be `zh_CN`.
- Ensure `cfguExit` is called even if `CFGU_GetSystemLanguage` failed.
This commit is contained in:
Pierre Wendling 2024-03-19 23:39:22 +01:00 committed by Sam Lantinga
parent 8f529d9d16
commit 390fff4ae0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/locale/n3ds/SDL_syslocale.c
View File

@ -33,7 +33,7 @@ int SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
{ {
/* The 3DS only supports these 12 languages, only one can be active at a time */ /* The 3DS only supports these 12 languages, only one can be active at a time */
static const char AVAILABLE_LOCALES[][6] = { "ja_JP", "en_US", "fr_FR", "de_DE", static const char AVAILABLE_LOCALES[][6] = { "ja_JP", "en_US", "fr_FR", "de_DE",
"it_IT", "es_ES", "zn_CN", "ko_KR", "it_IT", "es_ES", "zh_CN", "ko_KR",
"nl_NL", "pt_PT", "ru_RU", "zh_TW" }; "nl_NL", "pt_PT", "ru_RU", "zh_TW" };
u8 current_locale = GetLocaleIndex(); u8 current_locale = GetLocaleIndex();
if (current_locale != BAD_LOCALE) { if (current_locale != BAD_LOCALE) {
@ -45,12 +45,11 @@ int SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
static u8 GetLocaleIndex(void) static u8 GetLocaleIndex(void)
{ {
u8 current_locale; u8 current_locale;
Result result;
if (R_FAILED(cfguInit())) { if (R_FAILED(cfguInit())) {
return BAD_LOCALE; return BAD_LOCALE;
} }
if (R_FAILED(CFGU_GetSystemLanguage(&current_locale))) { result = CFGU_GetSystemLanguage(&current_locale);
return BAD_LOCALE;
}
cfguExit(); cfguExit();
return current_locale; return R_SUCCEEDED(result) ? current_locale : BAD_LOCALE;
} }