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
=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml 2016-02-25 22:16:54 +0000
+++ app/alarm/AlarmDelegate.qml 2016-02-29 21:02:10 +0000
@@ -25,7 +25,8 @@
25 property var localTime25 property var localTime
26 property bool showAlarmFrequency26 property bool showAlarmFrequency
27 property string alarmOccurrence: type === Alarm.Repeating ? alarmUtils.format_day_string(daysOfWeek, type)27 property string alarmOccurrence: type === Alarm.Repeating ? alarmUtils.format_day_string(daysOfWeek, type)
28 : alarmUtils.get_time_to_alarm(model.date, localTime)28 : model.enabled ? alarmUtils.get_time_to_alarm(model.date, localTime)
29 : ""
2930
30 onShowAlarmFrequencyChanged: {31 onShowAlarmFrequencyChanged: {
31 if (type === Alarm.Repeating && model.enabled) {32 if (type === Alarm.Repeating && model.enabled) {
3233
=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml 2016-02-25 22:16:54 +0000
+++ app/alarm/AlarmUtils.qml 2016-02-29 21:02:10 +0000
@@ -66,8 +66,9 @@
66 // even with different timezones (eg. during daylight saving change)66 // even with different timezones (eg. during daylight saving change)
67 var totalTime = get_utc_time(alarmDate) - get_utc_time(currentDateTime);67 var totalTime = get_utc_time(alarmDate) - get_utc_time(currentDateTime);
6868
69 // Alarm has passed
69 if(totalTime < 0) {70 if(totalTime < 0) {
70 return i18n.tr("Alarm Passed")71 return ""
71 }72 }
7273
73 var timeObject = _split_time(totalTime);74 var timeObject = _split_time(totalTime);
7475
=== modified file 'debian/changelog'
--- debian/changelog 2016-02-29 12:09:02 +0000
+++ debian/changelog 2016-02-29 21:02:10 +0000
@@ -27,6 +27,7 @@
27 * Migrated all page head to the new PageHeader (LP: #1550991)27 * Migrated all page head to the new PageHeader (LP: #1550991)
28 * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.28 * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
29 * Fixed colors being broken with OTA-10 SDK (LP: #1550716)29 * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
30 * Fixed alarm passed label being shown in the alarm description (LP: #1551307)
3031
31 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +010032 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Wed, 30 Dec 2015 01:43:24 +0100
3233
3334
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2016-02-25 23:08:35 +0000
+++ po/com.ubuntu.clock.pot 2016-02-29 21:02:10 +0000
@@ -1,6 +1,6 @@
1# SOME DESCRIPTIVE TITLE.1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR Canonical Ltd.2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the package.3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
6#, fuzzy6#, fuzzy
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-02-26 00:06+0100\n"11"POT-Creation-Date: 2016-02-29 21:58+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,100 +18,100 @@
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../app/MainPage.qml:63 ../app/alarm/AlarmPage.qml:3421#: ../app/alarm/AlarmLabel.qml:35 ../app/alarm/AlarmLabel.qml:79
22msgid "Alarms"
23msgstr ""
24
25#: ../app/alarm/AlarmLabel.qml:33 ../app/alarm/AlarmLabel.qml:71
26#: ../app/alarm/EditAlarmPage.qml:29722#: ../app/alarm/EditAlarmPage.qml:297
27msgid "Label"23msgid "Label"
28msgstr ""24msgstr ""
2925
30#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:9926#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:103
31#: ../app/worldclock/UserWorldCityList.qml:7027#: ../app/worldclock/UserWorldCityList.qml:70
32msgid "Delete"28msgid "Delete"
33msgstr ""29msgstr ""
3430
35#: ../app/alarm/AlarmPage.qml:48 ../app/alarm/EditAlarmPage.qml:4331#: ../app/alarm/AlarmPage.qml:38 ../app/components/AlarmBottomEdge.qml:38
32msgid "Alarms"
33msgstr ""
34
35#: ../app/alarm/AlarmPage.qml:52 ../app/alarm/EditAlarmPage.qml:43
36#: ../app/alarm/EditAlarmPage.qml:18836#: ../app/alarm/EditAlarmPage.qml:188
37msgid "Alarm"37msgid "Alarm"
38msgstr ""38msgstr ""
3939
40#: ../app/alarm/AlarmPage.qml:62 ../app/worldclock/WorldCityList.qml:7940#: ../app/alarm/AlarmPage.qml:66 ../app/worldclock/WorldCityList.qml:83
41msgid "Back"41msgid "Back"
42msgstr ""42msgstr ""
4343
44#: ../app/alarm/AlarmPage.qml:7444#: ../app/alarm/AlarmPage.qml:78
45msgid "Select None"45msgid "Select None"
46msgstr ""46msgstr ""
4747
48#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:5948#: ../app/alarm/AlarmPage.qml:80 ../app/alarm/AlarmRepeat.qml:62
49msgid "Select All"49msgid "Select All"
50msgstr ""50msgstr ""
5151
52#: ../app/alarm/AlarmPage.qml:15552#: ../app/alarm/AlarmPage.qml:159
53msgid "No saved alarms"53msgid "No saved alarms"
54msgstr ""54msgstr ""
5555
56#: ../app/alarm/AlarmPage.qml:15656#: ../app/alarm/AlarmPage.qml:160
57msgid "Tap the + icon to add an alarm"57msgid "Tap the + icon to add an alarm"
58msgstr ""58msgstr ""
5959
60#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:28260#: ../app/alarm/AlarmRepeat.qml:38 ../app/alarm/EditAlarmPage.qml:282
61msgid "Repeat"61msgid "Repeat"
62msgstr ""62msgstr ""
6363
64#: ../app/alarm/AlarmSettingsPage.qml:2864#: ../app/alarm/AlarmSettingsPage.qml:31
65msgid "Settings"65msgid "Settings"
66msgstr ""66msgstr ""
6767
68#. TRANSLATORS: Alarm stops after68#. TRANSLATORS: Alarm stops after
69#. TRANSLATORS: Snooze for69#. TRANSLATORS: Snooze for
70#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:5470#: ../app/alarm/AlarmSettingsPage.qml:56 ../app/alarm/AlarmSettingsPage.qml:57
71#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:5671#: ../app/alarm/AlarmSettingsPage.qml:58 ../app/alarm/AlarmSettingsPage.qml:59
72#: ../app/alarm/AlarmSettingsPage.qml:66 ../app/alarm/AlarmSettingsPage.qml:6772#: ../app/alarm/AlarmSettingsPage.qml:69 ../app/alarm/AlarmSettingsPage.qml:70
73#: ../app/alarm/AlarmSettingsPage.qml:68 ../app/alarm/AlarmSettingsPage.qml:6973#: ../app/alarm/AlarmSettingsPage.qml:71 ../app/alarm/AlarmSettingsPage.qml:72
74#: ../app/alarm/AlarmSettingsPage.qml:11874#: ../app/alarm/AlarmSettingsPage.qml:121
75#: ../app/alarm/AlarmSettingsPage.qml:14775#: ../app/alarm/AlarmSettingsPage.qml:150
76#, qt-format76#, qt-format
77msgid "%1 minute"77msgid "%1 minute"
78msgid_plural "%1 minutes"78msgid_plural "%1 minutes"
79msgstr[0] ""79msgstr[0] ""
80msgstr[1] ""80msgstr[1] ""
8181
82#: ../app/alarm/AlarmSettingsPage.qml:9682#: ../app/alarm/AlarmSettingsPage.qml:99
83msgid "Alarm volume"83msgid "Alarm volume"
84msgstr ""84msgstr ""
8585
86#: ../app/alarm/AlarmSettingsPage.qml:11786#: ../app/alarm/AlarmSettingsPage.qml:120
87msgid "Alarm stops after"87msgid "Alarm stops after"
88msgstr ""88msgstr ""
8989
90#: ../app/alarm/AlarmSettingsPage.qml:14690#: ../app/alarm/AlarmSettingsPage.qml:149
91msgid "Snooze for"91msgid "Snooze for"
92msgstr ""92msgstr ""
9393
94#: ../app/alarm/AlarmSettingsPage.qml:17594#: ../app/alarm/AlarmSettingsPage.qml:178
95msgid "Vibration"95msgid "Vibration"
96msgstr ""96msgstr ""
9797
98#: ../app/alarm/AlarmSettingsPage.qml:20098#: ../app/alarm/AlarmSettingsPage.qml:203
99msgid "Change time and date"99msgid "Change time and date"
100msgstr ""100msgstr ""
101101
102#: ../app/alarm/AlarmSound.qml:30 ../app/alarm/EditAlarmPage.qml:317102#: ../app/alarm/AlarmSound.qml:60 ../app/alarm/EditAlarmPage.qml:317
103msgid "Sound"103msgid "Sound"
104msgstr ""104msgstr ""
105105
106#: ../app/alarm/AlarmSound.qml:185106#: ../app/alarm/AlarmSound.qml:190
107msgid "Custom alarm sounds"107msgid "Custom alarm sounds"
108msgstr ""108msgstr ""
109109
110#: ../app/alarm/AlarmSound.qml:200110#: ../app/alarm/AlarmSound.qml:205
111msgid "Add sound"111msgid "Add sound"
112msgstr ""112msgstr ""
113113
114#: ../app/alarm/AlarmSound.qml:336114#: ../app/alarm/AlarmSound.qml:341
115msgid "Default alarm sounds"115msgid "Default alarm sounds"
116msgstr ""116msgstr ""
117117
@@ -131,21 +131,17 @@
131msgid "Daily"131msgid "Daily"
132msgstr ""132msgstr ""
133133
134#: ../app/alarm/AlarmUtils.qml:70134#: ../app/alarm/AlarmUtils.qml:81
135msgid "Alarm Passed"
136msgstr ""
137
138#: ../app/alarm/AlarmUtils.qml:80
139#, no-c-format, qt-format135#, no-c-format, qt-format
140msgid "in %1d %2h %3m"136msgid "in %1d %2h %3m"
141msgstr ""137msgstr ""
142138
143#: ../app/alarm/AlarmUtils.qml:90139#: ../app/alarm/AlarmUtils.qml:91
144#, no-c-format, qt-format140#, no-c-format, qt-format
145msgid "in %1h %2m"141msgid "in %1h %2m"
146msgstr ""142msgstr ""
147143
148#: ../app/alarm/AlarmUtils.qml:99144#: ../app/alarm/AlarmUtils.qml:100
149#, no-c-format, qt-format145#, no-c-format, qt-format
150msgid "in %1m"146msgid "in %1m"
151msgstr ""147msgstr ""
@@ -246,27 +242,27 @@
246msgid "Same time"242msgid "Same time"
247msgstr ""243msgstr ""
248244
249#: ../app/worldclock/WorldCityList.qml:50245#: ../app/worldclock/WorldCityList.qml:56
250msgid "Select a city"246msgid "Select a city"
251msgstr ""247msgstr ""
252248
253#: ../app/worldclock/WorldCityList.qml:108249#: ../app/worldclock/WorldCityList.qml:112
254msgid "Search..."250msgid "Search..."
255msgstr ""251msgstr ""
256252
257#: ../app/worldclock/WorldCityList.qml:212253#: ../app/worldclock/WorldCityList.qml:216
258msgid "Searching for a city"254msgid "Searching for a city"
259msgstr ""255msgstr ""
260256
261#: ../app/worldclock/WorldCityList.qml:217257#: ../app/worldclock/WorldCityList.qml:221
262msgid "No City Found"258msgid "No City Found"
263msgstr ""259msgstr ""
264260
265#: ../app/worldclock/WorldCityList.qml:223261#: ../app/worldclock/WorldCityList.qml:227
266msgid "Unable to connect."262msgid "Unable to connect."
267msgstr ""263msgstr ""
268264
269#: ../app/worldclock/WorldCityList.qml:224265#: ../app/worldclock/WorldCityList.qml:228
270msgid "Please check your network connection and try again"266msgid "Please check your network connection and try again"
271msgstr ""267msgstr ""
272268

Subscribers

People subscribed via source and target branches

to all changes: