Merge lp:~dpm/gallery-app/i18n-strings into lp:gallery-app

[David Planella]

Mark photo deletion strings for translation

Superseding https://code.launchpad.net/~vrruiz/gallery-app/i18n-strings/+merge/234671 to revert the .pot update change and include only the code fix.

After a conversation with Bill Filler, we've decided to do this to ease the landing. In the same silo reserved for Gallery, there's another MP that touches the .pot file too, and this would generate merge conflicts with this branch.

The .pot file will be updated manually after the two branches have landed.

[Bill Filler (bfiller)]

approved

review: Approve

[Sebastien Bacher (seb128)]

in fact it seems that using the count created an off-by-one count error case, see https://bugs.launchpad.net/gallery-app/+bug/1375713

=== modified file 'rc/qml/EventsOverview.qml'
--- rc/qml/EventsOverview.qml	2014-08-20 18:30:56 +0000
+++ rc/qml/EventsOverview.qml	2014-09-17 17:27:20 +0000
@@ -62,8 +62,7 @@
     Component {
         id: deleteDialog
         DeleteDialog {
-            //FIXME this count > 1 thing needs to be properly replaced by translation wrappers allowing for multiple plural forms
-            title: organicEventView.selection.selectedCount > 1 ? "Delete photos" : "Delete a photo"
+            title: i18n.tr("Delete %1 photo", "Delete %1 photos", organicEventView.selection.selectedCount).arg(organicEventView.selection.selectedCount)
 
             onDeleteClicked: {
                 organicEventView.selection.model.destroySelectedMedia();

=== modified file 'rc/qml/PhotosOverview.qml'
--- rc/qml/PhotosOverview.qml	2014-08-20 18:30:56 +0000
+++ rc/qml/PhotosOverview.qml	2014-09-17 17:27:20 +0000
@@ -70,10 +70,7 @@
     Component {
         id: deleteDialog
         DeleteDialog {
-            //FIXME this count > 1 thing needs to be properly replaced by translation wrappers allowing for multiple plural forms
-            title: d.selection.selectedCount > 1 ? i18n.tr("Delete photos") :
-                                                   i18n.tr("Delete a photo")
-
+            title: i18n.tr("Delete %1 photo", "Delete %1 photos", d.selection.selectedCount).arg(d.selection.selectedCount)
             onDeleteClicked: {
                 d.selection.model.destroySelectedMedia();
                 photosOverview.leaveSelectionMode();