From e99053661e081aaeb4476dd55fdbd576d631aed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 15 Dec 2017 14:06:55 +0300
Subject: [PATCH] Relocate localization files.

---
 src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs      |  3 ++-
 .../Identity/Localization/Resource/IdentityResource.cs | 10 ----------
 .../Localization/Resource/IdentityResource.cs          | 10 ++++++++++
 .../{Areas/Identity => }/Localization/Resource/en.json |  0
 .../{Areas/Identity => }/Localization/Resource/tr.json |  0
 .../Pages/Identity/Users/CreateModal.cshtml            |  2 +-
 .../Pages/Identity/Users/EditModal.cshtml              |  2 +-
 .../Pages/Identity/Users/Index.cshtml                  |  2 +-
 src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj |  5 +----
 .../wwwroot/modules/identity/views/users/index.js      |  2 +-
 10 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/IdentityResource.cs
 create mode 100644 src/Volo.Abp.Identity.Web/Localization/Resource/IdentityResource.cs
 rename src/Volo.Abp.Identity.Web/{Areas/Identity => }/Localization/Resource/en.json (100%)
 rename src/Volo.Abp.Identity.Web/{Areas/Identity => }/Localization/Resource/tr.json (100%)

diff --git a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
index a9a74902b9..f46a90d262 100644
--- a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
+++ b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AutoMapper;
-using Volo.Abp.Identity.Web.Areas.Identity.Localization.Resource;
+using Volo.Abp.Identity.Web.Localization.Resource;
 using Volo.Abp.Identity.Web.Navigation;
 using Volo.Abp.Identity.Web.ObjectMappings;
 using Volo.Abp.Localization;
@@ -14,6 +14,7 @@ namespace Volo.Abp.Identity.Web
 {
     [DependsOn(typeof(AbpIdentityApplicationContractsModule))]
     [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))]
+    [DependsOn(typeof(AbpAutoMapperModule))]
     public class AbpIdentityWebModule : AbpModule
     {
         public override void PreConfigureServices(IServiceCollection services)
diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/IdentityResource.cs b/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/IdentityResource.cs
deleted file mode 100644
index b047fbe0f5..0000000000
--- a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/IdentityResource.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Volo.Abp.Localization;
-
-namespace Volo.Abp.Identity.Web.Areas.Identity.Localization.Resource
-{
-    [ShortLocalizationResourceName("AbpIdentityWeb")]
-    public class IdentityResource
-    {
-        
-    }
-}
diff --git a/src/Volo.Abp.Identity.Web/Localization/Resource/IdentityResource.cs b/src/Volo.Abp.Identity.Web/Localization/Resource/IdentityResource.cs
new file mode 100644
index 0000000000..2829300a3f
--- /dev/null
+++ b/src/Volo.Abp.Identity.Web/Localization/Resource/IdentityResource.cs
@@ -0,0 +1,10 @@
+using Volo.Abp.Localization;
+
+namespace Volo.Abp.Identity.Web.Localization.Resource
+{
+    [ShortLocalizationResourceName("AbpIdentity")]
+    public class IdentityResource
+    {
+        
+    }
+}
diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json b/src/Volo.Abp.Identity.Web/Localization/Resource/en.json
similarity index 100%
rename from src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/en.json
rename to src/Volo.Abp.Identity.Web/Localization/Resource/en.json
diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json b/src/Volo.Abp.Identity.Web/Localization/Resource/tr.json
similarity index 100%
rename from src/Volo.Abp.Identity.Web/Areas/Identity/Localization/Resource/tr.json
rename to src/Volo.Abp.Identity.Web/Localization/Resource/tr.json
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index 99e94c4e7b..a39e0f8c52 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -1,6 +1,6 @@
 @page
 @using Microsoft.Extensions.Localization
-@using Volo.Abp.Identity.Web.Areas.Identity.Localization.Resource
+@using Volo.Abp.Identity.Web.Localization.Resource
 @model Volo.Abp.Identity.Web.Pages.Identity.Users.CreateModalModel
 @inject IStringLocalizer<IdentityResource> L
 @{
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
index aeb3c958fa..f41370055d 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
@@ -1,6 +1,6 @@
 @page
 @using Microsoft.Extensions.Localization
-@using Volo.Abp.Identity.Web.Areas.Identity.Localization.Resource
+@using Volo.Abp.Identity.Web.Localization.Resource
 @model Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalModel
 @inject IStringLocalizer<IdentityResource> L
 @{
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
index f9061ab4d4..9385d59d97 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml
@@ -1,7 +1,7 @@
 @page
 @model Volo.Abp.Identity.Web.Pages.Identity.Users.IndexModel
 @using Microsoft.AspNetCore.Mvc.Localization
-@using Volo.Abp.Identity.Web.Areas.Identity.Localization.Resource
+@using Volo.Abp.Identity.Web.Localization.Resource
 @inject IHtmlLocalizer<IdentityResource> L
 @section styles {
     <link rel="stylesheet" type="text/css" href="~/modules/identity/views/users/index.css" />
diff --git a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
index b54e531061..2bb4693bde 100644
--- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
+++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
@@ -11,12 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Areas\**\*.cshtml" />
-    <EmbeddedResource Include="Areas\**\*.js" />
-    <EmbeddedResource Include="Areas\**\*.json" />
-    <EmbeddedResource Include="Areas\**\*.css" />
     <EmbeddedResource Include="wwwroot\**\*.*" />
     <EmbeddedResource Include="Pages\**\*.cshtml" />
+    <EmbeddedResource Include="Localization\Resource\*.json" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js
index e3eb4e8dbf..5e66c9d999 100644
--- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js
+++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js
@@ -1,6 +1,6 @@
 (function() {
     
-    var _l = abp.localization.getResource('AbpIdentityWeb'); //TODO: AbpIdentityWeb to const
+    var _l = abp.localization.getResource('AbpIdentity'); //TODO: AbpIdentityWeb to const
     var _identityUserAppService = volo.abp.identity.identityUser;
 
     var _editModal = new abp.ModalManager({