From ed3fe1ecc28d23a8e890c7e8721b374a311438b1 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 9 Jan 2018 21:46:55 -0500 Subject: [PATCH] (js) Improve alarm description --- UI/Scheduler/English.lproj/Localizable.strings | 1 + UI/WebServerResources/js/Scheduler/Component.service.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index a56f28d55..45567338e 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -339,6 +339,7 @@ "repeat_YEARLY" = "Yearly"; "repeat_CUSTOM" = "Custom..."; "reminder_NONE" = "No reminder"; +"reminder_0" = "At time of event"; "reminder_5_MINUTES_BEFORE" = "5 minutes before"; "reminder_10_MINUTES_BEFORE" = "10 minutes before"; "reminder_15_MINUTES_BEFORE" = "15 minutes before"; diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js index 0b27d7670..220f2e1dc 100644 --- a/UI/WebServerResources/js/Scheduler/Component.service.js +++ b/UI/WebServerResources/js/Scheduler/Component.service.js @@ -1379,13 +1379,16 @@ Component.prototype.alarmDescription = function() { var key, localizedString = null; if (this.alarm) { - key = ['reminder' + this.alarm.quantity, this.alarm.unit, this.alarm.reference].join('_'); + key = ['reminder', this.alarm.quantity]; + if (this.alarm.quantity > 0) + key.push(this.alarm.unit.toUpperCase(), this.alarm.reference.toUpperCase()); + key = key.join('_'); localizedString = l(key); if (key === localizedString) // No localized string for this reminder definition localizedString = [this.alarm.quantity, - l('reminder_' + this.alarm.unit), - l('reminder_' + this.alarm.reference)].join(' '); + l('reminder_' + this.alarm.unit.toUpperCase()), + l('reminder_' + this.alarm.reference.toUpperCase())].join(' '); } return localizedString;