otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

do not set locale if it's English

Browse source
This commit is contained in:
tildearrow 2024-06-19 13:43:28 -05:00
parent 8a6d81473e
commit 64f931e895
2 changed files with 56 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/settings.cpp
View file

@ -79,7 +79,7 @@ const char* locales[][3]={
//{"Français (0%)", "fr_FR", "redémarrer Furnace pour que ce réglage soit effectif."}, //{"Français (0%)", "fr_FR", "redémarrer Furnace pour que ce réglage soit effectif."},
//{"Հայերեն (1%)", "hy_AM", "???"}, //{"Հայերեն (1%)", "hy_AM", "???"},
//{"日本語 (0%)", "ja_JP", "???"}, //{"日本語 (0%)", "ja_JP", "???"},
//{"한국어 (10%)", "ko_KR", "이 설정을 적용하려면 Furnace를 다시 시작해야 합니다."}, {"한국어 (10%)", "ko_KR", "이 설정을 적용하려면 Furnace를 다시 시작해야 합니다."},
//{"Nederlands (4%)", "nl_NL", "start Furnace opnieuw op om deze instelling effectief te maken."}, //{"Nederlands (4%)", "nl_NL", "start Furnace opnieuw op om deze instelling effectief te maken."},
{"Polski (90%)", "pl_PL", "aby to ustawienie było skuteczne, należy ponownie uruchomić program."}, {"Polski (90%)", "pl_PL", "aby to ustawienie było skuteczne, należy ponownie uruchomić program."},
{"Português (Brasil) (90%)", "pt_BR", "reinicie o Furnace para que essa configuração entre em vigor."}, {"Português (Brasil) (90%)", "pt_BR", "reinicie o Furnace para que essa configuração entre em vigor."},

108
src/main.cpp
View file

@ -555,74 +555,76 @@ int main(int argc, char** argv) {
reqLocale+=".UTF-8"; reqLocale+=".UTF-8";
} }
} }
const char* localeRet=NULL; if (reqLocale!="en_US.UTF-8") {
const char* localeRet=NULL;
#ifdef HAVE_SETLOCALE #ifdef HAVE_SETLOCALE
if ((localeRet=setlocale(LC_CTYPE,reqLocale.c_str()))==NULL) { if ((localeRet=setlocale(LC_CTYPE,reqLocale.c_str()))==NULL) {
logE("could not set locale (CTYPE)!"); logE("could not set locale (CTYPE)!");
displayLocaleFailError=true; displayLocaleFailError=true;
} else { } else {
logV("locale: %s",localeRet); logV("locale: %s",localeRet);
}
if ((localeRet=setlocale(LC_MESSAGES,reqLocale.c_str()))==NULL) {
logE("could not set locale (MESSAGES)!");
displayLocaleFailError=true;
#ifdef HAVE_MOMO
if (momo_setlocale(LC_MESSAGES,reqLocale.c_str())==NULL) {
logV("Momo: could not set locale!");
} }
#endif if ((localeRet=setlocale(LC_MESSAGES,reqLocale.c_str()))==NULL) {
} else { logE("could not set locale (MESSAGES)!");
logV("locale: %s",localeRet); displayLocaleFailError=true;
#ifdef HAVE_MOMO #ifdef HAVE_MOMO
if (momo_setlocale(LC_MESSAGES,localeRet)==NULL) { if (momo_setlocale(LC_MESSAGES,reqLocale.c_str())==NULL) {
logV("Momo: could not set locale!"); logV("Momo: could not set locale!");
} }
#endif #endif
} } else {
logV("locale: %s",localeRet);
#ifdef HAVE_MOMO
if (momo_setlocale(LC_MESSAGES,localeRet)==NULL) {
logV("Momo: could not set locale!");
}
#endif
}
#else #else
if ((localeRet=momo_setlocale(LC_MESSAGES,reqLocale.c_str()))==NULL) { if ((localeRet=momo_setlocale(LC_MESSAGES,reqLocale.c_str()))==NULL) {
logV("Momo: could not set locale!"); logV("Momo: could not set locale!");
} else { } else {
logV("locale: %s",localeRet); logV("locale: %s",localeRet);
} }
#endif #endif
char exePath[4096]; char exePath[4096];
#ifdef ANDROID #ifdef ANDROID
memset(exePath,0,4096); memset(exePath,0,4096);
#else #else
if (!getExePath(argv[0],exePath,4096)) memset(exePath,0,4096); if (!getExePath(argv[0],exePath,4096)) memset(exePath,0,4096);
#endif #endif
bool textDomainBound=false; bool textDomainBound=false;
for (int i=0; localeDirs[i]; i++) { for (int i=0; localeDirs[i]; i++) {
if (exePath[0]!=0 && localeDirs[i][0]!=DIR_SEPARATOR) { if (exePath[0]!=0 && localeDirs[i][0]!=DIR_SEPARATOR) {
strncpy(localeDir,exePath,4095); strncpy(localeDir,exePath,4095);
strncat(localeDir,DIR_SEPARATOR_STR,4095); strncat(localeDir,DIR_SEPARATOR_STR,4095);
strncat(localeDir,localeDirs[i],4095); strncat(localeDir,localeDirs[i],4095);
} else { } else {
strncpy(localeDir,localeDirs[i],4095); strncpy(localeDir,localeDirs[i],4095);
}
logV("bind text domain: %s",localeDir);
if (!dirExists(localeDir)) continue;
if ((localeRet=TA_BINDTEXTDOMAIN("furnace",localeDir))==NULL) {
continue;
} else {
textDomainBound=true;
logV("text domain 1: %s",localeRet);
break;
}
} }
logV("bind text domain: %s",localeDir); if (!textDomainBound) {
if (!dirExists(localeDir)) continue; logE("could not bind text domain!");
if ((localeRet=TA_BINDTEXTDOMAIN("furnace",localeDir))==NULL) {
continue;
} else { } else {
textDomainBound=true; if ((localeRet=TA_TEXTDOMAIN("furnace"))==NULL) {
logV("text domain 1: %s",localeRet); logE("could not text domain!");
break; } else {
logV("text domain 2: %s",localeRet);
}
} }
}
if (!textDomainBound) {
logE("could not bind text domain!");
} else {
if ((localeRet=TA_TEXTDOMAIN("furnace"))==NULL) {
logE("could not text domain!");
} else {
logV("text domain 2: %s",localeRet);
}
}
#endif #endif
}
initParams(); initParams();