Merge lp:~lukas-kde/ubuntu-settings-components/fixCalendarCaption into lp:~registry/ubuntu-settings-components/trunk

[Lukáš Tinkl]

Use the standalone month name for the calendar caption

Use the standalone month name for the calendar caption

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/117/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
y

review: Approve

=== modified file 'plugins/Ubuntu/Settings/Menus/CalendarMenu.qml'
--- plugins/Ubuntu/Settings/Menus/CalendarMenu.qml	2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/CalendarMenu.qml	2015-07-28 14:13:03 +0000
@@ -54,7 +54,9 @@
                 right: parent.right
             }
             fontSize: "large"
-            text: Qt.formatDate(calendar.currentDate, "MMMM") + " " + calendar.currentDate.getFullYear()
+            text: i18n.ctr("%1=month name, %2=4-digit year", "%1 %2")
+                      .arg(Qt.locale().standaloneMonthName(calendar.currentDate.getMonth(), Locale.LongFormat))
+                      .arg(calendar.currentDate.getFullYear())
         }
 
         Calendar {