LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve alarm description

pull/239/head
Francis Lachapelle 2018-01-09 21:46:55 -05:00
parent da4e2e92bd
commit ed3fe1ecc2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/Scheduler/English.lproj/Localizable.strings
View File

@ -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";

9
UI/WebServerResources/js/Scheduler/Component.service.js
View File

@ -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;