From 863152ed1f8efc392386f403e92e4ffd7a1bf254 Mon Sep 17 00:00:00 2001 From: wangjun Date: Mon, 3 Jul 2023 18:19:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/EnumLocalicationExtension.cs | 19 ------------------- .../Localization/MyProjectName/en.json | 15 +-------------- .../Localization/MyProjectName/zh-Hans.json | 14 +------------- ...anyName.MyProjectName.Domain.Shared.csproj | 12 ++++++------ .../Extensions/EnumLocalicationExtension.cs | 19 ------------------- .../Localization/MyProjectName/en.json | 15 +-------------- .../Localization/MyProjectName/zh-Hans.json | 14 +------------- ...anyName.MyProjectName.Domain.Shared.csproj | 12 ++++++------ 8 files changed, 16 insertions(+), 104 deletions(-) delete mode 100644 templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs delete mode 100644 templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs deleted file mode 100644 index 3dfd62aa..00000000 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs +++ /dev/null @@ -1,19 +0,0 @@ -// namespace MyCompanyName.MyProjectName.Localization.Extensions -// { -// public static class EnumLocalicationExtension -// { -// public static string ToLocalicationDescription(this Enum value) -// { -// var member = -// ((IEnumerable)value.GetType().GetMember(value.ToString())) -// .FirstOrDefault(); -// -// var localKey =$"Enum:{member.ReflectedType.Name}:{value}:{Convert.ToInt16(value)}"; -// if (localKey.IsNullOrWhiteSpace()) -// { -// throw new ArgumentException(); -// } -// return !(member != (MemberInfo)null) ? value.ToString() : LocalizationHelper.L[localKey]; -// } -// } -// } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json index 3b490d85..9a176ff3 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json @@ -24,19 +24,6 @@ "Description:Setting.Group.Other.Github": "Github", "Enum:TestType:Created:1":"Created", "Enum:TestType:Cancel:1":"Cancel", - "Enum:TestType:Delete:1":"Delete", - - "MyCompanyName.MyProjectName:100001": "OrganizationUnit Not Exist", - "MyCompanyName.MyProjectName:100002": "UserLockedOut", - "MyCompanyName.MyProjectName:100003": "UserOrPasswordMismatch", - "MyCompanyName.MyProjectName:100004": "ApiResource Not Exist", - "MyCompanyName.MyProjectName:100005": "ApiResource Exist", - "MyCompanyName.MyProjectName:100006": "ApiScope Not Exist", - "MyCompanyName.MyProjectName:100007": "ApiScope Exist", - "MyCompanyName.MyProjectName:100008": "ApiClient Not Exist", - "MyCompanyName.MyProjectName:100009": "ApiClient Exist", - "MyCompanyName.MyProjectName:100010": "IdentityResource Not Exist", - "MyCompanyName.MyProjectName:100011": "IdentityResource Exist" - + "Enum:TestType:Delete:1":"Delete" } } diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json index ca5d72a8..497f63ef 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json @@ -25,18 +25,6 @@ "Description:Setting.Group.Other.Github": "Github", "Enum:TestType:Created:1":"创建", "Enum:TestType:Cancel:1":"取消", - "Enum:TestType:Delete:1":"删除", - - "MyCompanyName.MyProjectName:100001": "组织机构不存在", - "MyCompanyName.MyProjectName:100002": "用户被锁定", - "MyCompanyName.MyProjectName:100003": "用户名或者密码错误", - "MyCompanyName.MyProjectName:100004": "ApiResource不存在", - "MyCompanyName.MyProjectName:100005": "ApiResource 已存在", - "MyCompanyName.MyProjectName:100006": "ApiScope 不存在", - "MyCompanyName.MyProjectName:100007": "ApiScope 已存在", - "MyCompanyName.MyProjectName:100008": "ApiClient 不存在", - "MyCompanyName.MyProjectName:100009": "ApiClient 已存在", - "MyCompanyName.MyProjectName:100010": "IdentityResource 不存在", - "MyCompanyName.MyProjectName:100011": "IdentityResource 已存在" + "Enum:TestType:Delete:1":"删除" } } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index 29ab497d..b4e77551 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -6,16 +6,16 @@ - - + + - - - - + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs deleted file mode 100644 index 3dfd62aa..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs +++ /dev/null @@ -1,19 +0,0 @@ -// namespace MyCompanyName.MyProjectName.Localization.Extensions -// { -// public static class EnumLocalicationExtension -// { -// public static string ToLocalicationDescription(this Enum value) -// { -// var member = -// ((IEnumerable)value.GetType().GetMember(value.ToString())) -// .FirstOrDefault(); -// -// var localKey =$"Enum:{member.ReflectedType.Name}:{value}:{Convert.ToInt16(value)}"; -// if (localKey.IsNullOrWhiteSpace()) -// { -// throw new ArgumentException(); -// } -// return !(member != (MemberInfo)null) ? value.ToString() : LocalizationHelper.L[localKey]; -// } -// } -// } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json index 3b490d85..9a176ff3 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json @@ -24,19 +24,6 @@ "Description:Setting.Group.Other.Github": "Github", "Enum:TestType:Created:1":"Created", "Enum:TestType:Cancel:1":"Cancel", - "Enum:TestType:Delete:1":"Delete", - - "MyCompanyName.MyProjectName:100001": "OrganizationUnit Not Exist", - "MyCompanyName.MyProjectName:100002": "UserLockedOut", - "MyCompanyName.MyProjectName:100003": "UserOrPasswordMismatch", - "MyCompanyName.MyProjectName:100004": "ApiResource Not Exist", - "MyCompanyName.MyProjectName:100005": "ApiResource Exist", - "MyCompanyName.MyProjectName:100006": "ApiScope Not Exist", - "MyCompanyName.MyProjectName:100007": "ApiScope Exist", - "MyCompanyName.MyProjectName:100008": "ApiClient Not Exist", - "MyCompanyName.MyProjectName:100009": "ApiClient Exist", - "MyCompanyName.MyProjectName:100010": "IdentityResource Not Exist", - "MyCompanyName.MyProjectName:100011": "IdentityResource Exist" - + "Enum:TestType:Delete:1":"Delete" } } diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json index ca5d72a8..497f63ef 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json @@ -25,18 +25,6 @@ "Description:Setting.Group.Other.Github": "Github", "Enum:TestType:Created:1":"创建", "Enum:TestType:Cancel:1":"取消", - "Enum:TestType:Delete:1":"删除", - - "MyCompanyName.MyProjectName:100001": "组织机构不存在", - "MyCompanyName.MyProjectName:100002": "用户被锁定", - "MyCompanyName.MyProjectName:100003": "用户名或者密码错误", - "MyCompanyName.MyProjectName:100004": "ApiResource不存在", - "MyCompanyName.MyProjectName:100005": "ApiResource 已存在", - "MyCompanyName.MyProjectName:100006": "ApiScope 不存在", - "MyCompanyName.MyProjectName:100007": "ApiScope 已存在", - "MyCompanyName.MyProjectName:100008": "ApiClient 不存在", - "MyCompanyName.MyProjectName:100009": "ApiClient 已存在", - "MyCompanyName.MyProjectName:100010": "IdentityResource 不存在", - "MyCompanyName.MyProjectName:100011": "IdentityResource 已存在" + "Enum:TestType:Delete:1":"删除" } } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index 6e362890..bc606447 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -6,16 +6,16 @@ - - + + - - - - + + + + \ No newline at end of file