Fixed: Use 24 hour time when configured

This commit is contained in:
Mark McDowall
2014-12-26 13:09:43 -08:00
parent 85f7195d57
commit 158e20bfe7
4 changed files with 13 additions and 9 deletions

View File

@@ -8,15 +8,19 @@ define(
url : window.NzbDrone.ApiRoot + '/config/ui',
shortDateTime : function () {
return this.get('shortDateFormat') + ' ' + this.time(true);
shortDateTime : function (includeSeconds) {
return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds);
},
longDateTime : function () {
return this.get('longDateFormat') + ' ' + this.time(true);
longDateTime : function (includeSeconds) {
return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds);
},
time : function (includeMinuteZero) {
time : function (includeMinuteZero, includeSeconds) {
if (includeSeconds) {
return this.get('timeFormat').replace(/\(?\:mm\)?/, ':mm:ss');
}
if (includeMinuteZero) {
return this.get('timeFormat').replace('(', '').replace(')', '');
}