Merge lp:~seb128/ubuntu-system-settings/set-correct-application-name into lp:ubuntu-system-settings

Proposed by Sebastien Bacher on 2015-02-13
Status: Merged
Approved by: Iain Lane on 2015-02-13
Approved revision: 1304
Merged at revision: 1305
Proposed branch: lp:~seb128/ubuntu-system-settings/set-correct-application-name
Merge into: lp:ubuntu-system-settings
Diff against target: 12 lines (+1/-1)
1 file modified
src/qml/MainWindow.qml (+1/-1)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/set-correct-application-name
Reviewer Review Type Date Requested Status
Iain Lane 2015-02-13 Approve on 2015-02-13
PS Jenkins bot continuous-integration Needs Fixing on 2015-02-13
Review via email: mp+249613@code.launchpad.net

Commit Message

change applicationName MainView's property to be "ubuntu-system-settings"
rather than "SystemSettings", the documentation says it should match the
desktop file name. The toolkit also sets the textdomain to that value
which leads to translation issues, even if the domain is changed again
later on, since glib does some init based on the return value of the first
call to g_dgettext for example

Description of the Change

change applicationName MainView's property to be "ubuntu-system-settings"
rather than "SystemSettings", the documentation says it should match the
desktop file name. The toolkit also sets the textdomain to that value
which leads to translation issues, even if the domain is changed again
later on, since glib does some init based on the return value of the first
call to g_dgettext for example

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/MainWindow.qml'
2--- src/qml/MainWindow.qml 2014-09-12 19:32:31 +0000
3+++ src/qml/MainWindow.qml 2015-02-13 09:09:22 +0000
4@@ -27,7 +27,7 @@
5 id: main
6 width: units.gu(50)
7 height: units.gu(90)
8- applicationName: "SystemSettings"
9+ applicationName: "ubuntu-system-settings"
10 objectName: "mainView"
11 automaticOrientation: true
12 useDeprecatedToolbar: false

Subscribers

People subscribed via source and target branches