Add language support for zh_CN and zh_TW

README.md

@@ -167,6 +167,34 @@ To just need to include `/<resources-file-name>/` before the string resource ide
     | ---- | ----- |
     | ButtonFlyoutMessage.Text | ¡Esto es un mensaje increíble! |
 
+- zh-CN:
+
+  - Resources.resw
+
+    | Name | Value |
+    | ---- | ----- |
+    | TestPageButton.Content | 完美! |
+
+  - Messages.resw
+
+    | Name | Value |
+    | ---- | ----- |
+    | ButtonFlyoutMessage.Text | 这是一条完美的消息！ |
+
+- zh-TW:
+
+  - Resources.resw
+
+    | Name | Value |
+    | ---- | ----- |
+    | TestPageButton.Content | 完美! |
+
+  - Messages.resw
+
+    | Name | Value |
+    | ---- | ----- |
+    | ButtonFlyoutMessage.Text | 這是一條完美的消息！ |
+
 - ja:
 
   - Resources.resw
@@ -221,6 +249,26 @@ In this case, we just use the `Uid` as `Name`.
     | Green | Verde |
     | Blue | Azul |
 
+- zh-CN:
+
+  - Resources.resw
+
+    | Name | Value |
+    | ---- | ----- |
+    | Red | 红 |
+    | Green | 绿 |
+    | Blue | 蓝 |
+
+- zh-TW:
+
+  - Resources.resw
+
+    | Name | Value |
+    | ---- | ----- |
+    | Red | 紅 |
+    | Green | 緑 |
+    | Blue | 藍 |
+
 - ja:
 
   - Resources.resw

WinUI3Localizer.SampleApp/App.xaml.cs

@@ -160,6 +160,10 @@ private static async Task PrepareEnvironmentForWinUI3LocalizerOnPackagedApp()
         await MakeSureStringResourceFileExists(stringsFolder, "en-US", "ErrorMessages.resw");
         await MakeSureStringResourceFileExists(stringsFolder, "es-ES", "Resources.resw");
         await MakeSureStringResourceFileExists(stringsFolder, "es-ES", "ErrorMessages.resw");
+        await MakeSureStringResourceFileExists(stringsFolder, "zh-CN", "Resources.resw");
+        await MakeSureStringResourceFileExists(stringsFolder, "zh-CN", "ErrorMessages.resw");
+        await MakeSureStringResourceFileExists(stringsFolder, "zh-TW", "Resources.resw");
+        await MakeSureStringResourceFileExists(stringsFolder, "zh-TW", "ErrorMessages.resw");
         await MakeSureStringResourceFileExists(stringsFolder, "ja", "Resources.resw");
         await MakeSureStringResourceFileExists(stringsFolder, "ja", "ErrorMessages.resw");
     }

WinUI3Localizer.SampleApp/ShellPage.xaml

@@ -14,6 +14,7 @@
         <NavigationView
             x:Name="NavigationViewControl"
             PaneDisplayMode="Top"
+            BackRequested = "NavigationViewControl_BackRequested"
             SelectionChanged="NavigationView_SelectionChanged">
             <NavigationView.MenuItems>
                 <NavigationViewItem

WinUI3Localizer.SampleApp/ShellPage.xaml.cs

@@ -1,6 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Navigation;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,6 +22,7 @@ public ShellPage()
             .FirstOrDefault(x => x.Language == Localizer.Get().GetCurrentLanguage());
 
         this.NavigationViewControl.Loaded += NavigationViewControl_Loaded;
+        this.ContentFrame.Navigated += On_Navigated;
 
         LanguageDictionaryItems = Localizer
             .Get()
@@ -42,7 +44,42 @@ private void NavigationViewControl_Loaded(object sender, RoutedEventArgs e)
             Uids.SetUid(settingsItem, "MainWindow_NavigationView_Settings");
         }
     }
+    private void NavigationViewControl_BackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args)
+    {
+        if (sender.IsPaneOpen && (sender.DisplayMode == NavigationViewDisplayMode.Compact || sender.DisplayMode == NavigationViewDisplayMode.Minimal))
+        {
+            return;
+        }
+        this.ContentFrame.GoBack();
+    }
+    private void On_Navigated(object sender, NavigationEventArgs e)
+    {
+        this.NavigationViewControl.IsBackEnabled = this.ContentFrame.CanGoBack;
 
+        if (this.ContentFrame.SourcePageType == typeof(SettingsPage))
+        {
+            // SettingsItem is not part of NavView.MenuItems, and doesn't have a Tag.
+            this.NavigationViewControl.SelectedItem = (NavigationViewItem)this.NavigationViewControl.SettingsItem;
+
+            // We don't use Control.Header sofar
+            // NavigationViewControl.Header = "Settings";
+        }
+        else if (this.ContentFrame.SourcePageType != null)
+        {
+            // Select the nav view item that corresponds to the page being navigated to.
+            string? s = this.ContentFrame.SourcePageType.FullName;
+            string result = s?.Substring(s.LastIndexOf('.') + 1) ?? string.Empty;
+            if (result.Length > 0)
+            {
+                this.NavigationViewControl.SelectedItem = this.NavigationViewControl.MenuItems
+                            .OfType<NavigationViewItem>()
+                            .First(i => i.Tag.Equals(result));
+
+                // We don't use Control.Header sofar
+                //this.NavigationViewControl.Header = ((NavigationViewItem)this.NavigationViewControl.SelectedItem).Tag;
+            }
+        }
+    }
     private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
     {
         if (args.IsSettingsSelected is true)

WinUI3Localizer.SampleApp/Strings/en-US/Resources.resw

@@ -284,4 +284,16 @@ To scope a string resource identifier reference to a particular file, you just a
   <data name="StylesPage_Top.Text" xml:space="preserve">
     <value>Top</value>
   </data>
+  <data name="zh-CN" xml:space="preserve">
+    <value>中文</value>
+  </data>
+  <data name="MainWindow_zh-CN.Text" xml:space="preserve">
+    <value>Chinese [中文]</value>
+  </data>
+  <data name="zh-TW" xml:space="preserve">
+    <value>繁體中文</value>
+  </data>
+  <data name="MainWindow_zh-TW.Text" xml:space="preserve">
+    <value>Chinese Traditional [繁體中文]</value>
+  </data>
 </root>

WinUI3Localizer.SampleApp/Strings/es-ES/Resources.resw

@@ -284,4 +284,16 @@ Para especificar el alcance de un identificador de recurso de cadena a un archiv
   <data name="StylesPage_Top.Text" xml:space="preserve">
     <value>Arriba</value>
   </data>
+  <data name="zh-CN" xml:space="preserve">
+    <value>中文</value>
+  </data>
+  <data name="MainWindow_zh-CN.Text" xml:space="preserve">
+    <value>Chino [中文]</value>
+  </data>
+  <data name="MainWindow_zh-TW.Text" xml:space="preserve">
+    <value>Chino Tradicional [繁體中文]</value>
+  </data>
+  <data name="zh-TW" xml:space="preserve">
+    <value>繁體中文</value>
+  </data>
 </root>

WinUI3Localizer.SampleApp/Strings/ja/Resources.resw

@@ -284,4 +284,16 @@
   <data name="StylesPage_Top.Text" xml:space="preserve">
     <value>上</value>
   </data>
+  <data name="zh-CN" xml:space="preserve">
+    <value>中文</value>
+  </data>
+  <data name="MainWindow_zh-CN.Text" xml:space="preserve">
+    <value>中国語</value>
+  </data>
+  <data name="MainWindow_zh-TW.Text" xml:space="preserve">
+    <value>繁体中国語</value>
+  </data>
+  <data name="zh-TW" xml:space="preserve">
+    <value>繁體中文</value>
+  </data>
 </root>

WinUI3Localizer.SampleApp/Strings/zh-CN/ErrorMessages.resw

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ErrorMessageExample.Text" xml:space="preserve">
+    <value>错误消息示例</value>
+  </data>
+</root>