Ubuntu Clock App

Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/fix-clock-bug-1551307 into lp:ubuntu-clock-app

  1. fix-clock-bug-1551307
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 453
Merged at revision: 451
Proposed branch: lp:~ubuntu-clock-dev/ubuntu-clock-app/fix-clock-bug-1551307
Merge into: lp:ubuntu-clock-app
Diff against target: 249 lines (+45/-46)
4 files modified
app/alarm/AlarmDelegate.qml (+2/-1)
app/alarm/AlarmUtils.qml (+2/-1)
debian/changelog (+1/-0)
po/com.ubuntu.clock.pot (+40/-44)
To merge this branch: bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/fix-clock-bug-1551307
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Bartosz Kosiorek Approve
Review via email: mp+287493@code.launchpad.net

Commit message

Fixed alarm passed label being shown in the alarm description of one-time alarms

Description of the change

Fixed bug 1551307

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

@Bartosz, pls update pot file & top-approve if you are happy with the solution. Lets release clock-app v3.7 after this MP is merged.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:452
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1094/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/651/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1094/rebuild

review: Needs Fixing (continuous-integration)
lp:~ubuntu-clock-dev/ubuntu-clock-app/fix-clock-bug-1551307 updated
453. By Bartosz Kosiorek

Update translation template

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:453
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1095/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/652/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1095/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Works ok to me

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

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 2016-02-25 22:16:54 +0000
3+++ app/alarm/AlarmDelegate.qml 2016-02-29 21:02:10 +0000
4@@ -25,7 +25,8 @@
5 property var localTime
6 property bool showAlarmFrequency
7 property string alarmOccurrence: type === Alarm.Repeating ? alarmUtils.format_day_string(daysOfWeek, type)
8- : alarmUtils.get_time_to_alarm(model.date, localTime)
9+ : model.enabled ? alarmUtils.get_time_to_alarm(model.date, localTime)
10+ : ""
11
12 onShowAlarmFrequencyChanged: {
13 if (type === Alarm.Repeating && model.enabled) {
14
15=== modified file 'app/alarm/AlarmUtils.qml'
16--- app/alarm/AlarmUtils.qml 2016-02-25 22:16:54 +0000
17+++ app/alarm/AlarmUtils.qml 2016-02-29 21:02:10 +0000
18@@ -66,8 +66,9 @@
19 // even with different timezones (eg. during daylight saving change)
20 var totalTime = get_utc_time(alarmDate) - get_utc_time(currentDateTime);
21
22+ // Alarm has passed
23 if(totalTime < 0) {
24- return i18n.tr("Alarm Passed")
25+ return ""
26 }
27
28 var timeObject = _split_time(totalTime);
29
30=== modified file 'debian/changelog'
31--- debian/changelog 2016-02-29 12:09:02 +0000
32+++ debian/changelog 2016-02-29 21:02:10 +0000
33@@ -27,6 +27,7 @@
34 * Migrated all page head to the new PageHeader (LP: #1550991)
35 * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
36 * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
37+ * Fixed alarm passed label being shown in the alarm description (LP: #1551307)
38
39 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +0100
40
41
42=== modified file 'po/com.ubuntu.clock.pot'
43--- po/com.ubuntu.clock.pot 2016-02-25 23:08:35 +0000
44+++ po/com.ubuntu.clock.pot 2016-02-29 21:02:10 +0000
45@@ -1,6 +1,6 @@
46 # SOME DESCRIPTIVE TITLE.
47 # Copyright (C) YEAR Canonical Ltd.
48-# This file is distributed under the same license as the package.
49+# This file is distributed under the same license as the PACKAGE package.
50 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
51 #
52 #, fuzzy
53@@ -8,7 +8,7 @@
54 msgstr ""
55 "Project-Id-Version: \n"
56 "Report-Msgid-Bugs-To: \n"
57-"POT-Creation-Date: 2016-02-26 00:06+0100\n"
58+"POT-Creation-Date: 2016-02-29 21:58+0100\n"
59 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
60 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
61 "Language-Team: LANGUAGE <LL@li.org>\n"
62@@ -18,100 +18,100 @@
63 "Content-Transfer-Encoding: 8bit\n"
64 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
65
66-#: ../app/MainPage.qml:63 ../app/alarm/AlarmPage.qml:34
67-msgid "Alarms"
68-msgstr ""
69-
70-#: ../app/alarm/AlarmLabel.qml:33 ../app/alarm/AlarmLabel.qml:71
71+#: ../app/alarm/AlarmLabel.qml:35 ../app/alarm/AlarmLabel.qml:79
72 #: ../app/alarm/EditAlarmPage.qml:297
73 msgid "Label"
74 msgstr ""
75
76-#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:99
77+#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:103
78 #: ../app/worldclock/UserWorldCityList.qml:70
79 msgid "Delete"
80 msgstr ""
81
82-#: ../app/alarm/AlarmPage.qml:48 ../app/alarm/EditAlarmPage.qml:43
83+#: ../app/alarm/AlarmPage.qml:38 ../app/components/AlarmBottomEdge.qml:38
84+msgid "Alarms"
85+msgstr ""
86+
87+#: ../app/alarm/AlarmPage.qml:52 ../app/alarm/EditAlarmPage.qml:43
88 #: ../app/alarm/EditAlarmPage.qml:188
89 msgid "Alarm"
90 msgstr ""
91
92-#: ../app/alarm/AlarmPage.qml:62 ../app/worldclock/WorldCityList.qml:79
93+#: ../app/alarm/AlarmPage.qml:66 ../app/worldclock/WorldCityList.qml:83
94 msgid "Back"
95 msgstr ""
96
97-#: ../app/alarm/AlarmPage.qml:74
98+#: ../app/alarm/AlarmPage.qml:78
99 msgid "Select None"
100 msgstr ""
101
102-#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:59
103+#: ../app/alarm/AlarmPage.qml:80 ../app/alarm/AlarmRepeat.qml:62
104 msgid "Select All"
105 msgstr ""
106
107-#: ../app/alarm/AlarmPage.qml:155
108+#: ../app/alarm/AlarmPage.qml:159
109 msgid "No saved alarms"
110 msgstr ""
111
112-#: ../app/alarm/AlarmPage.qml:156
113+#: ../app/alarm/AlarmPage.qml:160
114 msgid "Tap the + icon to add an alarm"
115 msgstr ""
116
117-#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:282
118+#: ../app/alarm/AlarmRepeat.qml:38 ../app/alarm/EditAlarmPage.qml:282
119 msgid "Repeat"
120 msgstr ""
121
122-#: ../app/alarm/AlarmSettingsPage.qml:28
123+#: ../app/alarm/AlarmSettingsPage.qml:31
124 msgid "Settings"
125 msgstr ""
126
127 #. TRANSLATORS: Alarm stops after
128 #. TRANSLATORS: Snooze for
129-#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:54
130-#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
131-#: ../app/alarm/AlarmSettingsPage.qml:66 ../app/alarm/AlarmSettingsPage.qml:67
132-#: ../app/alarm/AlarmSettingsPage.qml:68 ../app/alarm/AlarmSettingsPage.qml:69
133-#: ../app/alarm/AlarmSettingsPage.qml:118
134-#: ../app/alarm/AlarmSettingsPage.qml:147
135+#: ../app/alarm/AlarmSettingsPage.qml:56 ../app/alarm/AlarmSettingsPage.qml:57
136+#: ../app/alarm/AlarmSettingsPage.qml:58 ../app/alarm/AlarmSettingsPage.qml:59
137+#: ../app/alarm/AlarmSettingsPage.qml:69 ../app/alarm/AlarmSettingsPage.qml:70
138+#: ../app/alarm/AlarmSettingsPage.qml:71 ../app/alarm/AlarmSettingsPage.qml:72
139+#: ../app/alarm/AlarmSettingsPage.qml:121
140+#: ../app/alarm/AlarmSettingsPage.qml:150
141 #, qt-format
142 msgid "%1 minute"
143 msgid_plural "%1 minutes"
144 msgstr[0] ""
145 msgstr[1] ""
146
147-#: ../app/alarm/AlarmSettingsPage.qml:96
148+#: ../app/alarm/AlarmSettingsPage.qml:99
149 msgid "Alarm volume"
150 msgstr ""
151
152-#: ../app/alarm/AlarmSettingsPage.qml:117
153+#: ../app/alarm/AlarmSettingsPage.qml:120
154 msgid "Alarm stops after"
155 msgstr ""
156
157-#: ../app/alarm/AlarmSettingsPage.qml:146
158+#: ../app/alarm/AlarmSettingsPage.qml:149
159 msgid "Snooze for"
160 msgstr ""
161
162-#: ../app/alarm/AlarmSettingsPage.qml:175
163+#: ../app/alarm/AlarmSettingsPage.qml:178
164 msgid "Vibration"
165 msgstr ""
166
167-#: ../app/alarm/AlarmSettingsPage.qml:200
168+#: ../app/alarm/AlarmSettingsPage.qml:203
169 msgid "Change time and date"
170 msgstr ""
171
172-#: ../app/alarm/AlarmSound.qml:30 ../app/alarm/EditAlarmPage.qml:317
173+#: ../app/alarm/AlarmSound.qml:60 ../app/alarm/EditAlarmPage.qml:317
174 msgid "Sound"
175 msgstr ""
176
177-#: ../app/alarm/AlarmSound.qml:185
178+#: ../app/alarm/AlarmSound.qml:190
179 msgid "Custom alarm sounds"
180 msgstr ""
181
182-#: ../app/alarm/AlarmSound.qml:200
183+#: ../app/alarm/AlarmSound.qml:205
184 msgid "Add sound"
185 msgstr ""
186
187-#: ../app/alarm/AlarmSound.qml:336
188+#: ../app/alarm/AlarmSound.qml:341
189 msgid "Default alarm sounds"
190 msgstr ""
191
192@@ -131,21 +131,17 @@
193 msgid "Daily"
194 msgstr ""
195
196-#: ../app/alarm/AlarmUtils.qml:70
197-msgid "Alarm Passed"
198-msgstr ""
199-
200-#: ../app/alarm/AlarmUtils.qml:80
201+#: ../app/alarm/AlarmUtils.qml:81
202 #, no-c-format, qt-format
203 msgid "in %1d %2h %3m"
204 msgstr ""
205
206-#: ../app/alarm/AlarmUtils.qml:90
207+#: ../app/alarm/AlarmUtils.qml:91
208 #, no-c-format, qt-format
209 msgid "in %1h %2m"
210 msgstr ""
211
212-#: ../app/alarm/AlarmUtils.qml:99
213+#: ../app/alarm/AlarmUtils.qml:100
214 #, no-c-format, qt-format
215 msgid "in %1m"
216 msgstr ""
217@@ -246,27 +242,27 @@
218 msgid "Same time"
219 msgstr ""
220
221-#: ../app/worldclock/WorldCityList.qml:50
222+#: ../app/worldclock/WorldCityList.qml:56
223 msgid "Select a city"
224 msgstr ""
225
226-#: ../app/worldclock/WorldCityList.qml:108
227+#: ../app/worldclock/WorldCityList.qml:112
228 msgid "Search..."
229 msgstr ""
230
231-#: ../app/worldclock/WorldCityList.qml:212
232+#: ../app/worldclock/WorldCityList.qml:216
233 msgid "Searching for a city"
234 msgstr ""
235
236-#: ../app/worldclock/WorldCityList.qml:217
237+#: ../app/worldclock/WorldCityList.qml:221
238 msgid "No City Found"
239 msgstr ""
240
241-#: ../app/worldclock/WorldCityList.qml:223
242+#: ../app/worldclock/WorldCityList.qml:227
243 msgid "Unable to connect."
244 msgstr ""
245
246-#: ../app/worldclock/WorldCityList.qml:224
247+#: ../app/worldclock/WorldCityList.qml:228
248 msgid "Please check your network connection and try again"
249 msgstr ""
250

Subscribers

People subscribed via source and target branches

to all changes: