Merge lp:~nik90/ubuntu-clock-app/fix-alarm-locale into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fixes the alarms repeat days-of-week picker to respect user locale

Fixes the alarms repeat days-of-week picker to respect user locale and also updates the copyright year to 2015 for the files that were edited this year.

Previously, the alarm days of the week were hardcoded from Mon-Sun...however this was bad since it did not respect the user locale. In this MP, I generate the alarm days of the week using Qt.locale() which provides info such as the first day of the week.

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

PASSED: Continuous integration, rev:193
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/607/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/791
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/791/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/607/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/fix-alarm-locale]

194. By Nekhelesh Ramananthan on 2015-01-22

Readjusted code formatting to max 80 columns

195. By Nekhelesh Ramananthan on 2015-01-22

Updated copyright year to 2015 in the files that were changed this year

196. By Nekhelesh Ramananthan on 2015-01-22

Converted while loop into for loop

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

FAILED: Continuous integration, rev:196
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/608/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/792/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/608/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/fix-alarm-locale]

197. By Nekhelesh Ramananthan on 2015-01-22

Empty commit to kick jenkins

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

PASSED: Continuous integration, rev:197
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/609/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/794
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/794/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/609/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

LGTM, thanks!

review: Approve

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2015-01-21 21:15:10 +0000
+++ app/alarm/AlarmDelegate.qml	2015-01-22 00:26:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	2014-09-18 10:23:40 +0000
+++ app/alarm/AlarmRepeat.qml	2015-01-22 00:26:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -27,6 +27,9 @@
     // Property to set the alarm days of the week in the edit alarm page
     property var alarm
 
+    // Property to hold the alarm utils functions passed from edit alarm page
+    property var alarmUtils
+
     visible: false
     title: i18n.tr("Repeat")
 
@@ -76,40 +79,22 @@
 
     ListModel {
         id: daysModel
-
-        ListElement {
-            day: "1"
-            flag: Alarm.Monday
-        }
-
-        ListElement {
-            day: "2"
-            flag: Alarm.Tuesday
-        }
-
-        ListElement {
-            day: "3"
-            flag: Alarm.Wednesday
-        }
-
-        ListElement {
-            day: "4"
-            flag: Alarm.Thursday
-        }
-
-        ListElement {
-            day: "5"
-            flag: Alarm.Friday
-        }
-
-        ListElement {
-            day: "6"
-            flag: Alarm.Saturday
-        }
-
-        ListElement {
-            day: "0"
-            flag: Alarm.Sunday
+        Component.onCompleted: initialise()
+
+        // Function to generate the days of the week based on the user locale
+        function initialise() {
+            // Get the first day of the week based on the user locale
+            var j = Qt.locale().firstDayOfWeek
+
+            // Set first item on the list to be the first day of the week
+            daysModel.append({ "day": Qt.locale().standaloneDayName(j, Locale.LongFormat),
+                                 "flag": alarmUtils.get_alarm_day(j) })
+
+            // Retrieve the rest of the alarms days of the week
+            for (var i=1; i<=6; i++) {
+                daysModel.append({ "day": Qt.locale().standaloneDayName((j+i)%7, Locale.LongFormat),
+                                     "flag": alarmUtils.get_alarm_day((j+i)%7) })
+            }
         }
     }
 
@@ -141,7 +126,7 @@
                     }
 
                     color: UbuntuColors.midAubergine
-                    text: Qt.locale().standaloneDayName(day, Locale.LongFormat)
+                    text: day
                 }
 
                 control: CheckBox {

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-10-16 19:03:51 +0000
+++ app/alarm/EditAlarmPage.qml	2015-01-22 00:26:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -292,7 +292,7 @@
             text: i18n.tr("Repeat")
             subText: alarmUtils.format_day_string(_alarm.daysOfWeek, _alarm.type)
             onClicked: pageStack.push(Qt.resolvedUrl("AlarmRepeat.qml"),
-                                      {"alarm": _alarm})
+                                      {"alarm": _alarm, "alarmUtils": alarmUtils})
         }
 
         SubtitledListItem {

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2015-01-21 02:32:40 +0000
+++ app/clock/ClockPage.qml	2015-01-22 00:26:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml	2015-01-21 02:32:40 +0000
+++ app/clock/MainClock.qml	2015-01-22 00:26:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2015-01-21 02:32:40 +0000
+++ app/ubuntu-clock-app.qml	2015-01-22 00:26:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-21 21:15:10 +0000
+++ debian/changelog	2015-01-22 00:26:25 +0000
@@ -6,6 +6,7 @@
   * Fixed the incorrect overriding of alarm delegate model value.
   * Fixed qml tests broken in vivid due to listitem behaviour change.
   * OneTime alarms are not automatically dismissed after they are triggered (LP: #1362341)
+  * Fixed Day-of-Week picker in alarms not respecting user locale (LP: #1372545)
 
   [Brendan Donegan]
   * Fixed AP failure by waiting for the bottom edge tip visible property to be true

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2014-11-17 16:11:18 +0000
+++ po/com.ubuntu.clock.pot	2015-01-22 00:26:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -44,7 +44,7 @@
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
 msgid "Select All"
 msgstr ""
 
@@ -56,7 +56,7 @@
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
 msgid "Repeat"
 msgstr ""
 
@@ -154,11 +154,11 @@
 msgid "Delete alarm"
 msgstr ""
 
-#: ../app/clock/ClockPage.qml:268
+#: ../app/clock/ClockPage.qml:271
 msgid "Location Service Error!"
 msgstr ""
 
-#: ../app/clock/ClockPage.qml:270
+#: ../app/clock/ClockPage.qml:273
 msgid "Retrieving location..."
 msgstr ""
 

=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml	2015-01-21 00:17:07 +0000
+++ tests/unit/tst_alarmRepeat.qml	2015-01-22 00:26:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd
+ * Copyright (C) 2014-2015 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -33,10 +33,15 @@
         id: _alarm
     }
 
+    AlarmUtils {
+        id: _alarmUtils
+    }
+
     Component {
         id: alarmRepeatPage
         AlarmRepeat {
             alarm: _alarm
+            alarmUtils: _alarmUtils
         }
     }