From a92a5c98ab95aab4c456d9068c141e6fddba8109 Mon Sep 17 00:00:00 2001
From: enisn <iletisim@enisnecipoglu.com>
Date: Tue, 12 Jan 2021 13:36:35 +0300
Subject: [PATCH] CmsKit - Fix localization problem for TagDefinitions

---
 .../Volo/CmsKit/Admin/Tags/TagDefinitionDto.cs       | 10 ++++++++++
 .../Volo/CmsKit/Admin/Tags/TagAdminAppService.cs     | 12 ++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagDefinitionDto.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagDefinitionDto.cs
index b5abf8b69c..0fdfe04b00 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagDefinitionDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Tags/TagDefinitionDto.cs
@@ -2,7 +2,17 @@
 {
     public class TagDefinitionDto
     {
+        public TagDefinitionDto()
+        {
+        }
+        public TagDefinitionDto(string entityType, string displayName)
+        {
+            EntityType = entityType;
+            DisplayName = displayName;
+        }
+
         public string EntityType { get; set; }
+
         public string DisplayName { get; set; }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs
index 29fbb943bb..54e2a7a530 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,11 +24,15 @@ namespace Volo.CmsKit.Admin.Tags
     {
         protected ITagManager TagManager { get; }
 
+        protected IStringLocalizerFactory StringLocalizerFactory { get; }
+
         public TagAdminAppService(
             IRepository<Tag, Guid> repository,
-            ITagManager tagManager) : base(repository)
+            ITagManager tagManager,
+            IStringLocalizerFactory stringLocalizerFactory) : base(repository)
         {
             TagManager = tagManager;
+           StringLocalizerFactory = stringLocalizerFactory;
 
             GetListPolicyName = CmsKitAdminPermissions.Tags.Default;
             GetPolicyName = CmsKitAdminPermissions.Tags.Default;
@@ -71,7 +76,10 @@ namespace Volo.CmsKit.Admin.Tags
         {
             var definitions = await TagManager.GetTagDefinitionsAsync();
 
-            return ObjectMapper.Map<List<TagDefiniton>, List<TagDefinitionDto>>(definitions);
+            return definitions
+                        .Select(s => 
+                            new TagDefinitionDto(s.EntityType, s.DisplayName.Localize(StringLocalizerFactory)))
+                        .ToList();
         }
     }
 }