jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix GetPreferredLocales locale detection 

When scanning the preferred locales, always pick the one
with exact match before falling back to other matches.
master
Ka Ho Ng 2020-06-06 09:00:52 +08:00
parent 05c9ddd229
commit 33dd7eebd2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/platform-x11.cpp
View File

@ -72,6 +72,7 @@ string GetDefaultVideoSavePath()
vector<string> GetPreferredLocales()
{
setlocale(LC_ALL, "");
vector<string> matched;
string messages = setlocale(LC_MESSAGES, NULL);
if (!messages.size() || messages == "C" || messages == "POSIX")
return {};
@ -85,10 +86,10 @@ vector<string> GetPreferredLocales()
return {locale};
if (locale.substr(0, 2) == messages.substr(0, 2))
return {locale};
matched.push_back(locale);
}
return {};
return matched;
}
bool IsAlwaysOnTop(QWidget *window)