Merge lp:~ahayzen/music-app/remix-remove-empty-year-label into lp:music-app/remix

[Andrew Hayzen]

* Only show year in SongsPage.qml if year exists

* Only show year in SongsPage.qml if year exists

[lp:~ahayzen/music-app/remix-remove-empty-year-label]

683. By Andrew Hayzen on 2014-10-21

* Fix formatting

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

PASSED: Continuous integration, rev:682
http://91.189.93.70:8080/job/music-app-remix-ci/131/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1115
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/131

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

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

PASSED: Continuous integration, rev:683
http://91.189.93.70:8080/job/music-app-remix-ci/132/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1116
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/132

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

review: Approve (continuous-integration)

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-20 14:14:09 +0000
+++ common/SongsPage.qml	2014-10-21 17:32:18 +0000
@@ -225,8 +225,9 @@
                     elide: Text.ElideRight
                     fontSize: "small"
                     maximumLineCount: 1
-                    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)
+                    text: isAlbum && line1 !== i18n.tr("Genre")
+                          ? (year !== "" ? year + " | " : "") + i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
+                          : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
                     wrapMode: Text.NoWrap
                 }
             }