aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2018-12-30 17:20:15 -0500
committerGitHub <noreply@github.com>2018-12-30 17:20:15 -0500
commit7ad023143062c1995178e5700961b553822bd5af (patch)
tree194cad7cb5e6854b1ac51a58de64c73c16a7f3ad
parentb0fd432126606d7008544ff0237beabc52109e02 (diff)
parent9986a3d22cb6db87d3ce6ff13561b1fcbbb94498 (diff)
Merge pull request #332 from bfayers/replace-embymedia-with-jellyfinmedia
Replace all emby.media links with jellyfin.media links
-rw-r--r--Emby.Notifications/Notifications.cs2
-rw-r--r--MediaBrowser.Providers/Movies/MovieDbProvider.cs3
-rw-r--r--MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs3
3 files changed, 5 insertions, 3 deletions
diff --git a/Emby.Notifications/Notifications.cs b/Emby.Notifications/Notifications.cs
index 3cadad6c8..5725d1ba1 100644
--- a/Emby.Notifications/Notifications.cs
+++ b/Emby.Notifications/Notifications.cs
@@ -137,7 +137,7 @@ namespace Emby.Notifications
var notification = new NotificationRequest
{
- Description = "Please see emby.media for details.",
+ Description = "Please see jellyfin.media for details.",
NotificationType = type,
Name = _localization.GetLocalizedString("NewVersionIsAvailable")
};
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index e16e6aa8c..c742e3df2 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -287,7 +287,8 @@ namespace MediaBrowser.Providers.Movies
if (!string.IsNullOrEmpty(language))
{
// They require this to be uppercase
- // https://emby.media/community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148
+ // Everything after the hyphen must be written in uppercase due to a way TMDB wrote their api.
+ // See here: https://www.themoviedb.org/talk/5119221d760ee36c642af4ad?page=3#56e372a0c3a3685a9e0019ab
var parts = language.Split('-');
if (parts.Length == 2)
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index f6ea9b4b2..78afde80b 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -353,7 +353,8 @@ namespace MediaBrowser.XbmcMetadata.Savers
if (!string.IsNullOrEmpty(stream.Language))
{
- // https://emby.media/community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify
+ // http://web.archive.org/web/20181230211547/https://emby.media/community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify
+ // Web Archive version of link since it's not really explained in the thread.
writer.WriteElementString("language", RemoveInvalidXMLChars(stream.Language));
}