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

2
desktop-widgets/preferences/preferences_language.cpp
View file

@ -89,7 +89,7 @@ void PreferencesLanguage::syncSettings()
qPrefLanguage::set_time_format(ui->timeFormatEntry->currentText());
qPrefLanguage::set_date_format(ui->dateFormatEntry->currentText());
qPrefLanguage::set_date_format_short(ui->shortDateFormatEntry->text());
uiLanguage(NULL);
initUiLanguage();
QString qDateTimeWeb = tr("These will be used as is. This might not be what you intended.\nSee http://doc.qt.io/qt-5/qdatetime.html#toString");
QRegExp tfillegalchars("[^hHmszaApPt\\s:;\\.,]");

2
desktop-widgets/usermanual.cpp
View file

@ -64,7 +64,7 @@ UserManual::UserManual(QWidget *parent) : QDialog(parent)
QString searchPath = getSubsurfaceDataPath("Documentation");
if (searchPath.size()) {
// look for localized versions of the manual first
QString lang = uiLanguage(NULL);
QString lang = getUiLanguage();
QString prefix = searchPath.append("/user-manual");
QFile manual(prefix + "_" + lang + ".html");
if (!manual.exists())

4
desktop-widgets/usersurvey.cpp
View file

@ -31,7 +31,7 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),
QString osArch = SubsurfaceSysInfo::currentCpuArchitecture();
os.append(QString("&osCpuArch=%1").arg(osArch));
}
os.append(QString("&uiLang=%1").arg(uiLanguage(NULL)));
os.append(QString("&uiLang=%1").arg(getUiLanguage()));
os.append(QString("&uuid=%1").arg(getUUID()));
ui->system->setPlainText(getVersion());
}
@ -46,7 +46,7 @@ QString UserSurvey::getVersion()
sysInfo.append(tr("\nCPU architecture: %1").arg(arch));
if (arch == "i386")
sysInfo.append(tr("\nOS CPU architecture: %1").arg(SubsurfaceSysInfo::currentCpuArchitecture()));
sysInfo.append(tr("\nLanguage: %1").arg(uiLanguage(NULL)));
sysInfo.append(tr("\nLanguage: %1").arg(getUiLanguage()));
return sysInfo;
}