Ubuntu Calendar App

Merge lp:~dpm/ubuntu-calendar-app/i18n-fixes into lp:ubuntu-calendar-app

  1. i18n-fixes
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Kunal Parmar
Approved revision: 21
Merged at revision: 20
Proposed branch: lp:~dpm/ubuntu-calendar-app/i18n-fixes
Merge into: lp:ubuntu-calendar-app
Diff against target: 47 lines (+13/-13)
2 files modified
MonthView.qml (+1/-1)
calendar.qml (+12/-12)
To merge this branch: bzr merge lp:~dpm/ubuntu-calendar-app/i18n-fixes
Reviewer Review Type Date Requested Status
Kunal Parmar Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+163396@code.launchpad.net

Commit message

A few internationalization fixes: used standaloneMonthName and removed explicit setting of i18n.language

Description of the change

A few internationalization fixes: used standaloneMonthName and removed explicit setting of i18n.language

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:21
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/2/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/2
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/2

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

review: Approve (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

changes looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MonthView.qml'
2--- MonthView.qml 2013-04-02 11:45:59 +0000
3+++ MonthView.qml 2013-05-11 13:44:28 +0000
4@@ -104,7 +104,7 @@
5
6 property int squareUnit: monthView.width / 8
7 property int verticalMargin: units.gu(1)
8- property int weekstartDay: Qt.locale(i18n.language).firstDayOfWeek
9+ property int weekstartDay: Qt.locale().firstDayOfWeek
10 property int monthCount: 49 // months for +-2 years
11
12 property var today: (new Date()).midnight() // TODO: update at midnight
13
14=== modified file 'calendar.qml'
15--- calendar.qml 2013-04-11 19:47:11 +0000
16+++ calendar.qml 2013-05-11 13:44:28 +0000
17@@ -45,18 +45,18 @@
18 id: tabs
19 anchors.fill: parent
20
21- Tab { title: Qt.locale(i18n.language).monthName(0) }
22- Tab { title: Qt.locale(i18n.language).monthName(1) }
23- Tab { title: Qt.locale(i18n.language).monthName(2) }
24- Tab { title: Qt.locale(i18n.language).monthName(3) }
25- Tab { title: Qt.locale(i18n.language).monthName(4) }
26- Tab { title: Qt.locale(i18n.language).monthName(5) }
27- Tab { title: Qt.locale(i18n.language).monthName(6) }
28- Tab { title: Qt.locale(i18n.language).monthName(7) }
29- Tab { title: Qt.locale(i18n.language).monthName(8) }
30- Tab { title: Qt.locale(i18n.language).monthName(9) }
31- Tab { title: Qt.locale(i18n.language).monthName(10) }
32- Tab { title: Qt.locale(i18n.language).monthName(11) }
33+ Tab { title: Qt.locale().standaloneMonthName(0) }
34+ Tab { title: Qt.locale().standaloneMonthName(1) }
35+ Tab { title: Qt.locale().standaloneMonthName(2) }
36+ Tab { title: Qt.locale().standaloneMonthName(3) }
37+ Tab { title: Qt.locale().standaloneMonthName(4) }
38+ Tab { title: Qt.locale().standaloneMonthName(5) }
39+ Tab { title: Qt.locale().standaloneMonthName(6) }
40+ Tab { title: Qt.locale().standaloneMonthName(7) }
41+ Tab { title: Qt.locale().standaloneMonthName(8) }
42+ Tab { title: Qt.locale().standaloneMonthName(9) }
43+ Tab { title: Qt.locale().standaloneMonthName(10) }
44+ Tab { title: Qt.locale().standaloneMonthName(11) }
45
46 onSelectedTabIndexChanged: monthView.gotoNextMonth(selectedTabIndex)
47 }

Subscribers

People subscribed via source and target branches

to status/vote changes: