From 40781d65c68bd6ce8756c301d4eab77d708fe747 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 16 Jan 2019 13:40:38 +0300
Subject: [PATCH] IAbpTagHelperLocalizer changes

---
 .../TagHelpers/AbpTagHelperLocalizer.cs            | 14 ++++++++++----
 .../TagHelpers/IAbpTagHelperLocalizer.cs           |  5 ++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperLocalizer.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperLocalizer.cs
index 72d32ce10b..395edb19c4 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperLocalizer.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperLocalizer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
@@ -20,20 +21,25 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
 
         public string GetLocalizedText(string text, ModelExplorer explorer)
         {
-            var localizer = GetStringLocalizer(explorer);
+            var localizer = GetStringLocalizer(explorer.Container.ModelType.Assembly);
 
             return localizer == null ? text : localizer[text].Value;
         }
 
         public IStringLocalizer GetLocalizer(ModelExplorer explorer)
         {
-            return GetStringLocalizer(explorer);
+            return GetStringLocalizer(explorer.Container.ModelType.Assembly);
         }
 
-        private IStringLocalizer GetStringLocalizer(ModelExplorer explorer)
+        public IStringLocalizer GetLocalizer(Assembly assembly)
+        {
+            return GetStringLocalizer(assembly);
+        }
+
+        private IStringLocalizer GetStringLocalizer(Assembly assembly)
         {
             IStringLocalizer localizer = null;
-            var resourceType = _options.AssemblyResources.GetOrDefault(explorer.Container.ModelType.Assembly);
+            var resourceType = _options.AssemblyResources.GetOrDefault(assembly);
 
             if (resourceType != null)
             {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/IAbpTagHelperLocalizer.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/IAbpTagHelperLocalizer.cs
index 8107f58d23..68b7b3529e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/IAbpTagHelperLocalizer.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/IAbpTagHelperLocalizer.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using System.Reflection;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.Extensions.Localization;
 using Volo.Abp.DependencyInjection;
 
@@ -9,5 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
         string GetLocalizedText(string text, ModelExplorer explorer);
 
         IStringLocalizer GetLocalizer(ModelExplorer explorer);
+
+        IStringLocalizer GetLocalizer(Assembly assembly);
     }
 }