Merge lp:~dpm/ubuntu-clock-app/reboot-i18n into lp:ubuntu-clock-app

[David Planella]

Added initial internationalization support in the build system.

Added initial internationalization support in the build system. Internationalization of the .desktop file coming in another merge proposal.

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

FAILED: Continuous integration, rev:51
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/177/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/9/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/177/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/177/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/ubuntu-clock-app/reboot-i18n]

52. By David Planella on 2014-08-13

Merged from trunk

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

PASSED: Continuous integration, rev:52
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/194/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/30
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/194

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/194/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

72 - i18n.tr("%1 minutes").arg(10),
73 - i18n.tr("%1 minutes").arg(20),
74 - i18n.tr("%1 minutes").arg(30),
75 - i18n.tr("%1 minutes").arg(60)
76 + i18n.tr("%1 minute", "%1 minutes", 10).arg(10),
77 + i18n.tr("%1 minute", "%1 minutes", 20).arg(20),
78 + i18n.tr("%1 minute", "%1 minutes", 30).arg(30),
79 + i18n.tr("%1 minute", "%1 minutes", 60).arg(60)

This is not required since the values shown in the brackets (10, 20, 30 ,60) are the only numbers that will be shown in the UI. Since they are all plural, we don't require %1 minute.

26 +Translations for the Music app happen in [Launchpad Translations][] and

This should be clock app.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

10 + app/**.qml backend/**.cpp backend/**.h)

I don't think we need to include the .cpp and .h files since they are mostly used for data processing and do not include any UI strings that need to be translated.

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

Also please append an entry to the 3.1 version in the debian/changelog pls.

[lp:~dpm/ubuntu-clock-app/reboot-i18n]

53. By David Planella on 2014-08-16

Refinements to the addition of translations build support

54. By David Planella on 2014-08-16

Updated .pot file

55. By David Planella on 2014-08-16

Fixed string arguments typo

[David Planella (dpm)]

Thanks for the review, I believe I've addressed all comments. The reason I used plural forms for the i18n.tr("%1 minutes").arg(10) strings was simply because some languages have different plural rules for different types of numbers. It might not be an issue and I was just playing it safe. I guess if we get it wrong translators will tell us :)

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

PASSED: Continuous integration, rev:55
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/211/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/49
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/211

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/211/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

lgtm! Thanks for this. Can you set up launchpad to do the automatic import for the reboot branch?

review: Approve

[David Planella (dpm)]

Awesome, thanks! Yes, I had already done so in preparation for this branch
to land. Translations are already visible at
https://translations.launchpad.net/ubuntu-clock-app/reboot

On Sat, Aug 16, 2014 at 10:31 AM, Nekhelesh Ramananthan <
<email address hidden>> wrote:

> Review: Approve
>
> lgtm! Thanks for this. Can you set up launchpad to do the automatic import
> for the reboot branch?
> --
> https://code.launchpad.net/~dpm/ubuntu-clock-app/reboot-i18n/+merge/230578
> You are the owner of lp:~dpm/ubuntu-clock-app/reboot-i18n.
>

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-13 12:03:49 +0000
+++ CMakeLists.txt	2014-08-16 07:40:18 +0000
@@ -64,8 +64,14 @@
   set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
 endif()
 
+file(GLOB_RECURSE I18N_SRC_FILES
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
+    *.qml *.js)
+list(SORT I18N_SRC_FILES)
+
 add_subdirectory(app)
 add_subdirectory(backend)
+add_subdirectory(po)
 if(NOT CLICK_MODE)
   add_subdirectory(tests)
 endif(NOT CLICK_MODE)

=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2014-08-16 07:40:18 +0000
@@ -0,0 +1,40 @@
+# Updating translations
+
+Translations for the Music app happen in [Launchpad Translations][] and
+are automatically committed daily on the trunk branch in the po/ folder.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+translatable messages to translators. So whenever you add new translatable
+messages in the code, make sure to follow these steps:
+
+ 1. Run click-buddy retaining the build directory:
+    `click-buddy --dir . --no-clean`
+ 2. Copy the .pot file from the <build dir> mentioned in the output to your
+    original source:
+    `cp <build dir>/po/*.pot po/`
+ 3. Commit the generated .pot file:
+    `bzr commit -m"Updated translation template"`
+ 4. Push the branch and send a merge proposal as usual
+
+And that's it, once the branch lands Launchpad should take care of all the rest!
+
+# Behind the scenes
+
+Behind the scenes, whenever the po/*.pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual po/*.po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations for core apps follow the standard [gettext format].
+
+ [Launchpad Translations]: https://translations.launchpad.net/ubuntu-clock-app/reboot
+ [gettext format]: https://www.gnu.org/software/gettext/

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2014-08-07 22:01:05 +0000
+++ app/alarm/AlarmSettingsPage.qml	2014-08-16 07:40:18 +0000
@@ -64,6 +64,7 @@
 
         function title(index) {
             if (title["text"] === undefined) {
+		// TRANSLATORS: this refers to either 10, 20, 30 or 60 minutes
                 title.text =
                         [
                             i18n.tr("%1 minutes").arg(10),

=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml	2014-08-07 13:17:02 +0000
+++ app/worldclock/UserWorldCityDelegate.qml	2014-08-16 07:40:18 +0000
@@ -144,6 +144,8 @@
                     day = i18n.tr("Yesterday")
                 }
 
+                // TRANSLATORS: this indicates if the time in a world clock
+                // is behind or ahead of the time at the current location
                 var isBehind = model.timeTo > 0 ? i18n.tr("behind")
                                                 : i18n.tr("ahead")
 
@@ -152,7 +154,9 @@
                 var hour = timediff[0]
 
                 if(hour > 0 &&  minute > 0) {
-                    return ("%1\n%2hr%3min %4")
+                    // TRANSLATORS: the first argument is a day, followed by hour, minute and the
+                    // translation for either 'behind' or 'ahead'
+                    return (i18n.tr("%1\n%2 h %3 m %4"))
                     .arg(day)
                     .arg(hour)
                     .arg(minute)
@@ -160,14 +164,18 @@
                 }
 
                 else if(hour > 0 && minute === 0) {
-                    return ("%1\n%2hr %3")
+                    // TRANSLATORS: the first argument is a day, followed by hour and the
+                    // translation for either 'behind' or 'ahead'
+                    return (i18n.tr("%1\n%2 h %3"))
                     .arg(day)
                     .arg(hour)
                     .arg(isBehind)
                 }
 
                 else if(hour === 0 && minute > 0) {
-                    return ("%1\n%2min %3")
+                    // TRANSLATORS: the first argument is a day, followed by minute and the
+                    // translation for either 'behind' or 'ahead'
+                    return ("%1\n%2 m %3")
                     .arg(day)
                     .arg(minute)
                     .arg(isBehind)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-13 17:45:35 +0000
+++ debian/changelog	2014-08-16 07:40:18 +0000
@@ -6,6 +6,9 @@
   * Synced the fast scroll component with upstream changes
   * Updated inner clock texture as requested by design
 
+  [David Planella]
+  * Added internationalization support (LP: #1354522)
+
  -- Nekhelesh Ramananthan <[e-mail]>  Wed, 13 Aug 2014 15:46:12 +0200
 
 ubuntu-clock-app (3.0-0ubuntu1) utopic; urgency=medium

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2014-08-16 07:40:18 +0000
@@ -0,0 +1,25 @@
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${PROJECT_NAME})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+add_custom_target(${POT_FILE} ALL
+    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+        -D ${CMAKE_CURRENT_SOURCE_DIR}
+        --from-code=UTF-8
+        --c++ --qt --add-comments=TRANSLATORS
+        --keyword=tr --keyword=tr:1,2
+        --package-name='${PROJECT}'
+        --copyright-holder='Canonical Ltd.'
+        ${I18N_SRC_FILES})
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

=== added file 'po/com.ubuntu.clock.devel.pot'
--- po/com.ubuntu.clock.devel.pot	1970-01-01 00:00:00 +0000
+++ po/com.ubuntu.clock.devel.pot	2014-08-16 07:40:18 +0000
@@ -0,0 +1,171 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-16 09:36+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../app/alarm/AlarmLabel.qml:27 ../app/alarm/AlarmLabel.qml:43
+#: ../app/alarm/EditAlarmPage.qml:220
+msgid "Label"
+msgstr ""
+
+#: ../app/alarm/AlarmList.qml:81 ../app/alarm/AlarmPage.qml:78
+#: ../app/worldclock/UserWorldCityList.qml:103
+msgid "Delete"
+msgstr ""
+
+#: ../app/alarm/AlarmPage.qml:26
+msgid "Alarms"
+msgstr ""
+
+#: ../app/alarm/AlarmPage.qml:42 ../app/alarm/EditAlarmPage.qml:53
+msgid "Alarm"
+msgstr ""
+
+#: ../app/alarm/AlarmPage.qml:55
+msgid "Cancel selection"
+msgstr ""
+
+#: ../app/alarm/AlarmPage.qml:64
+msgid "Select All"
+msgstr ""
+
+#: ../app/alarm/AlarmRepeat.qml:28 ../app/alarm/EditAlarmPage.qml:210
+msgid "Repeat"
+msgstr ""
+
+#: ../app/alarm/AlarmSettingsPage.qml:29
+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
+#, qt-format
+msgid "%1 minutes"
+msgstr ""
+
+#: ../app/alarm/AlarmSettingsPage.qml:93
+msgid "Alarm volume"
+msgstr ""
+
+#: ../app/alarm/AlarmSettingsPage.qml:135
+msgid "Silence after"
+msgstr ""
+
+#: ../app/alarm/AlarmSettingsPage.qml:177
+msgid "Vibration"
+msgstr ""
+
+#: ../app/alarm/AlarmSettingsPage.qml:206
+msgid "Change time and date"
+msgstr ""
+
+#: ../app/alarm/AlarmSound.qml:27
+msgid "Sound"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:33
+msgid "Weekdays"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:37
+msgid "Weekends"
+msgstr ""
+
+#: ../app/alarm/AlarmUtils.qml:41
+msgid "Daily"
+msgstr ""
+
+#: ../app/alarm/EditAlarmPage.qml:39
+msgid "New alarm"
+msgstr ""
+
+#: ../app/alarm/EditAlarmPage.qml:39
+msgid "Edit alarm"
+msgstr ""
+
+#: ../app/alarm/EditAlarmPage.qml:233
+msgid "Sound (disabled)"
+msgstr ""
+
+#: ../app/alarm/EditAlarmPage.qml:255
+msgid "Delete alarm"
+msgstr ""
+
+#: ../app/clock/ClockPage.qml:64
+msgid "Add"
+msgstr ""
+
+#: ../app/clock/ClockPage.qml:65 ../app/worldclock/WorldCityList.qml:50
+msgid "City"
+msgstr ""
+
+#: ../app/ubuntu-clock-app.qml:102
+msgid "Next Alarm in .."
+msgstr ""
+
+#: ../app/worldclock/UserWorldCityDelegate.qml:136
+msgid "Today"
+msgstr ""
+
+#: ../app/worldclock/UserWorldCityDelegate.qml:140
+msgid "Tomorrow"
+msgstr ""
+
+#: ../app/worldclock/UserWorldCityDelegate.qml:144
+msgid "Yesterday"
+msgstr ""
+
+#. TRANSLATORS: this indicates if the time in a world clock
+#. is behind or ahead of the time at the current location
+#: ../app/worldclock/UserWorldCityDelegate.qml:149
+msgid "behind"
+msgstr ""
+
+#: ../app/worldclock/UserWorldCityDelegate.qml:150
+msgid "ahead"
+msgstr ""
+
+#. TRANSLATORS: the first argument is a day, followed by hour, minute and the
+#. translation for either 'behind' or 'ahead'
+#: ../app/worldclock/UserWorldCityDelegate.qml:159
+#, qt-format
+msgid ""
+"%1\n"
+"%2 h %3 m %4"
+msgstr ""
+
+#. TRANSLATORS: the first argument is a day, followed by hour and the
+#. translation for either 'behind' or 'ahead'
+#: ../app/worldclock/UserWorldCityDelegate.qml:169
+#, qt-format
+msgid ""
+"%1\n"
+"%2 h %3"
+msgstr ""
+
+#: ../app/worldclock/UserWorldCityDelegate.qml:185
+msgid "No Time Difference"
+msgstr ""
+
+#: ../app/worldclock/WorldCityList.qml:38
+msgid "Select a city"
+msgstr ""
+
+#: ../app/worldclock/WorldCityList.qml:64
+msgid "Back"
+msgstr ""