Merge lp:~renatofilho/mediaplayer-app/i18n into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Initial support for i18n

[lp:~renatofilho/mediaplayer-app/i18n]

85. By Renato Araujo Oliveira Filho on 2013-05-21

Added "po" dir

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1571

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/47/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

In src/qml/player/TimeLine.qml, currentTime and remainingTime should be localized:

 - the formatProgress() function should take care of internationalization
 - strings in _slider.onValueChanged should be internationalized (and while you’re at it, append an "n" to "unknow")
 - the property change in the "DEGRESSIVE" state should also be properly internationalized (prepending a "- " to the internationalized string is not correct)

review: Needs Fixing

[Olivier Tilloy (osomon)]

In src/qml/player.qml, the HUD keywords should also be internationalized.

review: Needs Fixing

[Olivier Tilloy (osomon)]

86 +#: /home/renato/work/phablet/mediaplayer/translation/src/qml/player.qml:156

Not a big deal, but you can ensure the comments don’t include a full path, by invoking xgettext with the -D option, and passing relative file names.

[Olivier Tilloy (osomon)]

114 +"X-Launchpad-Export-Date: 2013-05-19 06:13+0000\n"
115 +"X-Generator: Launchpad (build 16626)\n"

Out of curiosity, where did you get that from? https://translations.launchpad.net/mediaplayer-app says there are no translations for this project (yet).

[lp:~renatofilho/mediaplayer-app/i18n]

86. By Renato Araujo Oliveira Filho on 2013-05-22

Added more strings to translate.

87. By Renato Araujo Oliveira Filho on 2013-05-22

Updated translation file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/48/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/47/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/48/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/mediaplayer-app/i18n]

88. By Renato Araujo Oliveira Filho on 2013-05-22

Created a target to generate pot file. ¨make create-pot¨
Fixed files path on pot file.

89. By Renato Araujo Oliveira Filho on 2013-05-22

Fixed string used on translations.

[Olivier Tilloy (osomon)]

255 - if (secs < 10) secs = "0" + secs
256 - if (min < 10) min = "0" + min
257 - if (hour < 10) hour = "0" + hour
258 + if (secs < 10) secs = i18n.tr("0") + secs
259 + if (min < 10) min = i18n.tr("0") + min
260 + if (hour < 10) hour = i18n.tr("0") + hour
261
262 - return hour + ":" + min + ":" + secs
263 + return i18n.tr("%1:%2:%3").arg(hour).arg(min).arg(secs)

That’s not proper internationalization. You’re assuming that in every language out there the time is displayed like e.g. 23:05:47, which is not necessarily correct. Please use proper localization functions operating on Date objects, i.e. something like that:

    return new Date(0, 0, 0, hour, min, sec).toLocaleTimeString(Qt.locale(), "HH:mm:ss")

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/48
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1590

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/49/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

> 255 - if (secs < 10) secs = "0" + secs
> 256 - if (min < 10) min = "0" + min
> 257 - if (hour < 10) hour = "0" + hour
> 258 + if (secs < 10) secs = i18n.tr("0") + secs
> 259 + if (min < 10) min = i18n.tr("0") + min
> 260 + if (hour < 10) hour = i18n.tr("0") + hour
> 261
> 262 - return hour + ":" + min + ":" + secs
> 263 + return i18n.tr("%1:%2:%3").arg(hour).arg(min).arg(secs)
>
> That’s not proper internationalization. You’re assuming that in every language
> out there the time is displayed like e.g. 23:05:47, which is not necessarily
> correct. Please use proper localization functions operating on Date objects,
> i.e. something like that:
>
> return new Date(0, 0, 0, hour, min, sec).toLocaleTimeString(Qt.locale(),
> "HH:mm:ss")

I can not use this function to format the video duration, because this is a interval and not a real time.
For example 23:40:01 must be always 23:40:01 and never 11:40:01 PM.

[lp:~renatofilho/mediaplayer-app/i18n]

90. By Renato Araujo Oliveira Filho on 2013-05-22

Fixed i18n format for duration.

[Olivier Tilloy (osomon)]

66 + add_custom_target(create-pot)

To ease the future integration with dh_translations, could you rename this target to ${DOMAIN}.pot ?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/50
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1595/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/mediaplayer-app/i18n]

91. By Renato Araujo Oliveira Filho on 2013-05-22

Renamed pot target in cmake.

[Olivier Tilloy (osomon)]

68 + COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr -D ${CMAKE_SOURCE_DIR} -s -kWORD=tr -p ${CMAKE_CURRENT_SOURCE_DIR} -o mediaplayer-app.pot ${QML_SRCS}

You’re passing "--keyword=tr" and "-kWORD=tr", which is redundant (and I believe the latter is incorrect syntax anyway, so you should remove it).

review: Needs Fixing

[Olivier Tilloy (osomon)]

236 + _timeLine.remainingTime = utf8.tr("unknown")
240 + _timeLine.currentTime = utf8.tr("0:00:00")

You have a problem with unicode, don’t you? ;)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1597

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/52/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

68 + COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr -D

Also, --keyword=tr:1,2 needs to be added to handle plural forms here

review: Needs Fixing

[David Planella (dpm)]

In Olivier's suggestion:

    return new Date(0, 0, 0, hour, min, sec).toLocaleTimeString(Qt.locale(), "HH:mm:ss")

The "HH:mm:ss" string should probably be read from the default locale setting for time format if possible. Otherwise, if it's not possible or if we haven't got the hooks to get it, then we should also mark that string for translation (i.e. i18n.tr("HH:mm:ss")), adding a comment for translators on the format they can use here.

[lp:~renatofilho/mediaplayer-app/i18n]

92. By Renato Araujo Oliveira Filho on 2013-05-22

Fixed invalid function name.

93. By Renato Araujo Oliveira Filho on 2013-05-22

Fixed xgettext command arguments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1602

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/53/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good now.

review: Approve

[David Planella (dpm)]

Hm, I guess I was too late to comment, as this has now been merged, but there are a couple of things that I noticed:

236 + _timeLine.remainingTime = i18n.tr("unknown")

Could we add a comment for translators above this line? This would give them some more context about how to translate that string. If the word TRANSLATORS is included, xgettext will pick it up, put it in the .pot file and make the comment visible in Launchpad. E.g.

// TRANSLATORS: this refers to an unknown amount of time.

240 + _timeLine.currentTime = i18n.tr("0:00:00")

Rather than translating the initial value explicitly, is there no way to use something similar to strftime in QML? E.g. "%H:%M:%S", mark this as translatable and initialize currentTime as 0?

265 + return i18n.tr("%1:%2:%3").arg(hour).arg(min).arg(secs)

Same comment as above, if possible, I'd suggest using an strftime-formatted string.

If there isn't another way, I'd recommend adding a translators comment, as otherwise translators will not know how to translate this one at all.

[Renato Araujo Oliveira Filho (renatofilho)]

I have create a new MR with this comments, check: https://code.launchpad.net/~renatofilho/mediaplayer-app/translators-comments/+merge/165260

=== modified file '.bzrignore'
--- .bzrignore	2012-10-24 09:09:28 +0000
+++ .bzrignore	2013-05-22 17:30:47 +0000
@@ -1,1 +1,2 @@
 CMakeLists.txt.*
+po/*.gmo

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-20 19:46:02 +0000
+++ CMakeLists.txt	2013-05-22 17:30:47 +0000
@@ -26,6 +26,7 @@
 add_subdirectory(sdk)
 add_subdirectory(src)
 add_subdirectory(tests)
+add_subdirectory(po)
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
 

=== modified file 'debian/control'
--- debian/control	2013-05-09 13:23:11 +0000
+++ debian/control	2013-05-22 17:30:47 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
+               gettext,
                libgl1-mesa-dev[i386 amd64] | libgl-dev[i386 amd64],
                libgles2-mesa-dev[armhf],
                libgstreamer0.10-dev,

=== modified file 'debian/mediaplayer-app.install'
--- debian/mediaplayer-app.install	2013-05-20 19:46:02 +0000
+++ debian/mediaplayer-app.install	2013-05-22 17:30:47 +0000
@@ -2,3 +2,4 @@
 /usr/share/icons/hicolor/scalable/apps/mediaplayer-app.svg
 /usr/bin/mediaplayer-app
 /usr/share/mediaplayer-app/qml/*
+/usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2013-05-22 17:30:47 +0000
@@ -0,0 +1,25 @@
+project(mediaplayer-translations)
+
+include(FindGettext)
+
+set(DOMAIN mediaplayer-app)
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+file(GLOB_RECURSE QML_SRCS RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/*.qml)
+
+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)
+
+find_program(XGETTEXT_EXECUTABLE xgettext)
+if(XGETTEXT_EXECUTABLE)
+    add_custom_target(${POT_FILE})
+    add_custom_command(TARGET ${POT_FILE}
+        COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o mediaplayer-app.pot ${QML_SRCS}
+    )
+endif()

=== added file 'po/mediaplayer-app.pot'
--- po/mediaplayer-app.pot	1970-01-01 00:00:00 +0000
+++ po/mediaplayer-app.pot	2013-05-22 17:30:47 +0000
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-22 12:36-0300\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"
+
+#: src/qml/player/TimeLine.qml:133
+#, qt-format
+msgid "%1:%2:%3"
+msgstr ""
+
+#: src/qml/player/TimeLine.qml:102
+#, qt-format
+msgid "- %1"
+msgstr ""
+
+#: src/qml/player/TimeLine.qml:129 src/qml/player/TimeLine.qml:130
+#: src/qml/player/TimeLine.qml:131
+#, qt-format
+msgid "0%1"
+msgstr ""
+
+#: src/qml/player/TimeLine.qml:69
+msgid "0:00:00"
+msgstr ""
+
+#: src/qml/player.qml:159
+msgid "Pause or Resume Playhead"
+msgstr ""
+
+#: src/qml/player.qml:158
+msgid "Play / Pause"
+msgstr ""
+
+#: src/qml/player.qml:163
+msgid "Post;Upload;Attach"
+msgstr ""
+
+#: src/qml/player.qml:162
+msgid "Share"
+msgstr ""
+
+#: src/qml/player/TimeLine.qml:66
+msgid "unknown"
+msgstr ""

=== added file 'po/pt_BR.po'
--- po/pt_BR.po	1970-01-01 00:00:00 +0000
+++ po/pt_BR.po	2013-05-22 17:30:47 +0000
@@ -0,0 +1,56 @@
+# Brazilian Portuguese translation for webbrowser-app
+# Copyright (c) 2013 Canonical Ltd 2013
+# This file is distributed under the same license as the webbrowser-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mediaplayer-app\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-16 18:13+0200\n"
+"PO-Revision-Date: 2013-05-17 14:27+0000\n"
+"Last-Translator: Renato Araujo Oliveira Filho <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/qml/player/TimeLine.qml:133
+#, qt-format
+msgid "%1:%2:%3"
+msgstr "%1:%2:%3"
+
+#: src/qml/player/TimeLine.qml:102
+#, qt-format
+msgid "- %1"
+msgstr "- %1"
+
+#: src/qml/player/TimeLine.qml:129 src/qml/player/TimeLine.qml:130
+#: src/qml/player/TimeLine.qml:131
+#, qt-format
+msgid "0%1"
+msgstr "0%1"
+
+#: src/qml/player/TimeLine.qml:69
+msgid "0:00:00"
+msgstr "0:00:00"
+
+#: src/qml/player.qml:159
+msgid "Pause or Resume Playhead"
+msgstr "Pause ou Continue"
+
+#: src/qml/player.qml:158
+msgid "Play / Pause"
+msgstr "Play / Pause"
+
+#: src/qml/player.qml:163
+msgid "Post;Upload;Attach"
+msgstr "Postar;Carregar;Anexar"
+
+#: src/qml/player.qml:162
+msgid "Share"
+msgstr "Compartilhar"
+
+#: src/qml/player/TimeLine.qml:66
+msgid "unknown"
+msgstr "desconhecido"

=== modified file 'src/qml/player.qml'
--- src/qml/player.qml	2013-05-20 19:46:02 +0000
+++ src/qml/player.qml	2013-05-22 17:30:47 +0000
@@ -47,6 +47,10 @@
         mediaPlayer.orientation = Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
     }
 
+    Component.onCompleted: {
+        i18n.domain = "mediaplayer-app"
+    }
+
     Loader {
         id: playerLoader
         source: "player/VideoPlayer.qml"
@@ -151,12 +155,12 @@
             }
 
             HUD.Action {
-                label: "Play / Pause"
-                keywords: "Pause or Resume Playhead"
+                label: i18n.tr("Play / Pause")
+                keywords: i18n.tr("Pause or Resume Playhead")
             }
             HUD.Action {
-                label: "Share"
-                keywords: "Post;Upload;Attach"
+                label: i18n.tr("Share")
+                keywords: i18n.tr("Post;Upload;Attach")
             }
         }
     }

=== modified file 'src/qml/player/TimeLine.qml'
--- src/qml/player/TimeLine.qml	2013-05-08 20:03:38 +0000
+++ src/qml/player/TimeLine.qml	2013-05-22 17:30:47 +0000
@@ -63,10 +63,10 @@
                 if (_slider.maximumValue > 0) {
                     _timeLine.remainingTime = formatProgress(_slider.maximumValue - value)
                 } else {
-                    _timeLine.remainingTime = "unknow"
+                    _timeLine.remainingTime = i18n.tr("unknown")
                 }
             } else {
-                _timeLine.currentTime = "0:00:00"
+                _timeLine.currentTime = i18n.tr("0:00:00")
             }
         }
 
@@ -99,7 +99,7 @@
             },
             State {
                 name: "DEGRESSIVE"
-                PropertyChanges { target: _TimeLabel; text: "- " + _timeLine.remainingTime }
+                PropertyChanges { target: _TimeLabel; text: i18n.tr("- %1").arg(_timeLine.remainingTime) }
             }
         ]
 
@@ -126,10 +126,10 @@
         min = time % 60
         hour = Math.floor(time / 60)
 
-        if (secs < 10) secs = "0" + secs
-        if (min < 10) min = "0" + min
-        if (hour < 10) hour = "0" + hour
+        if (secs < 10) secs = i18n.tr("0%1").arg(secs)
+        if (min < 10) min = i18n.tr("0%1").arg(min)
+        if (hour < 10) hour = i18n.tr("0%1").arg(hour)
 
-        return hour + ":" + min + ":" + secs
+        return  i18n.tr("%1:%2:%3").arg(hour).arg(min).arg(secs)
     }
 }