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

[Richard Somlói]

Localization of Week Number string

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

[Kunal Parmar (pkunal-parmar)]

Code wise patch seems good

review: Approve (code review)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[David Planella (dpm)]

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

review: Needs Fixing

[Richard Somlói (ricsipontaz)]

And how can I add a translator comment?

[Nekhelesh Ramananthan (nik90)]

@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.

[Nekhelesh Ramananthan (nik90)]

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)

[lp:~ricsipontaz/ubuntu-calendar-app/fix-for-bug-1428501]

601. By Richard Somlói on 2015-04-16

Localization of Week Number string + Template update

[Richard Somlói (ricsipontaz)]

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

[David Planella (dpm)]

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

[lp:~ricsipontaz/ubuntu-calendar-app/fix-for-bug-1428501]

602. By Richard Somlói on 2015-04-17

Localization of Week Number string, updated the po template

[Richard Somlói (ricsipontaz)]

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

[David Planella (dpm)]

Looks good to me, thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2015-02-19 13:50:29 +0000
+++ TimeLineHeader.qml	2015-04-17 05:05:33 +0000
@@ -45,7 +45,8 @@
             Label{
                 id: weekNumLabel
                 objectName: "weeknumber"
-                text: i18n.tr("W") + root.weekNumber
+                // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
+                text: i18n.tr("W%1").arg(root.weekNumber)
                 fontSize: "small"
                 height: units.gu(5)
                 width: parent.width

=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot	2015-02-18 19:11:05 +0000
+++ po/com.ubuntu.calendar.pot	2015-04-17 05:05:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-18 19:09+0000\n"
+"POT-Creation-Date: 2015-04-17 07:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -23,21 +23,21 @@
 msgid "Today"
 msgstr ""
 
-#: ../AgendaView.qml:91
+#: ../AgendaView.qml:92
 msgid "No upcoming events"
 msgstr ""
 
-#: ../AgendaView.qml:94
+#: ../AgendaView.qml:95
 msgid "You have no calendars enabled"
 msgstr ""
 
-#: ../AgendaView.qml:104
+#: ../AgendaView.qml:105
 msgid "Enable calendars"
 msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
 #. while the second one (%2) refers to the end time
-#: ../AgendaView.qml:166 ../EventBubble.qml:131
+#: ../AgendaView.qml:168 ../EventBubble.qml:131
 #, qt-format
 msgid "%1 - %2"
 msgstr ""
@@ -59,7 +59,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:41
+#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:59
 msgid "Calendars"
 msgstr ""
 
@@ -69,11 +69,11 @@
 
 #. TRANSLATORS: Please translate this string  to 15 characters only.
 #. Currently ,there is no way we can increase width of action menu currently.
-#: ../CalendarChoicePopup.qml:51
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
 msgid "Sync"
 msgstr ""
 
-#: ../CalendarChoicePopup.qml:51
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
 msgid "Syncing"
 msgstr ""
 
@@ -101,7 +101,7 @@
 #. TRANSLATORS: this is a time formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
 #. It's used in the header of the month and week views
-#: ../DayView.qml:58 ../MonthView.qml:56 ../WeekView.qml:60
+#: ../DayView.qml:59 ../MonthView.qml:57 ../WeekView.qml:61
 msgid "MMMM yyyy"
 msgstr ""
 
@@ -154,7 +154,7 @@
 msgid "Edit this"
 msgstr ""
 
-#: ../EventActions.qml:32 ../NewEvent.qml:283
+#: ../EventActions.qml:50 ../NewEvent.qml:283
 msgid "New Event"
 msgstr ""
 
@@ -390,15 +390,17 @@
 msgid "2 weeks"
 msgstr ""
 
-#: ../TimeLineHeader.qml:47
-msgid "W"
+#. TRANSLATORS: W refers to Week, followed by the actual week number (%1)
+#: ../TimeLineHeader.qml:49
+#, qt-format
+msgid "W%1"
 msgstr ""
 
-#: ../TimeLineHeader.qml:59
+#: ../TimeLineHeader.qml:61
 msgid "All Day"
 msgstr ""
 
-#: ../YearView.qml:53
+#: ../YearView.qml:54
 #, qt-format
 msgid "Year %1"
 msgstr ""