aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-03-14 12:47:24 -0700
committerRob Mensching <rob@firegiant.com>2022-03-14 14:37:27 -0700
commitcc8ee1c9f0b470f2e6610e69262260f429960b92 (patch)
tree17af8812add13ee58a822fd4aa0289006d588988
parent9453eaa9a38f78e248526ddd996485140a5d4d9a (diff)
downloadwix-cc8ee1c9f0b470f2e6610e69262260f429960b92.tar.gz
wix-cc8ee1c9f0b470f2e6610e69262260f429960b92.tar.bz2
wix-cc8ee1c9f0b470f2e6610e69262260f429960b92.zip
Use UTF-8 for Kazakh language
Fixes 5685
-rw-r--r--src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs20
-rw-r--r--src/ext/UI/wixlib/WixUI_kk-KZ.wxl2
2 files changed, 21 insertions, 1 deletions
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
@@ -100,6 +100,18 @@ namespace WixToolsetTest.UI
100 } 100 }
101 101
102 [Fact] 102 [Fact]
103 public void CanBuildUsingWixUIMinimalInKazakh()
104 {
105 var folder = TestData.Get(@"TestData\WixUI_Minimal");
106 var bindFolder = TestData.Get(@"TestData\data");
107 var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
108
109 var results = build.BuildAndQuery(BuildInKazakh, "Dialog");
110 var welcomeDlg = results.Where(r => r.StartsWith("Dialog:WelcomeDlg\t")).Select(r => r.Split('\t')).Single();
111 Assert.Equal("[ProductName] бағдарламасын орнату", welcomeDlg[6]);
112 }
113
114 [Fact]
103 public void CanBuildUsingWixUIMinimalAndReadPdb() 115 public void CanBuildUsingWixUIMinimalAndReadPdb()
104 { 116 {
105 var folder = TestData.Get(@"TestData\WixUI_Minimal"); 117 var folder = TestData.Get(@"TestData\WixUI_Minimal");
@@ -177,5 +189,13 @@ namespace WixToolsetTest.UI
177 var result = WixRunner.Execute(localizedArgs) 189 var result = WixRunner.Execute(localizedArgs)
178 .AssertSuccess(); 190 .AssertSuccess();
179 } 191 }
192
193 private static void BuildInKazakh(string[] args)
194 {
195 var localizedArgs = args.Append("-culture").Append("kk-KZ").ToArray();
196
197 var result = WixRunner.Execute(localizedArgs)
198 .AssertSuccess();
199 }
180 } 200 }
181} 201}
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 @@
2<!-- 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. --> 2<!-- 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. -->
3 3
4 4
5<WixLocalization Culture="kk-kz" Codepage="1251" xmlns="http://wixtoolset.org/schemas/v4/wxl"> 5<WixLocalization Culture="kk-kz" Codepage="65001" SummaryInformationCodepage="1251" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6 <String Id="WixUIBack" Overridable="yes">&amp;Артқа</String> 6 <String Id="WixUIBack" Overridable="yes">&amp;Артқа</String>
7 <String Id="WixUINext" Overridable="yes">&amp;Келесі</String> 7 <String Id="WixUINext" Overridable="yes">&amp;Келесі</String>
8 <String Id="WixUICancel" Overridable="yes">Болдырмау</String> 8 <String Id="WixUICancel" Overridable="yes">Болдырмау</String>