Merge lp:~vthompson/music-app/remix-fix-1379452 into lp:music-app/remix

[Victor Thompson]

Do not return unknown to the model

Do not return unknown to the model. When the translatable string is returned from the database, the query of the mediascanner models will not work. Instead, the "Unknown" strings should be added only when displayed.

[lp:~vthompson/music-app/remix-fix-1379452]

667. By Victor Thompson on 2014-10-12

Update translatable strings

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

Unmerged revisions

667. By Victor Thompson on 2014-10-12

Update translatable strings

666. By Victor Thompson on 2014-10-12

Do not return unknown to the model

=== modified file 'MusicStart.qml'
--- MusicStart.qml	2014-09-20 15:41:33 +0000
+++ MusicStart.qml	2014-10-12 19:48:56 +0000
@@ -166,7 +166,7 @@
                         anchors.rightMargin: units.gu(1)
                         color: styleMusic.common.white
                         elide: Text.ElideRight
-                        text: title
+                        text: title || i18n.tr("Unknown Album")
                         fontSize: "small"
                         font.weight: Font.DemiBold
                     }
@@ -180,7 +180,7 @@
                         anchors.rightMargin: units.gu(1)
                         color: styleMusic.common.white
                         elide: Text.ElideRight
-                        text: title2
+                        text: title2 || i18n.tr("Unknown Artist")
                         fontSize: "x-small"
                     }
                     MouseArea {

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-05 06:08:44 +0000
+++ common/SongsPage.qml	2014-10-12 19:48:56 +0000
@@ -101,7 +101,7 @@
                     rightMargin: units.gu(2)
                 }
                 elide: Text.ElideRight
-                text: line2
+                text: line2 || i18n.tr("Unknown Album")
             }
 
             Label {
@@ -121,7 +121,7 @@
                     rightMargin: units.gu(2)
                 }
                 elide: Text.ElideRight
-                text: line1
+                text: line1 || i18n.tr("Unknown Artist")
             }
 
             Label {

=== modified file 'meta-database.js'
--- meta-database.js	2014-09-12 02:57:30 +0000
+++ meta-database.js	2014-10-12 19:48:56 +0000
@@ -87,9 +87,9 @@
             if (dbItem.type === "album")
             {
                 res.push({time:dbItem.time,
-                             title:dbItem.title || i18n.tr("Unknown Album"),
-                             title2:dbItem.title2 || i18n.tr("Unknown Artist"),
-                             key:dbItem.key || i18n.tr("Unknown Album"),
+                             title:dbItem.title,
+                             title2:dbItem.title2,
+                             key:dbItem.key,
                              art:dbItem.cover || undefined,
                              type:dbItem.type
                          });

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2014-10-09 01:50:11 +0000
+++ po/com.ubuntu.music.pot	2014-10-12 19:48:56 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-08 20:48-0500\n"
+"POT-Creation-Date: 2014-10-12 14:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -242,6 +242,14 @@
 msgid "Clear History"
 msgstr ""
 
+#: ../MusicStart.qml:169 ../common/SongsPage.qml:104
+msgid "Unknown Album"
+msgstr ""
+
+#: ../MusicStart.qml:183 ../common/SongsPage.qml:124
+msgid "Unknown Artist"
+msgstr ""
+
 #: ../MusicStart.qml:227
 msgid "Genres"
 msgstr ""
@@ -312,14 +320,6 @@
 msgid "Clear"
 msgstr ""
 
-#: ../meta-database.js:90 ../meta-database.js:92
-msgid "Unknown Album"
-msgstr ""
-
-#: ../meta-database.js:91
-msgid "Unknown Artist"
-msgstr ""
-
 #: ../music-app.qml:135
 msgid "Search Track"
 msgstr ""