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

cleanup: split uiLanguage() in two functions

Browse source 
The uiLanguage() function was used for two purposes: to initialize
the language related preferences and to read the current language.
To make things more easy to follow, split this function in two:
one for initializing, one for getting the current language.

Moreover, don't return the current locale in an out-parameter
as there is already a function to do that [getLocale()].

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-22 16:43:21 +01:00 • committed by Dirk Hohndel
parent 2dca7d0ce5
commit eb55ffde16
8 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/qthelper.cpp
View file

@ -426,7 +426,7 @@ QString getUserAgent()
userAgent.append(arch);
if (arch == "i386")
userAgent.append("/" + SubsurfaceSysInfo::currentCpuArchitecture());
userAgent.append(":" + uiLanguage(NULL));
userAgent.append(":" + getUiLanguage());
return userAgent;
}
@ -438,21 +438,20 @@ extern "C" const char *subsurface_user_agent()
return copy_qstring(uA);
}
QString getUiLanguage()
{
return prefs.locale.lang_locale;
}
/* TOOD: Move this to SettingsObjectWrapper, and also fix this complexity.
* gezus.
*/
QString uiLanguage(QLocale *callerLoc)
void initUiLanguage()
{
QString shortDateFormat;
QString dateFormat;
QString timeFormat;
// Language settings are already loaded, see qPref::load()
// so no need to reload them
// remark this method used "useSystemLanguage", which is not set
// instead use_system_language is loaded from disk
// set loc as system language or selected language
if (!qPrefLanguage::use_system_language()) {
loc = QLocale(qPrefLanguage::lang_locale());
@ -483,8 +482,6 @@ QString uiLanguage(QLocale *callerLoc)
else if (languages.count() > 2 && languages[2].contains('-'))
uiLang = languages[2];
}
if (callerLoc)
*callerLoc = loc;
prefs.locale.lang_locale = copy_qstring(uiLang);
@ -515,7 +512,6 @@ QString uiLanguage(QLocale *callerLoc)
free((void *)prefs.time_format);
prefs.time_format = copy_qstring(timeFormat);
}
return uiLang;
}
QLocale getLocale()