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

[William Hua]

Make language and formats locale independent settings

Make language and formats locale independent settings

[Ken VanDine (ken-vandine)]

Looks good and seems to work fine.

Please update the test plan to match https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-system-settings#Language_.26_Text

review: Approve

[Ken VanDine (ken-vandine)]

We need Pat and design to agree to what we're implementing here and from the conversation on IRC I have the feeling not everyone is agreement to land this.

review: Needs Information

Unmerged revisions

1662. By William Hua on 2016-06-14

Only change the language if the mode is 0

1661. By William Hua on 2016-06-02

Make language and formats locale independent settings

=== modified file 'plugins/language/DisplayLanguage.qml'
--- plugins/language/DisplayLanguage.qml	2015-08-10 13:31:45 +0000
+++ plugins/language/DisplayLanguage.qml	2016-06-14 14:37:20 +0000
@@ -28,12 +28,13 @@
     id: root
     objectName: "displayLanguageDialog"
 
+    property int displayMode: 0
     property string initialLanguage
 
     signal languageChanged (int newLanguage, int oldLanguage)
 
     modal: true
-    title: i18n.tr("Display language")
+    title: displayMode == 0 ? i18n.tr("Display language") : i18n.tr("Date & number formats")
 
     contentsWidth: parent.width
     contentsHeight: parent.height
@@ -58,7 +59,7 @@
            otherwise the UI might end up in a situation where scrolling doesn't work */
         flickableDirection: Flickable.VerticalFlick
 
-        currentIndex: plugin.currentLanguage
+        currentIndex: displayMode == 0 ? plugin.currentLanguage : plugin.currentFormat
 
         model: plugin.languageNames
         delegate: ListItem.Standard {
@@ -72,7 +73,8 @@
         }
 
         onCurrentIndexChanged: {
-            i18n.language = plugin.languageCodes[currentIndex]
+            if (displayMode == 0)
+                i18n.language = plugin.languageCodes[currentIndex]
         }
     }
 
@@ -114,7 +116,7 @@
             id: confirmButton
             objectName: "confirmChangeLanguage"
             text: i18n.tr("Confirm")
-            enabled: languageList.currentIndex != plugin.currentLanguage
+            enabled: languageList.currentIndex != (displayMode == 0 ? plugin.currentLanguage : plugin.currentFormat)
 
             anchors.left: parent.horizontalCenter
             anchors.right: parent.right
@@ -125,10 +127,16 @@
             anchors.bottomMargin: units.gu(1)
 
             onClicked: {
-                var oldLang = plugin.currentLanguage;
+                var oldLang = displayMode == 0 ? plugin.currentLanguage : plugin.currentFormat;
                 var newLang = languageList.currentIndex;
+
                 languageChanged(newLang, oldLang);
-                plugin.currentLanguage = newLang;
+
+                if (displayMode == 0)
+                    plugin.currentLanguage = newLang;
+                else
+                    plugin.currentFormat = newLang;
+
                 PopupUtils.close(root);
             }
         }
 
=== modified file 'plugins/language/PageComponent.qml'
--- plugins/language/PageComponent.qml	2016-03-02 13:15:34 +0000
+++ plugins/language/PageComponent.qml	2016-06-14 14:37:20 +0000
@@ -53,8 +53,24 @@
         id: displayLanguage
 
         DisplayLanguage {
-            onLanguageChanged: {
-                PopupUtils.open(rebootNecessaryNotification, root, {
+            displayMode: 0
+
+            onLanguageChanged: {
+                PopupUtils.open(rebootNecessaryNotificationLanguage, root, {
+                    revertTo: oldLanguage
+                })
+            }
+        }
+    }
+
+    Component {
+        id: displayFormat
+
+        DisplayLanguage {
+            displayMode: 1
+
+            onLanguageChanged: {
+                PopupUtils.open(rebootNecessaryNotificationFormat, root, {
                     revertTo: oldLanguage
                 })
             }
@@ -68,7 +84,7 @@
     }
 
     Component {
-        id: rebootNecessaryNotification
+        id: rebootNecessaryNotificationLanguage
 
         RebootNecessary {
 
@@ -82,6 +98,20 @@
         }
     }
 
+    Component {
+        id: rebootNecessaryNotificationFormat
+
+        RebootNecessary {
+
+            onReboot: {
+                plugin.reboot();
+            }
+            onRevert: {
+                plugin.currentFormat = to;
+            }
+        }
+    }
+
     GSettings {
         id: settings
 
@@ -106,7 +136,6 @@
                 iconSource: "image://theme/language-chooser"
                 text: i18n.tr("Display language…")
                 objectName: "displayLanguage"
-                showDivider: false
                 component: Label {
                     property int currentLanguage: plugin.currentLanguage
                     objectName: "currentLanguage"
@@ -118,6 +147,13 @@
                 onClicked: PopupUtils.open(displayLanguage)
             }
 
+            ListItem.SingleValue {
+                text: i18n.tr("Date & number formats")
+                progression: true
+                value: plugin.languageNames[plugin.currentFormat]
+                onClicked: PopupUtils.open(displayFormat)
+            }
+
             ListItem.Divider {}
 
             ListItem.SingleValue {
 
=== modified file 'plugins/language/language-plugin.cpp'
--- plugins/language/language-plugin.cpp	2015-12-22 13:49:39 +0000
+++ plugins/language/language-plugin.cpp	2016-06-14 14:37:20 +0000
@@ -86,6 +86,8 @@
     QObject(parent),
     m_currentLanguage(-1),
     m_nextCurrentLanguage(-1),
+    m_currentFormat(-1),
+    m_nextCurrentFormat(-1),
     m_manager(act_user_manager_get_default()),
     m_user(nullptr)
 {
@@ -159,6 +161,22 @@
     }
 }
 
+int
+LanguagePlugin::currentFormat() const
+{
+    return m_currentFormat;
+}
+
+void
+LanguagePlugin::setCurrentFormat(int index)
+{
+    if (index >= 0 && index < m_languageCodes.length()) {
+        m_nextCurrentFormat = index;
+
+        updateCurrentLanguage();
+    }
+}
+
 SubsetModel *
 LanguagePlugin::spellCheckingModel()
 {
@@ -246,6 +264,7 @@
 LanguagePlugin::updateCurrentLanguage()
 {
     int previousLanguage(m_currentLanguage);
+    int previousFormat(m_currentFormat);
 
     if (m_user != nullptr && act_user_is_loaded(m_user)) {
         if (m_nextCurrentLanguage >= 0) {
@@ -255,23 +274,35 @@
             QString formatsLocale(m_languageCodes[m_currentLanguage]);
             QString language(formatsLocale.left(formatsLocale.indexOf('.')));
             act_user_set_language(m_user, qPrintable(language));
+        } else if (m_nextCurrentFormat >= 0) {
+            m_currentFormat = m_nextCurrentFormat;
+            m_nextCurrentFormat = -1;
+
+            QString formatsLocale(m_languageCodes[m_currentFormat]);
             act_user_set_formats_locale(m_user, qPrintable(formatsLocale));
         } else {
+            QString language(act_user_get_language(m_user));
             QString formatsLocale(act_user_get_formats_locale(m_user));
-            m_currentLanguage = indexForLocale(formatsLocale);
-
-            if (m_currentLanguage < 0) {
-                QString language(act_user_get_language(m_user));
-                m_currentLanguage = indexForLocale(language);
-            }
+
+            m_currentLanguage = indexForLocale(language);
+            m_currentFormat = indexForLocale(formatsLocale);
+
+            if (m_currentLanguage < 0)
+                m_currentLanguage = m_currentFormat;
         }
     }
 
     if (m_currentLanguage < 0)
         m_currentLanguage = indexForLocale(QLocale::system().name());
 
+    if (m_currentFormat < 0)
+        m_currentFormat = indexForLocale(QLocale::system().name());
+
     if (m_currentLanguage != previousLanguage)
         Q_EMIT currentLanguageChanged();
+
+    if (m_currentFormat != previousFormat)
+        Q_EMIT currentFormatChanged();
 }
 
 
 
=== modified file 'plugins/language/language-plugin.h'
--- plugins/language/language-plugin.h	2015-12-22 13:49:39 +0000
+++ plugins/language/language-plugin.h	2016-06-14 14:37:20 +0000
@@ -56,6 +56,11 @@
                WRITE setCurrentLanguage
                NOTIFY currentLanguageChanged)
 
+    Q_PROPERTY(int currentFormat
+               READ currentFormat
+               WRITE setCurrentFormat
+               NOTIFY currentFormatChanged)
+
     Q_PROPERTY(SubsetModel *spellCheckingModel
                READ spellCheckingModel
                CONSTANT)
@@ -73,6 +78,10 @@
     void setCurrentLanguage(int index);
     Q_SIGNAL void currentLanguageChanged() const;
 
+    int currentFormat() const;
+    void setCurrentFormat(int index);
+    Q_SIGNAL void currentFormatChanged() const;
+
     SubsetModel *spellCheckingModel();
     Q_SLOT void spellCheckingModelChanged();
 
@@ -104,6 +113,8 @@
 
     int m_currentLanguage;
     int m_nextCurrentLanguage;
+    int m_currentFormat;
+    int m_nextCurrentFormat;
     ActUserManager *m_manager;
     ActUser *m_user;