Merge lp:~vthompson/music-app/fix-songs-translation-1357626 into lp:music-app/trusty

[Victor Thompson]

* Fix inability to translate 'song'

This MP fixes the app's inability to translate 'song' in AlbumsPage and SongsPage. This is rather important given the push for RTM.

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

PASSED: Continuous integration, rev:572
http://91.189.93.70:8080/job/music-app-ci/1026/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1555
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/250

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1026/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

LGTM, nice touch in simplifying the strings for translators!

I wonder if Qt makes it possible to have mixed types of arguments in a string. The MP is good as it is, as the strings in question are not probably something that translators need to rearrange the order of. But for other types of strings, it'd be great if something like this could be possible, so that translators have full control in reordering the elements of the string. E.g.:

"%s | %1 song"

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/571/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1563/console
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-autolanding/112/console

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Ah, this has a conflict here:

<<<<<<< TREE
                text: isAlbum && line1 !== i18n.tr("Genre") ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumtrackslist.count).arg(albumtrackslist.count)
=======
                text: isAlbum && line1 !== "Genre" ? year + " | " + i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
>>>>>>> MERGE-SOURCE
                                                   : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)

So you'll need to merge trunk and fix the conflict before this can land.

review: Needs Fixing

[lp:~vthompson/music-app/fix-songs-translation-1357626]

573. By Victor Thompson on 2014-08-16

merge trunk and resolve conflict

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

PASSED: Continuous integration, rev:573
http://91.189.93.70:8080/job/music-app-ci/1028/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1567
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/252

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1028/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM

review: Approve

=== modified file 'common/AlbumsPage.qml'
--- common/AlbumsPage.qml	2014-08-09 22:52:40 +0000
+++ common/AlbumsPage.qml	2014-08-16 13:38:54 +0000
@@ -325,8 +325,8 @@
                     anchors.right: parent.right
                     anchors.rightMargin: units.gu(1.5)
                     elide: Text.ElideRight
-                    text: i18n.tr(songAlbumArtistModelRepeater.year + " | %1 song",
-                                  songAlbumArtistModelRepeater.year + " | %1 songs",
+                    text: songAlbumArtistModelRepeater.year + " | " +
+                          i18n.tr("%1 song", "%1 songs",
                                   songAlbumArtistModelRepeater.count).arg(songAlbumArtistModelRepeater.count)
                 }
 

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-08-16 05:40:39 +0000
+++ common/SongsPage.qml	2014-08-16 13:38:54 +0000
@@ -119,7 +119,7 @@
                 anchors.right: parent.right
                 anchors.rightMargin: units.gu(1.5)
                 elide: Text.ElideRight
-                text: isAlbum && line1 !== i18n.tr("Genre") ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumtrackslist.count).arg(albumtrackslist.count)
+                text: isAlbum && line1 !== i18n.tr("Genre") ? year + " | " + i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
                                                    : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
 
             }