diff --git a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs index 2af0ed9b8..ff5eff9fc 100644 --- a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs +++ b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs @@ -22,7 +22,8 @@ namespace NzbDrone.Core.Notifications.Email public EmailSettings() { - Port = 25; + Port = 587; + Ssl = true; } [FieldDefinition(0, Label = "Server", HelpText = "Hostname or IP of Email server")] diff --git a/src/UI/Cells/InCinemasCell.js b/src/UI/Cells/InCinemasCell.js index 9f1cb2d57..e9ce812eb 100644 --- a/src/UI/Cells/InCinemasCell.js +++ b/src/UI/Cells/InCinemasCell.js @@ -1,20 +1,17 @@ var TemplatedCell = require('./TemplatedCell'); +var moment = require('moment'); +var FormatHelpers = require('../Shared/FormatHelpers'); +var UiSettingsModel = require('../Shared/UiSettingsModel'); module.exports = TemplatedCell.extend({ className : 'in-cinemas-cell', render : function() { - var monthNames = ["January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December" - ]; - this.$el.html(""); if (this.model.get("inCinemas")) { - var cinemasDate = new Date(this.model.get("inCinemas")); - var year = cinemasDate.getFullYear(); - var month = monthNames[cinemasDate.getMonth()]; - this.$el.html(month + " " + year); //Hack, but somehow handlebar helper does not work. + var cinemasDate = this.model.get("inCinemas"); + this.$el.html(moment(cinemasDate).format(UiSettingsModel.shortDate())); } return this; diff --git a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs index ffc74aace..18033cc04 100644 --- a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs +++ b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs @@ -37,7 +37,7 @@
{{GetStatus}} - {{inCinemas}} + {{ShortDate inCinemas}} {{profile profileId}} diff --git a/src/UI/Shared/UiSettingsModel.js b/src/UI/Shared/UiSettingsModel.js index a517b5aba..e81b08396 100644 --- a/src/UI/Shared/UiSettingsModel.js +++ b/src/UI/Shared/UiSettingsModel.js @@ -8,6 +8,10 @@ var UiSettings = Backbone.Model.extend({ return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds); }, + shortDate : function() { + return this.get('shortDateFormat'); + }, + longDateTime : function(includeSeconds) { return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds); },