diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs index 5ef2d307f8..0f51787c01 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs @@ -1,5 +1,8 @@ -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap +using Volo.Abp.Localization; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap { + [ShortLocalizationResourceName("AbpBootstrap")] public class AbpBootstrapResource { } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/en.json b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/en.json index d921873fa7..849303c22c 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/en.json +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/en.json @@ -3,6 +3,9 @@ "texts": { "Close": "Close", "Save": "Save", - "SavingWithThreeDot": "Saving..." + "SavingWithThreeDot": "Saving...", + "Actions": "Actions", + "Delete": "Delete", + "Edit": "Edit" } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/tr.json b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/tr.json index 6f05d798df..70ad3061a5 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/tr.json +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/tr.json @@ -1,8 +1,11 @@ -{ +{ "culture": "tr", "texts": { "Close": "Kapat", "Save": "Kaydet", - "SavingWithThreeDot": "Kaydediliyor..." + "SavingWithThreeDot": "Kaydediliyor...", + "Actions": "İşlemler", + "Delete": "Sil", + "Edit": "Düzenle" } } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/IdentityResource.cs b/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/IdentityResource.cs index 5a7fbb5d7c..fed35c92cd 100644 --- a/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/IdentityResource.cs +++ b/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/IdentityResource.cs @@ -1,10 +1,13 @@ -using Volo.Abp.Localization; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap; +using Volo.Abp.Localization; using Volo.Abp.Localization.Resources.AbpValidation; namespace Volo.Abp.Identity.Web.Localization.Resources.AbpIdentity { + [InheritResource( + typeof(AbpValidationResource), + typeof(AbpBootstrapResource))] [ShortLocalizationResourceName("AbpIdentity")] - [InheritResource(typeof(AbpValidationResource))] public class IdentityResource //TODO: Rename to AbpIdentityResource { diff --git a/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json b/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json index 33a86edf6b..f12cad4212 100644 --- a/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json +++ b/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json @@ -3,23 +3,16 @@ "texts": { "Users": "Users", "NewUser": "New user", - "Actions": "Actions", "UserName": "User name", "EmailAddress": "Email address", "PhoneNumber": "Phone number", "UserInformations": "User informations", "Roles": "Roles", - "Close": "Close", - "Delete": "Delete", - "Edit": "Edit", - "Save": "Save", "Password": "Password", "UserDeletionConfirmationMessage": "User '{0}' will be deleted. Do you confirm that?", "TwoFactorVerification": "Two factor verification", "AccountLockoutOnFailedLoginAttempts": "Locking account after failed login attempts", "NewRole": "New role", - "RoleName": "Role name", - "CreationTime": "Creation time" - + "RoleName": "Role name" } } \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/AbpMultiTenancyResource.cs b/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/AbpMultiTenancyResource.cs index bdb618d6dc..80329739bd 100644 --- a/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/AbpMultiTenancyResource.cs +++ b/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/AbpMultiTenancyResource.cs @@ -1,10 +1,13 @@ -using Volo.Abp.Localization; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap; +using Volo.Abp.Localization; using Volo.Abp.Localization.Resources.AbpValidation; namespace Volo.Abp.MultiTenancy.Web.Localization.Resources.AbpMultiTenancy { + [InheritResource( + typeof(AbpValidationResource), + typeof(AbpBootstrapResource))] [ShortLocalizationResourceName("AbpMultiTenancy")] - [InheritResource(typeof(AbpValidationResource))] public class AbpMultiTenancyResource { diff --git a/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/en.json b/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/en.json index 30b5f914bf..7cbdcd8494 100644 --- a/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/en.json +++ b/src/Volo.Abp.MultiTenancy.Web/Localization/Resources/AbpMultiTenancy/en.json @@ -1,7 +1,9 @@ { "culture": "en", "texts": { + "Tenants": "Tenants", "NewTenant": "New tenant", - "TenantName": "Tenant name" + "TenantName": "Tenant name", + "TenantDeletionConfirmationMessage": "Tenant '{0}' will be deleted. Do you confirm that?" } } \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml b/src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml index ca710b1d76..121aa93333 100644 --- a/src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml +++ b/src/Volo.Abp.MultiTenancy.Web/Pages/MultiTenancy/Tenants/Index.cshtml @@ -37,7 +37,7 @@ @L["Actions"] - @L["Name"] + @L["TenantName"]