diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index 2057deaf6f..922ec763cb 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -1,4 +1,4 @@ -define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globalize", "loading", "connectionManager", "playMethodHelper", "cardBuilder", "imageLoader", "components/activitylog", "scripts/imagehelper", "indicators", "humanedate", "listViewStyle", "emby-button", "flexStyles", "emby-button", "emby-itemscontainer"], function (datetime, events, itemHelper, serverNotifications, dom, globalize, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog, imageHelper, indicators) { +define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globalize", "datefns", "dfnshelper", "loading", "connectionManager", "playMethodHelper", "cardBuilder", "imageLoader", "components/activitylog", "scripts/imagehelper", "indicators", "listViewStyle", "emby-button", "flexStyles", "emby-button", "emby-itemscontainer"], function (datetime, events, itemHelper, serverNotifications, dom, globalize, datefns, dfnshelper, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog, imageHelper, indicators) { "use strict"; function showPlaybackInfo(btn, session) { @@ -470,7 +470,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa if (!nowPlayingItem) { return { - html: "Last seen " + humaneDate(session.LastActivityDate), + html: globalize.translate("LastSeen", datefns.formatDistanceToNow(Date.parse(session.LastActivityDate), { addSuffix: true, locale: dfnshelper.getLocale() })), image: imgUrl }; } diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js index 133e6247de..f6616bad9d 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js @@ -1,4 +1,4 @@ -define(["jQuery", "loading", "events", "globalize", "dfnshelper", "serverNotifications", "date-fns", "listViewStyle", "emby-button"], function($, loading, events, globalize, dfnshelper, serverNotifications, datefns) { +define(["jQuery", "loading", "events", "globalize", "serverNotifications", "date-fns", "dfnshelper", "listViewStyle", "emby-button"], function ($, loading, events, globalize, serverNotifications, datefns, dfnshelper) { "use strict"; function reloadList(page) { diff --git a/src/controllers/devices.js b/src/controllers/devices.js index 3fd2be983e..dccece404d 100644 --- a/src/controllers/devices.js +++ b/src/controllers/devices.js @@ -1,4 +1,4 @@ -define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "humanedate", "emby-button", "emby-itemscontainer", "cardStyle"], function (loading, dom, libraryMenu, globalize, imageHelper) { +define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "date-fns", "dfnshelper", "emby-button", "emby-itemscontainer", "cardStyle"], function (loading, dom, libraryMenu, globalize, imageHelper, datefns, dfnshelper) { "use strict"; function canDelete(deviceId) { @@ -103,7 +103,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu if (device.LastUserName) { deviceHtml += device.LastUserName; - deviceHtml += ", " + humaneDate(device.DateLastActivity); + deviceHtml += ", " + datefns.formatDistanceToNow(Date.parse(device.DateLastActivity), { addSuffix: true, locale: dfnshelper.getLocale() }); } deviceHtml += " "; diff --git a/src/scripts/dfnshelper.js b/src/scripts/dfnshelper.js index f317613454..0efc6aa6fe 100644 --- a/src/scripts/dfnshelper.js +++ b/src/scripts/dfnshelper.js @@ -20,7 +20,7 @@ define(["globalize"], function (globalize) { case 'de': return locale.de; case 'el': - return locale.el + return locale.el; case 'en-gb': return locale.enGB; case 'en-us': @@ -52,7 +52,7 @@ define(["globalize"], function (globalize) { case 'id': return locale.id; case 'it': - return locale.it + return locale.it; case 'kk': return locale.kk; case 'ko': @@ -66,7 +66,7 @@ define(["globalize"], function (globalize) { case 'nl': return locale.nl; case 'pl': - return locale.pl + return locale.pl; case 'pt-br': return locale.ptBR; case 'pt-pt': diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 3787f3025f..79e8feb8d2 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1473,5 +1473,6 @@ "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.", "WriteAccessRequired": "Jellyfin Server requires write access to this folder. Please ensure write access and try again.", "ListPaging": "{0} of {1}", - "PersonRole": "as {0}" + "PersonRole": "as {0}", + "LastSeen": "Last seen {0}" } diff --git a/src/strings/es.json b/src/strings/es.json index e35d29cc4e..7439138b75 100644 --- a/src/strings/es.json +++ b/src/strings/es.json @@ -1481,5 +1481,6 @@ "PathNotFound": "No se encontró la ruta especificada. Asegúrate de que existe e inténtalo de nuevo.", "WriteAccessRequired": "Jellyfin requiere de permisos de escritura en esta carpeta. Asegúrate de que existe este permiso e inténtalo de nuevo.", "ListPaging": "{0} de {1}", - "PersonRole": "como {0}" + "PersonRole": "como {0}", + "LastSeen": "Última vez {0}" }