Merge lp:~nik90/ubuntu-clock-app/make-alarmlabel-translatable into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Made the default alarm label translatable and updated the pot file.

Made the default alarm label translatable and updated the pot file.

==== Checklist ====

* Are there any related MPs required for this MP to build/function as expected? Please list.

None Required.

* Is your branch in sync with latest trunk? (e.g. bzr pull lp:ubuntu-clock-app -> no changes)

Yes it is.

* Did the tests run successfully (QML and AP)?

Yes

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* What device (or emulator) has your component test plan been executed successfully on?

x86 Emulator and N4 Device

* If you changed the UI, was the change specified/approved by design?

No UI Change

* What manual tests are relevant for this MP?

- Change your phone language to something other than english.
- Create a new alarm
- In the add alarm page, ensure that the alarm label is translated

* If you changed UI labels, did you update the pot file?

Yes, I updated the pot file

* Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?

https://wiki.ubuntu.com/Process/Merges/Checklists/Clock

[lp:~nik90/ubuntu-clock-app/make-alarmlabel-translatable]

93. By Nekhelesh Ramananthan on 2014-09-08

Commented code to make it more clear to other devs

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

PASSED: Continuous integration, rev:93
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/453/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/253
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/100

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me. However, I've noticed some updates in the .pot file that probably need to be fixed in a separate branch:

186 -msgid "%1 h %2 m %3"
187 +msgid "%1h %2m %3"
188 msgstr ""
189
190 #. TRANSLATORS: the first argument is hour, followed by the
191 #. translation for either 'behind' or 'ahead'
192 #: ../app/worldclock/UserWorldCityDelegate.qml:160
193 #, qt-format
194 -msgid "%1 h %2"
195 +msgid "%1h %2"
196 msgstr ""
197
198 #. TRANSLATORS: the first argument is minute, followed by the
199 #. translation for either 'behind' or 'ahead'
200 #: ../app/worldclock/UserWorldCityDelegate.qml:168
201 #, qt-format
202 -msgid "%1 m %2"
203 +msgid "%1m %2"

Numerical value and unit symbol are separated by a space (see [1]), which seems to have been reverted in a previous branch. This is not just about being pedantic: attaching letters to %1 arguments modifies the way the arguments behave, therefore it's always best to leave the %1 args on their own. As an example, if I try to translate this string in LP: "%1m %2" as "%1 m %2", gettext complains that the translated argument needs to be the same as the original, and does not allow me to submit the translation.

So approving it, but with caveats for this to be changed in a separate branch.

[1] http://en.wikipedia.org/wiki/ISO_31-0

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-09-01 11:59:43 +0000
+++ app/alarm/EditAlarmPage.qml	2014-09-08 22:31:21 +0000
@@ -173,6 +173,17 @@
     Alarm {
         id: _alarm
 
+        Component.onCompleted: {
+            /*
+             Sets the alarm name manually to "Alarm" to ensure that it is
+             translatable instead of using the default name set by the SDK
+             Alarms API.
+            */
+            if (isNewAlarm) {
+                _alarm.message = i18n.tr("Alarm")
+            }
+        }
+
         onErrorChanged: {
             if (error !== Alarm.NoError) {
                 Utils.log(debugMode, "Error saving alarm, code: " + error)

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-06 16:34:39 +0000
+++ debian/changelog	2014-09-08 22:31:21 +0000
@@ -30,6 +30,7 @@
   * Fixed no UI hint being show to add cities (LP: #1362263)
   * Fixed add world city being triggered accidentally (LP: #1359180)
   * Added alarm snooze settings (LP: #1354400)
+  * Fixed default alarm label not being translatable (LP: #1365012)
 
   [Zsombor Egri]
   * Fixed alarm status toggle being reverted immediately (LP: #1272337)

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-09-04 21:12:53 +0000
+++ po/com.ubuntu.clock.pot	2014-09-08 22:31:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-02 17:11+0200\n"
+"POT-Creation-Date: 2014-09-09 00:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,23 +17,23 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../app/alarm/AlarmDelegate.qml:135
+#: ../app/alarm/AlarmDelegate.qml:136
 #, qt-format
 msgid "in %1d %1h %2m"
 msgstr ""
 
-#: ../app/alarm/AlarmDelegate.qml:144
+#: ../app/alarm/AlarmDelegate.qml:145
 #, qt-format
 msgid "in %1h %2m"
 msgstr ""
 
-#: ../app/alarm/AlarmDelegate.qml:152
+#: ../app/alarm/AlarmDelegate.qml:153
 #, c-format, qt-format
 msgid "in %1m"
 msgstr ""
 
 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:52
-#: ../app/alarm/EditAlarmPage.qml:268
+#: ../app/alarm/EditAlarmPage.qml:303
 msgid "Label"
 msgstr ""
 
@@ -46,7 +46,8 @@
 msgid "Alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:42 ../app/alarm/EditAlarmPage.qml:54
+#: ../app/alarm/AlarmPage.qml:42 ../app/alarm/EditAlarmPage.qml:55
+#: ../app/alarm/EditAlarmPage.qml:178
 msgid "Alarm"
 msgstr ""
 
@@ -54,11 +55,11 @@
 msgid "Cancel selection"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:64
+#: ../app/alarm/AlarmPage.qml:64 ../app/alarm/AlarmRepeat.qml:35
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:28 ../app/alarm/EditAlarmPage.qml:258
+#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:293
 msgid "Repeat"
 msgstr ""
 
@@ -66,9 +67,12 @@
 msgid "Settings"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:70 ../app/alarm/AlarmSettingsPage.qml:71
-#: ../app/alarm/AlarmSettingsPage.qml:72 ../app/alarm/AlarmSettingsPage.qml:73
-#: ../app/alarm/AlarmSettingsPage.qml:136
+#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:54
+#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
+#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
+#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
+#: ../app/alarm/AlarmSettingsPage.qml:135
+#: ../app/alarm/AlarmSettingsPage.qml:198
 #, qt-format
 msgid "%1 minutes"
 msgstr ""
@@ -77,31 +81,39 @@
 msgid "Alarm volume"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:135
+#: ../app/alarm/AlarmSettingsPage.qml:134
 msgid "Silence after"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:177
+#: ../app/alarm/AlarmSettingsPage.qml:197
+msgid "Snooze for"
+msgstr ""
+
+#: ../app/alarm/AlarmSettingsPage.qml:241
 msgid "Vibration"
 msgstr ""
 
-#: ../app/alarm/AlarmSettingsPage.qml:206
+#: ../app/alarm/AlarmSettingsPage.qml:270
 msgid "Change time and date"
 msgstr ""
 
-#: ../app/alarm/AlarmSound.qml:27 ../app/alarm/EditAlarmPage.qml:281
+#: ../app/alarm/AlarmSound.qml:27 ../app/alarm/EditAlarmPage.qml:316
 msgid "Sound"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:33
+#: ../app/alarm/AlarmUtils.qml:31
+msgid "Never"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:37
 msgid "Weekdays"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:37
+#: ../app/alarm/AlarmUtils.qml:41
 msgid "Weekends"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:41
+#: ../app/alarm/AlarmUtils.qml:45
 msgid "Daily"
 msgstr ""
 
@@ -113,15 +125,16 @@
 msgid "Edit alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:305
+#: ../app/alarm/EditAlarmPage.qml:340
 msgid "Delete alarm"
 msgstr ""
 
-#: ../app/clock/ClockPage.qml:64
+#: ../app/worldclock/AddWorldCityButton.qml:36
 msgid "Add"
 msgstr ""
 
-#: ../app/clock/ClockPage.qml:65 ../app/worldclock/WorldCityList.qml:52
+#: ../app/worldclock/AddWorldCityButton.qml:62
+#: ../app/worldclock/WorldCityList.qml:52
 msgid "City"
 msgstr ""
 
@@ -140,21 +153,21 @@
 #. 'ahead'
 #: ../app/worldclock/UserWorldCityDelegate.qml:151
 #, qt-format
-msgid "%1 h %2 m %3"
+msgid "%1h %2m %3"
 msgstr ""
 
 #. TRANSLATORS: the first argument is hour, followed by the
 #. translation for either 'behind' or 'ahead'
 #: ../app/worldclock/UserWorldCityDelegate.qml:160
 #, qt-format
-msgid "%1 h %2"
+msgid "%1h %2"
 msgstr ""
 
 #. TRANSLATORS: the first argument is minute, followed by the
 #. translation for either 'behind' or 'ahead'
 #: ../app/worldclock/UserWorldCityDelegate.qml:168
 #, qt-format
-msgid "%1 m %2"
+msgid "%1m %2"
 msgstr ""
 
 #: ../app/worldclock/UserWorldCityDelegate.qml:174