From c367c21a7683617c76bc9281991c3ee11adcdaa0 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Fri, 25 Jul 2008 19:28:24 +0000 Subject: Make rbutil check the system language and try to use the correct translation. A language selection in the configuration file will override this. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18118 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbsettings.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'rbutil/rbutilqt/rbsettings.cpp') diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 38ed542ee7..d1f90ea7f6 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp @@ -252,7 +252,13 @@ QString RbSettings::curVoiceName() QString RbSettings::curLang() { - return userSettings->value("lang").toString(); + // QSettings::value only returns the default when the setting + // doesn't exist. Make sure to return the system language if + // the language in the configuration is present but empty too. + QString lang = userSettings->value("lang").toString(); + if(lang.isEmpty()) + lang = QLocale::system().name(); + return lang; } QString RbSettings::curEncoder() -- cgit v1.2.3