Ubuntu Clock App

Merge lp:~vthompson/ubuntu-clock-app/fix-1285694 into lp:ubuntu-clock-app/saucy

  1. fix-1285694
  2. Merge into saucy
Proposed by Victor Thompson
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 356
Merged at revision: 362
Proposed branch: lp:~vthompson/ubuntu-clock-app/fix-1285694
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 12 lines (+1/-1)
1 file modified
alarm/AlarmPage.qml (+1/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-clock-app/fix-1285694
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Review via email: mp+208655@code.launchpad.net

Commit message

* Check if alarm is repeating when displaying the alarm occurrences

Description of the change

* Check if alarm is repeating when displaying the alarm occurrences

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:356
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/298/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1535
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/298
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/298
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/216

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

nice catch! lgtm and works as expected.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-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 'alarm/AlarmPage.qml'
2--- alarm/AlarmPage.qml 2014-02-20 22:31:32 +0000
3+++ alarm/AlarmPage.qml 2014-02-27 17:41:34 +0000
4@@ -98,7 +98,7 @@
5 var occurs = get_day(value, type);
6
7 if (value != Alarm.Daily) {
8- if (occurs.length > 1)
9+ if (type === Alarm.Repeating)
10 return i18n.tr("Every ") + occurs
11 else
12 return i18n.tr("Once on ") + occurs

Subscribers

People subscribed via source and target branches