diff --git a/labs/Teacher/Infrastructure/Web/LocalizedValidationAttributeAdapterProvider.cs b/labs/Teacher/Infrastructure/Web/LocalizedValidationAttributeAdapterProvider.cs index 449e0009..c9c55c13 100644 --- a/labs/Teacher/Infrastructure/Web/LocalizedValidationAttributeAdapterProvider.cs +++ b/labs/Teacher/Infrastructure/Web/LocalizedValidationAttributeAdapterProvider.cs @@ -8,7 +8,6 @@ namespace Infrastructure.Web { public new IAttributeAdapter GetAttributeAdapter(ValidationAttribute attribute, IStringLocalizer stringLocalizer) { - new RequiredAttributeAdapter(null, null); return base.GetAttributeAdapter(attribute, stringLocalizer); } } diff --git a/labs/Teacher/Infrastructure/Web/LocalizedValidationMetadataProvider.cs b/labs/Teacher/Infrastructure/Web/LocalizedValidationMetadataProvider.cs index 807b83a3..e71a9926 100644 --- a/labs/Teacher/Infrastructure/Web/LocalizedValidationMetadataProvider.cs +++ b/labs/Teacher/Infrastructure/Web/LocalizedValidationMetadataProvider.cs @@ -16,12 +16,6 @@ namespace Infrastructure.Web public void CreateValidationMetadata(ValidationMetadataProviderContext context) { - var assembly = Assembly.GetExecutingAssembly(); - var resources = assembly.GetManifestResourceNames(); - foreach (var res in resources) - { - System.Diagnostics.Debug.WriteLine($"resource:{res} "); - } foreach (var attribute in context.ValidationMetadata.ValidatorMetadata) { var validationAttribute = attribute as ValidationAttribute; diff --git a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs index 4836259e..95508626 100644 --- a/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs +++ b/labs/Teacher/TeacherExt/Models/EditTeacherModel.cs @@ -389,7 +389,7 @@ namespace TeacherExt.Models public DateTime? FullTimeSchoolEducationDate { get; set; } [ExcelHeader("在职教育,毕业院校\r\n以毕业证为准", "2,2")] - [Description("是否提示【填写毕业院校全称】")] + [Description("填写毕业院校全称")] [SkipSearch, SkipList] [Display(Order = 350, Name = "在职教育毕业院校")] [MaxLength(50)] @@ -402,7 +402,7 @@ namespace TeacherExt.Models public string JobTimeSchoolType { get; set; } [ExcelHeader("在职教育,专业\r\n以毕业证书为准", "2,2")] - [Description("是否提示【严格按照毕业证书填写】")] + [Description("严格按照毕业证书填写")] [SkipSearch, SkipList] [Display(Order = 360, Name = "在职教育毕业证书专业")] [MaxLength(50)] diff --git a/labs/Teacher/TeacherExt/Resources/Resource.Zh-CN.resx b/labs/Teacher/TeacherExt/Resources/Resource.zh.resx similarity index 96% rename from labs/Teacher/TeacherExt/Resources/Resource.Zh-CN.resx rename to labs/Teacher/TeacherExt/Resources/Resource.zh.resx index 6250d243..6d54c69e 100644 --- a/labs/Teacher/TeacherExt/Resources/Resource.Zh-CN.resx +++ b/labs/Teacher/TeacherExt/Resources/Resource.zh.resx @@ -117,12 +117,18 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + {0}格式错误 + 最大长度为{0} 必须同意才能继续 + + {0}验证错误 + 必须输入{0} diff --git a/labs/Teacher/TeacherExt/Startup.cs b/labs/Teacher/TeacherExt/Startup.cs index 502c3a9d..8810d3f8 100644 --- a/labs/Teacher/TeacherExt/Startup.cs +++ b/labs/Teacher/TeacherExt/Startup.cs @@ -69,7 +69,7 @@ namespace TeacherExt services.AddTransient(); services.AddTransient(); services.AddLocalization(options => options.ResourcesPath = null); - //services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.Configure( options => diff --git a/labs/Teacher/TeacherExt/TeacherExt.csproj b/labs/Teacher/TeacherExt/TeacherExt.csproj index 51c5469a..4e3c1ac2 100644 --- a/labs/Teacher/TeacherExt/TeacherExt.csproj +++ b/labs/Teacher/TeacherExt/TeacherExt.csproj @@ -5,7 +5,7 @@ true en true - 1.0.0.0-beta.9 + 1.0.0.0-beta.10 13a75881-1072-47ca-88e9-4d78bd678d65