From 3c56f85f60a0f7cccaf57b9072ede590659063e7 Mon Sep 17 00:00:00 2001 From: WWWesten <4700006+WWWesten@users.noreply.github.com> Date: Fri, 5 Nov 2021 02:53:45 +0500 Subject: [PATCH 1/6] Update Library Settings Fix localisation's handling in libraryoptionseditor.js, unification of styling of labels --- src/components/libraryoptionseditor/libraryoptionseditor.js | 2 +- src/strings/en-us.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index 91a45a7f3a..b422833899 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -218,7 +218,7 @@ import template from './libraryoptionseditor.template.html'; html += '
'; html += '
'; - html += '

' + globalize.translate('HeaderTypeImageFetchers', availableTypeOptions.Type) + '

'; + html += '

' + globalize.translate('HeaderTypeImageFetchers', globalize.translate(availableTypeOptions.Type)) + '

'; const supportedImageTypes = availableTypeOptions.SupportedImageTypes || []; if (supportedImageTypes.length > 1 || supportedImageTypes.length === 1 && supportedImageTypes[0] !== 'Primary') { html += ''; diff --git a/src/strings/en-us.json b/src/strings/en-us.json index fc8041d15c..fcfba0fa79 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -470,7 +470,7 @@ "HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.", "HeaderTunerDevices": "Tuner Devices", "HeaderTuners": "Tuners", - "HeaderTypeImageFetchers": "{0} Image Fetchers", + "HeaderTypeImageFetchers": "{0} - Image fetchers", "HeaderTypeText": "Enter Text", "HeaderUninstallPlugin": "Uninstall Plugin", "HeaderUpcomingOnTV": "Upcoming On TV", @@ -929,7 +929,7 @@ "LabelTunerType": "Tuner type:", "LabelTVHomeScreen": "TV mode home screen:", "LabelType": "Type:", - "LabelTypeMetadataDownloaders": "{0} metadata downloaders:", + "LabelTypeMetadataDownloaders": "{0} - Metadata downloaders:", "LabelTypeText": "Text", "LabelUDPPortRange": "UDP Communication Range:", "LabelUDPPortRangeHelp": "Restrict Jellyfin to use this port range when making UDP connections. (Default is 1024 - 645535).
Note: Certain function require fixed ports that may be outside of this range.", From dee072f9b1c7258d565ac5cb5bbcd59760782e0a Mon Sep 17 00:00:00 2001 From: WWWesten <4700006+WWWesten@users.noreply.github.com> Date: Fri, 5 Nov 2021 03:04:07 +0500 Subject: [PATCH 2/6] Update en-us.json Fix missing colon --- src/strings/en-us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index fcfba0fa79..f1aedf8ee0 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -470,7 +470,7 @@ "HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.", "HeaderTunerDevices": "Tuner Devices", "HeaderTuners": "Tuners", - "HeaderTypeImageFetchers": "{0} - Image fetchers", + "HeaderTypeImageFetchers": "{0} - Image fetchers:", "HeaderTypeText": "Enter Text", "HeaderUninstallPlugin": "Uninstall Plugin", "HeaderUpcomingOnTV": "Upcoming On TV", From 4938081f8fcad620a3b86aa83cb26e7665e129df Mon Sep 17 00:00:00 2001 From: WWWesten <4700006+WWWesten@users.noreply.github.com> Date: Sat, 6 Nov 2021 13:15:45 +0500 Subject: [PATCH 3/6] Update Libray Options Editor Update librayoptionseditor.js and en-us.json --- .../libraryoptionseditor/libraryoptionseditor.js | 4 ++-- src/strings/en-us.json | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index b422833899..743bf7dc39 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -118,7 +118,7 @@ import template from './libraryoptionseditor.template.html'; if (!plugins.length) return html; html += '
'; - html += '

' + globalize.translate('LabelTypeMetadataDownloaders', globalize.translate(availableTypeOptions.Type)) + '

'; + html += '

' + globalize.translate('LabelTypeMetadataDownloaders', globalize.translate('TypeOptionPlural' + availableTypeOptions.Type)) + '

'; html += '
'; plugins.forEach((plugin, index) => { @@ -218,7 +218,7 @@ import template from './libraryoptionseditor.template.html'; html += '
'; html += '
'; - html += '

' + globalize.translate('HeaderTypeImageFetchers', globalize.translate(availableTypeOptions.Type)) + '

'; + html += '

' + globalize.translate('HeaderTypeImageFetchers', globalize.translate('TypeOptionPlural' + availableTypeOptions.Type)) + '

'; const supportedImageTypes = availableTypeOptions.SupportedImageTypes || []; if (supportedImageTypes.length > 1 || supportedImageTypes.length === 1 && supportedImageTypes[0] !== 'Primary') { html += ''; diff --git a/src/strings/en-us.json b/src/strings/en-us.json index f1aedf8ee0..79e70f80b0 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -470,7 +470,7 @@ "HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.", "HeaderTunerDevices": "Tuner Devices", "HeaderTuners": "Tuners", - "HeaderTypeImageFetchers": "{0} - Image fetchers:", + "HeaderTypeImageFetchers": "{0} image fetchers", "HeaderTypeText": "Enter Text", "HeaderUninstallPlugin": "Uninstall Plugin", "HeaderUpcomingOnTV": "Upcoming On TV", @@ -929,7 +929,7 @@ "LabelTunerType": "Tuner type:", "LabelTVHomeScreen": "TV mode home screen:", "LabelType": "Type:", - "LabelTypeMetadataDownloaders": "{0} - Metadata downloaders:", + "LabelTypeMetadataDownloaders": "{0} metadata downloaders:", "LabelTypeText": "Text", "LabelUDPPortRange": "UDP Communication Range:", "LabelUDPPortRangeHelp": "Restrict Jellyfin to use this port range when making UDP connections. (Default is 1024 - 645535).
Note: Certain function require fixed ports that may be outside of this range.", @@ -1465,6 +1465,17 @@ "Tuesday": "Tuesday", "TV": "TV", "TvLibraryHelp": "Review the {0}TV naming guide{1}.", + "TypeOptionPluralAudio": "Audios", + "TypeOptionPluralBook": "Books" + "TypeOptionPluralBoxSet": "Box Sets" + "TypeOptionPluralEpisode": "Episodes", + "TypeOptionPluralMovie": "Movies", + "TypeOptionPluralMusicAlbum": "Music Albums", + "TypeOptionPluralMusicArtist": "Music Artists", + "TypeOptionPluralMusicVideo": "Music Videos", + "TypeOptionPluralSeazon": "Seasons", + "TypeOptionPluralSeries": "TV Shows", + "TypeOptionPluralVideo": "Videos", "Typewriter": "Typewriter", "Uniform": "Uniform", "UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?", From 47525934f6ce70d80886205cf22fa43c5e481f39 Mon Sep 17 00:00:00 2001 From: WWWesten <4700006+WWWesten@users.noreply.github.com> Date: Sat, 6 Nov 2021 17:41:24 +0500 Subject: [PATCH 4/6] Update en-us.json --- src/strings/en-us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 79e70f80b0..5f9c2b0aee 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1466,8 +1466,8 @@ "TV": "TV", "TvLibraryHelp": "Review the {0}TV naming guide{1}.", "TypeOptionPluralAudio": "Audios", - "TypeOptionPluralBook": "Books" - "TypeOptionPluralBoxSet": "Box Sets" + "TypeOptionPluralBook": "Books", + "TypeOptionPluralBoxSet": "Box Sets", "TypeOptionPluralEpisode": "Episodes", "TypeOptionPluralMovie": "Movies", "TypeOptionPluralMusicAlbum": "Music Albums", From 3b9776d36630272dc6525400ca407b5cf1619b78 Mon Sep 17 00:00:00 2001 From: WWWesten <4700006+WWWesten@users.noreply.github.com> Date: Sat, 6 Nov 2021 19:23:51 +0500 Subject: [PATCH 5/6] Update en-us.json --- src/strings/en-us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 5f9c2b0aee..1f34ef8d32 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -470,7 +470,7 @@ "HeaderTranscodingProfileHelp": "Add transcoding profiles to indicate which formats should be used when transcoding is required.", "HeaderTunerDevices": "Tuner Devices", "HeaderTuners": "Tuners", - "HeaderTypeImageFetchers": "{0} image fetchers", + "HeaderTypeImageFetchers": "Image fetchers ({0})", "HeaderTypeText": "Enter Text", "HeaderUninstallPlugin": "Uninstall Plugin", "HeaderUpcomingOnTV": "Upcoming On TV", @@ -929,7 +929,7 @@ "LabelTunerType": "Tuner type:", "LabelTVHomeScreen": "TV mode home screen:", "LabelType": "Type:", - "LabelTypeMetadataDownloaders": "{0} metadata downloaders:", + "LabelTypeMetadataDownloaders": "Metadata downloaders ({0}):", "LabelTypeText": "Text", "LabelUDPPortRange": "UDP Communication Range:", "LabelUDPPortRangeHelp": "Restrict Jellyfin to use this port range when making UDP connections. (Default is 1024 - 645535).
Note: Certain function require fixed ports that may be outside of this range.", From 82a6fb88e1093f8e003817f57c64cffefda83e77 Mon Sep 17 00:00:00 2001 From: WWWesten <4700006+WWWesten@users.noreply.github.com> Date: Sun, 7 Nov 2021 02:34:13 +0500 Subject: [PATCH 6/6] Update src/strings/en-us.json Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> --- src/strings/en-us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 1f34ef8d32..beb8110750 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1473,7 +1473,7 @@ "TypeOptionPluralMusicAlbum": "Music Albums", "TypeOptionPluralMusicArtist": "Music Artists", "TypeOptionPluralMusicVideo": "Music Videos", - "TypeOptionPluralSeazon": "Seasons", + "TypeOptionPluralSeason": "Seasons", "TypeOptionPluralSeries": "TV Shows", "TypeOptionPluralVideo": "Videos", "Typewriter": "Typewriter",