Преглед на файлове

Default to en-US for missing core translations

Claus Vium преди 6 години
родител
ревизия
c3c52b6682
променени са 1 файла, в които са добавени 8 реда и са изтрити 4 реда
  1. 8 4
      Emby.Server.Implementations/Localization/LocalizationManager.cs

+ 8 - 4
Emby.Server.Implementations/Localization/LocalizationManager.cs

@@ -460,11 +460,15 @@ namespace Emby.Server.Implementations.Localization
         {
         {
             using (var stream = _assembly.GetManifestResourceStream(resourcePath))
             using (var stream = _assembly.GetManifestResourceStream(resourcePath))
             {
             {
-                var dict = await _jsonSerializer.DeserializeFromStreamAsync<Dictionary<string, string>>(stream);
-
-                foreach (var key in dict.Keys)
+                // If a Culture doesn't have a translation the stream will be null and it defaults to en-us further up the chain
+                if (stream != null)
                 {
                 {
-                    dictionary[key] = dict[key];
+                    var dict = await _jsonSerializer.DeserializeFromStreamAsync<Dictionary<string, string>>(stream);
+
+                    foreach (var key in dict.Keys)
+                    {
+                        dictionary[key] = dict[key];
+                    }
                 }
                 }
             }
             }
         }
         }