From ceafa313cd31e2c39afcf6fd140d53ea699dac5f Mon Sep 17 00:00:00 2001 From: lostmypillow <47119111+lostmypillow@users.noreply.github.com> Date: Tue, 12 Mar 2019 23:13:41 -0500 Subject: [PATCH 1/4] Remove unused localization strings Improved version of original PR --- src/strings/en-us.json | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 5ac13f0aad..1502f6e6fe 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -38,7 +38,6 @@ "AlwaysPlaySubtitles": "Always play subtitles", "AlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.", "AnamorphicVideoNotSupported": "Anamorphic video not supported", - "AndroidUnlockRestoreHelp": "To restore your previous purchase, please ensure you're signed into the device with the same Google (or Amazon) account that originally made the purchase. Make sure the app store is enabled and not restricted by any parental controls, and ensure you have an active internet connection. You'll only have to do this once to restore your previous purchase.", "AnyLanguage": "Any language", "Anytime": "Anytime", "AroundTime": "Around {0}", @@ -152,7 +151,6 @@ "ButtonPrivacyPolicy": "Privacy policy", "ButtonProfile": "Profile", "ButtonProfileHelp": "Set your profile image and password.", - "ButtonPurchase": "Purchase", "ButtonQuality": "Quality", "ButtonQuickStartGuide": "Quick Start Guide", "ButtonRecord": "Record", @@ -173,7 +171,6 @@ "ButtonResetTuner": "Reset tuner", "ButtonRestart": "Restart", "ButtonRestartNow": "Restart Now", - "ButtonRestorePreviousPurchase": "Restore Purchase", "ButtonResume": "Resume", "ButtonRevoke": "Revoke", "ButtonSave": "Save", @@ -208,8 +205,6 @@ "ButtonTrailer": "Trailer", "ButtonTryAgain": "Try Again", "ButtonUninstall": "Uninstall", - "ButtonUnlockPrice": "Unlock {0}", - "ButtonUnlockWithPurchase": "Unlock with Purchase", "ButtonUnmute": "Unmute", "ButtonUp": "Up", "ButtonUpdateNow": "Update Now", @@ -319,7 +314,6 @@ "DrmChannelsNotImported": "Channels with DRM will not be imported.", "DropShadow": "Drop shadow", "DvrFeatureDescription": "Schedule individual Live TV recordings, series recordings, and more with Jellyfin DVR.", - "DvrSubscriptionRequired": "Jellyfin DVR requires an active Jellyfin Premiere subscription.", "EasyPasswordHelp": "Your easy pin code is used for offline access with supported Jellyfin apps, and can also be used for easy in-network sign in.", "Edit": "Edit", "EditImages": "Edit images", @@ -369,7 +363,6 @@ "ErrorReachingJellyfinConnect": "There was an error reaching the Jellyfin Connect server. Please ensure you have an active internet connection and try again.", "ErrorRemovingJellyfinConnectAccount": "There was an error removing the Jellyfin Connect account. Please ensure you have an active internet connection and try again.", "ErrorSavingTvProvider": "There was an error saving the TV provider. Please ensure it is accessible and try again.", - "ErrorValidatingSupporterInfo": "There was an error validating your Jellyfin Premiere information. Please try again later.", "EveryNDays": "Every {0} days", "ExitFullscreen": "Exit full screen", "ExtraLarge": "Extra large", @@ -379,7 +372,6 @@ "FastForward": "Fast-forward", "Favorite": "Favorite", "Favorites": "Favorites", - "FeatureRequiresJellyfinPremiere": "This feature requires an active Jellyfin Premiere subscription.", "Features": "Features", "File": "File", "FileNotFound": "File not found.", @@ -441,7 +433,6 @@ "HeaderAlert": "Alert", "HeaderAllRecordings": "All Recordings", "HeaderAllowMediaDeletionFrom": "Allow Media Deletion From", - "HeaderAlreadyPaid": "Already Paid?", "HeaderApiKey": "Api Key", "HeaderApiKeys": "Api Keys", "HeaderApiKeysHelp": "External applications are required to have an Api key in order to communicate with Jellyfin Server. Keys are issued by logging in with an Jellyfin account, or by manually granting the application a key.", @@ -456,8 +447,6 @@ "HeaderAvailableServices": "Available Services", "HeaderAwardsAndReviews": "Awards and Reviews", "HeaderBackdrops": "Backdrops", - "HeaderBecomeProjectSupporter": "Get Jellyfin Premiere", - "HeaderBenefitsJellyfinPremiere": "Benefits of Jellyfin Premiere", "HeaderBlockItemsWithNoRating": "Block items with no or unrecognized rating information:", "HeaderBooks": "Books", "HeaderBranding": "Branding", @@ -771,12 +760,9 @@ "HeaderSupportTheTeam": "Support the Jellyfin Team", "HeaderSync": "Sync", "HeaderSyncJobInfo": "Sync Job", - "HeaderSyncRequiresSub": "Downloading requires an active Jellyfin Premiere subscription.", - "HeaderSystemDlnaProfiles": "System Profiles", "HeaderTV": "TV", "HeaderTags": "Tags", "HeaderTaskTriggers": "Task Triggers", - "HeaderTermsOfPurchase": "Terms of Purchase", "HeaderTermsOfService": "Jellyfin Terms of Service", "HeaderThemeSongs": "Theme Songs", "HeaderThemeVideos": "Theme Videos", @@ -830,12 +816,9 @@ "HideWatchedContentFromLatestMedia": "Hide watched content from latest media", "Home": "Home", "Horizontal": "Horizontal", - "HowDidYouPay": "How did you pay?", "HowToConnectFromJellyfinApps": "How to Connect from Jellyfin apps", "HowWouldYouLikeToAddUser": "How would you like to add a user?", "HttpsRequiresCert": "To enable secure connections, you will need to supply a trusted SSL certificate, such as Lets Encrypt. Please either supply a certificate, or disable secure connections.", - "IHaveJellyfinPremiere": "I have Jellyfin Premiere", - "IPurchasedThisApp": "I purchased this app", "Identify": "Identify", "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG/PNG only.", "Images": "Images", @@ -1355,7 +1338,6 @@ "LinkApi": "Api", "LinkCommunity": "Community", "LinkGithub": "Github", - "LinkLearnMoreAboutSubscription": "Learn about Jellyfin Premiere", "LinksValue": "Links: {0}", "List": "List", "Live": "Live", @@ -1436,7 +1418,6 @@ "MessageConfirmRevokeApiKey": "Are you sure you wish to revoke this api key? The application's connection to Jellyfin Server will be abruptly terminated.", "MessageConfirmShutdown": "Are you sure you wish to shutdown Jellyfin Server?", "MessageConfirmSplitMedia": "Are you sure you wish to split the media sources into separate items?", - "MessageConfirmSubCancel": "NO, Please don't go... You will miss out on all the great features of Jellyfin Premiere!", "MessageConnectAccountRequiredToInviteGuest": "In order to invite guests you need to first link your Jellyfin account to this server.", "MessageContactAdminToResetPassword": "Please contact your system administrator to reset your password.", "MessageCreateAccountAt": "Create an account at {0}", @@ -1448,9 +1429,7 @@ "MessageDownloadQueued": "Download queued.", "MessageEnablingOptionLongerScans": "Enabling this option may result in significantly longer library scans.", "MessageEnsureOpenTuner": "Please ensure there is an open tuner availalble.", - "MessageErrorLoadingSupporterInfo": "There was an error loading Jellyfin Premiere information. Please try again later.", "MessageErrorPlayingVideo": "There was an error playing the video.", - "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active Jellyfin Premiere subscription.", "MessageFileNotFound": "File not found.", "MessageFileReadError": "There was an error reading the file. Please try again.", "MessageFileWillBeDeleted": "The following file will be deleted:", @@ -1487,7 +1466,6 @@ "MessageNoTrailersFound": "No trailers found. Install the Trailer channel to enhance your movie experience by adding a library of internet trailers.", "MessageNothingHere": "Nothing here.", "MessagePasswordResetForUsers": "Passwords have been removed for the following users. To login, sign in with a blank password.", - "MessagePaymentServicesUnavailable": "Payment services are currently unavailable. Please try again later.", "MessagePendingJellyfinAccountAdded": "The Jellyfin account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email.", "MessagePlayAccessRestricted": "Playback of this content is currently restricted. Please contact your Jellyfin Server administrator for more information.", "MessagePleaseEnsureInternetMetadata": "Please ensure downloading of internet metadata is enabled.", @@ -1496,8 +1474,6 @@ "MessagePleaseWait": "Please wait. This may take a minute.", "MessagePluginConfigurationRequiresLocalAccess": "To configure this plugin please sign in to your local server directly.", "MessagePluginInstallDisclaimer": "Plugins built by Jellyfin community members are a great way to enhance your Jellyfin experience with additional features and benefits. Before installing, please be aware of the effects they may have on your Jellyfin Server, such as longer library scans, additional background processing, and decreased system stability.", - "MessagePluginRequiresSubscription": "This plugin will require an active Jellyfin Premiere subscription after the 14 day free trial.", - "MessagePremiumPluginRequiresMembership": "This plugin will require an active Jellyfin Premiere subscription in order to purchase after the 14 day free trial.", "MessageReenableUser": "See below to reenable", "MessageServerConfigurationUpdated": "Server configuration has been updated", "MessageSettingsSaved": "Settings saved.", @@ -1505,13 +1481,8 @@ "MessageThankYouForConnectSignUpNoValidation": "Thank you for signing up for Jellyfin Connect! You will now be asked to login with your Jellyfin Connect information.", "MessageThankYouForSupporting": "Thank you for supporting Jellyfin.", "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your Jellyfin library:", - "MessageToValidateSupporter": "If you have an active Jellyfin Premiere subscription, ensure you've setup Jellyfin Premiere in your Jellyfin Server Dashboard, which you can access by clicking Jellyfin Premiere within the main menu.", - "MessageTrialExpired": "The trial period for this feature has expired", - "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)", "MessageTunerDeviceNotListed": "Is your tuner device not listed? Try installing an external service provider for more Live TV options.", "MessageUnableToConnectToServer": "We're unable to connect to the selected server right now. Please ensure it is running and try again.", - "MessageUnlockAppWithPurchaseOrSupporter": "Unlock this feature with a small one-time purchase, or with an active Jellyfin Premiere subscription.", - "MessageUnlockAppWithSupporter": "Unlock this feature with an active Jellyfin Premiere subscription.", "MessageUnsetContentHelp": "Content will be displayed as plain folders. For best results use the metadata manager to set the content types of sub-folders.", "MessageWeDidntRecognizeCommand": "We're sorry, we didn't recognize that command.", "MessageYouHaveVersionInstalled": "You currently have version {0} installed.", @@ -2137,7 +2108,6 @@ "TermsOfUse": "Terms of use", "TextConnectToServerManually": "Connect to server manually", "TextEnjoyBonusFeatures": "Enjoy Bonus Features", - "ThankYouForTryingEnjoyOneMinute": "Please enjoy one minute of playback. Thank you for trying Jellyfin.", "ThemeSongs": "Theme songs", "ThemeVideos": "Theme videos", "Themes": "Themes", @@ -2213,7 +2183,6 @@ "ValueOneTrailer": "1 trailer", "ValuePremiered": "Premiered {0}", "ValuePremieres": "Premieres {0}", - "ValuePriceUSD": "Price: {0} (USD)", "ValueSeconds": "{0} seconds", "ValueSeriesCount": "{0} series", "ValueSeriesYearToPresent": "{0} - Present", @@ -2265,4 +2234,4 @@ "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.", "Yes": "Yes", "Yesterday": "Yesterday" -} \ No newline at end of file +} From 8234f189a0cd3047aa551cc1e3630851a74af4ce Mon Sep 17 00:00:00 2001 From: vitorsemeano Date: Tue, 12 Mar 2019 22:49:13 +0000 Subject: [PATCH 2/4] fix bug apphost naming resolution --- src/scripts/site.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/site.js b/src/scripts/site.js index b2d17265c8..caae156ba5 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -1200,7 +1200,7 @@ var AppInfo = {}; console.log("Begin onAppReady"); // ensure that appHost is loaded in this point - require(['appHost'], function (appHost) { + require(['apphost'], function (appHost) { var isInBackground = -1 !== self.location.href.toString().toLowerCase().indexOf("start=backgroundsync"); window.Emby = {}; From f698ba1f39ab183dab4c68008b9c8392751e39a3 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Wed, 13 Mar 2019 21:34:58 -0400 Subject: [PATCH 3/4] Correct syntax error in networkPath --- src/dashboard/dashboardgeneral.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dashboard/dashboardgeneral.js b/src/dashboard/dashboardgeneral.js index c0ff217ffe..ed3b000b12 100644 --- a/src/dashboard/dashboardgeneral.js +++ b/src/dashboard/dashboardgeneral.js @@ -97,7 +97,7 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb $("#txtMetadataPath", view).val(path); } if (networkPath) { - $("#txtMetadataNetworkPath", view).val(networkPath)); + $("#txtMetadataNetworkPath", view).val(networkPath); } picker.close(); }, From f95018e80978b1501027f19e4e2c831ce086905e Mon Sep 17 00:00:00 2001 From: lostmypillow <47119111+lostmypillow@users.noreply.github.com> Date: Thu, 14 Mar 2019 16:11:52 -0500 Subject: [PATCH 4/4] Added back DLNA string --- src/strings/en-us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 1502f6e6fe..9c0cac2a24 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -760,6 +760,7 @@ "HeaderSupportTheTeam": "Support the Jellyfin Team", "HeaderSync": "Sync", "HeaderSyncJobInfo": "Sync Job", + "HeaderSystemDlnaProfiles": "System Profiles", "HeaderTV": "TV", "HeaderTags": "Tags", "HeaderTaskTriggers": "Task Triggers",