diff --git a/0001-rhbz-1541486-Fix-localized-ness-of-ooSetupFactoryUIN.patch b/0001-rhbz-1541486-Fix-localized-ness-of-ooSetupFactoryUIN.patch new file mode 100644 index 0000000..d7739b4 --- /dev/null +++ b/0001-rhbz-1541486-Fix-localized-ness-of-ooSetupFactoryUIN.patch @@ -0,0 +1,52 @@ +From ffd8369b909c86653ef30593fddf67c9f5308583 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Mon, 5 Feb 2018 17:17:17 +0100 +Subject: [PATCH] rhbz#1541486: Fix localized'ness of ooSetupFactoryUIName + props + +8f44fb5ee0bd21d192820ffd359504f6d1c68a52 "Mark Base window titles for +localisation" localized some uses of ooSetupFactoryUIName in +officecfg/registry/data/org/openoffice/Setup.xcu, but failed to mark the prop as +oor:localized="true" in officecfg/registry/schema/org/openoffice/Setup.xcs. (So +some arbitrary localized version of the prop would win at runtime, potentially +displaying certain window titles in wrong languages.) + +Other uses of ooSetupFactoryUIName in Setup.xcu (for "Calc", "Impress", +"Writer", etc.) have never been localized, and are probably not meant to be +localized. AFAICS, irrespective of oor:localized="true" in Setup.xcs, their +values not being marked with xml:lang="en-US" in Setup.xcu will mean that they +will not appear in +translations/source/*/officecfg/registry/data/org/openoffice.po and will not +accidentally start to be translated after this commit. + +(Theoretically, inconsistencies between oor:localized in xcs and uses of +xml:lang in xcu could statically be caught at build time, e.g., with +officecfg/util/sanity.xsl. However, those checks work on each XML file +individually, so don't have the schema information available when looking at +the data in the xcu file. And those checks are written in XSLT, which makes +writing new checks rather, erm, unpleasant.) + +Change-Id: I9c61e8ebf75d3d54f7e5b6688eac47a6ed8dc5c3 +Reviewed-on: https://gerrit.libreoffice.org/49252 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann +--- + officecfg/registry/schema/org/openoffice/Setup.xcs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs +index f55e3698f58f..31db1eca9af4 100644 +--- a/officecfg/registry/schema/org/openoffice/Setup.xcs ++++ b/officecfg/registry/schema/org/openoffice/Setup.xcs +@@ -149,7 +149,7 @@ + Specifies the short name of the factory. + + +- ++ + + + Specifies the UI name of the factory. +-- +2.14.3 + diff --git a/libreoffice.spec b/libreoffice.spec index f13a7a2..da99ba7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -57,7 +57,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.3 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -271,6 +271,7 @@ Patch3: 0001-gtk3-only-for-3.20.patch Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch Patch5: 0001-request-installation-of-langpack-via-packagekit.patch Patch6: 0001-the-test-is-declared-uncond.-so-define-it-so-too.patch +Patch7: 0001-rhbz-1541486-Fix-localized-ness-of-ooSetupFactoryUIN.patch %if 0%{?rhel} # not upstreamed @@ -2288,6 +2289,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Tue Feb 06 2018 Stephan Bergmann - 1:6.0.0.3-2-UNBUILT +- Resolves: rhbz#1541486 Base table dialog title shown in wrong language + * Sun Feb 04 2018 David Tardon - 1:6.0.0.3-1 - update to 6.0.0 rc3