Merge pull request #9774 from glassez/fix-locale

Consider empty locale  setting as not set. Closes #9735
This commit is contained in:
Vladimir Golovnev
2018-10-28 17:43:07 +03:00
committed by GitHub

View File

@@ -91,7 +91,8 @@ void Preferences::setValue(const QString &key, const QVariant &value)
// General options
QString Preferences::getLocale() const
{
return value("Preferences/General/Locale", QLocale::system().name()).toString();
const QString localeName = value("Preferences/General/Locale").toString();
return (localeName.isEmpty() ? QLocale::system().name() : localeName);
}
void Preferences::setLocale(const QString &locale)