Ubuntu Music App

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

  1. fix-1343725
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 525
Merged at revision: 531
Proposed branch: lp:~vthompson/music-app/fix-1343725
Merge into: lp:music-app/trusty
Diff against target: 13 lines (+2/-2)
1 file modified
common/SongsPage.qml (+2/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1343725
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+227277@code.launchpad.net

Commit message

* Do not show year for genre

Description of the change

* Do not show year for genre

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:525
http://91.189.93.70:8080/job/music-app-ci/944/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1067
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/168

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/SongsPage.qml'
2--- common/SongsPage.qml 2014-07-11 22:29:21 +0000
3+++ common/SongsPage.qml 2014-07-18 02:42:03 +0000
4@@ -117,8 +117,8 @@
5 anchors.right: parent.right
6 anchors.rightMargin: units.gu(1.5)
7 elide: Text.ElideRight
8- text: isAlbum ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumtrackslist.count).arg(albumtrackslist.count)
9- : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
10+ text: isAlbum && line1 !== "Genre" ? i18n.tr(year + " | %1 song", year + " | %1 songs", albumtrackslist.count).arg(albumtrackslist.count)
11+ : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
12
13 }
14

Subscribers

People subscribed via source and target branches

to status/vote changes: