ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/music-app/fix-1550832-plural-track-count into lp:music-app.

Commit message:
* Fix regression where AddToPlaylist.qml no long supports plural track counts

Requested reviews:
  Music App Developers (music-app-dev)
Related bugs:
  Bug #1550832 in Ubuntu Music App: "In AddToPlaylist, the Cards for each playlist do not support plural number of tracks"
  https://bugs.launchpad.net/music-app/+bug/1550832

For more details, see:
https://code.launchpad.net/~vthompson/music-app/fix-1550832-plural-track-count/+merge/287399

* Fix regression where AddToPlaylist.qml no long supports plural track counts
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~vthompson/music-app/fix-1550832-plural-track-count into lp:music-app.

=== modified file 'app/ui/AddToPlaylist.qml'
--- app/ui/AddToPlaylist.qml	2016-01-29 02:20:55 +0000
+++ app/ui/AddToPlaylist.qml	2016-02-28 01:20:18 +0000
@@ -96,7 +96,7 @@
             property string count: model.count
 
             primaryText: playlist.name
-            secondaryText: i18n.tr("%1 track", "%1 track", playlist.count).arg(playlist.count)
+            secondaryText: i18n.tr("%1 track", "%1 tracks", playlist.count).arg(playlist.count)
 
             onClicked: {
                 Playlists.addToPlaylistList(name, chosenElements)

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-26 03:18:20 +0000
+++ debian/changelog	2016-02-28 01:20:18 +0000
@@ -6,6 +6,7 @@
   * Change translation strings from song to track (LP: #1378143).
   * Ensure that only one ContentHubExport page is open (LP: #1538863).
   * Fix fallback image path in MusicListItem (LP: #1549580).
+  * Fix regression where AddToPlaylist.qml no long supports plural track counts (LP: #1550832).
 
   [ Andrew Hayzen ]
   * Fix so that a press and hold cannot disable selection in the ContentHubExport.qml (LP: #1538838)

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2016-01-29 04:03:27 +0000
+++ po/com.ubuntu.music.pot	2016-02-28 01:20:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-28 20:27-0600\n"
+"POT-Creation-Date: 2016-02-27 19:11-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -115,17 +115,17 @@
 msgstr ""
 
 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
-#: ../app/components/Helpers/ContentHubHelper.qml:82
+#: ../app/components/Helpers/ContentHubHelper.qml:86
 msgid "Filepath must start with"
 msgstr ""
 
 #. TRANSLATORS: This string represents that a blank filepath destination has been used
-#: ../app/components/Helpers/ContentHubHelper.qml:108
+#: ../app/components/Helpers/ContentHubHelper.qml:112
 msgid "Filepath must be a file"
 msgstr ""
 
 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
-#: ../app/components/Helpers/ContentHubHelper.qml:114
+#: ../app/components/Helpers/ContentHubHelper.qml:118
 msgid "Failed to move file"
 msgstr ""
 
@@ -287,7 +287,7 @@
 #: ../app/ui/SongsView.qml:291 ../app/ui/SongsView.qml:292
 #, qt-format
 msgid "%1 track"
-msgid_plural "%1 track"
+msgid_plural "%1 tracks"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -335,11 +335,11 @@
 msgid "Artists"
 msgstr ""
 
-#: ../app/ui/Artists.qml:114
+#: ../app/ui/Artists.qml:94
 msgid "Artist"
 msgstr ""
 
-#: ../app/ui/ContentHubExport.qml:33
+#: ../app/ui/ContentHubExport.qml:34
 msgid "Export Track"
 msgstr ""