Merge lp:~attente/ubuntu-system-settings/lp1236772 into lp:ubuntu-system-settings

[William Hua]

Update formats locale too. (LP: #1236772)

Update formats locale too. (LP: #1236772)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:467
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/480/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/480

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/480/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

The change looks nice, I see the values changing on the system as mentioned in specs and bug #1236772. I'm not sure if this merge is good for the later refactoring that has been done here, but those changes make sense in overall. So if no one minds, I'm approving this one.

review: Approve

=== modified file 'plugins/language/language-plugin.cpp'
--- plugins/language/language-plugin.cpp	2013-10-16 23:17:30 +0000
+++ plugins/language/language-plugin.cpp	2013-10-17 14:56:44 +0000
@@ -158,7 +158,9 @@
         }
 
         if (m_nextCurrentLanguage != m_currentLanguage) {
-            act_user_set_language(user, qPrintable(languageCodes()[m_nextCurrentLanguage]));
+            QString languageCode(languageCodes()[m_nextCurrentLanguage]);
+            act_user_set_language(user, qPrintable(languageCode.left(languageCode.indexOf('.'))));
+            act_user_set_formats_locale(user, qPrintable(languageCode));
             m_currentLanguage = m_nextCurrentLanguage;
             Q_EMIT currentLanguageChanged();
         }
@@ -442,10 +444,10 @@
 
         QString localeOutput(localeProcess.readAllStandardOutput());
         QStringList localeNames(localeOutput.split(QRegExp("\\s+")));
-        QSet<QString> languageNames;
+        QHash<QString, QString> nameCodes;
 
         for (QStringList::const_iterator i(localeNames.begin()); i != localeNames.end(); ++i) {
-            QString localeName(i->left(i->indexOf('.')));
+            QString localeName(i->left(i->indexOf('.')).trimmed());
             QLocale locale(localeName);
             QString languageName(locale.nativeLanguageName().trimmed().toCaseFolded());
 
@@ -454,14 +456,14 @@
                 QString genericName(genericLocale.nativeLanguageName().trimmed().toCaseFolded());
 
                 if (genericName == languageName) {
-                    if (!languageNames.contains(genericName)) {
+                    if (!nameCodes.contains(genericName)) {
                         *m_languageLocales += genericLocale;
-                        languageNames += genericName;
+                        nameCodes.insert(genericName, i->trimmed());
                     }
                 } else {
-                    if (!languageNames.contains(languageName)) {
+                    if (!nameCodes.contains(languageName)) {
                         *m_languageLocales += locale;
-                        languageNames += languageName;
+                        nameCodes.insert(languageName, i->trimmed());
                     }
                 }
             }
@@ -471,9 +473,10 @@
 
         for (int i(0); i < m_languageLocales->length(); i++) {
             *m_languageNames += (*m_languageLocales)[i].nativeLanguageName().trimmed();
-            *m_languageCodes += (*m_languageLocales)[i].name().trimmed();
+            *m_languageCodes += nameCodes[(*m_languageNames)[i].toCaseFolded()];
             (*m_nameIndices)[(*m_languageNames)[i]] = i;
-            (*m_codeIndices)[(*m_languageCodes)[i]] = i;
+            QString languageCode((*m_languageCodes)[i]);
+            (*m_codeIndices)[languageCode.left(languageCode.indexOf('.'))] = i;
         }
     }