From b1b269e6093c94856ed8c89d15253fa0c7709fec Mon Sep 17 00:00:00 2001 From: Ruud Date: Thu, 23 Jul 2015 11:46:59 +0200 Subject: [PATCH] ETA date not working on Safari --- couchpotato/core/media/movie/_base/static/movie.js | 2 +- couchpotato/static/scripts/combined.plugins.min.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/couchpotato/core/media/movie/_base/static/movie.js b/couchpotato/core/media/movie/_base/static/movie.js index 77f3ed4..d144ba5 100644 --- a/couchpotato/core/media/movie/_base/static/movie.js +++ b/couchpotato/core/media/movie/_base/static/movie.js @@ -267,7 +267,7 @@ var Movie = new Class({ eta_date = null; } else { - eta_date = eta_date.toLocaleString('en-us', { month: "short" }) + (d.getFullYear() != eta_date.getFullYear() ? ' ' + eta_date.getFullYear() : ''); + eta_date = eta_date.format('%b') + (d.getFullYear() != eta_date.getFullYear() ? ' ' + eta_date.getFullYear() : ''); } } diff --git a/couchpotato/static/scripts/combined.plugins.min.js b/couchpotato/static/scripts/combined.plugins.min.js index e372230..88f8452 100644 --- a/couchpotato/static/scripts/combined.plugins.min.js +++ b/couchpotato/static/scripts/combined.plugins.min.js @@ -1957,9 +1957,7 @@ var Movie = new Class({ if (+eta_date / 1e3 < now) { eta_date = null; } else { - eta_date = eta_date.toLocaleString("en-us", { - month: "short" - }) + (d.getFullYear() != eta_date.getFullYear() ? " " + eta_date.getFullYear() : ""); + eta_date = eta_date.format("%b") + (d.getFullYear() != eta_date.getFullYear() ? " " + eta_date.getFullYear() : ""); } } var rating, stars;