configmgr/qa/unit/test.cxx | 8 ++++++++
test/user-template/registry-common/modifications.xcd | 2 ++
2 files changed, 10 insertions(+)
New commits:
commit 302a22cd19e6f6963fc8eb0b9a581c7eff5e5430
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Feb 17 12:55:19 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Feb 17 18:56:56 2023 +0000
Verify that zh-Hant-TW locale works in configmgr as intended
...after b52117c0be97c45824d2897657084f8ac7e9bf42 "Try an override locale as
first fallback"
Change-Id: I23d8459fff4d76fd9d542d098953bf97cf5397a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147219
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 03d44a9947ee..60d19be8472c 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -333,6 +333,14 @@ void Test::testLocalizedProperty() {
access->getByHierarchicalName("/org.libreoffice.unittest/localized/*es-419")
>>= v);
CPPUNIT_ASSERT_EQUAL(OUString("es"), v);
}
+ {
+ // See
<https://git.libreoffice.org/core/+/dfc28be2487c13be36a90efd778b8d8f179c589d%5E%21>
+ // "configmgr: Use a proper LanguageTag-based locale fallback
mechanism":
+ OUString v;
+ CPPUNIT_ASSERT(
+
access->getByHierarchicalName("/org.libreoffice.unittest/localized/*zh-Hant-TW")
>>= v);
+ CPPUNIT_ASSERT_EQUAL(OUString("zh-TW"), v);
+ }
{
// Make sure a degenerate passed-in "-" locale is handled gracefully:
OUString v;
diff --git a/test/user-template/registry-common/modifications.xcd
b/test/user-template/registry-common/modifications.xcd
index fff0045b08ee..a212242785ea 100644
--- a/test/user-template/registry-common/modifications.xcd
+++ b/test/user-template/registry-common/modifications.xcd
@@ -22,6 +22,8 @@
<value xml:lang="en-US">en-US</value>
<value xml:lang="es">es</value>
<value xml:lang="pt-PT">pt-PT</value>
+ <value xml:lang="zh-CN">zh-CN</value>
+ <value xml:lang="zh-TW">zh-TW</value>
</prop>
<prop oor:name="noDefaultLang">
<value xml:lang="en-US">en-US</value>
