Merge lp://qastaging/~ricsipontaz/ubuntu-calendar-app/fix-for-bug-1428501 into lp://qastaging/ubuntu-calendar-app

Proposed by Richard Soml贸i
Status: Merged
Approved by: David Planella
Approved revision: 602
Merged at revision: 629
Proposed branch: lp://qastaging/~ricsipontaz/ubuntu-calendar-app/fix-for-bug-1428501
Merge into: lp://qastaging/ubuntu-calendar-app
Diff against target: 115 lines (+18/-15)
2 files modified
TimeLineHeader.qml (+2/-1)
po/com.ubuntu.calendar.pot (+16/-14)
To merge this branch: bzr merge lp://qastaging/~ricsipontaz/ubuntu-calendar-app/fix-for-bug-1428501
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Kunal Parmar code review Approve
Review via email: mp+251878@code.qastaging.launchpad.net

Commit message

Localization of Week Number string

Description of the change

In the week view the text which shows the actual week should be more translation friendly

For example:

In english: W9
Actual hungarian translation: h9 (which is not reflect what is it)
Better solution: 9. h or 9. h茅t

To post a comment you must log in.
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

Code wise patch seems good

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~ricsipontaz/ubuntu-calendar-app/fix-for-bug-1428501/+merge/251878/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Thanks for the fix! Looks good to me, I'd just suggest to add a translator comment here. (See inline comment)

review: Needs Fixing
Revision history for this message
Richard Soml贸i (ricsipontaz) wrote :

And how can I add a translator comment?

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

@Richard, just before the i18n.tr() line, you add a comment,

// TRANSLATORS: Some random translator comment

When you build and run the app, the pot file should be updated to include the TRANSLATORS comment.

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

So what david wanted was something like,

// TRANSLATORS: W refers to Week, followed by the actual week number (%1)
text: i18n.tr("W%1").arg(root.weekNumber)

601. By Richard Soml贸i

Localization of Week Number string + Template update

Revision history for this message
Richard Soml贸i (ricsipontaz) wrote :

Thanks. I did it. Is there anything I need to do yet?

Revision history for this message
David Planella (dpm) wrote :

Thanks Richard, that's all that needs to be done. I.e. applying the fix, committing and pushing it. Then when everything is fine, a core app dev will approve the merge proposal, automated tests will be run against it and when they pass it will be merged to trunk.

That said, there is something that still needs to be fixed: the translator comment line uses tabs where the rest of the file uses spaces. Could you replace the tabs with spaces to be consistent with the rest of the code?

Thanks!

review: Needs Fixing
602. By Richard Soml贸i

Localization of Week Number string, updated the po template

Revision history for this message
Richard Soml贸i (ricsipontaz) wrote :

I have fixed it, hope everything is good now. :)

Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks!

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: