From 8b34705c16e414ff7b3a4f8a4cdaab9d28fa5835 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 11 Aug 2022 17:08:39 +0800
Subject: [PATCH] Localize `Duplicate tenancy name` .

Close #13640
---
 .../AbpTenantManagementDomainSharedModule.cs                | 6 ++++++
 .../Abp/TenantManagement/Localization/Resources/ar.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/de-DE.json  | 1 +
 .../Abp/TenantManagement/Localization/Resources/en.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/es.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/fi.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/fr.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/hi.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/it.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/pt-BR.json  | 1 +
 .../Abp/TenantManagement/Localization/Resources/ru.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/sk.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/sl.json     | 1 +
 .../Abp/TenantManagement/Localization/Resources/tr.json     | 1 +
 .../TenantManagement/Localization/Resources/zh-Hans.json    | 1 +
 .../TenantManagement/Localization/Resources/zh-Hant.json    | 1 +
 .../Volo/Abp/TenantManagement/TenantManager.cs              | 2 +-
 17 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs
index e0ce655235..5b388d9078 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs
@@ -1,6 +1,7 @@
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.TenantManagement.Localization;
+using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Validation;
 using Volo.Abp.Validation.Localization;
 using Volo.Abp.VirtualFileSystem;
@@ -25,5 +26,10 @@ public class AbpTenantManagementDomainSharedModule : AbpModule
                     typeof(AbpValidationResource)
                 ).AddVirtualJson("/Volo/Abp/TenantManagement/Localization/Resources");
         });
+
+        Configure<AbpExceptionLocalizationOptions>(options =>
+        {
+            options.MapCodeNamespace("Volo.Abp.TenantManagement", typeof(AbpTenantManagementResource));
+        });
     }
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json
index 134da8c601..829a326d24 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json
@@ -1,6 +1,7 @@
 {
   "culture": "ar",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "اسم المستأجر موجود بالفعل: {Name}",
     "Menu:TenantManagement": "إدارة الجهات",
     "Tenants": "الجهات",
     "NewTenant": "جهة جديدة",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json
index 16644b17aa..2033fdf1ed 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json
@@ -1,6 +1,7 @@
 {
   "culture": "de-DE",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Der Name des Mandanten ist bereits vorhanden: {Name}",
     "Menu:TenantManagement": "Mandantenverwaltung",
     "Tenants": "Mandanten",
     "NewTenant": "Neuer Mandant",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json
index ba4109c392..1a10c5b77a 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json
@@ -1,6 +1,7 @@
 {
   "culture": "en",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Tenant name already exist: {Name}",
     "Menu:TenantManagement": "Tenant management",
     "Tenants": "Tenants",
     "NewTenant": "New tenant",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json
index cd18e3c33b..774201178b 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json
@@ -1,6 +1,7 @@
 {
   "culture": "es",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "El nombre del inquilino ya existe: {Name}",
     "Menu:TenantManagement": "Gestión de tenants",
     "Tenants": "Inquilinos",
     "NewTenant": "Nuevo inquilino",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json
index cae6bf6cac..b24d67135e 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json
@@ -1,6 +1,7 @@
 {
   "culture": "fi",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Vuokralaisen nimi on jo olemassa: {Name}",
     "Menu:TenantManagement": "Vuokralaisten hallinta",
     "Tenants": "Vuokralaiset",
     "NewTenant": "Uusi vuokralainen",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json
index 4aac3eebab..4d6ccd76b0 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json
@@ -1,6 +1,7 @@
 {
  "culture": "fr",
  "texts": {
+  "Volo.Abp.TenantManagement:DuplicateTenantName": "Le nom du locataire existe déjà: {Name}",
   "Menu:TenantManagement": "Gestion des locataires",
   "Tenants": "Locataires",
   "NewTenant": "Nouveau locataire",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json
index 1094744a16..93f4a1a1ad 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json
@@ -1,6 +1,7 @@
 {
   "culture": "hi",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "किरायेदार नाम पहले से मौजूद है: {Name}",
     "Menu:TenantManagement": "किरायेदार प्रबंधन",
     "Tenants": "किरायेदारों",
     "NewTenant": "नया किरायेदार",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json
index c80b7974ab..6deff1bd54 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json
@@ -1,6 +1,7 @@
 {
   "culture": "it",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Il nome del tenant esiste già: {Name}",
     "Menu:TenantManagement": "Gestione tenants",
     "Tenants": "Tenants",
     "NewTenant": "Nuovo Tenant",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json
index 672d2c49ad..877f777f25 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json
@@ -1,6 +1,7 @@
 {
   "culture": "pt-BR",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "O nome do ambiente já existe: {Name}",
     "Menu:TenantManagement": "Gerencimento de Inquilinos",
     "Tenants": "Inquilinos",
     "NewTenant": "Novo Inquilino",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json
index 9e5732bbd7..b3585c20a4 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json
@@ -1,6 +1,7 @@
 {
   "culture": "ru",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Имя арендатора уже существует: {Name}",
     "Menu:TenantManagement": "Управление арендаторами",
     "Tenants": "Арендаторы",
     "NewTenant": "Новый арендатор",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json
index df3cd3dd13..e37d605d16 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json
@@ -1,6 +1,7 @@
 {
   "culture": "sk",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Názov tenanta už existuje: {Name}",
     "Menu:TenantManagement": "Správa tenantov",
     "Tenants": "Tentanti",
     "NewTenant": "Nový tenant",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json
index b9df388d7c..9e5d1c215a 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json
@@ -1,6 +1,7 @@
 {
   "culture": "sl",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Ime najemnika že obstaja: {Name}",
     "Menu:TenantManagement": "Upravljanje najemnikov",
     "Tenants": "Najemniki",
     "NewTenant": "Nov najemnik",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json
index 25ca3f2407..ffbab818f2 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json
@@ -1,6 +1,7 @@
 {
   "culture": "tr",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "Müşteri ismi zaten mevcut: {Name}",
     "Menu:TenantManagement": "Müşteri yönetimi",
     "Tenants": "Müşteriler",
     "NewTenant": "Yeni müşteri",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json
index 034d4bac81..94ef8abba1 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json
@@ -1,6 +1,7 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "租户名称已存在: {Name}",
     "Menu:TenantManagement": "租户管理",
     "Tenants": "租户",
     "NewTenant": "新租户",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json
index 6950a1ca00..1403cb79d5 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json
@@ -1,6 +1,7 @@
 {
   "culture": "zh-Hant",
   "texts": {
+    "Volo.Abp.TenantManagement:DuplicateTenantName": "租戶名稱已存在: {Name}",
     "Menu:TenantManagement": "租戶管理",
     "Tenants": "租戶",
     "NewTenant": "新租戶",
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
index 8fc75d2ecb..fa388426d9 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
@@ -36,7 +36,7 @@ public class TenantManager : DomainService, ITenantManager
         var tenant = await TenantRepository.FindByNameAsync(name);
         if (tenant != null && tenant.Id != expectedId)
         {
-            throw new UserFriendlyException("Duplicate tenancy name: " + name); //TODO: A domain exception would be better..?
+            throw new BusinessException("Volo.Abp.TenantManagement:DuplicateTenantName").WithData("Name", name);
         }
     }
 }