From 5b235ffd25e400cb16076f18907acf135eb0a212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=80=A1=E9=A3=9E?= <363301617@qq.com>
Date: Tue, 13 Aug 2024 20:09:19 +0800
Subject: [PATCH] Update zh-hans-cn to zh-hans

Update zh-hans-cn to zh-hans
---
 GetStoreApp/GetStoreApp.csproj                       |  5 +++--
 .../Services/Controls/Settings/LanguageService.cs    |  5 +----
 .../Strings/{zh-hans-cn => zh-hans}/About.resw       |  0
 .../Strings/{zh-hans-cn => zh-hans}/AppManager.resw  |  0
 .../Strings/{zh-hans-cn => zh-hans}/AppUpdate.resw   |  0
 .../Strings/{zh-hans-cn => zh-hans}/Console.resw     |  0
 .../Strings/{zh-hans-cn => zh-hans}/Dialog.resw      |  0
 .../Strings/{zh-hans-cn => zh-hans}/Download.resw    |  0
 .../{zh-hans-cn => zh-hans}/Notification.resw        |  0
 .../Strings/{zh-hans-cn => zh-hans}/Resources.resw   |  0
 .../Strings/{zh-hans-cn => zh-hans}/Settings.resw    |  0
 .../Strings/{zh-hans-cn => zh-hans}/Store.resw       |  0
 .../Strings/{zh-hans-cn => zh-hans}/WebView.resw     |  0
 .../Strings/{zh-hans-cn => zh-hans}/WinGet.resw      |  0
 .../Strings/{zh-hans-cn => zh-hans}/Window.resw      |  0
 GetStoreApp/Views/Pages/SettingsPage.xaml            |  2 +-
 GetStoreApp/Views/Pages/SettingsPage.xaml.cs         | 12 ++++++++++--
 GetStoreAppPackage/GetStoreAppPackage.wapproj        |  2 +-
 GetStoreAppPackage/Package.appxmanifest              |  2 +-
 19 files changed, 17 insertions(+), 11 deletions(-)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/About.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/AppManager.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/AppUpdate.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Console.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Dialog.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Download.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Notification.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Resources.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Settings.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Store.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/WebView.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/WinGet.resw (100%)
 rename GetStoreApp/Strings/{zh-hans-cn => zh-hans}/Window.resw (100%)

diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
index ccc06c4bb..3d81c1fdb 100644
--- a/GetStoreApp/GetStoreApp.csproj
+++ b/GetStoreApp/GetStoreApp.csproj
@@ -19,6 +19,7 @@
     <IsAotCompatible>true</IsAotCompatible>
     <LangVersion>latest</LangVersion>
     <OptimizationPreference>Size</OptimizationPreference>
+    <Optimize>False</Optimize>
     <OutputType>WinExe</OutputType>
     <Platforms>x86;x64;ARM64</Platforms>
     <PublishProtocol>FileSystem</PublishProtocol>
@@ -156,10 +157,10 @@
   </ItemGroup>
 
   <!-- 在 Debug 调试模式下测试 AOT 发布后的文件 -->
-  <!--<Target Name="AutoPublish" AfterTargets="AfterBuild" Condition="$(Configuration) == 'Debug'">
+  <Target Name="AutoPublish" AfterTargets="AfterBuild" Condition="$(Configuration) == 'Debug'">
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" />
     <Copy SourceFiles="$(NativeOutputPath)$(AssemblyName).exe" DestinationFiles="$(ProjectDir)obj\$(Platform)\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\apphost.exe" />
-  </Target>-->
+  </Target>
   
   <!-- 捆绑前对二进制文件进行后处理 -->
   <!-- 该任务会在 Debug 以 AOT 发布时触发，故限制在 Release 模式下进行操作 -->
diff --git a/GetStoreApp/Services/Controls/Settings/LanguageService.cs b/GetStoreApp/Services/Controls/Settings/LanguageService.cs
index ff19282a7..42088b1f8 100644
--- a/GetStoreApp/Services/Controls/Settings/LanguageService.cs
+++ b/GetStoreApp/Services/Controls/Settings/LanguageService.cs
@@ -90,7 +90,6 @@ private static DictionaryEntry GetLanguage()
                 {
                     SetLanguage(currentLanguage);
                     FlowDirection = currentCulture.TextInfo.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
-                    System.IO.File.AppendAllText("D:\\01.txt", currentCulture.TextInfo.IsRightToLeft.ToString() + Environment.NewLine);
                     return currentLanguage;
                 }
                 else
@@ -102,7 +101,6 @@ private static DictionaryEntry GetLanguage()
                     {
                         SetLanguage(currentParentLanguage);
                         FlowDirection = currentParentCulture.TextInfo.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
-                        System.IO.File.AppendAllText("D:\\01.txt", currentCulture.TextInfo.IsRightToLeft.ToString() + Environment.NewLine);
                         return currentParentLanguage;
                     }
 
@@ -111,7 +109,6 @@ private static DictionaryEntry GetLanguage()
                     {
                         SetLanguage(DefaultAppLanguage);
                         FlowDirection = CultureInfo.GetCultureInfo(DefaultAppLanguage.Value.ToString()).TextInfo.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
-                        System.IO.File.AppendAllText("D:\\01.txt", currentCulture.TextInfo.IsRightToLeft.ToString() + Environment.NewLine);
                         return DefaultAppLanguage;
                     }
                 }
@@ -120,7 +117,7 @@ private static DictionaryEntry GetLanguage()
             {
                 CultureInfo savedCultureInfo = CultureInfo.GetCultureInfo(language.ToString());
                 FlowDirection = savedCultureInfo.TextInfo.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
-                return LanguageList.Find(item => item.Value.ToString().Contains(language.ToString(), StringComparison.OrdinalIgnoreCase));
+                return LanguageList.Find(item => language.ToString().Contains(item.Value.ToString(), StringComparison.OrdinalIgnoreCase));
             }
         }
 
diff --git a/GetStoreApp/Strings/zh-hans-cn/About.resw b/GetStoreApp/Strings/zh-hans/About.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/About.resw
rename to GetStoreApp/Strings/zh-hans/About.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/AppManager.resw b/GetStoreApp/Strings/zh-hans/AppManager.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/AppManager.resw
rename to GetStoreApp/Strings/zh-hans/AppManager.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/AppUpdate.resw b/GetStoreApp/Strings/zh-hans/AppUpdate.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/AppUpdate.resw
rename to GetStoreApp/Strings/zh-hans/AppUpdate.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Console.resw b/GetStoreApp/Strings/zh-hans/Console.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Console.resw
rename to GetStoreApp/Strings/zh-hans/Console.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Dialog.resw b/GetStoreApp/Strings/zh-hans/Dialog.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Dialog.resw
rename to GetStoreApp/Strings/zh-hans/Dialog.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Download.resw b/GetStoreApp/Strings/zh-hans/Download.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Download.resw
rename to GetStoreApp/Strings/zh-hans/Download.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Notification.resw b/GetStoreApp/Strings/zh-hans/Notification.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Notification.resw
rename to GetStoreApp/Strings/zh-hans/Notification.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Resources.resw b/GetStoreApp/Strings/zh-hans/Resources.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Resources.resw
rename to GetStoreApp/Strings/zh-hans/Resources.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Settings.resw b/GetStoreApp/Strings/zh-hans/Settings.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Settings.resw
rename to GetStoreApp/Strings/zh-hans/Settings.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Store.resw b/GetStoreApp/Strings/zh-hans/Store.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Store.resw
rename to GetStoreApp/Strings/zh-hans/Store.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/WebView.resw b/GetStoreApp/Strings/zh-hans/WebView.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/WebView.resw
rename to GetStoreApp/Strings/zh-hans/WebView.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/WinGet.resw b/GetStoreApp/Strings/zh-hans/WinGet.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/WinGet.resw
rename to GetStoreApp/Strings/zh-hans/WinGet.resw
diff --git a/GetStoreApp/Strings/zh-hans-cn/Window.resw b/GetStoreApp/Strings/zh-hans/Window.resw
similarity index 100%
rename from GetStoreApp/Strings/zh-hans-cn/Window.resw
rename to GetStoreApp/Strings/zh-hans/Window.resw
diff --git a/GetStoreApp/Views/Pages/SettingsPage.xaml b/GetStoreApp/Views/Pages/SettingsPage.xaml
index ab1a59d62..4364f291d 100644
--- a/GetStoreApp/Views/Pages/SettingsPage.xaml
+++ b/GetStoreApp/Views/Pages/SettingsPage.xaml
@@ -701,7 +701,7 @@
                         Grid.Column="0"
                         Margin="0,0,12,0"
                         FontSize="16"
-                        Glyph="&#xE773;" />
+                        Glyph="&#xE721;" />
 
                     <StackPanel Grid.Column="1" Orientation="Vertical">
                         <TextBlock
diff --git a/GetStoreApp/Views/Pages/SettingsPage.xaml.cs b/GetStoreApp/Views/Pages/SettingsPage.xaml.cs
index bd9b8c544..edfbc829e 100644
--- a/GetStoreApp/Views/Pages/SettingsPage.xaml.cs
+++ b/GetStoreApp/Views/Pages/SettingsPage.xaml.cs
@@ -27,8 +27,8 @@
 using Windows.System;
 using WinRT.Interop;
 
-// 抑制 IDE0060 警告
-#pragma warning disable IDE0060
+// 抑制 CA1822，IDE0060 警告
+#pragma warning disable CA1822,IDE0060
 
 namespace GetStoreApp.Views.Pages
 {
@@ -731,6 +731,14 @@ private void OnAlwaysShowBackdropToggled(object sender, RoutedEventArgs args)
         /// </summary>
         private void OnOpened(object sender, object args)
         {
+            foreach (LanguageModel languageItem in LanguageCollection)
+            {
+                if (languageItem.IsChecked)
+                {
+                    LanguageListView.ScrollIntoView(languageItem);
+                    break;
+                }
+            }
         }
 
         /// <summary>
diff --git a/GetStoreAppPackage/GetStoreAppPackage.wapproj b/GetStoreAppPackage/GetStoreAppPackage.wapproj
index e15fb9438..085dd96da 100644
--- a/GetStoreAppPackage/GetStoreAppPackage.wapproj
+++ b/GetStoreAppPackage/GetStoreAppPackage.wapproj
@@ -39,7 +39,7 @@
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundleAutoResourcePackageQualifiers>DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
     <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
-    <AppxDefaultResourceQualifiers>Language=EN-US;ZH-HANS-CN</AppxDefaultResourceQualifiers>
+    <AppxDefaultResourceQualifiers>Language=AR;EN-US;ZH-HANS</AppxDefaultResourceQualifiers>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxPackageSigningTimestampServerUrl>http://timestamp.digicert.com</AppxPackageSigningTimestampServerUrl>
diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
index 4cf0c8fc2..c1b025349 100644
--- a/GetStoreAppPackage/Package.appxmanifest
+++ b/GetStoreAppPackage/Package.appxmanifest
@@ -27,7 +27,7 @@
   <Resources>
     <Resource Language="AR" />
     <Resource Language="EN-US" />
-    <Resource Language="ZH-HANS-CN" />
+    <Resource Language="ZH-HANS" />
   </Resources>
 
   <Applications>