Merge lp:~mterry/ubuntu-system-settings/reset-lang-after-page into lp:ubuntu-system-settings

[Michael Terry]

After selecting the language, update the session environment immediately and restart indicators so that their notifications (like wifi prompt) are translated.

After selecting the language, update the session environment immediately and restart indicators so that their notifications (like wifi prompt) are translated.

I've split out the language parts of the cleanup job into its own upstart job that the wizard calls when prompted to by the language page.

== Checklist ==
 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 - Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 - Yes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 - Yes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 - Yes

 * Has a 5 minute exploratory testing run been executed on N4?
 - Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 - NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 - NA

 * If you changed UI labels, did you update the pot file?
 - NA

 * What components might get impacted by your changes?
 - Just wizard

 * Have you requested review by the teams of these owning components?
 - I'm sorta responsible for it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:915
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2865
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/431
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4962
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4962/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11682
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3149
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3149/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1242/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

that looks fine to me, thanks

review: Approve

=== modified file 'wizard/CMakeLists.txt'
--- wizard/CMakeLists.txt	2014-06-17 15:03:02 +0000
+++ wizard/CMakeLists.txt	2014-08-18 14:22:14 +0000
@@ -1,4 +1,5 @@
 include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
 )
 
@@ -41,6 +42,7 @@
 install(TARGETS system-settings-wizard RUNTIME DESTINATION bin)
 install(FILES ubuntu-system-settings-wizard.conf
               ubuntu-system-settings-wizard-cleanup.conf
+              ubuntu-system-settings-wizard-set-lang.conf
         DESTINATION share/upstart/sessions)
 
 set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
 
=== modified file 'wizard/main.cpp'
--- wizard/main.cpp	2014-07-03 14:04:32 +0000
+++ wizard/main.cpp	2014-08-18 14:22:14 +0000
@@ -22,18 +22,42 @@
 #include <QDebug>
 #include <QGuiApplication>
 #include <QLibrary>
+#include <QObject>
 #include <QProcess>
 #include <QQmlContext>
 #include <QQmlEngine>
+#include <QQuickItem>
 #include <QQuickView>
 #include <QTimer>
 
 #include "PageList.h"
 
-void quitViaUpstart()
+class SignalHandler : public QObject
 {
-    QProcess::startDetached("initctl start ubuntu-system-settings-wizard-cleanup");
-}
+    Q_OBJECT
+
+public:
+    static SignalHandler *instance()
+    {
+        static SignalHandler instance_;
+        return &instance_;
+    }
+
+public Q_SLOTS:
+    void handleLanguageUpdate()
+    {
+        QProcess::startDetached("sh -c \"initctl start ubuntu-system-settings-wizard-set-lang; initctl emit --no-wait indicator-services-start; initctl start --no-wait maliit-server\"");
+    }
+
+    void handleQuit()
+    {
+        QProcess::startDetached("initctl start ubuntu-system-settings-wizard-cleanup");
+    }
+
+private:
+    SignalHandler() {}
+    Q_DISABLE_COPY(SignalHandler)
+};
 
 int main(int argc, const char *argv[])
 {
@@ -69,7 +93,10 @@
     view->setSource(QUrl(rootDir + "/qml/main.qml"));
     view->setColor("transparent");
 
-    QObject::connect(view->engine(), &QQmlEngine::quit, quitViaUpstart);
+    QObject::connect(view->rootObject(), SIGNAL(updateLanguage()),
+                     SignalHandler::instance(), SLOT(handleLanguageUpdate()));
+    QObject::connect(view->engine(), &QQmlEngine::quit,
+                     SignalHandler::instance(), &SignalHandler::handleQuit);
 
     if (isMirServer) {
         view->showFullScreen();
@@ -83,3 +110,5 @@
     delete application;
     return result;
 }
+
+#include "main.moc"
 
=== modified file 'wizard/qml/Pages/10-welcome.qml'
--- wizard/qml/Pages/10-welcome.qml	2014-08-07 19:02:11 +0000
+++ wizard/qml/Pages/10-welcome.qml	2014-08-18 14:22:14 +0000
@@ -89,6 +89,7 @@
             text: i18n.tr("Start")
             onClicked: {
                 plugin.currentLanguage = languageList.selectedIndex
+                root.updateLanguage()
                 if (manager.modems.length == 0 || simManager0.present || simManager1.present)
                     pageStack.next()
                 else
 
=== modified file 'wizard/qml/main.qml'
--- wizard/qml/main.qml	2014-08-06 19:36:06 +0000
+++ wizard/qml/main.qml	2014-08-18 14:22:14 +0000
@@ -33,6 +33,8 @@
     property int passwordMethod: UbuntuSecurityPrivacyPanel.Swipe
     property string password: ""
 
+    signal updateLanguage()
+
     Component.onCompleted: {
         Theme.name = "Ubuntu.Components.Themes.SuruGradient"
         i18n.domain = "ubuntu-system-settings"
 
=== modified file 'wizard/ubuntu-system-settings-wizard-cleanup.conf'
--- wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-08-06 19:18:13 +0000
+++ wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-08-18 14:22:14 +0000
@@ -24,23 +24,6 @@
         echo "Resetting MIR_SOCKET to $WIZARD_ORIG_MIR_SOCKET"
         setenv MIR_SOCKET $WIZARD_ORIG_MIR_SOCKET
     fi
-
-    UID=$(id -u)
-
-    # But do change upstart's ideas about locales
-    LANGUAGE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User$UID --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)
-    setenv LANGUAGE $LANGUAGE
-    echo "Set language for $USER_PATH as $LANGUAGE"
-    LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User$UID --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)
-    setenv LC_ALL $LOCALE
-    setenv LANG $LOCALE
-    echo "Set locale as $LOCALE"
-
-    # Stop any indicators so they will be restarted with new environment
-    initctl emit indicator-services-end
-
-    # Stop maliit-server, since it needs to be restarted by unity8
-    stop maliit-server || true
 end script
 
 post-stop script
 
=== added file 'wizard/ubuntu-system-settings-wizard-set-lang.conf'
--- wizard/ubuntu-system-settings-wizard-set-lang.conf	1970-01-01 00:00:00 +0000
+++ wizard/ubuntu-system-settings-wizard-set-lang.conf	2014-08-18 14:22:14 +0000
@@ -0,0 +1,30 @@
+description "Welcome to Ubuntu Cleanup"
+author "Michael Terry <[e-mail]>"
+
+# This job updates the system idea of what language is configured.  It adjusts
+# the upstart env and the DBus activation env.  It also stops indicators and
+# the OSK so that they can be restarted with the new env.
+
+task
+
+script
+    setenv() {
+        initctl set-env --global $1=$2
+        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'$1': '$2'}"
+    }
+
+    UID=$(id -u)
+
+    # Change upstart's ideas about locales
+    LANGUAGE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User$UID --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)
+    setenv LANGUAGE $LANGUAGE
+    echo "Set language for $USER_PATH as $LANGUAGE"
+    LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User$UID --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)
+    setenv LC_ALL $LOCALE
+    setenv LANG $LOCALE
+    echo "Set locale as $LOCALE"
+
+    # Stop any indicators and OSK so they will be restarted with new environment
+    initctl emit indicator-services-end
+    stop maliit-server || true
+end script
 
=== modified file 'wizard/ubuntu-system-settings-wizard.conf'
--- wizard/ubuntu-system-settings-wizard.conf	2014-08-13 16:46:37 +0000
+++ wizard/ubuntu-system-settings-wizard.conf	2014-08-18 14:22:14 +0000
@@ -39,11 +39,6 @@
 
 exec system-settings-wizard
 
-post-start script
-    initctl emit --no-wait indicator-services-start # for Wi-Fi page
-    start --no-wait maliit-server # for Wi-Fi page
-end script
-
 post-stop script
     rm -f "$XDG_RUNTIME_DIR/wizard_socket"
 end script