Merge lp:~timo-jyrinki/gallery-app/allow_translating_date_strings into lp:gallery-app

[Timo Jyrinki]

Allow translating the date strings in EventCard.qml, update .pot file (LP: #1457357)

.pot file updated automatically by SDK, seems to add also a few strings not previously available?

[Timo Jyrinki (timo-jyrinki)]

Tested locally successfully by adding the translation to fi.po and making the .mo available as gallery-app.mo in the system.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1197
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/570
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20687

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1156/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1197
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/570
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20687

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1156/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

Change looks good to me, thanks for looking at this.

review: Approve

=== modified file 'po/gallery-app.pot'
--- po/gallery-app.pot	2015-02-25 10:17:40 +0000
+++ po/gallery-app.pot	2015-05-21 11:35:44 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gallery-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-25 11:17+0100\n"
+"POT-Creation-Date: 2015-05-21 13:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -25,15 +25,17 @@
 #: rc/qml/AlbumEditor/AlbumEditMenu.qml:50
 #: rc/qml/AlbumViewer/AlbumViewer.qml:375
 #: rc/qml/Components/DeleteDialog.qml:32
-#: rc/qml/MediaViewer/MediaViewer.qml:466 rc/qml/Utility/EditingHUD.qml:67
+#: rc/qml/MediaViewer/MediaViewer.qml:345 rc/qml/Utility/EditingHUD.qml:67
 #: rc/qml/Utility/SelectionToolbarAction.qml:56
 msgid "Delete"
 msgstr ""
 
 #: rc/qml/AlbumEditor/AlbumEditor.qml:39
 #: rc/qml/Components/MediaSelector.qml:92
-#: rc/qml/MediaViewer/MediaViewer.qml:294 rc/qml/PickerScreen.qml:235
-#: rc/qml/Utility/SelectionToolbarAction.qml:75
+#: rc/qml/MediaViewer/MediaViewer.qml:275
+#: rc/qml/MediaViewer/PhotoEditor.qml:206
+#: rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml:80
+#: rc/qml/PickerScreen.qml:235 rc/qml/Utility/SelectionToolbarAction.qml:75
 msgid "Cancel"
 msgstr ""
 
@@ -62,7 +64,7 @@
 msgstr ""
 
 #: rc/qml/AlbumViewer/AlbumViewer.qml:369
-#: rc/qml/MediaViewer/MediaViewer.qml:456
+#: rc/qml/MediaViewer/MediaViewer.qml:335
 msgid "Add to album"
 msgstr ""
 
@@ -88,12 +90,12 @@
 msgstr ""
 
 #: rc/qml/Components/DeleteDialog.qml:36
-#: rc/qml/MediaViewer/MediaViewer.qml:242
+#: rc/qml/MediaViewer/MediaViewer.qml:223
 msgid "Yes"
 msgstr ""
 
 #: rc/qml/Components/DeleteDialog.qml:45
-#: rc/qml/MediaViewer/MediaViewer.qml:253
+#: rc/qml/MediaViewer/MediaViewer.qml:234
 msgid "No"
 msgstr ""
 
@@ -105,6 +107,14 @@
 msgid "Delete album + contents"
 msgstr ""
 
+#: rc/qml/Components/EventCard.qml:59
+msgid "MMM yyyy"
+msgstr ""
+
+#: rc/qml/Components/EventCard.qml:73
+msgid "dd"
+msgstr ""
+
 #: rc/qml/Components/MediaSelector.qml:59
 #: rc/qml/Components/MediaSelector.qml:80
 msgid "Add to Album"
@@ -179,64 +189,89 @@
 msgid "Photos"
 msgstr ""
 
-#: rc/qml/MediaViewer/CropOverlay.qml:352
-#: rc/qml/MediaViewer/EditPopover.qml:51 rc/qml/Utility/EditingHUD.qml:106
-msgid "Crop"
-msgstr ""
-
-#: rc/qml/MediaViewer/EditPopover.qml:42 rc/qml/Utility/EditingHUD.qml:99
-msgid "Rotate"
-msgstr ""
-
-#: rc/qml/MediaViewer/EditPopover.qml:60
-msgid "Auto enhance"
-msgstr ""
-
-#: rc/qml/MediaViewer/EditPopover.qml:69 rc/qml/Utility/EditingHUD.qml:82
-msgid "Undo"
-msgstr ""
-
-#: rc/qml/MediaViewer/EditPopover.qml:79 rc/qml/Utility/EditingHUD.qml:87
-msgid "Redo"
-msgstr ""
-
-#: rc/qml/MediaViewer/EditPopover.qml:89
-msgid "Revert to original"
-msgstr ""
-
-#: rc/qml/MediaViewer/MediaViewer.qml:231
+#: rc/qml/MediaViewer/ExtrasPhotoEditorPage.qml:26
+#: rc/qml/MediaViewer/GalleryPhotoEditorPage.qml:25
+msgid "Edit Photo"
+msgstr ""
+
+#: rc/qml/MediaViewer/MediaViewer.qml:212
 msgid "Delete a photo"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:231
+#: rc/qml/MediaViewer/MediaViewer.qml:212
 msgid "Delete a video"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:264
+#: rc/qml/MediaViewer/MediaViewer.qml:245
 msgid "Remove a photo from album"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:264
+#: rc/qml/MediaViewer/MediaViewer.qml:245
 msgid "Remove a video from album"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:273
+#: rc/qml/MediaViewer/MediaViewer.qml:254
 msgid "Remove from Album"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:284
+#: rc/qml/MediaViewer/MediaViewer.qml:265
 msgid "Remove from Album and Delete"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:449
+#: rc/qml/MediaViewer/MediaViewer.qml:312
 msgid "Edit"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:477 rc/qml/Utility/EditingHUD.qml:72
+#: rc/qml/MediaViewer/MediaViewer.qml:356 rc/qml/Utility/EditingHUD.qml:72
 #: rc/qml/Utility/SelectionToolbarAction.qml:65
 msgid "Share"
 msgstr ""
 
+#: rc/qml/MediaViewer/PhotoEditor.qml:43
+#: rc/qml/MediaViewer/PhotoEditor/CropOverlay.qml:349
+#: rc/qml/Utility/EditingHUD.qml:106
+msgid "Crop"
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor.qml:52 rc/qml/Utility/EditingHUD.qml:99
+msgid "Rotate"
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor.qml:196
+msgid "Revert to original"
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor.qml:197
+msgid "This will undo all edits, including those from previous sessions."
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor.qml:212
+msgid "Revert Photo"
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor.qml:226
+msgid "Enhancing photo..."
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:114
+#: rc/qml/Utility/EditingHUD.qml:82
+msgid "Undo"
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:121
+#: rc/qml/Utility/EditingHUD.qml:87
+msgid "Redo"
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor/EditStack.qml:128
+#: rc/qml/Utility/EditingHUD.qml:113
+msgid "Revert to Original"
+msgstr ""
+
+#: rc/qml/MediaViewer/PhotoEditor/ExposureAdjuster.qml:71
+msgid "Done"
+msgstr ""
+
 #: rc/qml/MediaViewer/PopupPhotoViewer.qml:46
 #: desktop/gallery-app.desktop.in.in.h:1
 msgid "Gallery"
@@ -294,10 +329,6 @@
 msgid "Crop the image"
 msgstr ""
 
-#: rc/qml/Utility/EditingHUD.qml:113
-msgid "Revert to Original"
-msgstr ""
-
 #: rc/qml/Utility/EditingHUD.qml:114
 msgid "Discard Changes"
 msgstr ""

=== modified file 'rc/qml/Components/EventCard.qml'
--- rc/qml/Components/EventCard.qml	2013-09-03 21:06:17 +0000
+++ rc/qml/Components/EventCard.qml	2015-05-21 11:35:44 +0000
@@ -55,7 +55,8 @@
         font.capitalization: Font.AllUppercase
         horizontalAlignment: Text.AlignHCenter
 
-        text: (event) ? Qt.formatDate(event.date, "MMM yyyy") : ""
+        /// The event ubuntushape's month/year part, keep as is unless you know what you're doing
+        text: (event) ? Qt.formatDate(event.date, i18n.tr("MMM yyyy")) : ""
     }
 
     Label {
@@ -68,6 +69,7 @@
 
         horizontalAlignment: Text.AlignHCenter
 
-        text: (event) ? Qt.formatDate(event.date, "dd") : ""
+        /// The event ubuntushape's day part, keep as is unless you know what you're doing
+        text: (event) ? Qt.formatDate(event.date, i18n.tr("dd")) : ""
     }
 }