Skip to content

Q
qgroundcontrol
Commit d384f58d authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

parent 1b0a329c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/QGCApplication.cc
View file @ d384f58d
...@@ -459,7 +459,6 @@ void QGCApplication::setLanguage() ...@@ -459,7 +459,6 @@ void QGCApplication::setLanguage()
} }
} }
qCDebug(LocalizationLog) << "Loading localizations for" << _locale.name(); qCDebug(LocalizationLog) << "Loading localizations for" << _locale.name();
QLocale::setDefault(_locale);
_app->removeTranslator(&_qgcTranslatorJSON); _app->removeTranslator(&_qgcTranslatorJSON);
_app->removeTranslator(&_qgcTranslatorSourceCode); _app->removeTranslator(&_qgcTranslatorSourceCode);
_app->removeTranslator(&_qgcTranslatorQtLibs); _app->removeTranslator(&_qgcTranslatorQtLibs);
...@@ -469,6 +468,7 @@ void QGCApplication::setLanguage() ...@@ -469,6 +468,7 @@ void QGCApplication::setLanguage()
qCWarning(LocalizationLog) << "Qt lib localization for" << _locale.name() << "is not present"; qCWarning(LocalizationLog) << "Qt lib localization for" << _locale.name() << "is not present";
} }
if (_locale.name() != "en_US") { if (_locale.name() != "en_US") {
QLocale::setDefault(_locale);
if(_qgcTranslatorSourceCode.load(_locale, QLatin1String("qgc_source_"), "", ":/i18n")) { if(_qgcTranslatorSourceCode.load(_locale, QLatin1String("qgc_source_"), "", ":/i18n")) {
_app->installTranslator(&_qgcTranslatorSourceCode); _app->installTranslator(&_qgcTranslatorSourceCode);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment