mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/UI/Handlebars/Helpers/DateTime.js
View File

@ -61,7 +61,7 @@ define(
return ''; return '';
} }
return moment(input).format(UiSettings.time(false)); return moment(input).format(UiSettings.time(false, false));
}); });
Handlebars.registerHelper('LTS', function (input) { Handlebars.registerHelper('LTS', function (input) {
@ -69,7 +69,7 @@ define(
return ''; return '';
} }
return moment(input).format('h:mm:ss A'); return moment(input).format(UiSettings.time(true, true));
}); });
Handlebars.registerHelper('if_today', function(context, options) { Handlebars.registerHelper('if_today', function(context, options) {

2
src/UI/Release/AgeCell.js
View File

@ -13,7 +13,7 @@ define(
var age = this.model.get('age'); var age = this.model.get('age');
var ageHours = this.model.get('ageHours'); var ageHours = this.model.get('ageHours');
var published = moment(this.model.get('publishDate')); var published = moment(this.model.get('publishDate'));
var publishedFormatted = published.format('{0} h:mm:ss A'.format(UiSettings.get('shortDateFormat'))); var publishedFormatted = published.format('{0} {1}'.format(UiSettings.get('shortDateFormat'), UiSettings.time(true, true)));
var formatted = age; var formatted = age;
var suffix = this.plural(age, 'day'); var suffix = this.plural(age, 'day');

14
src/UI/Shared/UiSettingsModel.js
View File

@ -8,15 +8,19 @@ define(
url : window.NzbDrone.ApiRoot + '/config/ui', url : window.NzbDrone.ApiRoot + '/config/ui',
shortDateTime : function () { shortDateTime : function (includeSeconds) {
return this.get('shortDateFormat') + ' ' + this.time(true); return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds);
}, },
longDateTime : function () { longDateTime : function (includeSeconds) {
return this.get('longDateFormat') + ' ' + this.time(true); 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) { if (includeMinuteZero) {
return this.get('timeFormat').replace('(', '').replace(')', ''); return this.get('timeFormat').replace('(', '').replace(')', '');
} }

2
src/UI/System/Logs/Table/LogTimeCell.js
View File

@ -12,7 +12,7 @@ define(
render: function () { render: function () {
var date = moment(this._getValue()); var date = moment(this._getValue());
this.$el.html('<span title="{1}">{0}</span>'.format(date.format(UiSettings.time(true)), date.format(UiSettings.longDateTime()))); this.$el.html('<span title="{1}">{0}</span>'.format(date.format(UiSettings.time(true, false)), date.format(UiSettings.longDateTime(true))));
return this; return this;
} }