Merge lp://staging/~mterry/ubuntu-system-settings/reset-lang-after-page into lp://staging/ubuntu-system-settings
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 915 |
Merged at revision: | 942 |
Proposed branch: | lp://staging/~mterry/ubuntu-system-settings/reset-lang-after-page |
Merge into: | lp://staging/ubuntu-system-settings |
Diff against target: |
189 lines (+68/-26) 7 files modified
wizard/CMakeLists.txt (+2/-0) wizard/main.cpp (+33/-4) wizard/qml/Pages/10-welcome.qml (+1/-0) wizard/qml/main.qml (+2/-0) wizard/ubuntu-system-settings-wizard-cleanup.conf (+0/-17) wizard/ubuntu-system-settings-wizard-set-lang.conf (+30/-0) wizard/ubuntu-system-settings-wizard.conf (+0/-5) |
To merge this branch: | bzr merge lp://staging/~mterry/ubuntu-system-settings/reset-lang-after-page |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+231200@code.staging.launchpad.net |
Commit message
After selecting the language, update the session environment immediately and restart indicators so that their notifications (like wifi prompt) are translated.
Description of the change
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
PASSED: Continuous integration, rev:915 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/1242/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/3715 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 2865 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- amd64-ci/ 435 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- armhf-ci/ 431 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- armhf-ci/ 431/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- i386-ci/ 434 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/3595 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/4962 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/4962/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 11682 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 2326 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3149 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3149/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/1242/ rebuild
http://