Ubuntu Clock App

Merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-disabled-alarm-fix into lp:ubuntu-clock-app

  1. ubuntu-clock-app-disabled-alarm-fix
  2. Merge into trunk
Proposed by Bartosz Kosiorek on 2015-10-16
Status: Merged
Merged at revision: 399
Proposed branch: lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-disabled-alarm-fix
Merge into: lp:ubuntu-clock-app
Diff against target: 181 lines (+25/-25)
3 files modified
app/alarm/AlarmDelegate.qml (+3/-4)
debian/changelog (+1/-0)
po/com.ubuntu.clock.pot (+21/-21)
To merge this branch: bzr merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-disabled-alarm-fix
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing on 2015-10-19
Nekhelesh Ramananthan Approve on 2015-10-16
Victor Thompson Needs Fixing on 2015-10-16
Bartosz Kosiorek Approve on 2015-10-16
Review via email: mp+274661@code.launchpad.net

Commit Message

Disable alarms which have passed due to timezone changes (or phone is turned off) made by the user (LP: #1505522)

Description of the Change

Disable alarms which have passed due to timezone changes (or phone is turned off) made by the user (LP: #1505522)

To post a comment you must log in.
Bartosz Kosiorek (gang65) wrote :

Already approved by Nekhelesh with MR:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-order-fix/+merge/274270

This MR is only to separate changes from others one.

review: Approve
Victor Thompson (vthompson) wrote :

1 inline comment.

review: Needs Fixing
Bartosz Kosiorek (gang65) wrote :

@Victor Nice catch. Already fixed. Thanks

Nekhelesh Ramananthan (nik90) wrote :

Tiny little detail, the comment "It is important to keep the alarm list in order of occurrence (also for disabled alarms)." is not true. That if loop does not affect the alarm list order. Can you remove that statement?

Nekhelesh Ramananthan (nik90) :
review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:399
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/854/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/320/
Executed test runs:

review: Needs Fixing (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmDelegate.qml'
2--- app/alarm/AlarmDelegate.qml 2015-08-17 18:28:28 +0000
3+++ app/alarm/AlarmDelegate.qml 2015-10-19 02:19:20 +0000
4@@ -137,11 +137,10 @@
5 alarmData.enabled = checked
6
7 /*
8- Calculate the new alarm time if it is a one-time alarm and has
9- gone-off and the user is re-enabling the alarm. Repeating
10- alarms do this automatically.
11+ Calculate the alarm time if it is a one-time alarm.
12+ Repeating alarms do this automatically.
13 */
14- if(checked && type === Alarm.OneTime) {
15+ if(type === Alarm.OneTime) {
16 alarmData.daysOfWeek = Alarm.AutoDetect
17 var now = new Date()
18 if (alarmData.date.getHours()*60+alarmData.date.getMinutes() <= now.getHours()*60+now.getMinutes()) {
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2015-09-17 04:33:11 +0000
22+++ debian/changelog 2015-10-19 02:19:20 +0000
23@@ -16,6 +16,7 @@
24 * Fix stopwatch issue appering during changing timezone during runtime (LP: #1493358)
25 * Fix Daylight Saving Time issues (LP: #1437805)
26 * Fix time for second location wrong after daylight saving started (LP: #1457523)
27+ * Disable alarms which have passed due to timezone changes made by the user (LP: #1505522)
28
29 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 02 Sep 2015 15:16:29 +0200
30
31
32=== modified file 'po/com.ubuntu.clock.pot'
33--- po/com.ubuntu.clock.pot 2015-09-10 11:10:13 +0000
34+++ po/com.ubuntu.clock.pot 2015-10-19 02:19:20 +0000
35@@ -8,7 +8,7 @@
36 msgstr ""
37 "Project-Id-Version: \n"
38 "Report-Msgid-Bugs-To: \n"
39-"POT-Creation-Date: 2015-09-10 13:06+0200\n"
40+"POT-Creation-Date: 2015-10-19 04:17+0200\n"
41 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
42 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
43 "Language-Team: LANGUAGE <LL@li.org>\n"
44@@ -18,7 +18,7 @@
45 "Content-Transfer-Encoding: 8bit\n"
46 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
47
48-#: ../app/MainPage.qml:47 ../app/alarm/AlarmUtils.qml:55
49+#: ../app/MainPage.qml:53 ../app/alarm/AlarmUtils.qml:55
50 msgid "No active alarms"
51 msgstr ""
52
53@@ -54,11 +54,11 @@
54 msgid "Select All"
55 msgstr ""
56
57-#: ../app/alarm/AlarmPage.qml:141
58+#: ../app/alarm/AlarmPage.qml:152
59 msgid "No saved alarms"
60 msgstr ""
61
62-#: ../app/alarm/AlarmPage.qml:142
63+#: ../app/alarm/AlarmPage.qml:153
64 msgid "Tap the + icon to add an alarm"
65 msgstr ""
66
67@@ -136,26 +136,26 @@
68 msgid "Daily"
69 msgstr ""
70
71-#: ../app/alarm/AlarmUtils.qml:72
72+#: ../app/alarm/AlarmUtils.qml:82
73 #, qt-format
74 msgid "Next Alarm %1"
75 msgstr ""
76
77-#: ../app/alarm/AlarmUtils.qml:79
78+#: ../app/alarm/AlarmUtils.qml:89
79 msgid "Alarm Passed"
80 msgstr ""
81
82-#: ../app/alarm/AlarmUtils.qml:89
83+#: ../app/alarm/AlarmUtils.qml:99
84 #, no-c-format, qt-format
85 msgid "in %1d %2h %3m"
86 msgstr ""
87
88-#: ../app/alarm/AlarmUtils.qml:99
89+#: ../app/alarm/AlarmUtils.qml:109
90 #, no-c-format, qt-format
91 msgid "in %1h %2m"
92 msgstr ""
93
94-#: ../app/alarm/AlarmUtils.qml:108
95+#: ../app/alarm/AlarmUtils.qml:118
96 #, no-c-format, qt-format
97 msgid "in %1m"
98 msgstr ""
99@@ -177,13 +177,13 @@
100 msgid "Add sound from"
101 msgstr ""
102
103-#: ../app/clock/ClockPage.qml:225
104+#: ../app/clock/ClockPage.qml:249
105 msgid "Retrieving location..."
106 msgstr ""
107
108 #. TRANSLATORS: This refers to the stopwatch lap and is shown as a header where space is limited. Constrain
109 #. translation length to a few characters.
110-#: ../app/stopwatch/LapListView.qml:46 ../app/stopwatch/StopwatchPage.qml:131
111+#: ../app/stopwatch/LapListView.qml:46 ../app/stopwatch/StopwatchPage.qml:83
112 msgid "Lap"
113 msgstr ""
114
115@@ -195,19 +195,19 @@
116 msgid "Total Time"
117 msgstr ""
118
119-#: ../app/stopwatch/StopwatchPage.qml:114
120+#: ../app/stopwatch/StopwatchPage.qml:66
121 msgid "Stop"
122 msgstr ""
123
124-#: ../app/stopwatch/StopwatchPage.qml:114
125+#: ../app/stopwatch/StopwatchPage.qml:66
126 msgid "Start"
127 msgstr ""
128
129-#: ../app/stopwatch/StopwatchPage.qml:114
130+#: ../app/stopwatch/StopwatchPage.qml:66
131 msgid "Resume"
132 msgstr ""
133
134-#: ../app/stopwatch/StopwatchPage.qml:131
135+#: ../app/stopwatch/StopwatchPage.qml:83
136 msgid "Clear"
137 msgstr ""
138
139@@ -222,37 +222,37 @@
140
141 #. TRANSLATORS: this indicates if the time in a world clock
142 #. is behind or ahead of the time at the current location
143-#: ../app/worldclock/UserWorldCityDelegate.qml:147
144+#: ../app/worldclock/UserWorldCityDelegate.qml:133
145 msgid "behind"
146 msgstr ""
147
148-#: ../app/worldclock/UserWorldCityDelegate.qml:148
149+#: ../app/worldclock/UserWorldCityDelegate.qml:134
150 msgid "ahead"
151 msgstr ""
152
153 #. TRANSLATORS: the first argument is hour, followed by
154 #. minute, and the translation for either 'behind' or
155 #. 'ahead'
156-#: ../app/worldclock/UserWorldCityDelegate.qml:158
157+#: ../app/worldclock/UserWorldCityDelegate.qml:144
158 #, qt-format
159 msgid "%1h %2m %3"
160 msgstr ""
161
162 #. TRANSLATORS: the first argument is hour, followed by the
163 #. translation for either 'behind' or 'ahead'
164-#: ../app/worldclock/UserWorldCityDelegate.qml:167
165+#: ../app/worldclock/UserWorldCityDelegate.qml:153
166 #, qt-format
167 msgid "%1h %2"
168 msgstr ""
169
170 #. TRANSLATORS: the first argument is minute, followed by the
171 #. translation for either 'behind' or 'ahead'
172-#: ../app/worldclock/UserWorldCityDelegate.qml:175
173+#: ../app/worldclock/UserWorldCityDelegate.qml:161
174 #, qt-format
175 msgid "%1m %2"
176 msgstr ""
177
178-#: ../app/worldclock/UserWorldCityDelegate.qml:181
179+#: ../app/worldclock/UserWorldCityDelegate.qml:167
180 msgid "Same time"
181 msgstr ""
182

Subscribers

People subscribed via source and target branches