Merge pull request #971 from lfoust/externalid-type

Display specific types for ExternalIds
This commit is contained in:
Vasily 2020-04-03 00:44:13 +03:00 committed by GitHub
commit c850a386de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 5 deletions

View File

@ -296,8 +296,6 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
var html = ""; var html = "";
var providerIds = item.ProviderIds || {};
for (var i = 0, length = idList.length; i < length; i++) { for (var i = 0, length = idList.length; i < length; i++) {
var idInfo = idList[i]; var idInfo = idList[i];
@ -306,9 +304,12 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
html += '<div class="inputContainer">'; html += '<div class="inputContainer">';
var idLabel = globalize.translate("LabelDynamicExternalId").replace("{0}", idInfo.Name); var fullName = idInfo.Name;
if (idInfo.Type) {
fullName = idInfo.Name + " " + globalize.translate(idInfo.Type);
}
var value = providerIds[idInfo.Key] || ""; var idLabel = globalize.translate("LabelDynamicExternalId").replace("{0}", fullName);
html += '<input is="emby-input" class="txtLookupId" data-providerkey="' + idInfo.Key + '" id="' + id + '" label="' + idLabel + '"/>'; html += '<input is="emby-input" class="txtLookupId" data-providerkey="' + idInfo.Key + '" id="' + id + '" label="' + idLabel + '"/>';

View File

@ -465,7 +465,12 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
var id = "txt1" + idInfo.Key; var id = "txt1" + idInfo.Key;
var formatString = idInfo.UrlFormatString || ''; var formatString = idInfo.UrlFormatString || '';
var labelText = globalize.translate('LabelDynamicExternalId').replace('{0}', idInfo.Name); var fullName = idInfo.Name;
if (idInfo.Type) {
fullName = idInfo.Name + " " + globalize.translate(idInfo.Type);
}
var labelText = globalize.translate("LabelDynamicExternalId").replace("{0}", fullName);
html += '<div class="inputContainer">'; html += '<div class="inputContainer">';
html += '<div class="flex align-items-center">'; html += '<div class="flex align-items-center">';

View File

@ -11,6 +11,8 @@
"AdditionalNotificationServices": "Browse the plugin catalog to install additional notification services.", "AdditionalNotificationServices": "Browse the plugin catalog to install additional notification services.",
"AirDate": "Air date", "AirDate": "Air date",
"Aired": "Aired", "Aired": "Aired",
"Album": "Album",
"AlbumArtist": "Album Artist",
"Albums": "Albums", "Albums": "Albums",
"Alerts": "Alerts", "Alerts": "Alerts",
"All": "All", "All": "All",
@ -35,6 +37,7 @@
"Anytime": "Anytime", "Anytime": "Anytime",
"AroundTime": "Around {0}", "AroundTime": "Around {0}",
"Art": "Art", "Art": "Art",
"Artist": "Artist",
"Artists": "Artists", "Artists": "Artists",
"AsManyAsPossible": "As many as possible", "AsManyAsPossible": "As many as possible",
"Ascending": "Ascending", "Ascending": "Ascending",
@ -55,6 +58,7 @@
"BookLibraryHelp": "Audio and text books are supported. Review the {0}book naming guide{1}.", "BookLibraryHelp": "Audio and text books are supported. Review the {0}book naming guide{1}.",
"Books": "Books", "Books": "Books",
"Box": "Box", "Box": "Box",
"BoxSet": "Box Set",
"BoxRear": "Box (rear)", "BoxRear": "Box (rear)",
"Browse": "Browse", "Browse": "Browse",
"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins.", "BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins.",
@ -234,6 +238,7 @@
"EnableThemeVideosHelp": "Play theme videos in the background while browsing the library.", "EnableThemeVideosHelp": "Play theme videos in the background while browsing the library.",
"Ended": "Ended", "Ended": "Ended",
"EndsAtValue": "Ends at {0}", "EndsAtValue": "Ends at {0}",
"Episode": "Episode",
"Episodes": "Episodes", "Episodes": "Episodes",
"ErrorAddingListingsToSchedulesDirect": "There was an error adding the lineup to your Schedules Direct account. Schedules Direct only allows a limited number of lineups per account. You may need to log into the Schedules Direct website and remove others listings from your account before proceeding.", "ErrorAddingListingsToSchedulesDirect": "There was an error adding the lineup to your Schedules Direct account. Schedules Direct only allows a limited number of lineups per account. You may need to log into the Schedules Direct website and remove others listings from your account before proceeding.",
"ErrorAddingMediaPathToVirtualFolder": "There was an error adding the media path. Please ensure the path is valid and the Jellyfin Server process has access to that location.", "ErrorAddingMediaPathToVirtualFolder": "There was an error adding the media path. Please ensure the path is valid and the Jellyfin Server process has access to that location.",
@ -1016,6 +1021,7 @@
"MoveLeft": "Move left", "MoveLeft": "Move left",
"MoveRight": "Move right", "MoveRight": "Move right",
"MovieLibraryHelp": "Review the {0}movie naming guide{1}.", "MovieLibraryHelp": "Review the {0}movie naming guide{1}.",
"Movie": "Movie",
"Movies": "Movies", "Movies": "Movies",
"MusicAlbum": "Music Album", "MusicAlbum": "Music Album",
"MusicArtist": "Music Artist", "MusicArtist": "Music Artist",
@ -1202,6 +1208,7 @@
"OptionWeekends": "Weekends", "OptionWeekends": "Weekends",
"OptionWeekly": "Weekly", "OptionWeekly": "Weekly",
"OriginalAirDateValue": "Original air date: {0}", "OriginalAirDateValue": "Original air date: {0}",
"OtherArtist": "Other Artist",
"Overview": "Overview", "Overview": "Overview",
"PackageInstallCancelled": "{0} installation cancelled.", "PackageInstallCancelled": "{0} installation cancelled.",
"PackageInstallCompleted": "{0} installation completed.", "PackageInstallCompleted": "{0} installation completed.",
@ -1215,6 +1222,7 @@
"PasswordSaved": "Password saved.", "PasswordSaved": "Password saved.",
"People": "People", "People": "People",
"PerfectMatch": "Perfect match", "PerfectMatch": "Perfect match",
"Person": "Person",
"Photos": "Photos", "Photos": "Photos",
"PictureInPicture": "Picture in picture", "PictureInPicture": "Picture in picture",
"PinCodeResetComplete": "The pin code has been reset.", "PinCodeResetComplete": "The pin code has been reset.",
@ -1268,6 +1276,7 @@
"RefreshMetadata": "Refresh metadata", "RefreshMetadata": "Refresh metadata",
"RefreshQueued": "Refresh queued.", "RefreshQueued": "Refresh queued.",
"ReleaseDate": "Release date", "ReleaseDate": "Release date",
"ReleaseGroup": "Release Group",
"RememberMe": "Remember me", "RememberMe": "Remember me",
"RemoveFromCollection": "Remove from collection", "RemoveFromCollection": "Remove from collection",
"RemoveFromPlaylist": "Remove from playlist", "RemoveFromPlaylist": "Remove from playlist",
@ -1298,6 +1307,7 @@
"SearchForMissingMetadata": "Search for missing metadata", "SearchForMissingMetadata": "Search for missing metadata",
"SearchForSubtitles": "Search for Subtitles", "SearchForSubtitles": "Search for Subtitles",
"SearchResults": "Search Results", "SearchResults": "Search Results",
"Season": "Season",
"SelectAdminUsername": "Please select a username for the admin account.", "SelectAdminUsername": "Please select a username for the admin account.",
"SendMessage": "Send message", "SendMessage": "Send message",
"Series": "Series", "Series": "Series",
@ -1413,6 +1423,7 @@
"TitleHardwareAcceleration": "Hardware Acceleration", "TitleHardwareAcceleration": "Hardware Acceleration",
"TitleHostingSettings": "Hosting Settings", "TitleHostingSettings": "Hosting Settings",
"TitlePlayback": "Playback", "TitlePlayback": "Playback",
"Track": "Track",
"TrackCount": "{0} tracks", "TrackCount": "{0} tracks",
"Trailers": "Trailers", "Trailers": "Trailers",
"Transcoding": "Transcoding", "Transcoding": "Transcoding",