From 6ba268bf58d49f3ec78d04d6485ea5078701b513 Mon Sep 17 00:00:00 2001 From: botcher Date: Tue, 20 Sep 2022 10:09:44 +0800 Subject: [PATCH] Use the neutral cultures zh-Hans and zh-Hant Problem: Refer to https://github.com/dotnet/msbuild/issues/3897 When building with dotnet cli, certain cultures cannot be utilized for resource localization, such as getting localized strings. This impacts both the build process (e.g., identifying and processing resource files) and the lookup of resources at runtime. For example: MyStrings.zh-TW.resx will not have a resource assembly created. Solution: This change renames all *.zh-CN.resx to *.zh-Hans.resx and *.zh-TW.resx to *.zh-Hant.resx. Test Done: Local build with dotnet cli and verified chinese assemblies are created. --- .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 ModernWpf/Resources/{Strings.zh-CN.resx => Strings.zh-Hans.resx} | 0 ModernWpf/Resources/{Strings.zh-TW.resx => Strings.zh-Hant.resx} | 0 .../Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} | 0 .../Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename ModernWpf.Controls/NavigationView/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf.Controls/NavigationView/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) rename ModernWpf.Controls/NumberBox/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf.Controls/NumberBox/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) rename ModernWpf.Controls/PersonPicture/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf.Controls/PersonPicture/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) rename ModernWpf.Controls/ProgressRing/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf.Controls/ProgressRing/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) rename ModernWpf.Controls/RatingControl/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf.Controls/RatingControl/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) rename ModernWpf.Controls/SplitButton/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf.Controls/SplitButton/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) rename ModernWpf/ProgressBar/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf/ProgressBar/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) rename ModernWpf/Resources/{Strings.zh-CN.resx => Strings.zh-Hans.resx} (100%) rename ModernWpf/Resources/{Strings.zh-TW.resx => Strings.zh-Hant.resx} (100%) rename ModernWpf/TextContextMenu/Strings/{Resources.zh-CN.resx => Resources.zh-Hans.resx} (100%) rename ModernWpf/TextContextMenu/Strings/{Resources.zh-TW.resx => Resources.zh-Hant.resx} (100%) diff --git a/ModernWpf.Controls/NavigationView/Strings/Resources.zh-CN.resx b/ModernWpf.Controls/NavigationView/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf.Controls/NavigationView/Strings/Resources.zh-CN.resx rename to ModernWpf.Controls/NavigationView/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf.Controls/NavigationView/Strings/Resources.zh-TW.resx b/ModernWpf.Controls/NavigationView/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf.Controls/NavigationView/Strings/Resources.zh-TW.resx rename to ModernWpf.Controls/NavigationView/Strings/Resources.zh-Hant.resx diff --git a/ModernWpf.Controls/NumberBox/Strings/Resources.zh-CN.resx b/ModernWpf.Controls/NumberBox/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf.Controls/NumberBox/Strings/Resources.zh-CN.resx rename to ModernWpf.Controls/NumberBox/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf.Controls/NumberBox/Strings/Resources.zh-TW.resx b/ModernWpf.Controls/NumberBox/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf.Controls/NumberBox/Strings/Resources.zh-TW.resx rename to ModernWpf.Controls/NumberBox/Strings/Resources.zh-Hant.resx diff --git a/ModernWpf.Controls/PersonPicture/Strings/Resources.zh-CN.resx b/ModernWpf.Controls/PersonPicture/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf.Controls/PersonPicture/Strings/Resources.zh-CN.resx rename to ModernWpf.Controls/PersonPicture/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf.Controls/PersonPicture/Strings/Resources.zh-TW.resx b/ModernWpf.Controls/PersonPicture/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf.Controls/PersonPicture/Strings/Resources.zh-TW.resx rename to ModernWpf.Controls/PersonPicture/Strings/Resources.zh-Hant.resx diff --git a/ModernWpf.Controls/ProgressRing/Strings/Resources.zh-CN.resx b/ModernWpf.Controls/ProgressRing/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf.Controls/ProgressRing/Strings/Resources.zh-CN.resx rename to ModernWpf.Controls/ProgressRing/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf.Controls/ProgressRing/Strings/Resources.zh-TW.resx b/ModernWpf.Controls/ProgressRing/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf.Controls/ProgressRing/Strings/Resources.zh-TW.resx rename to ModernWpf.Controls/ProgressRing/Strings/Resources.zh-Hant.resx diff --git a/ModernWpf.Controls/RatingControl/Strings/Resources.zh-CN.resx b/ModernWpf.Controls/RatingControl/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf.Controls/RatingControl/Strings/Resources.zh-CN.resx rename to ModernWpf.Controls/RatingControl/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf.Controls/RatingControl/Strings/Resources.zh-TW.resx b/ModernWpf.Controls/RatingControl/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf.Controls/RatingControl/Strings/Resources.zh-TW.resx rename to ModernWpf.Controls/RatingControl/Strings/Resources.zh-Hant.resx diff --git a/ModernWpf.Controls/SplitButton/Strings/Resources.zh-CN.resx b/ModernWpf.Controls/SplitButton/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf.Controls/SplitButton/Strings/Resources.zh-CN.resx rename to ModernWpf.Controls/SplitButton/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf.Controls/SplitButton/Strings/Resources.zh-TW.resx b/ModernWpf.Controls/SplitButton/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf.Controls/SplitButton/Strings/Resources.zh-TW.resx rename to ModernWpf.Controls/SplitButton/Strings/Resources.zh-Hant.resx diff --git a/ModernWpf/ProgressBar/Strings/Resources.zh-CN.resx b/ModernWpf/ProgressBar/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf/ProgressBar/Strings/Resources.zh-CN.resx rename to ModernWpf/ProgressBar/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf/ProgressBar/Strings/Resources.zh-TW.resx b/ModernWpf/ProgressBar/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf/ProgressBar/Strings/Resources.zh-TW.resx rename to ModernWpf/ProgressBar/Strings/Resources.zh-Hant.resx diff --git a/ModernWpf/Resources/Strings.zh-CN.resx b/ModernWpf/Resources/Strings.zh-Hans.resx similarity index 100% rename from ModernWpf/Resources/Strings.zh-CN.resx rename to ModernWpf/Resources/Strings.zh-Hans.resx diff --git a/ModernWpf/Resources/Strings.zh-TW.resx b/ModernWpf/Resources/Strings.zh-Hant.resx similarity index 100% rename from ModernWpf/Resources/Strings.zh-TW.resx rename to ModernWpf/Resources/Strings.zh-Hant.resx diff --git a/ModernWpf/TextContextMenu/Strings/Resources.zh-CN.resx b/ModernWpf/TextContextMenu/Strings/Resources.zh-Hans.resx similarity index 100% rename from ModernWpf/TextContextMenu/Strings/Resources.zh-CN.resx rename to ModernWpf/TextContextMenu/Strings/Resources.zh-Hans.resx diff --git a/ModernWpf/TextContextMenu/Strings/Resources.zh-TW.resx b/ModernWpf/TextContextMenu/Strings/Resources.zh-Hant.resx similarity index 100% rename from ModernWpf/TextContextMenu/Strings/Resources.zh-TW.resx rename to ModernWpf/TextContextMenu/Strings/Resources.zh-Hant.resx