github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Fixed problem with setlocale (missing .utf8 part)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13512 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-07-29 12:00:30 +00:00
parent ef573f3903
commit 597798b5dd
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/Core/App.cpp
View file

@ -337,8 +337,6 @@ void Exit(int code)
throw ExitExc();
}
bool AppNormalExit;
void AppExecute__(void (*app)())
{
try {
@ -347,7 +345,6 @@ void AppExecute__(void (*app)())
catch(ExitExc) {
return;
}
AppNormalExit = true;
}
#ifdef PLATFORM_POSIX

18
uppsrc/Core/LangInfo.cpp
View file

@ -244,7 +244,7 @@ LanguageInfo::LanguageInfo()
void LanguageInfo::Set(int lang_)
{
language = lang_;
dword q = sGetLanguageDetails(language, &english_name, &native_name);
dword q = sGetLanguageDetails(language, &english_name, &native_name);
if(!q)
return;
@ -254,6 +254,10 @@ void LanguageInfo::Set(int lang_)
getindexletter = CSCZGetIndexLetter;
compare = CSCZLanguageCompare;
}
decimal_point = ".";
thousand_separator = ",";
#ifdef PLATFORM_WIN32
LCID lcid = q;
thousand_separator = GetLocaleInfoA(lcid, LOCALE_STHOUSAND);
@ -299,16 +303,9 @@ void LanguageInfo::Set(int lang_)
#if defined(PLATFORM_POSIX) && !defined(PLATFORM_ANDROID)
String langtext = LNGAsText(language);
char ltext[6];
ltext[0] = ToLower(langtext[0]);
ltext[1] = ToLower(langtext[1]);
ltext[2] = '_';
ltext[3] = ToUpper(langtext[3]);
ltext[4] = ToUpper(langtext[4]);
ltext[5] = 0;
String ltext = Format("%c%c_%c%c", ToLower(langtext[0]), ToLower(langtext[1]), ToUpper(langtext[3]), ToUpper(langtext[4]));
String oldloc = setlocale(LC_ALL, NULL);
if(setlocale(LC_ALL, ltext))
{
if(setlocale(LC_ALL, ltext + ".utf8") || setlocale(LC_ALL, ltext + ".UTF-8") || setlocale(LC_ALL, ltext)) {
const struct lconv *lc = localeconv();
decimal_point = lc->decimal_point;
thousand_separator = lc->thousands_sep;
@ -344,6 +341,7 @@ void LanguageInfo::Set(int lang_)
setlocale(LC_ALL, oldloc);
}
#endif
for(int i = 0; i < 12; i++) {
month[i] = month_names[i].ToString();

2
uppsrc/Core/heapdbg.cpp
View file

@ -194,7 +194,7 @@ void MemoryDumpLeaks()
{
if(PanicMode)
return;
if(!AppNormalExit) {
if(IsMainRunning()) {
VppLog() << "Application was terminated in a non-standard way (e.g. exit(x) call or Ctrl+C)\n";
return;
}