ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #03272
[Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app.
Commit message:
Snooze time more than 10 minutes (LP: #1450767)
Requested reviews:
Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
Bug #1450767 in Ubuntu Clock App: "[clock] Snooze time more than 10 minutes"
https://bugs.launchpad.net/ubuntu-clock-app/+bug/1450767
For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend/+merge/263846
Snooze time more than 10 minutes (lp: #1450767)
--
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app.
=== modified file 'README.developers'
--- README.developers 2014-08-14 20:16:14 +0000
+++ README.developers 2015-07-05 13:15:35 +0000
@@ -6,7 +6,7 @@
bzr branch lp:ubuntu-clock-app/reboot branch-name
cd branch-name
mkdir builddir && cd builddir
-cmake .. && make
+cmake .. && cmake --build .
qmlscene ../app/ubuntu-clock-app.qml -I backend/
```
=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml 2015-03-13 16:55:52 +0000
+++ app/alarm/AlarmSettingsPage.qml 2015-07-05 13:15:35 +0000
@@ -50,6 +50,7 @@
Component.onCompleted: initialise()
function initialise() {
+ // TRANSLATORS: Silence after
durationModel.append({ "duration": 10, "text": i18n.tr("%1 minute", "%1 minutes", 10).arg(10) })
durationModel.append({ "duration": 20, "text": i18n.tr("%1 minute", "%1 minutes", 20).arg(20) })
durationModel.append({ "duration": 30, "text": i18n.tr("%1 minute", "%1 minutes", 30).arg(30) })
@@ -62,10 +63,14 @@
Component.onCompleted: initialise()
function initialise() {
+ // TRANSLATORS: Snooze for
snoozeModel.append({ "duration": 2, "text": i18n.tr("%1 minute", "%1 minutes", 2).arg(2) })
snoozeModel.append({ "duration": 4, "text": i18n.tr("%1 minute", "%1 minutes", 4).arg(4) })
snoozeModel.append({ "duration": 5, "text": i18n.tr("%1 minute", "%1 minutes", 5).arg(5) })
snoozeModel.append({ "duration": 10, "text": i18n.tr("%1 minute", "%1 minutes", 10).arg(10) })
+ snoozeModel.append({ "duration": 15, "text": i18n.tr("%1 minute", "%1 minutes", 15).arg(15) })
+ snoozeModel.append({ "duration": 30, "text": i18n.tr("%1 minute", "%1 minutes", 30).arg(30) })
+ snoozeModel.append({ "duration": 60, "text": i18n.tr("%1 minute", "%1 minutes", 60).arg(60) })
}
}
=== modified file 'debian/changelog'
--- debian/changelog 2015-06-19 18:40:57 +0000
+++ debian/changelog 2015-07-05 13:15:35 +0000
@@ -1,8 +1,12 @@
-ubuntu-clock-app (3.4ubuntu1) UNRELEASED; urgency=medium
+ubuntu-clock-app (3.4ubuntu2) UNRELEASED; urgency=medium
+ [ Nicholas Skaggs ]
* Update testing layout.
- -- Nicholas Skaggs <nicholas.skaggs@xxxxxxxxxxxxx> Thu, 18 Jun 2015 15:48:22 -0400
+ [ Bartosz Kosiorek]
+ * Add more time choises for snooze time (LP: #1450767)
+
+ -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx> Sun, 05 Jul 2015 15:10:12 +0200
ubuntu-clock-app (3.4) vivid; urgency=medium
Follow ups
-
[Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: noreply, 2015-07-10
-
[Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Bartosz Kosiorek, 2015-07-10
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-07-10
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-07-10
-
[Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-07-10
-
[Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Riccardo Padovani, 2015-07-10
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Riccardo Padovani, 2015-07-10
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Bartosz Kosiorek, 2015-07-10
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Bartosz Kosiorek, 2015-07-09
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-07-07
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Nekhelesh Ramananthan, 2015-07-05
-
Re: [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-snooze-time-extend into lp:ubuntu-clock-app
From: Ubuntu Phone Apps Jenkins Bot, 2015-07-05