Merge lp:~kalikiana/ubuntu-ui-toolkit/i18nDomainUsr into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Tim Peeters
Approved revision: 1078
Merged at revision: 1081
Proposed branch: lp:~kalikiana/ubuntu-ui-toolkit/i18nDomainUsr
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 22 lines (+6/-5)
1 file modified
modules/Ubuntu/Components/plugin/i18n.cpp (+6/-5)
To merge this branch: bzr merge lp:~kalikiana/ubuntu-ui-toolkit/i18nDomainUsr
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
David Planella (community) Approve
Review via email: mp+220977@code.launchpad.net

Commit message

Call bindtextdomain on /usr if APP_DIR is not defined

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1077
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/919
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/919/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/562
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/562/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/288/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Localized with this branch: Clock*, Unity, Apps scope, Music*, System settings, Shorts*, Calendar*

NOT: Dialler, Messages, Gallery*, Terminal*, Contacts

*Click

So it seems that both Click and Debian apps work. As strings are very incomplete I listed several examples and included those that didn't appear localized even though it may be expected. I tried with German and Spanish.

Revision history for this message
David Planella (dpm) wrote :

I've tested the following:

1. Install the .debs on a desktop
2. Run the clock app from the core apps PPA
3. It appears translated, as expected (previous to this regression, translations were not loaded)

1. Install the .debs on a N4
2. Check that the Search string is translated. It is now, as expected.
3. Run the clock app. It appears translated, as expected.

In summary, it looks good to me, nice work!

review: Approve
1078. By Cris Dywan

eg. should be e.g.

Revision history for this message
Tim Peeters (tpeeters) wrote :

code looks good, and it was well-tested

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1078
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/488
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/952
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/952/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/576
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/576/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/292/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
2--- modules/Ubuntu/Components/plugin/i18n.cpp 2014-05-22 15:54:13 +0000
3+++ modules/Ubuntu/Components/plugin/i18n.cpp 2014-05-27 09:35:43 +0000
4@@ -103,13 +103,14 @@
5 /*
6 The default is /usr/share/locale if we don't set a folder
7 For click we use APP_DIR/share/locale
8- eg. /usr/share/click/preinstalled/com.example.foo/current/share/locale
9+ e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
10 */
11- QDir appDir(getenv("APP_DIR"));
12- if (appDir.exists()) {
13- QString localePath(appDir.filePath("share/locale"));
14- C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
15+ QString appDir(getenv("APP_DIR"));
16+ if (!QDir::isAbsolutePath (appDir)) {
17+ appDir = "/usr";
18 }
19+ QString localePath(QDir(appDir).filePath("share/locale"));
20+ C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
21 Q_EMIT domainChanged();
22 }
23

Subscribers

People subscribed via source and target branches