ubuntu-touch-coreapps-reviewers team mailing list archive

[Niklas Wenzel <nikwen.developer@xxxxxxxxx>]

Niklas Wenzel has proposed merging lp:~nikwen/ubuntu-calendar-app/fix-standalone-month-name-i18n into lp:ubuntu-calendar-app.

Commit message:
Fix bad month translations for some languages, e.g. Polish

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)
Related bugs:
  Bug #1522569 in Ubuntu Calendar App: "Bad month translation in Polish"
  https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1522569

For more details, see:
https://code.launchpad.net/~nikwen/ubuntu-calendar-app/fix-standalone-month-name-i18n/+merge/279509

Fix bad month translations for some languages, e.g. Polish

See the related bug report for more information on why this change is necessary. ;)
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~nikwen/ubuntu-calendar-app/fix-standalone-month-name-i18n into lp:ubuntu-calendar-app.

=== modified file 'DayView.qml'
--- DayView.qml	2015-11-23 07:15:20 +0000
+++ DayView.qml	2015-12-03 21:17:25 +0000
@@ -57,7 +57,9 @@
             id:monthYear
             objectName:"monthYearLabel"
             fontSize: "x-large"
-            text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
+            // TRANSLATORS: This string is used in the header of the month, week and day views.
+            // %1 is going to be replaced by the month name, %2 by the year.
+            text: qsTr(i18n.tr("%1 %2")).arg(Qt.locale().standaloneMonthName(currentDay.getMonth(), Locale.LongFormat)).arg(currentDay.getFullYear())
             font.capitalization: Font.Capitalize
         }
     }

=== modified file 'MonthView.qml'
--- MonthView.qml	2015-11-23 07:15:20 +0000
+++ MonthView.qml	2015-12-03 21:17:25 +0000
@@ -53,12 +53,12 @@
         ]
 
         contents: Label {
+            id: monthViewTitle
             objectName:"monthYearLabel"
             fontSize: "x-large"
-            // 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
-            text: currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
+            // TRANSLATORS: This string is used in the header of the month, week and day views.
+            // %1 is going to be replaced by the month name, %2 by the year.
+            text: qsTr(i18n.tr("%1 %2")).arg(Qt.locale().standaloneMonthName(currentMonth.getMonth(), Locale.LongFormat)).arg(currentMonth.getFullYear())
             font.capitalization: Font.Capitalize
         }
     }

=== modified file 'WeekView.qml'
--- WeekView.qml	2015-10-28 02:12:50 +0000
+++ WeekView.qml	2015-12-03 21:17:25 +0000
@@ -61,7 +61,9 @@
             id:monthYear
             objectName:"monthYearLabel"
             fontSize: "x-large"
-            text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))
+            // TRANSLATORS: This string is used in the header of the month, week and day views.
+            // %1 is going to be replaced by the month name, %2 by the year.
+            text: qsTr(i18n.tr("%1 %2")).arg(Qt.locale().standaloneMonthName(dayStart.getMonth(), Locale.LongFormat)).arg(dayStart.getFullYear())
             font.capitalization: Font.Capitalize
         }
     }

=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot	2015-11-23 07:15:20 +0000
+++ po/com.ubuntu.calendar.pot	2015-12-03 21:17:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-23 15:14+0800\n"
+"POT-Creation-Date: 2015-12-03 22:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -98,11 +98,11 @@
 msgid "Search contact"
 msgstr ""
 
-#. 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:60 ../MonthView.qml:61 ../WeekView.qml:64
-msgid "MMMM yyyy"
+#. TRANSLATORS: This string is used in the header of the month, week and day views.
+#. %1 is going to be replaced by the month name, %2 by the year.
+#: ../DayView.qml:62 ../MonthView.qml:61 ../WeekView.qml:66
+#, qt-format
+msgid "%1 %2"
 msgstr ""
 
 #: ../DeleteConfirmationDialog.qml:31