Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #1543 from MediaBrowser/dev

Dev
Luke 9 years ago
parent
c4554311cd 734ebdab95
commit
b063083055
6 changed files with 24 additions and 8 deletions
Split View Show Diff Stats
  1. 1 1
      MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
  2. 17 1
      MediaBrowser.Providers/Movies/MovieDbProvider.cs
  3. 1 1
      MediaBrowser.Providers/TV/MovieDbSeasonProvider.cs
  4. 1 1
      MediaBrowser.Providers/TV/MovieDbSeriesProvider.cs
  5. 1 1
      MediaBrowser.WebDashboard/Api/PackageCreator.cs
  6. 3 3
      MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

+ 1 - 1
MediaBrowser.Providers/BoxSets/MovieDbBoxSetProvider.cs
View File 

@@ -168,7 +168,7 @@ namespace MediaBrowser.Providers.BoxSets
 
 
             if (!string.IsNullOrEmpty(language))
 
             {
 
-                url += string.Format("&language={0}", language);
 
+                url += string.Format("&language={0}", MovieDbProvider.NormalizeLanguage(language));
 
 
                 // Get images in english and with no language
 
                 url += "&include_image_language=" + MovieDbProvider.GetImageLanguagesParam(language);

+ 17 - 1
MediaBrowser.Providers/Movies/MovieDbProvider.cs
View File 

@@ -16,12 +16,14 @@ using System;
 
 using System.Collections.Generic;
 
 using System.Globalization;
 
 using System.IO;
 
+using System.Linq;
 
 using System.Net;
 
 using System.Threading;
 
 using System.Threading.Tasks;
 
 using CommonIO;
 
 using MediaBrowser.Common;
 
 using MediaBrowser.Model.Net;
 
+using MediaBrowser.Model.Extensions;
 
 
 namespace MediaBrowser.Providers.Movies
 
 {
 
@@ -279,6 +281,20 @@ namespace MediaBrowser.Providers.Movies
 
             return string.Join(",", languages.ToArray());
 
         }
 
 
+        public static string NormalizeLanguage(string language)
 
+        {
 
+            // They require this to be uppercase
 
+            // http://emby.media/community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148
 
+            var parts = language.Split('-');
 
+
 
+            if (parts.Length == 2)
 
+            {
 
+                language = parts[0] + "-" + parts[1].ToUpper();
 
+            }
 
+
 
+            return language;
 
+        }
 
+
 
         /// <summary>
 
         /// Fetches the main result.
 
         /// </summary>
 
@@ -293,7 +309,7 @@ namespace MediaBrowser.Providers.Movies
 
 
             if (!string.IsNullOrEmpty(language))
 
             {
 
-                url += string.Format("&language={0}", language);
 
+                url += string.Format("&language={0}", NormalizeLanguage(language));
 
 
                 // Get images in english and with no language
 
                 url += "&include_image_language=" + GetImageLanguagesParam(language);

+ 1 - 1
MediaBrowser.Providers/TV/MovieDbSeasonProvider.cs
View File 

@@ -201,7 +201,7 @@ namespace MediaBrowser.Providers.TV
 
 
             if (!string.IsNullOrEmpty(language))
 
             {
 
-                url += string.Format("&language={0}", language);
 
+                url += string.Format("&language={0}", MovieDbProvider.NormalizeLanguage(language));
 
             }
 
 
             var includeImageLanguageParam = MovieDbProvider.GetImageLanguagesParam(language);

+ 1 - 1
MediaBrowser.Providers/TV/MovieDbSeriesProvider.cs
View File 

@@ -301,7 +301,7 @@ namespace MediaBrowser.Providers.TV
 
 
             if (!string.IsNullOrEmpty(language))
 
             {
 
-                url += string.Format("&language={0}", language);
 
+                url += string.Format("&language={0}", MovieDbProvider.NormalizeLanguage(language));
 
 
                 // Get images in english and with no language
 
                 url += "&include_image_language=" + MovieDbProvider.GetImageLanguagesParam(language);

+ 1 - 1
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File 

@@ -295,7 +295,7 @@ namespace MediaBrowser.WebDashboard.Api
 
                         }
 
                     }
 
 
-                    html = html.Replace("<body>", "<body><paper-drawer-panel class=\"mainDrawerPanel mainDrawerPanelPreInit\" forceNarrow><div class=\"mainDrawer\" drawer></div><div class=\"mainDrawerPanelContent\" main><!--<div class=\"pageContainer\">")
 
+                    html = html.Replace("<body>", "<body><paper-drawer-panel class=\"mainDrawerPanel mainDrawerPanelPreInit skinContainer\" forceNarrow><div class=\"mainDrawer\" drawer></div><div class=\"mainDrawerPanelContent\" main><!--<div class=\"pageBackground\"></div><div class=\"pageContainer\">")
 
                         .Replace("</body>", "</div>--></div></paper-drawer-panel></body>");
 
                 }

+ 3 - 3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File 

@@ -284,6 +284,9 @@
 
     <Content Include="dashboard-ui\robots.txt">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\scripts\autobackdrops.js">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

     <Content Include="dashboard-ui\scripts\homenextup.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

@@ -859,9 +862,6 @@
 
     <Content Include="dashboard-ui\nowplaying.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\scripts\backdrops.js">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

     <Content Include="dashboard-ui\scripts\channelitems.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>