|
 |
69cc7b |
From ffd8369b909c86653ef30593fddf67c9f5308583 Mon Sep 17 00:00:00 2001
|
|
|
69cc7b |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
69cc7b |
Date: Mon, 5 Feb 2018 17:17:17 +0100
|
|
|
69cc7b |
Subject: [PATCH] rhbz#1541486: Fix localized'ness of ooSetupFactoryUIName
|
|
|
69cc7b |
props
|
|
|
69cc7b |
|
|
|
69cc7b |
8f44fb5ee0bd21d192820ffd359504f6d1c68a52 "Mark Base window titles for
|
|
|
69cc7b |
localisation" localized some uses of ooSetupFactoryUIName in
|
|
|
69cc7b |
officecfg/registry/data/org/openoffice/Setup.xcu, but failed to mark the prop as
|
|
|
69cc7b |
oor:localized="true" in officecfg/registry/schema/org/openoffice/Setup.xcs. (So
|
|
|
69cc7b |
some arbitrary localized version of the prop would win at runtime, potentially
|
|
|
69cc7b |
displaying certain window titles in wrong languages.)
|
|
|
69cc7b |
|
|
|
69cc7b |
Other uses of ooSetupFactoryUIName in Setup.xcu (for "Calc", "Impress",
|
|
|
69cc7b |
"Writer", etc.) have never been localized, and are probably not meant to be
|
|
|
69cc7b |
localized. AFAICS, irrespective of oor:localized="true" in Setup.xcs, their
|
|
|
69cc7b |
values not being marked with xml:lang="en-US" in Setup.xcu will mean that they
|
|
|
69cc7b |
will not appear in
|
|
|
69cc7b |
translations/source/*/officecfg/registry/data/org/openoffice.po and will not
|
|
|
69cc7b |
accidentally start to be translated after this commit.
|
|
|
69cc7b |
|
|
|
69cc7b |
(Theoretically, inconsistencies between oor:localized in xcs and uses of
|
|
|
69cc7b |
xml:lang in xcu could statically be caught at build time, e.g., with
|
|
|
69cc7b |
officecfg/util/sanity.xsl. However, those checks work on each XML file
|
|
|
69cc7b |
individually, so don't have the schema information available when looking at
|
|
|
69cc7b |
the data in the xcu file. And those checks are written in XSLT, which makes
|
|
|
69cc7b |
writing new checks rather, erm, unpleasant.)
|
|
|
69cc7b |
|
|
|
69cc7b |
Change-Id: I9c61e8ebf75d3d54f7e5b6688eac47a6ed8dc5c3
|
|
|
69cc7b |
Reviewed-on: https://gerrit.libreoffice.org/49252
|
|
|
69cc7b |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
69cc7b |
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
|
69cc7b |
---
|
|
|
69cc7b |
officecfg/registry/schema/org/openoffice/Setup.xcs | 2 +-
|
|
|
69cc7b |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
69cc7b |
|
|
|
69cc7b |
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
|
|
|
69cc7b |
index f55e3698f58f..31db1eca9af4 100644
|
|
|
69cc7b |
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
|
|
|
69cc7b |
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
|
|
|
69cc7b |
@@ -149,7 +149,7 @@
|
|
|
69cc7b |
<desc>Specifies the short name of the factory.</desc>
|
|
|
69cc7b |
</info>
|
|
|
69cc7b |
</prop>
|
|
|
69cc7b |
- <prop oor:name="ooSetupFactoryUIName" oor:type="xs:string">
|
|
|
69cc7b |
+ <prop oor:name="ooSetupFactoryUIName" oor:type="xs:string" oor:localized="true">
|
|
|
69cc7b |
|
|
|
69cc7b |
<info>
|
|
|
69cc7b |
<desc>Specifies the UI name of the factory.</desc>
|
|
|
69cc7b |
--
|
|
|
69cc7b |
2.14.3
|
|
|
69cc7b |
|