Fix resource resolving issue

Author: norberteder

source/IdentityServer3.Contrib.Localization.UI/IdentityServer3.Contrib.Localization.UI.csproj

@@ -93,6 +93,12 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <PropertyGroup>
+    <PostBuildEvent>if $(ConfigurationName) == Release (
+if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
+"$(SolutionDir)..\tools\nuget.exe" pack "$(SolutionDir)IdentityServer3.Contrib.Localization.UI\IdentityServer3.Contrib.Localization.UI.nuspec" -OutputDirectory "$(SolutionDir)..\packages"
+)</PostBuildEvent>
+  </PropertyGroup>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETCore'">
       <ItemGroup>
@@ -191,10 +197,4 @@
       </ItemGroup>
     </When>
   </Choose>
-  <PropertyGroup>
-    <PostBuildEvent>if $(ConfigurationName) == Release (
-if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
-"$(SolutionDir)..\tools\nuget.exe" pack "$(SolutionDir)IdentityServer3.Contrib.Localization.UI\IdentityServer3.Contrib.Localization.UI.nuspec" -OutputDirectory "$(SolutionDir)..\packages"
-)</PostBuildEvent>
-  </PropertyGroup>
 </Project>

source/IdentityServer3.Contrib.Localization.UI/IdentityServer3.Contrib.Localization.UI.nuspec

@@ -2,14 +2,14 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>IdentityServer3.Contrib.Localization.UI</id>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
         <title>Thinktecture IdentityServer3 - Localization.UI</title>
         <authors>Norbert Eder (MARMIND)</authors>
         <licenseUrl>https://github.com/marmind/IdentityServer3.Contrib.Localization.UI/blob/master/LICENSE</licenseUrl>
         <projectUrl>https://github.com/marmind/IdentityServer3.Contrib.Localization.UI</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contrib implementation of IViewLoader for IdentityServer3 views in multiple languages</description>
-        <releaseNotes>Working release.</releaseNotes>
+        <releaseNotes>Fixed resource resolving issue</releaseNotes>
         <tags>IdentityServer3, i18n, Localize, UI</tags>
         <dependencies>
             <dependency id="Thinktecture.IdentityServer3" version="1.6.1" />

source/IdentityServer3.Contrib.Localization.UI/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -8,9 +7,9 @@
 [assembly: AssemblyTitle("IdentityServer3.Contrib.Localization.UI")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("UPPER Network GmbH / MARMIND")]
 [assembly: AssemblyProduct("IdentityServer3.Contrib.Localization.UI")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright © UPPER Network GmbH 2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]

source/IdentityServer3.Contrib.Localization.UI/TranslatorHelper.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using System.Threading;
 using SecondLanguage;
 
@@ -34,9 +36,13 @@ public static TranslatorHelper Instance
 
         private void Init()
         {
-            var files = Directory.GetFiles("Resources", "*.po", SearchOption.AllDirectories);
+            var resPath = Path.Combine(AssemblyDirectory, "resources");
+            Console.WriteLine("Resource path: " + resPath);
+
+            var files = Directory.GetFiles(resPath, "*.po", SearchOption.AllDirectories);
             foreach (string file in files)
             {
+                Console.WriteLine(file);
                 var translator = new Translator();
                 translator.RegisterTranslation(file);
 
@@ -64,5 +70,16 @@ public Translator GetTranslatorForCurrentCulture()
 
             return translator;
         }
+
+        private string AssemblyDirectory
+        {
+            get
+            {
+                string codeBase = Assembly.GetExecutingAssembly().CodeBase;
+                var uri = new UriBuilder(codeBase);
+                string path = Uri.UnescapeDataString(uri.Path);
+                return Path.GetDirectoryName(path);
+            }
+        }
     }
 }