camera-app

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

  1. infographics-translations
  2. Merge into trunk
Proposed by Pete Woods
Status: Needs review
Proposed branch: lp:~unity-api-team/camera-app/infographics-translations
Merge into: lp:camera-app
Diff against target: 38 lines (+5/-5)
2 files modified
camera-app.qml (+4/-4)
po/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~unity-api-team/camera-app/infographics-translations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+250616@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Reply
Revision history for this message
Florian Boucault (fboucault) wrote :

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

Reply

Unmerged revisions

519. By Pete Woods

Tag infographic strings for extraction, rather than translate directly

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'camera-app.qml'
2--- camera-app.qml 2015-01-25 14:18:09 +0000
3+++ camera-app.qml 2015-02-23 13:09:58 +0000
4@@ -218,8 +218,8 @@
5 Metric {
6 id: metricPhotos
7 name: "camera-photos"
8- format: i18n.tr("<b>%1</b> photos taken today")
9- emptyFormat: i18n.tr("No photos taken today")
10+ format: i18n.tag("<b>%1</b> photos taken today")
11+ emptyFormat: i18n.tag("No photos taken today")
12 domain: "camera-app"
13 minimum: 0.0
14 }
15@@ -227,8 +227,8 @@
16 Metric {
17 id: metricVideos
18 name: "camera-videos"
19- format: i18n.tr("<b>%1</b> videos recorded today")
20- emptyFormat: i18n.tr("No videos recorded today")
21+ format: i18n.tag("<b>%1</b> videos recorded today")
22+ emptyFormat: i18n.tag("No videos recorded today")
23 domain: "camera-app"
24 minimum: 0.0
25 }
26
27=== modified file 'po/CMakeLists.txt'
28--- po/CMakeLists.txt 2014-09-05 12:04:54 +0000
29+++ po/CMakeLists.txt 2015-02-23 13:09:58 +0000
30@@ -18,7 +18,7 @@
31 --from-code=UTF-8
32 --c++ --qt --add-comments=TRANSLATORS
33 --keyword=tr --keyword=N_ --keyword=tr:1,2
34- --keyword=QT_TR_NOOP
35+ --keyword=QT_TR_NOOP --keyword=tag
36 --package-name=camera-app
37 --copyright-holder='Canonical Ltd.'
38 ${I18N_SRC_FILES})

Subscribers

People subscribed via source and target branches