From 8651d4bd00970920856950568adebb4bb157e149 Mon Sep 17 00:00:00 2001 From: artiume Date: Sun, 1 Mar 2020 20:59:42 -0500 Subject: [PATCH 001/324] Update playback warning --- src/components/playback/experimentalwarnings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/playback/experimentalwarnings.js b/src/components/playback/experimentalwarnings.js index 2d1ef53c19..9c0714e57e 100644 --- a/src/components/playback/experimentalwarnings.js +++ b/src/components/playback/experimentalwarnings.js @@ -46,21 +46,21 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function ( function showBlurayMessage() { var message = - 'Playback of Bluray folders in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native Bluray folder support.'; + 'Playback of Bluray folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'blurayexpirementalinfo', 'nativeblurayplayback'); } function showDvdMessage() { var message = - 'Playback of Dvd folders in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native Dvd folder support.'; + 'Playback of Dvd folders in this app is experimental. Jellyfin cannot decrypt DRM. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'dvdexpirementalinfo', 'nativedvdplayback'); } function showIsoMessage() { var message = - 'Playback of ISO files in this app is experimental. Some titles may not work at all. For a better experience, consider converting to mkv video files, or use an Jellyfin app with native ISO support.'; + 'Playback of ISO files in this app is experimental. The current behavior is to play all files in series, this can include a two minute black intro video.'; return showMessage(message, 'isoexpirementalinfo', 'nativeisoplayback'); } From d791da07e39240696e57463466a681cafcb9ba49 Mon Sep 17 00:00:00 2001 From: ferferga Date: Thu, 19 Mar 2020 00:17:51 +0100 Subject: [PATCH 002/324] Translate alerts --- src/components/directorybrowser/directorybrowser.js | 7 +++---- src/strings/en-us.json | 4 +++- src/strings/es.json | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js index b71f7bbb05..db53f0a398 100644 --- a/src/components/directorybrowser/directorybrowser.js +++ b/src/components/directorybrowser/directorybrowser.js @@ -163,16 +163,15 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper- } }).catch(function(response) { if (response) { - // TODO All alerts (across the project), should use Globalize.translate() if (response.status === 404) { - alertText("The path could not be found. Please ensure the path is valid and try again."); + alertText(Globalize.translate("PathNotFound")); return Promise.reject(); } if (response.status === 500) { if (validateWriteable) { - alertText("Jellyfin Server requires write access to this folder. Please ensure write access and try again."); + alertText(Globalize.translate("WriteAccessRequired")); } else { - alertText("The path could not be found. Please ensure the path is valid and try again.") + alertText(Globalize.translate("PathNotFound")) } return Promise.reject() } diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 62e8fa3f8f..784fa7c7ad 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1468,5 +1468,7 @@ "XmlTvPathHelp": "A path to a XMLTV file. Jellyfin will read this file and periodically check it for updates. You are responsible for creating and updating the file.", "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.", "Yes": "Yes", - "Yesterday": "Yesterday" + "Yesterday": "Yesterday", + "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." } diff --git a/src/strings/es.json b/src/strings/es.json index 3d56ff56d8..442459c9ea 100644 --- a/src/strings/es.json +++ b/src/strings/es.json @@ -1476,5 +1476,7 @@ "LabelDroppedFrames": "Frames perdidos:", "LabelCorruptedFrames": "Frames corruptos:", "AskAdminToCreateLibrary": "Solo un administrador puede crear librerías.", - "AllowFfmpegThrottling": "Acelerar transcodificación" + "AllowFfmpegThrottling": "Acelerar transcodificación", + "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." } From e383c3dee1c52d17b644079359a8e5ff70ce2f6c Mon Sep 17 00:00:00 2001 From: ferferga Date: Thu, 19 Mar 2020 00:40:17 +0100 Subject: [PATCH 003/324] Translate paging phrase --- src/components/imagedownloader/imagedownloader.js | 2 +- src/scripts/librarybrowser.js | 2 +- src/strings/en-us.json | 3 ++- src/strings/es.json | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/imagedownloader/imagedownloader.js b/src/components/imagedownloader/imagedownloader.js index ce53b5cf0d..947a50135c 100644 --- a/src/components/imagedownloader/imagedownloader.js +++ b/src/components/imagedownloader/imagedownloader.js @@ -109,7 +109,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader' html += ''; var startAtDisplay = totalRecordCount ? startIndex + 1 : 0; - html += startAtDisplay + '-' + recordsEnd + ' of ' + totalRecordCount; + html += globalize.translate("ListPaging").replace("{0}", startAtDisplay + '-' + recordsEnd).replace("{1}", totalRecordCount); html += ''; diff --git a/src/scripts/librarybrowser.js b/src/scripts/librarybrowser.js index bd8980aed2..a570558f47 100644 --- a/src/scripts/librarybrowser.js +++ b/src/scripts/librarybrowser.js @@ -83,7 +83,7 @@ define(["userSettings"], function (userSettings) { if (html += '
', showControls) { html += ''; - html += (totalRecordCount ? startIndex + 1 : 0) + "-" + recordsEnd + " of " + totalRecordCount; + html += Globalize.translate("ListPaging").replace("{0}", (totalRecordCount ? startIndex + 1 : 0) + "-" + recordsEnd).replace("{1}", totalRecordCount); html += ""; } diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 784fa7c7ad..f3e7756f5e 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1470,5 +1470,6 @@ "Yes": "Yes", "Yesterday": "Yesterday", "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." + "WriteAccessRequired": "Jellyfin Server requires write access to this folder. Please ensure write access and try again.", + "ListPaging": "{0} of {1}" } diff --git a/src/strings/es.json b/src/strings/es.json index 442459c9ea..138d19f86c 100644 --- a/src/strings/es.json +++ b/src/strings/es.json @@ -1478,5 +1478,6 @@ "AskAdminToCreateLibrary": "Solo un administrador puede crear librerías.", "AllowFfmpegThrottling": "Acelerar transcodificación", "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." + "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}" } From 9f300bfb11d1973525fac38bc34c40f1588250ac Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Thu, 19 Mar 2020 23:06:19 +0100 Subject: [PATCH 004/324] Don't scale logo on details page --- src/assets/css/librarybrowser.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index 67afef2376..22b9b6f5eb 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -614,8 +614,8 @@ position: absolute; top: 15vh; right: 0; - -webkit-background-size: contain; - background-size: contain; + -webkit-background-size: auto; + background-size: auto; } .noBackdrop .detailLogo { From b34a376691d2a0bea4a085bb1ebc30c94e1cefe5 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 21 Mar 2020 00:26:55 +0100 Subject: [PATCH 005/324] Add library page size settings on movies --- src/components/displaysettings/displaysettings.js | 4 ++++ .../displaysettings/displaysettings.template.html | 5 +++++ src/controllers/movies/movies.js | 10 ++++++++-- src/scripts/settings/userSettingsBuilder.js | 13 +++++++++++++ src/strings/en-us.json | 2 ++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/components/displaysettings/displaysettings.js b/src/components/displaysettings/displaysettings.js index da407c11f1..47924f1370 100644 --- a/src/components/displaysettings/displaysettings.js +++ b/src/components/displaysettings/displaysettings.js @@ -186,6 +186,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', ' context.querySelector('#selectLanguage').value = userSettings.language() || ''; context.querySelector('.selectDateTimeLocale').value = userSettings.dateTimeLocale() || ''; + context.querySelector('#txtLibraryPageSize').value = userSettings.libraryPageSize() || 100; + selectDashboardTheme.value = userSettings.dashboardTheme() || ''; selectTheme.value = userSettings.theme() || ''; @@ -215,6 +217,8 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', ' userSettingsInstance.soundEffects(context.querySelector('.selectSoundEffects').value); userSettingsInstance.screensaver(context.querySelector('.selectScreensaver').value); + userSettingsInstance.libraryPageSize(context.querySelector('#txtLibraryPageSize').value); + userSettingsInstance.skin(context.querySelector('.selectSkin').value); userSettingsInstance.enableFastFadein(context.querySelector('#chkFadein').checked); diff --git a/src/components/displaysettings/displaysettings.template.html b/src/components/displaysettings/displaysettings.template.html index 16bbf0dd8a..9f89117f55 100644 --- a/src/components/displaysettings/displaysettings.template.html +++ b/src/components/displaysettings/displaysettings.template.html @@ -143,6 +143,11 @@
+
+ +
${LabelLibraryPageSizeHelp}
+
+