Ubuntu Music App

Merge lp:~vthompson/music-app/fix-1357646 into lp:music-app/trusty

  1. fix-1357646
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: David Planella
Approved revision: 572
Merged at revision: 573
Proposed branch: lp:~vthompson/music-app/fix-1357646
Merge into: lp:music-app/trusty
Diff against target: 87 lines (+10/-10)
3 files modified
MusicPlaylists.qml (+1/-1)
MusicStart.qml (+2/-2)
common/SongsPage.qml (+7/-7)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1357646
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+231061@code.launchpad.net

Commit message

* Update 'Playlist' translations
* Update 'Genre' translations

Description of the change

* Update 'Playlist' translations
* Update 'Genre' translations

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks!

review: Approve
Revision history for this message
David Planella (dpm) wrote :

Could you update the .pot file in the same MP as well?

Revision history for this message
Victor Thompson (vthompson) wrote :

I've taken care not to do so in these MPs because I have an additional MP that adds an entry to the POT file. Each of the MPs that fix things without adding a new string should be good to go because the string is already covered. I suggest we update the pot as a final step, but really it's a bit silly because all it does is add the location in the qml file to the displayed text for translators.

Revision history for this message
David Planella (dpm) wrote :

Either way WFM, as long at the .pot file gets updated at the end. Top-approving, then.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicPlaylists.qml'
2--- MusicPlaylists.qml 2014-08-11 13:29:08 +0000
3+++ MusicPlaylists.qml 2014-08-16 05:42:47 +0000
4@@ -155,7 +155,7 @@
5 onItemClicked: {
6 albumTracksModel.filterPlaylistTracks(name)
7 songsPage.isAlbum = false
8- songsPage.line1 = "Playlist"
9+ songsPage.line1 = i18n.tr("Playlist")
10 songsPage.line2 = model.name
11 songsPage.covers = playlist.covers
12 songsPage.title = i18n.tr("Playlist")
13
14=== modified file 'MusicStart.qml'
15--- MusicStart.qml 2014-08-14 18:06:55 +0000
16+++ MusicStart.qml 2014-08-16 05:42:47 +0000
17@@ -117,7 +117,7 @@
18 id: recentDelegate
19 Item {
20 property string title: model.title
21- property string title2: model.title2
22+ property string title2: model.title2 !== "Playlist" ? model.title2 : i18n.tr("Playlist")
23 property var covers: type === "playlist" ? Playlists.getPlaylistCovers(title) : [{author: model.title2, album: model.title}]
24 property string type: model.type
25 property string time: model.time
26@@ -307,7 +307,7 @@
27 songsPage.covers = genreShape.covers
28 songsPage.genre = model.genre
29 songsPage.isAlbum = true
30- songsPage.line1 = "Genre"
31+ songsPage.line1 = i18n.tr("Genre")
32 songsPage.line2 = model.genre
33 songsPage.title = i18n.tr("Genre")
34
35
36=== modified file 'common/SongsPage.qml'
37--- common/SongsPage.qml 2014-08-11 13:29:08 +0000
38+++ common/SongsPage.qml 2014-08-16 05:42:47 +0000
39@@ -119,7 +119,7 @@
40 anchors.right: parent.right
41 anchors.rightMargin: units.gu(1.5)
42 elide: Text.ElideRight
43- text: isAlbum && line1 !== "Genre" ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumtrackslist.count).arg(albumtrackslist.count)
44+ text: isAlbum && line1 !== i18n.tr("Genre") ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumtrackslist.count).arg(albumtrackslist.count)
45 : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
46
47 }
48@@ -158,11 +158,11 @@
49 onClicked: {
50 trackClicked(albumtrackslist.model, 0) // play track
51
52- if (isAlbum && songStackPage.line1 !== "Genre") {
53+ if (isAlbum && songStackPage.line1 !== i18n.tr("Genre")) {
54 Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
55 mainView.hasRecent = true
56 recentModel.filterRecent()
57- } else if (songStackPage.line1 === "Playlist") {
58+ } else if (songStackPage.line1 === i18n.tr("Playlist")) {
59 Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
60 mainView.hasRecent = true
61 recentModel.filterRecent()
62@@ -220,9 +220,9 @@
63 progression: false
64 height: styleMusic.common.itemHeight
65
66- leftSideAction: songStackPage.line1 === "Playlist"
67+ leftSideAction: songStackPage.line1 === i18n.tr("Playlist")
68 ? playlistRemoveAction.item : null
69- reorderable: songStackPage.line1 === "Playlist"
70+ reorderable: songStackPage.line1 === i18n.tr("Playlist")
71 rightSideActions: [
72 AddToQueue {
73
74@@ -236,11 +236,11 @@
75 onItemClicked: {
76 trackClicked(albumtrackslist.model, index) // play track
77
78- if (isAlbum && songStackPage.line1 !== "Genre") {
79+ if (isAlbum && songStackPage.line1 !== i18n.tr("Genre")) {
80 Library.addRecent(songStackPage.line2, songStackPage.line1, songStackPage.covers[0], songStackPage.line2, "album")
81 mainView.hasRecent = true
82 recentModel.filterRecent()
83- } else if (songStackPage.line1 === "Playlist") {
84+ } else if (songStackPage.line1 === i18n.tr("Playlist")) {
85 Library.addRecent(songStackPage.line2, "Playlist", songStackPage.covers[0], songStackPage.line2, "playlist")
86 mainView.hasRecent = true
87 recentModel.filterRecent()

Subscribers

People subscribed via source and target branches

to status/vote changes: