Merge lp:~nik90/ubuntu-clock-app/fix-translation-string into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fixes the "h", "d" and "m" strings not being translatable in "Next Alarm in 3d 2h 4m".

Fixes the "h", "d" and "m" strings not being translatable in "Next Alarm in 3d 2h 4m".

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/582/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/245
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/245/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/582/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Thanks! See inline comments.

review: Needs Fixing

[Albert Astals Cid (aacid)]

I'd suggest adding
   //xgettext: no-c-format
as comment just over the tr call to instruct gettext it doesn't have to treat those strings as printf-like strings https://www.gnu.org/software/gettext/manual/html_node/c_002dformat-Flag.html

[lp:~nik90/ubuntu-clock-app/fix-translation-string]

174. By Nekhelesh Ramananthan on 2014-11-17

Reverted ugly string break up and hopefully fixed the issue using a c-string header comment

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:174
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/583/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/246
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/246/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/583/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Albert, but will that not disable error checking for those strings?

I.e. if we've got this situation:

msgid "in %1h %2m"
msgtr "en %1h"

Gettext will flag it as an error. As Launchpad uses gettext for format error checking, it won't allow submitting the incorrect translation.

However, if we add the no-c-format flag, no error checking will be performed, thus letting incorrect translations through. I'm not sure how the code would behave when loading that example translation from the .mo file.

Do I understand this correctly?

review: Needs Information

[Albert Astals Cid (aacid)]

No, that flag doesn't disable error checking, it disables c-format error checking.

[Albert Astals Cid (aacid)]

Let's give it a try i'd say.

review: Approve

[Nekhelesh Ramananthan (nik90)]

I am merging this to test the translation fix. If anything goes bad, it should be simple enough to revert.

review: Approve

=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml	2014-10-09 19:14:40 +0000
+++ app/alarm/AlarmUtils.qml	2014-11-17 16:11:28 +0000
@@ -85,6 +85,7 @@
         // TRANSLATORS: the first argument is the number of days,
         // followed by hour and minute (eg. in 1d 20h 3m)
         if(timeObject.days) {
+            //xgettext: no-c-format
             alarmETA = i18n.tr("in %1d %2h %3m")
             .arg(timeObject.days)
             .arg(timeObject.hours)
@@ -94,6 +95,7 @@
         // TRANSLATORS: the first argument is the number of
         // hours followed by the minutes (eg. in 4h 3m)
         else if (timeObject.hours) {
+            //xgettext: no-c-format
             alarmETA = i18n.tr("in %1h %2m")
             .arg(timeObject.hours)
             .arg(timeObject.minutes)
@@ -102,6 +104,7 @@
         // TRANSLATORS: the argument is the number of
         // minutes to the alarm (eg. in 3m)
         else {
+            //xgettext: no-c-format
             alarmETA = i18n.tr("in %1m")
             .arg(timeObject.minutes)
         }

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-28 10:54:45 +0000
+++ debian/changelog	2014-11-17 16:11:28 +0000
@@ -27,6 +27,7 @@
     now set to false to improve startup animation.
   * Customised splash screen (white background) (LP: #1377638)
   * Added manual test to check disabling of alarms.
+  * Fixed alarm string not being translatable (LP: #1380248)
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-11-04 15:58:05 +0000
+++ po/com.ubuntu.clock.pot	2014-11-17 16:11:28 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-04 16:55+0100\n"
+"POT-Creation-Date: 2014-11-17 17:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -127,18 +127,18 @@
 msgid "Alarm Passed"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:88
-#, qt-format
+#: ../app/alarm/AlarmUtils.qml:89
+#, no-c-format, qt-format
 msgid "in %1d %2h %3m"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:97
-#, qt-format
+#: ../app/alarm/AlarmUtils.qml:99
+#, no-c-format, qt-format
 msgid "in %1h %2m"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:105
-#, c-format, qt-format
+#: ../app/alarm/AlarmUtils.qml:108
+#, no-c-format, qt-format
 msgid "in %1m"
 msgstr ""