Merge lp:~unity-api-team/camera-app/infographics-translations into lp:camera-app

[Pete Woods]

Perform infographic translations server-side, instead of client-side

Perform infographic translations server-side, instead of client-side

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:519
http://jenkins.qa.ubuntu.com/job/camera-app-ci/393/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/89/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/159
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/638/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/793
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/363
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18272
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/752/console

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

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Thanks Pete!
Any chance you could fix https://bugs.launchpad.net/camera-app/+bug/1323373 while you are at it? :)

Unmerged revisions

519. By Pete Woods on 2015-02-23

Tag infographic strings for extraction, rather than translate directly

=== modified file 'camera-app.qml'
--- camera-app.qml	2015-01-25 14:18:09 +0000
+++ camera-app.qml	2015-02-23 13:09:58 +0000
@@ -218,8 +218,8 @@
     Metric {
         id: metricPhotos
         name: "camera-photos"
-        format: i18n.tr("<b>%1</b> photos taken today")
-        emptyFormat: i18n.tr("No photos taken today")
+        format: i18n.tag("<b>%1</b> photos taken today")
+        emptyFormat: i18n.tag("No photos taken today")
         domain: "camera-app"
         minimum: 0.0
     }
@@ -227,8 +227,8 @@
     Metric {
         id: metricVideos
         name: "camera-videos"
-        format: i18n.tr("<b>%1</b> videos recorded today")
-        emptyFormat: i18n.tr("No videos recorded today")
+        format: i18n.tag("<b>%1</b> videos recorded today")
+        emptyFormat: i18n.tag("No videos recorded today")
         domain: "camera-app"
         minimum: 0.0
     }
 
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-09-05 12:04:54 +0000
+++ po/CMakeLists.txt	2015-02-23 13:09:58 +0000
@@ -18,7 +18,7 @@
                           --from-code=UTF-8
                           --c++ --qt --add-comments=TRANSLATORS
                           --keyword=tr --keyword=N_ --keyword=tr:1,2
-                          --keyword=QT_TR_NOOP
+                          --keyword=QT_TR_NOOP --keyword=tag
                           --package-name=camera-app
                           --copyright-holder='Canonical Ltd.'
                           ${I18N_SRC_FILES})