From cc8ee1c9f0b470f2e6610e69262260f429960b92 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 14 Mar 2022 12:47:24 -0700
Subject: Use UTF-8 for Kazakh language

Fixes 5685
---
 .../UI/test/WixToolsetTest.UI/UIExtensionFixture.cs  | 20 ++++++++++++++++++++
 src/ext/UI/wixlib/WixUI_kk-KZ.wxl                    |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/ext')

diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index 4ab7ec3f..4b1c8575 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -99,6 +99,18 @@ namespace WixToolsetTest.UI
             Assert.Single(results, result => result.StartsWith("Dialog:WelcomeEulaDlg\t"));
         }
 
+        [Fact]
+        public void CanBuildUsingWixUIMinimalInKazakh()
+        {
+            var folder = TestData.Get(@"TestData\WixUI_Minimal");
+            var bindFolder = TestData.Get(@"TestData\data");
+            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
+
+            var results = build.BuildAndQuery(BuildInKazakh, "Dialog");
+            var welcomeDlg = results.Where(r => r.StartsWith("Dialog:WelcomeDlg\t")).Select(r => r.Split('\t')).Single();
+            Assert.Equal("[ProductName] бағдарламасын орнату", welcomeDlg[6]);
+        }
+
         [Fact]
         public void CanBuildUsingWixUIMinimalAndReadPdb()
         {
@@ -177,5 +189,13 @@ namespace WixToolsetTest.UI
             var result = WixRunner.Execute(localizedArgs)
                                   .AssertSuccess();
         }
+
+        private static void BuildInKazakh(string[] args)
+        {
+            var localizedArgs = args.Append("-culture").Append("kk-KZ").ToArray();
+
+            var result = WixRunner.Execute(localizedArgs)
+                                  .AssertSuccess();
+        }
     }
 }
diff --git a/src/ext/UI/wixlib/WixUI_kk-KZ.wxl b/src/ext/UI/wixlib/WixUI_kk-KZ.wxl
index 2e15277e..33c37292 100644
--- a/src/ext/UI/wixlib/WixUI_kk-KZ.wxl
+++ b/src/ext/UI/wixlib/WixUI_kk-KZ.wxl
@@ -2,7 +2,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<WixLocalization Culture="kk-kz" Codepage="1251" xmlns="http://wixtoolset.org/schemas/v4/wxl">
+<WixLocalization Culture="kk-kz" Codepage="65001" SummaryInformationCodepage="1251" xmlns="http://wixtoolset.org/schemas/v4/wxl">
     <String Id="WixUIBack" Overridable="yes">&amp;Артқа</String>
     <String Id="WixUINext" Overridable="yes">&amp;Келесі</String>
     <String Id="WixUICancel" Overridable="yes">Болдырмау</String>
-- 
cgit v1.2.3-55-g6feb