Merge pull request #1112 from dotnetcore/i18n-dev

I18n 🚑 增加默认的英文翻译
dotnetcore · May 22, 2022 · ef42ced · ef42ced
2 parents 3782b02 + fbbc043
commit ef42ced
Show file tree

Hide file tree

Showing 8 changed files with 501 additions and 505 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<Version>3.2.650-preview20220521</Version>
+		<Version>3.2.650-preview20220521-2</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.DbContext/Properties/DbContextStrings.resx b/FreeSql.DbContext/Properties/DbContextStrings.resx
diff --git a/FreeSql.Tests/FreeSql.Tests/Properties/CoreStringsTests.cs b/FreeSql.Tests/FreeSql.Tests/Properties/CoreStringsTests.cs
@@ -24,7 +24,11 @@ public CoreStringsTests(ITestOutputHelper output)
         public void AsTable_PropertyName_NotDateTimeTest()
         {
             var x = CoreStrings.CustomFieldSeparatedBySpaces;
+            output.WriteLine(x);
             x = CoreStrings.Custom_StaticMethodName_IsNotNull;
+            output.WriteLine(x);
+            x = CoreStrings.Custom_Reflection_IsNotNull;
+            output.WriteLine(x);
             string text = CoreStrings.AsTable_PropertyName_NotDateTime("1");
             output.WriteLine(text);
         }

diff --git a/FreeSql.Tests/FreeSql.Tests/Properties/DbContextStringsTests.cs b/FreeSql.Tests/FreeSql.Tests/Properties/DbContextStringsTests.cs
@@ -21,7 +21,7 @@ public DbContextStringsTests(ITestOutputHelper output)
             //Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US");
             //Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en-US");
 
-            //DbContextStrings.Culture= new System.Globalization.CultureInfo("zh-CN");
+            //DbContextStrings.Culture= new System.Globalization.CultureInfo("zh-Hans");
             DbContextStrings.Culture = new System.Globalization.CultureInfo("en-US");
         }
 

diff --git a/FreeSql.sln b/FreeSql.sln
@@ -687,8 +687,8 @@ Global
 		{D4FEE5C1-6805-4B46-B10B-BE5CC942B883} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
+		RESX_NeutralResourcesLanguage = en-US
+		RESX_PrefixTranslations = True
 		SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}
-		RESX_PrefixTranslations = False
-		RESX_NeutralResourcesLanguage = zh-Hans
 	EndGlobalSection
 EndGlobal
diff --git a/FreeSql/Properties/CoreStrings.resx b/FreeSql/Properties/CoreStrings.resx
diff --git a/FreeSql/Properties/CoreStrings.zh-Hans.resx b/FreeSql/Properties/CoreStrings.zh-Hans.resx
@@ -495,4 +495,7 @@
   <data name="Use_InsertDict_Method" xml:space="preserve">
     <value>请使用 fsql.InsertDict(dict) 方法插入字典数据</value>
   </data>
+  <data name="A" xml:space="preserve">
+    <value>Test</value>
+  </data>
 </root>