Refactor AbpTagHelperLocalizer.

Also, improve enum localization on select.

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/AbpTagHelperLocalizer.cs

@@ -21,38 +21,30 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
 
         public string GetLocalizedText(string text, ModelExplorer explorer)
         {
-            var resourceType = GetResourceTypeFromModelExplorer(explorer);
+            var localizer = GetLocalizerOrNull(explorer);
-            var localizer = GetStringLocalizer(resourceType);
+            return localizer == null
-
+                ? text
-            return localizer == null ? text : localizer[text].Value;
+                : localizer[text].Value;
-        }
-
-        public IStringLocalizer GetLocalizer(ModelExplorer explorer)
-        {
-            var resourceType = GetResourceTypeFromModelExplorer(explorer);
-            return GetStringLocalizer(resourceType);
-        }
-
-        public IStringLocalizer GetLocalizer(Assembly assembly)
-        {
-            var resourceType = _options.AssemblyResources.GetOrDefault(assembly);
-            return GetStringLocalizer(resourceType);
         }
 
-        public IStringLocalizer GetLocalizer(Type resourceType)
+        public IStringLocalizer GetLocalizerOrNull(ModelExplorer explorer)
         {
-            return GetStringLocalizer(resourceType);
+            return GetLocalizerOrNull(explorer.Container.ModelType.Assembly);
         }
 
-        private IStringLocalizer GetStringLocalizer(Type resourceType)
+        public IStringLocalizer GetLocalizerOrNull(Assembly assembly)
         {
-            return resourceType == null ? null : _stringLocalizerFactory.Create(resourceType);
+            var resourceType = GetResourceType(assembly);
+            return resourceType == null
+                ? _stringLocalizerFactory.CreateDefaultOrNull()
+                : _stringLocalizerFactory.Create(resourceType);
         }
 
-        private Type GetResourceTypeFromModelExplorer(ModelExplorer explorer)
+        private Type GetResourceType(Assembly assembly)
         {
-            var assembly = explorer.Container.ModelType.Assembly;
+            return _options
-            return _options.AssemblyResources.GetOrDefault(assembly);
+                .AssemblyResources
+                .GetOrDefault(assembly);
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpRadioInputTagHelperService.cs

@@ -90,7 +90,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual List<SelectListItem> GetSelectItemsFromEnum(TagHelperContext context, TagHelperOutput output, ModelExplorer explorer)
         {
-            var localizer = _tagHelperLocalizer.GetLocalizer(explorer);
+            var localizer = _tagHelperLocalizer.GetLocalizerOrNull(explorer);
 
             var selectItems = explorer.Metadata.IsEnum ? explorer.ModelType.GetTypeInfo().GetMembers(BindingFlags.Public | BindingFlags.Static)
                 .Select((t, i) => new SelectListItem { Value = i.ToString(), Text = GetLocalizedPropertyName(localizer, explorer.ModelType, t.Name) }).ToList() : null;

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs

@@ -11,6 +11,8 @@ using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
+using Volo.Abp.DynamicProxy;
+using Volo.Abp.Reflection;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 {
@@ -196,8 +198,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual List<SelectListItem> GetSelectItemsFromEnum(TagHelperContext context, TagHelperOutput output, ModelExplorer explorer)
         {
-            var localizer = _tagHelperLocalizer.GetLocalizer(explorer);
-
             var selectItems = new List<SelectListItem>();
             var isNullableType = Nullable.GetUnderlyingType(explorer.ModelType) != null;
             var enumType = explorer.ModelType;
@@ -208,26 +208,75 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 selectItems.Add(new SelectListItem());
             }
 
+            var containerLocalizer = _tagHelperLocalizer.GetLocalizerOrNull(explorer.Container.ModelType.Assembly);
+            IStringLocalizer modelObjectLocalizer = null;
+            if (explorer.Model != null)
+            {
+                modelObjectLocalizer = _tagHelperLocalizer.GetLocalizerOrNull(ProxyHelper.UnProxy(explorer.Model).GetType().Assembly);
+            }
+
             selectItems.AddRange(enumType.GetEnumNames()
                 .Select(enumName => new SelectListItem
                 {
                     Value = Convert.ToUInt64(Enum.Parse(enumType, enumName)).ToString(),
-                    Text = GetLocalizedPropertyName(localizer, enumType, enumName)
+                    Text = GetLocalizedEnumFieldName(containerLocalizer, modelObjectLocalizer, enumType, enumName)
                 }));
 
             return selectItems;
         }
 
-        protected virtual string GetLocalizedPropertyName(IStringLocalizer localizer, Type enumType, string propertyName)
+        protected virtual string GetLocalizedEnumFieldName(
+            IStringLocalizer containerLocalizer,
+            IStringLocalizer modelObjectLocalizer,
+            Type enumType, 
+            string fieldName)
         {
-            if (localizer == null)
+            LocalizedString localizedString;
+
+            //Look for the enum name + enum field name
+
+            var localizationKey = enumType.Name + "." + fieldName;
+            if (containerLocalizer != null)
+            {
+                localizedString = containerLocalizer[localizationKey];
+                if (!localizedString.ResourceNotFound)
+                {
+                    return localizedString.Value;
+                }
+            }
+
+            if (modelObjectLocalizer != null)
+            {
+                localizedString = modelObjectLocalizer[localizationKey];
+                if (!localizedString.ResourceNotFound)
+                {
+                    return localizedString.Value;
+                }
+            }
+
+            //Look for the enum field name
+
+            localizationKey = fieldName;
+
+            if (containerLocalizer != null)
             {
-                return propertyName;
+                localizedString = containerLocalizer[localizationKey];
+                if (!localizedString.ResourceNotFound)
+                {
+                    return localizedString.Value;
+                }
             }
 
-            var localizedString = localizer[enumType.Name + "." + propertyName];
+            if (modelObjectLocalizer != null)
+            {
+                localizedString = modelObjectLocalizer[localizationKey];
+                if (!localizedString.ResourceNotFound)
+                {
+                    return localizedString.Value;
+                }
+            }
 
-            return !localizedString.ResourceNotFound ? localizedString.Value : localizer[propertyName].Value;
+            return fieldName;
         }
 
         protected virtual List<SelectListItem> GetSelectItemsFromAttribute(

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/IAbpTagHelperLocalizer.cs

@@ -10,10 +10,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers
     {
         string GetLocalizedText(string text, ModelExplorer explorer);
 
-        IStringLocalizer GetLocalizer(ModelExplorer explorer);
+        IStringLocalizer GetLocalizerOrNull(ModelExplorer explorer);
 
-        IStringLocalizer GetLocalizer(Assembly assembly);
+        IStringLocalizer GetLocalizerOrNull(Assembly assembly);
-
-        IStringLocalizer GetLocalizer(Type resourceType);
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs

@@ -7,6 +7,7 @@ using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Microsoft.AspNetCore.Razor.TagHelpers;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Extensions;
 
@@ -17,12 +18,18 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
         private readonly IHtmlGenerator _generator;
         private readonly HtmlEncoder _encoder;
         private readonly IAbpTagHelperLocalizer _tagHelperLocalizer;
+        private readonly IStringLocalizerFactory _stringLocalizerFactory;
 
-        public AbpPaginationTagHelperService(IHtmlGenerator generator, HtmlEncoder encoder, IAbpTagHelperLocalizer tagHelperLocalizer)
+        public AbpPaginationTagHelperService(
+            IHtmlGenerator generator, 
+            HtmlEncoder encoder, 
+            IAbpTagHelperLocalizer tagHelperLocalizer, 
+            IStringLocalizerFactory stringLocalizerFactory)
         {
             _generator = generator;
             _encoder = encoder;
             _tagHelperLocalizer = tagHelperLocalizer;
+            _stringLocalizerFactory = stringLocalizerFactory;
         }
 
         public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
@@ -119,7 +126,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
 
         protected virtual async Task<string> RenderAnchorTagHelperLinkHtmlAsync(TagHelperContext context, TagHelperOutput output, string currentPage, string localizationKey)
         {
-            var localizer = _tagHelperLocalizer.GetLocalizer(typeof(AbpUiResource));
+            var localizer = _stringLocalizerFactory.Create(typeof(AbpUiResource));
 
             var anchorTagHelper = GetAnchorTagHelper(currentPage, out var attributeList);
 
@@ -156,7 +163,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
 
         protected virtual string GetOpeningTags(TagHelperContext context, TagHelperOutput output)
         {
-            var localizer = _tagHelperLocalizer.GetLocalizer(typeof(AbpUiResource));
+            var localizer = _stringLocalizerFactory.Create(typeof(AbpUiResource));
 
             var pagerInfo = (TagHelper.ShowInfo ?? false) ?
                 "    <div class=\"col-sm-12 col-md-5\"> " + localizer["PagerInfo{0}{1}{2}", TagHelper.Model.ShowingFrom, TagHelper.Model.ShowingTo, TagHelper.Model.TotalItemsCount] + "</div>\r\n"

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs

@@ -177,9 +177,7 @@ namespace Volo.Abp.Localization
 
             return allStrings.Values.ToImmutableList();
         }
-
         
-
         public class CultureWrapperStringLocalizer : IStringLocalizer, IStringLocalizerSupportsInheritance
         {
             private readonly string _cultureName;