Ubuntu Calendar App

Merge lp:~mihirsoni/ubuntu-calendar-app/fix-translation-args into lp:ubuntu-calendar-app

  1. fix-translation-args
  2. Merge into trunk
Proposed by Mihir Soni
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 503
Merged at revision: 500
Proposed branch: lp:~mihirsoni/ubuntu-calendar-app/fix-translation-args
Merge into: lp:ubuntu-calendar-app
Diff against target: 29 lines (+5/-3)
2 files modified
DeleteConfirmationDialog.qml (+3/-2)
EditEventConfirmationDialog.qml (+2/-1)
To merge this branch: bzr merge lp:~mihirsoni/ubuntu-calendar-app/fix-translation-args
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Sebastien Bacher (community) Approve
Ubuntu Calendar Developers Pending
Review via email: mp+238325@code.launchpad.net

Commit message

Fixed translation with arguments.

Description of the change

Fixed translation with arguments.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, the cmake rules to update the pot don't understand strings under '...' though, which means those are not going to be listed in the template

rather than using '...."something"...' you need to use "...\"something\"..."

otherwise looks good to me!

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:500
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/915/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/939
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/939/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/473

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/915/rebuild

review: Approve (continuous-integration)
lp:~mihirsoni/ubuntu-calendar-app/fix-translation-args updated
501. By Mihir Soni

Added escape sequence to sync with pot

502. By Mihir Soni

replaced single quote by double quotes

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:501
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/916/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/940
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/940/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/474

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/916/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good to me, thanks! (you might want to update the template as well)

review: Approve
lp:~mihirsoni/ubuntu-calendar-app/fix-translation-args updated
503. By Mihir Soni

Added Translators comments

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:502
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/917/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/941
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/941/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/475

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/917/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:503
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/918/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/942
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/942/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/476

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/918/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DeleteConfirmationDialog.qml'
2--- DeleteConfirmationDialog.qml 2014-09-20 10:45:35 +0000
3+++ DeleteConfirmationDialog.qml 2014-10-14 17:20:32 +0000
4@@ -32,8 +32,9 @@
5 i18n.tr("Delete Event") ;
6
7 text: event.parentId ?
8- i18n.tr('Delete only this event "'+event.displayLabel+'", or all events in the series?'):
9- i18n.tr('Are you sure you want to delete the event "'+ event.displayLabel +'"?');
10+ // TRANSLATORS: argument (%1) refers to an event name.
11+ i18n.tr("Delete only this event \"%1\", or all events in the series?").arg(event.displayLabel):
12+ i18n.tr("Are you sure you want to delete the event \"%1\"?").arg(event.displayLabel);
13
14 Button {
15 text: i18n.tr("Delete series")
16
17=== modified file 'EditEventConfirmationDialog.qml'
18--- EditEventConfirmationDialog.qml 2014-09-20 10:45:35 +0000
19+++ EditEventConfirmationDialog.qml 2014-10-14 17:20:32 +0000
20@@ -28,7 +28,8 @@
21
22 title: i18n.tr("Edit Event")
23
24- text: i18n.tr('Edit only this event "'+event.displayLabel+'", or all events in the series?');
25+ // TRANSLATORS: argument (%1) refers to an event name.
26+ text: i18n.tr("Edit only this event \"%1\", or all events in the series?").arg(event.displayLabel);
27
28 Button {
29 text: i18n.tr("Edit series")

Subscribers

People subscribed via source and target branches

to status/vote changes: