Ubuntu UI Toolkit

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

shareLocaleSmarts
Merge into staging

Proposed by Cris Dywan on 2014-05-13

Status:

Merged

Approved by:

Tim Peeters on 2014-05-14

Approved revision:

1051

Merged at revision:

1053

Proposed branch:

lp:~kalikiana/ubuntu-ui-toolkit/shareLocaleSmarts

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

94 lines (+13/-28)

4 files modified

modules/Ubuntu/Components/plugin/i18n.cpp (+6/-10)
tests/unit/tst_i18n/localizedApp/.click/status (+1/-0)
tests/unit/tst_i18n/src/tst_i18n.cpp (+5/-17)
tests/unit/tst_i18n/tst_i18n.pro (+1/-1)

To merge this branch:

bzr merge lp:~kalikiana/ubuntu-ui-toolkit/shareLocaleSmarts

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
David Planella (community)			Approve on 2014-05-14
Tim Peeters		2014-05-13	Approve on 2014-05-14
PS Jenkins bot	continuous-integration		Approve on 2014-05-14
Review via email: mp+219341@code.launchpad.net

Commit message

Pick data path if .click is present

Description of the change

Note for testing:
- System settings (deb) continues to be localized.
- Music (click) is now localized.

lp:~kalikiana/ubuntu-ui-toolkit/shareLocaleSmarts updated on 2014-05-13

1048. By Cris Dywan on 2014-05-13: Correct path set and updated test case

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-13:

FAILED: Continuous integration, rev:1047
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/384/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/209/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-13:

FAILED: Continuous integration, rev:1048
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/220/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/167/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/392/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/213/console

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

review: Needs Fixing (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/shareLocaleSmarts updated on 2014-05-13

1049. By Cris Dywan on 2014-05-13: Update tst_i18n.pro

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-13:

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

review: Approve (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/shareLocaleSmarts updated on 2014-05-13

1050. By Cris Dywan on 2014-05-13: Look for .click/status

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-13:

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

review: Approve (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/shareLocaleSmarts updated on 2014-05-14

1051. By Cris Dywan on 2014-05-14: Use APP_DIR instead of XDG_DATA_DIRS to find locale

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-14:

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-05-14:

code changes make sense

review: Approve

Revision history for this message

David Planella (dpm) wrote on 2014-05-14:

This seems to work on the Simplified Chinese translation of Shorts -> http://i.imgur.com/SBh008P.png

Nice work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Cris Dywan

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

 === modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
 --- modules/Ubuntu/Components/plugin/i18n.cpp	2014-04-23 08:50:20 +0000
 +++ modules/Ubuntu/Components/plugin/i18n.cpp	2014-05-14 10:26:09 +0000
@@ -102,18 +102,14 @@
      m_domain = domain;
      C::textdomain(domain.toUtf8());
      /*
--     Look for locale folder as per XDG basedir spec
       The default is /usr/share/locale if we don't set a folder
--     We look for share/domain to pick correctly among multiple prefixes
++     For click we use APP_DIR/share/locale
++     eg. /usr/share/click/preinstalled/com.example.foo/current/share/locale
       */
--    QString dataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
--        domain, QStandardPaths::LocateDirectory));
--    if (!dataPath.isEmpty()) {
--        QDir dataDir(dataPath);
--        if (dataDir.cdUp() && dataDir.cd("locale")) {
--            QString localePath(dataDir.path());
--            C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
--        }
++    QDir appDir(getenv("APP_DIR"));
++    if (appDir.exists()) {
++        QString localePath(appDir.filePath("share/locale"));
++        C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
+     }
      Q_EMIT domainChanged();
+ }
 === removed directory 'tests/unit/tst_i18n/appropriate/localizedApp'
 === renamed directory 'tests/unit/tst_i18n/appropriate' => 'tests/unit/tst_i18n/localizedApp'
 === added directory 'tests/unit/tst_i18n/localizedApp/.click'
 === added file 'tests/unit/tst_i18n/localizedApp/.click/status'
 --- tests/unit/tst_i18n/localizedApp/.click/status	1970-01-01 00:00:00 +0000
 +++ tests/unit/tst_i18n/localizedApp/.click/status	2014-05-14 10:26:09 +0000
@@ -0,0 +1,1 @@
++Package: localizedApp
 === added directory 'tests/unit/tst_i18n/localizedApp/share'
 === renamed directory 'tests/unit/tst_i18n/appropriate/locale' => 'tests/unit/tst_i18n/localizedApp/share/locale'
 === modified file 'tests/unit/tst_i18n/src/tst_i18n.cpp'
 --- tests/unit/tst_i18n/src/tst_i18n.cpp	2013-12-13 15:37:31 +0000
 +++ tests/unit/tst_i18n/src/tst_i18n.cpp	2014-05-14 10:26:09 +0000
@@ -76,19 +76,11 @@
+     {
          // Set test locale folder in the environment
          // Using setenv because QProcessEnvironment ignores changes
--        QString wrongDataFolder(QCoreApplication::applicationDirPath() + "/diversion");
--        QString testDataFolder(QCoreApplication::applicationDirPath() + "/appropriate");
--        setenv("XDG_DATA_DIRS", (wrongDataFolder + ":" + testDataFolder).toUtf8(), 1);
++        QString testAppDir(QCoreApplication::applicationDirPath() + "/localizedApp");
++        setenv("APP_DIR", testAppDir.toUtf8(), 1);
          // Verify that we set it correctly
--        QString dataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
--            "localizedApp", QStandardPaths::LocateDirectory));
--        QDir dataDir(dataPath);
--        QVERIFY(dataDir.cdUp());
--        QVERIFY(dataDir.cd("locale"));
--        QString doubleCheckLocalePath(dataDir.path());
--        QCOMPARE(doubleCheckLocalePath, testDataFolder + "/locale");
--        QVERIFY(QFileInfo(testDataFolder + "/locale/en/LC_MESSAGES/localizedApp.mo").exists());
++        QVERIFY(QFileInfo(testAppDir + "/share/locale/en/LC_MESSAGES/localizedApp.mo").exists());
          QString modules("../../../modules");
          QVERIFY(QDir(modules).exists());
@@ -128,12 +120,8 @@
          // Was the locale folder detected and set?
          QString boundDomain(C::bindtextdomain(i18n->domain().toUtf8(), ((const char*)0)));
--        QString dataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
--            i18n->domain(), QStandardPaths::LocateDirectory));
--        QDir dataDir(dataPath);
--        QVERIFY(dataDir.cdUp());
--        QVERIFY(dataDir.cd("locale"));
--        QString expectedLocalePath(dataDir.path());
++        QString testAppDir(QCoreApplication::applicationDirPath() + "/localizedApp");
++        QString expectedLocalePath(QDir(testAppDir).filePath("share/locale"));
          QCOMPARE(boundDomain, expectedLocalePath);
          // Is the domain gettext uses correct?
          QString gettextDomain(C::textdomain(((const char*)0)));
 === modified file 'tests/unit/tst_i18n/tst_i18n.pro'
 --- tests/unit/tst_i18n/tst_i18n.pro	2013-12-13 15:37:31 +0000
 +++ tests/unit/tst_i18n/tst_i18n.pro	2014-05-14 10:26:09 +0000
@@ -2,7 +2,7 @@
  QT += gui
  DEFINES += SRCDIR=\\\"$$PWD/\\\"
--system(msgfmt po/en_US.po -o appropriate/locale/en/LC_MESSAGES/localizedApp.mo)
++system(msgfmt po/en_US.po -o localizedApp/share/locale/en/LC_MESSAGES/localizedApp.mo)
  SOURCES += \
      src\/tst_i18n.cpp