From 7792a9a9aff84ed57569fd527839c3647725bb72 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Sat, 15 Dec 2018 16:30:38 +0100
Subject: [PATCH] Fix resource load crash

---
 .../ApplicationHost.cs                        |   1 +
 .../Emby.Server.Implementations.csproj        | 112 +-----------------
 .../Session/SessionManager.cs                 |   2 +-
 3 files changed, 7 insertions(+), 108 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index db716894e..011f3a0fb 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -2531,6 +2531,7 @@ namespace Emby.Server.Implementations
             return null;
         }
 
+        // TODO: @bond Remove?
         private Dictionary<string, string> LoadValues()
         {
             Dictionary<string, string> values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 97909fd18..bf459defb 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -41,113 +41,11 @@
  <ItemGroup>
     <EmbeddedResource Include="Localization\iso6392.txt" />
     <EmbeddedResource Include="Localization\countries.json" />
-    <EmbeddedResource Include="Localization\Core\ar.json" />
-    <EmbeddedResource Include="Localization\Core\bg-BG.json" />
-    <EmbeddedResource Include="Localization\Core\ca.json" />
-    <EmbeddedResource Include="Localization\Core\cs.json" />
-    <EmbeddedResource Include="Localization\Core\da.json" />
-    <EmbeddedResource Include="Localization\Core\de.json" />
-    <EmbeddedResource Include="Localization\Core\en-GB.json" />
-    <EmbeddedResource Include="Localization\Core\es-AR.json" />
-    <EmbeddedResource Include="Localization\Core\es-MX.json" />
-    <EmbeddedResource Include="Localization\Core\es.json" />
-    <EmbeddedResource Include="Localization\Core\fr-CA.json" />
-    <EmbeddedResource Include="Localization\Core\fr.json" />
-    <EmbeddedResource Include="Localization\Core\he.json" />
-    <EmbeddedResource Include="Localization\Core\hr.json" />
-    <EmbeddedResource Include="Localization\Core\hu.json" />
-    <EmbeddedResource Include="Localization\Core\it.json" />
-    <EmbeddedResource Include="Localization\Core\kk.json" />
-    <EmbeddedResource Include="Localization\Core\ko.json" />
-    <EmbeddedResource Include="Localization\Core\lt-LT.json" />
-    <EmbeddedResource Include="Localization\Core\ms.json" />
-    <EmbeddedResource Include="Localization\Core\nb.json" />
-    <EmbeddedResource Include="Localization\Core\nl.json" />
-    <EmbeddedResource Include="Localization\Core\pl.json" />
-    <EmbeddedResource Include="Localization\Core\pt-BR.json" />
-    <EmbeddedResource Include="Localization\Core\pt-PT.json" />
-    <EmbeddedResource Include="Localization\Core\ru.json" />
-    <EmbeddedResource Include="Localization\Core\sk.json" />
-    <EmbeddedResource Include="Localization\Core\sl-SI.json" />
-    <EmbeddedResource Include="Localization\Core\sv.json" />
-    <EmbeddedResource Include="Localization\Core\tr.json" />
-    <EmbeddedResource Include="Localization\Core\zh-CN.json" />
-    <EmbeddedResource Include="Localization\Core\zh-HK.json" />
-    <EmbeddedResource Include="Localization\Core\en-US.json" />
-    <EmbeddedResource Include="Localization\Core\el.json" />
-    <EmbeddedResource Include="Localization\Core\gsw.json" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\afr" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ara" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ben" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\bul" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ces" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\dan" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\deu" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ell" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\eng" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\est" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\fas" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\fin" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\fra" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\guj" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\heb" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\hin" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\hrv" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\hun" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ind" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ita" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\jpn" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\kan" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\kor" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\lav" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\lit" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\mal" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\mar" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\mkd" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\nep" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\nld" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\nor" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\pan" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\pol" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\por" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ron" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\rus" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\slk" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\slv" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\som" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\spa" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\sqi" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\swa" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\swe" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tam" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tel" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tgl" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tha" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\tur" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\ukr" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\urd" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\vie" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\zh-cn" />
-    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\zh-tw" />
+    <EmbeddedResource Include="Localization\Core\*.json" />
+    <EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" />
     <EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" />
+    <EmbeddedResource Include="Localization\Ratings\*.txt" />
+    <EmbeddedResource Include="values.txt" />
  </ItemGroup>
- <ItemGroup>
-   <EmbeddedResource Include="Localization\Ratings\br.txt" />
-   <EmbeddedResource Include="Localization\Ratings\ca.txt" />
-   <EmbeddedResource Include="Localization\Ratings\co.txt" />
-   <EmbeddedResource Include="Localization\Ratings\dk.txt" />
-   <EmbeddedResource Include="Localization\Ratings\fr.txt" />
-   <EmbeddedResource Include="Localization\Ratings\gb.txt" />
-   <EmbeddedResource Include="Localization\Ratings\ie.txt" />
-   <EmbeddedResource Include="Localization\Ratings\jp.txt" />
-   <EmbeddedResource Include="Localization\Ratings\kz.txt" />
-   <EmbeddedResource Include="Localization\Ratings\mx.txt" />
-   <EmbeddedResource Include="Localization\Ratings\nl.txt" />
-   <EmbeddedResource Include="Localization\Ratings\nz.txt" />
-   <EmbeddedResource Include="Localization\Ratings\us.txt" />
-   <EmbeddedResource Include="Localization\Ratings\uk.txt" />
-   <EmbeddedResource Include="Localization\Ratings\es.txt" />
-   <EmbeddedResource Include="Localization\Ratings\ro.txt" />
- </ItemGroup>
- 
+
 </Project>
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 9db4f4423..df7f231c7 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1901,4 +1901,4 @@ namespace Emby.Server.Implementations.Session
             return user != null && user.Policy.IsAdministrator;
         }
     }
-}
\ No newline at end of file
+}