pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Even better lang loading.

Browse source
This commit is contained in:
Martin Rotter 2016-06-22 22:51:07 +02:00
parent 8dba235318
commit b5240a5eb5
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/miscellaneous/localization.cpp
View file

@ -33,15 +33,7 @@ Localization::~Localization() {
} }
QString Localization::desiredLanguage() const { QString Localization::desiredLanguage() const {
QString from_settings = qApp->settings()->value(GROUP(General), SETTING(General::Language)).toString(); return qApp->settings()->value(GROUP(General), SETTING(General::Language)).toString();
foreach (Language lang, installedLanguages()) {
if (lang.m_code == from_settings) {
return from_settings;
}
}
return DEFAULT_LOCALE;
} }
void Localization::loadActiveLanguage() { void Localization::loadActiveLanguage() {
@ -52,6 +44,7 @@ void Localization::loadActiveLanguage() {
if (app_translator->load(QLocale(desired_localization), "rssguard", QSL("-"), APP_LANG_PATH)) { if (app_translator->load(QLocale(desired_localization), "rssguard", QSL("-"), APP_LANG_PATH)) {
Application::installTranslator(app_translator); Application::installTranslator(app_translator);
qDebug("Application localization '%s' loaded successfully.", qPrintable(desired_localization)); qDebug("Application localization '%s' loaded successfully.", qPrintable(desired_localization));
desired_localization = app_translator->translate("QObject", "LANG_ABBREV");
} }
else { else {
qWarning("Application localization '%s' was not loaded.", qPrintable(desired_localization)); qWarning("Application localization '%s' was not loaded.", qPrintable(desired_localization));