diff --git a/src/bundle.js b/src/bundle.js index 5e1a2ab3e3..dc2402d13d 100644 --- a/src/bundle.js +++ b/src/bundle.js @@ -114,3 +114,14 @@ var polyfill = require("@babel/polyfill/dist/polyfill"); _define("polyfill", function () { return polyfill; }); + +// Date-FNS +var date_fns = require("date-fns"); +_define("date-fns", function () { + return date_fns; +}); + +var date_fns_locale = require("date-fns/locale"); +_define("date-fns/locale", function () { + return date_fns_locale; +}); diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js index e21d4c23f4..5f437cc47b 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js @@ -1,4 +1,5 @@ -define(["jQuery", "loading", "events", "globalize", "serverNotifications", "humanedate", "listViewStyle", "emby-button"], function($, loading, events, globalize, serverNotifications) { +import { es } from 'date-fns/locale' +define(["jQuery", "loading", "events", "globalize", "serverNotifications", "date-fns", "listViewStyle", "emby-button"], function($, loading, events, globalize, serverNotifications, datefns) { "use strict"; function reloadList(page) { @@ -66,7 +67,8 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "huma var html = ""; if (task.State === "Idle") { if (task.LastExecutionResult) { - html += globalize.translate("LabelScheduledTaskLastRan", humaneDate(task.LastExecutionResult.EndTimeUtc), humaneElapsed(task.LastExecutionResult.StartTimeUtc, task.LastExecutionResult.EndTimeUtc)); + html += globalize.translate("LabelScheduledTaskLastRan", datefns.formatDistanceToNow(Date.parse(task.LastExecutionResult.EndTimeUtc), { addSuffix: true, locale: es }), + datefns.formatDistance(Date.parse(task.LastExecutionResult.StartTimeUtc), Date.parse(task.LastExecutionResult.EndTimeUtc), { addSuffix: false, locale: es })); if (task.LastExecutionResult.Status === "Failed") { html += " (" + globalize.translate("LabelFailed") + ")"; } else if (task.LastExecutionResult.Status === "Cancelled") { diff --git a/src/scripts/site.js b/src/scripts/site.js index fca5011478..d29da5cf30 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -619,6 +619,7 @@ var AppInfo = {}; } require(["mediaSession", "serverNotifications"]); + require(["date-fns", "date-fns/locale"]); if (!browser.tv && !browser.xboxOne) { require(["components/playback/playbackorientation"]); @@ -738,6 +739,7 @@ var AppInfo = {}; "webcomponents", "material-icons", "jellyfin-noto", + "date-fns", "page", "polyfill" ]