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

Cleaned up time formatting

This commit is contained in:
Mark McDowall 2014-08-05 07:30:44 -07:00
parent 0a8dcaaf16
commit b0c45aef50
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,11 +61,6 @@ define(
return '';
}
var date = moment(input);
if (date.format('mm') === '00') {
return date.format('ha');
}
return date.format('h:mma');
return moment(input).format(UiSettings.time(false));
});
});

2
src/UI/Shared/FormatHelpers.js
View File

@ -45,7 +45,7 @@ define(
return date.fromNow();
},
pad: function(n, width, z) {
pad: function (n, width, z) {
z = z || '0';
n = n + '';
return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;

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

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

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

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