mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

preferences: choose language code with one '-'

Browse source 
On initialization, the old code searched for the first language
code containing a '-'. However, my Qt version gives de-Latn-DE
as the first entry. That messed up the preferences code: it
didn't recognize that entry. Thus, simply opening and closing
the preferences switched the language to Bulgarian.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-03-09 10:49:17 +01:00 • committed by Dirk Hohndel
parent 889ca23999
commit cf990b0f39
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/qthelper.cpp
View file

@ -460,16 +460,12 @@ void initUiLanguage()
loc = QLocale(QLocale().uiLanguages().first()); loc = QLocale(QLocale().uiLanguages().first());
} }
// Find language code with one '-', or use the first entry.
QStringList languages = loc.uiLanguages(); QStringList languages = loc.uiLanguages();
QString uiLang; QString uiLang;
if (languages[0].contains('-')) auto it = std::find_if(languages.begin(), languages.end(), [](const QString &s)
uiLang = languages[0]; { return s.count('-') == 1; });
else if (languages.count() > 1 && languages[1].contains('-')) uiLang = it == languages.end() ? languages[0] : *it;
uiLang = languages[1];
else if (languages.count() > 2 && languages[2].contains('-'))
uiLang = languages[2];
else
uiLang = languages[0];
// there's a stupid Qt bug on MacOS where uiLanguages doesn't give us the country info // there's a stupid Qt bug on MacOS where uiLanguages doesn't give us the country info
if (!uiLang.contains('-') && uiLang != loc.bcp47Name()) { if (!uiLang.contains('-') && uiLang != loc.bcp47Name()) {