From e0ea3ff93a5e395824a339d1259f612ad5900a18 Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronjhchong@hotmail.com>
Date: Wed, 6 Sep 2017 01:10:01 +0800
Subject: [PATCH 1/5] Add missing localization used in edit modals

---
 .../Localization/SourceFiles/AbpProjectName.xml               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
index e66bdb2b0..cfc07847e 100644
--- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
+++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
@@ -77,5 +77,9 @@
     <text name="Actions">Actions</text>
 
     <text name="CouldNotCompleteLoginOperation">Could not complete login operation. Please try again later.</text>
+
+    <text name="EditRole">Edit role</text>
+    <text name="EditTenant">Edit tenant</text>
+    <text name="EditUser">Edit user</text>
   </texts>
 </localizationDictionary>

From 1711feb504deb7821027b8f427fc6b635ac42338 Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronjhchong@hotmail.com>
Date: Wed, 6 Sep 2017 01:10:19 +0800
Subject: [PATCH 2/5] Standardise capitalization of localized string

---
 .../Localization/SourceFiles/AbpProjectName.xml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
index cfc07847e..c6ce4f064 100644
--- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
+++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
@@ -72,7 +72,7 @@
     <text name="Edit">Edit</text>
     <text name="Delete">Delete</text>
 
-    <text name="CreateNewRole">Create New Role</text>
+    <text name="CreateNewRole">Create new role</text>
     <text name="RoleName">Role Name</text>
     <text name="Actions">Actions</text>
 

From b6ae7a3b95ebe0688b76ce6f8db95d94968c2e65 Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronjhchong@hotmail.com>
Date: Wed, 6 Sep 2017 01:48:26 +0800
Subject: [PATCH 3/5] Add missing localization used in UserRegistrationManager

---
 .../Localization/SourceFiles/AbpProjectName.xml                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
index c6ce4f064..684984412 100644
--- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
+++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
@@ -81,5 +81,7 @@
     <text name="EditRole">Edit role</text>
     <text name="EditTenant">Edit tenant</text>
     <text name="EditUser">Edit user</text>
+    <text name="TenantIdIsNotActive{0}">TenantId {0} is not active</text>
+    <text name="UnknownTenantId{0}">Unknown tenantId {0}</text>
   </texts>
 </localizationDictionary>

From f048d80ce3a693a22c834c81dc86ca7900dcc0c0 Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronjhchong@hotmail.com>
Date: Wed, 6 Sep 2017 01:52:00 +0800
Subject: [PATCH 4/5] Add missing localization used in TokenAuthController

---
 .../Localization/SourceFiles/AbpProjectName.xml                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
index 684984412..2235ed20a 100644
--- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
+++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
@@ -78,6 +78,7 @@
 
     <text name="CouldNotCompleteLoginOperation">Could not complete login operation. Please try again later.</text>
 
+    <text name="CouldNotValidateExternalUser">Could not validate external user</text>
     <text name="EditRole">Edit role</text>
     <text name="EditTenant">Edit tenant</text>
     <text name="EditUser">Edit user</text>

From db8872f838eeb867b639078b2d3a83ba55811382 Mon Sep 17 00:00:00 2001
From: Aaron Chong <aaronjhchong@hotmail.com>
Date: Wed, 6 Sep 2017 02:00:14 +0800
Subject: [PATCH 5/5] Fix localization key in RoleAppService

---
 .../Roles/RoleAppService.cs                                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs
index 05026cba4..a07736f88 100644
--- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs
+++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs
@@ -75,7 +75,7 @@ public override async Task Delete(EntityDto<int> input)
             var role = await _roleManager.FindByIdAsync(input.Id.ToString());
             if (role.IsStatic)
             {
-                throw new UserFriendlyException("CannotDeleteAStaticRole");
+                throw new UserFriendlyException(L("CanNotDeleteStaticRole"));
             }
 
             var users = await _userManager.GetUsersInRoleAsync(role.NormalizedName);