[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - i18npool/Library_localedata_euro.mk i18npool/source
Eike Rathke (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 31 22:26:25 UTC 2019
i18npool/Library_localedata_euro.mk | 1
i18npool/source/localedata/data/pl_PL.xml | 12 -
i18npool/source/localedata/data/szl_PL.xml | 244 +++++++++++++++++++++++++++++
i18npool/source/localedata/localedata.cxx | 1
4 files changed, 252 insertions(+), 6 deletions(-)
New commits:
commit 1b2a1b5a91b2a50fd35cee0cc18e45f70aeda5f1
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Fri May 31 18:44:22 2019 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Sat Jun 1 00:25:58 2019 +0200
Resolves: tdf#125590 add Silesian [szl-PL] locale data
Change-Id: I2e4af60cea41bc4ae0ba5ce87a830ae0ede96727
Co-authored-by: Grzegorz Kulik <gregorykkulik at gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/73286
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit 73751b825daf8245381553d495dc0819fef933ab)
Reviewed-on: https://gerrit.libreoffice.org/73292
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
index ee250c6afa92..ad4991920a88 100644
--- a/i18npool/Library_localedata_euro.mk
+++ b/i18npool/Library_localedata_euro.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
CustomTarget/i18npool/localedata/localedata_sr_CS \
CustomTarget/i18npool/localedata/localedata_sv_FI \
CustomTarget/i18npool/localedata/localedata_sv_SE \
+ CustomTarget/i18npool/localedata/localedata_szl_PL \
CustomTarget/i18npool/localedata/localedata_tr_TR \
CustomTarget/i18npool/localedata/localedata_tt_RU \
CustomTarget/i18npool/localedata/localedata_uk_UA \
diff --git a/i18npool/source/localedata/data/szl_PL.xml b/i18npool/source/localedata/data/szl_PL.xml
new file mode 100644
index 000000000000..36858fd37bfe
--- /dev/null
+++ b/i18npool/source/localedata/data/szl_PL.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.3">
+ <LC_INFO>
+ <Language>
+ <LangID>szl</LangID>
+ <DefaultName>Silesian</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>PL</CountryID>
+ <DefaultName>Poland</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE ref="pl_PL"/>
+ <LC_FORMAT ref="pl_PL" replaceFrom="[CURRENCY]" replaceTo="[$zł-699]"/>
+ <LC_COLLATION ref="pl_PL"/>
+ <LC_SEARCH ref="pl_PL"/>
+ <LC_INDEX>
+ <IndexKey phonetic="false" default="true" unoid="alphanumeric">A Ã B C Ć D E-L Ł M N Ń O Ō Ô Ŏ Õ P-S Ś T-Z Ź Ż</IndexKey>
+ <UnicodeScript>0</UnicodeScript>
+ <UnicodeScript>1</UnicodeScript>
+ <UnicodeScript>2</UnicodeScript>
+ <FollowPageWord>s.</FollowPageWord>
+ <FollowPageWord>ss.</FollowPageWord>
+ </LC_INDEX>
+ <LC_CALENDAR>
+ <Calendar unoid="gregorian" default="true">
+ <DaysOfWeek>
+ <Day>
+ <DayID>sun</DayID>
+ <DefaultAbbrvName>niydz.</DefaultAbbrvName>
+ <DefaultFullName>niydziela</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>mon</DayID>
+ <DefaultAbbrvName>pyń.</DefaultAbbrvName>
+ <DefaultFullName>pyńdziałek</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>tue</DayID>
+ <DefaultAbbrvName>wt.</DefaultAbbrvName>
+ <DefaultFullName>wtorek</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>wed</DayID>
+ <DefaultAbbrvName>strz.</DefaultAbbrvName>
+ <DefaultFullName>strzoda</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>thu</DayID>
+ <DefaultAbbrvName>sztw.</DefaultAbbrvName>
+ <DefaultFullName>sztwortek</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>fri</DayID>
+ <DefaultAbbrvName>pt.</DefaultAbbrvName>
+ <DefaultFullName>piōntek</DefaultFullName>
+ </Day>
+ <Day>
+ <DayID>sat</DayID>
+ <DefaultAbbrvName>sob.</DefaultAbbrvName>
+ <DefaultFullName>sobota</DefaultFullName>
+ </Day>
+ </DaysOfWeek>
+ <MonthsOfYear>
+ <Month>
+ <MonthID>jan</MonthID>
+ <DefaultAbbrvName>I</DefaultAbbrvName>
+ <DefaultFullName>styczyń</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>feb</MonthID>
+ <DefaultAbbrvName>II</DefaultAbbrvName>
+ <DefaultFullName>luty</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>mar</MonthID>
+ <DefaultAbbrvName>III</DefaultAbbrvName>
+ <DefaultFullName>marzec</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>apr</MonthID>
+ <DefaultAbbrvName>IV</DefaultAbbrvName>
+ <DefaultFullName>kwieciyń</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>may</MonthID>
+ <DefaultAbbrvName>V</DefaultAbbrvName>
+ <DefaultFullName>moj</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jun</MonthID>
+ <DefaultAbbrvName>VI</DefaultAbbrvName>
+ <DefaultFullName>czyrwiec</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jul</MonthID>
+ <DefaultAbbrvName>VII</DefaultAbbrvName>
+ <DefaultFullName>lipiec</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>aug</MonthID>
+ <DefaultAbbrvName>VIII</DefaultAbbrvName>
+ <DefaultFullName>sierpiyń</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>sep</MonthID>
+ <DefaultAbbrvName>IX</DefaultAbbrvName>
+ <DefaultFullName>wrzesiyń</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>oct</MonthID>
+ <DefaultAbbrvName>X</DefaultAbbrvName>
+ <DefaultFullName>październik</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>nov</MonthID>
+ <DefaultAbbrvName>XI</DefaultAbbrvName>
+ <DefaultFullName>listopad</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>dec</MonthID>
+ <DefaultAbbrvName>XII</DefaultAbbrvName>
+ <DefaultFullName>grudziyń</DefaultFullName>
+ </Month>
+ </MonthsOfYear>
+ <GenitiveMonths>
+ <Month>
+ <MonthID>jan</MonthID>
+ <DefaultAbbrvName>I</DefaultAbbrvName>
+ <DefaultFullName>stycznia</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>feb</MonthID>
+ <DefaultAbbrvName>II</DefaultAbbrvName>
+ <DefaultFullName>lutego</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>mar</MonthID>
+ <DefaultAbbrvName>III</DefaultAbbrvName>
+ <DefaultFullName>marca</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>apr</MonthID>
+ <DefaultAbbrvName>IV</DefaultAbbrvName>
+ <DefaultFullName>kwietnia</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>may</MonthID>
+ <DefaultAbbrvName>V</DefaultAbbrvName>
+ <DefaultFullName>moja</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jun</MonthID>
+ <DefaultAbbrvName>VI</DefaultAbbrvName>
+ <DefaultFullName>czyrwca</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>jul</MonthID>
+ <DefaultAbbrvName>VII</DefaultAbbrvName>
+ <DefaultFullName>lipca</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>aug</MonthID>
+ <DefaultAbbrvName>VIII</DefaultAbbrvName>
+ <DefaultFullName>sierpnia</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>sep</MonthID>
+ <DefaultAbbrvName>IX</DefaultAbbrvName>
+ <DefaultFullName>września</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>oct</MonthID>
+ <DefaultAbbrvName>X</DefaultAbbrvName>
+ <DefaultFullName>października</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>nov</MonthID>
+ <DefaultAbbrvName>XI</DefaultAbbrvName>
+ <DefaultFullName>listopada</DefaultFullName>
+ </Month>
+ <Month>
+ <MonthID>dec</MonthID>
+ <DefaultAbbrvName>XII</DefaultAbbrvName>
+ <DefaultFullName>grudnia</DefaultFullName>
+ </Month>
+ </GenitiveMonths>
+ <Eras>
+ <Era>
+ <EraID>bc</EraID>
+ <DefaultAbbrvName>p.n.e.</DefaultAbbrvName>
+ <DefaultFullName>p.n.e.</DefaultFullName>
+ </Era>
+ <Era>
+ <EraID>ad</EraID>
+ <DefaultAbbrvName>n.e.</DefaultAbbrvName>
+ <DefaultFullName>n.e.</DefaultFullName>
+ </Era>
+ </Eras>
+ <StartDayOfWeek>
+ <DayID>mon</DayID>
+ </StartDayOfWeek>
+ <MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+ </Calendar>
+ </LC_CALENDAR>
+ <LC_CURRENCY ref="pl_PL"/>
+ <LC_TRANSLITERATION ref="pl_PL"/>
+ <LC_MISC>
+ <ReservedWords>
+ <trueWord>prowda</trueWord>
+ <falseWord>fałsz</falseWord>
+ <quarter1Word>I sztwierć roku</quarter1Word>
+ <quarter2Word>II sztwierć roku</quarter2Word>
+ <quarter3Word>III sztwierć roku</quarter3Word>
+ <quarter4Word>IV sztwierć roku</quarter4Word>
+ <aboveWord>bez</aboveWord>
+ <belowWord>hned</belowWord>
+ <quarter1Abbreviation>S1</quarter1Abbreviation>
+ <quarter2Abbreviation>S2</quarter2Abbreviation>
+ <quarter3Abbreviation>S3</quarter3Abbreviation>
+ <quarter4Abbreviation>S4</quarter4Abbreviation>
+ </ReservedWords>
+ </LC_MISC>
+ <LC_NumberingLevel ref="pl_PL"/>
+ <LC_OutLineNumberingLevel ref="pl_PL"/>
+</Locale>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 91808eebdb77..f1c42c2db830 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -188,6 +188,7 @@ static const struct {
{ "lld_IT", lcl_DATA_EURO },
{ "cu_RU", lcl_DATA_EURO },
{ "vec_IT", lcl_DATA_EURO },
+ { "szl_PL", lcl_DATA_EURO },
{ "ja_JP", lcl_DATA_OTHERS },
{ "ko_KR", lcl_DATA_OTHERS },
commit 93dd61ba600b0de498bf4d9b3e89d328d0799796
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Fri May 31 18:27:52 2019 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Sat Jun 1 00:25:45 2019 +0200
Related: tdf#125590 prepare to derive from pl-PL
... by using replaceFrom="[CURRENCY]" in LC_FORMAT.
Change-Id: I9072e278e33de0a935a08bd9deb61109d220043d
Reviewed-on: https://gerrit.libreoffice.org/73281
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit 00df03966e0030412d6ad234045fd80d2d265af2)
Reviewed-on: https://gerrit.libreoffice.org/73291
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/i18npool/source/localedata/data/pl_PL.xml b/i18npool/source/localedata/data/pl_PL.xml
index b05b213efcfa..4beab12f6ee4 100644
--- a/i18npool/source/localedata/data/pl_PL.xml
+++ b/i18npool/source/localedata/data/pl_PL.xml
@@ -51,7 +51,7 @@
<TimePM>PM</TimePM>
<MeasurementSystem>metric</MeasurementSystem>
</LC_CTYPE>
- <LC_FORMAT>
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$zł-415]">
<DateAcceptancePattern>D.M</DateAcceptancePattern>
<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
<FormatCode>Standard</FormatCode>
@@ -87,22 +87,22 @@
<FormatCode>0,00%</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12">
- <FormatCode># ##0 [$zł-415];-# ##0 [$zł-415]</FormatCode>
+ <FormatCode># ##0 [CURRENCY];-# ##0 [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13">
- <FormatCode># ##0,00 [$zł-415];-# ##0,00 [$zł-415]</FormatCode>
+ <FormatCode># ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14">
- <FormatCode># ##0 [$zł-415];[RED]-# ##0 [$zł-415]</FormatCode>
+ <FormatCode># ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15">
- <FormatCode># ##0,00 [$zł-415];[RED]-# ##0,00 [$zł-415]</FormatCode>
+ <FormatCode># ##0,00 [CURRENCY];[RED]-# ##0,00 [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16">
<FormatCode># ##0,00 CCC</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17">
- <FormatCode># ##0,-- [$zł-415];[RED]-# ##0,-- [$zł-415]</FormatCode>
+ <FormatCode># ##0,-- [CURRENCY];[RED]-# ##0,-- [CURRENCY]</FormatCode>
</FormatElement>
<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
<FormatCode>YY-M-D</FormatCode>
More information about the Libreoffice-commits
mailing list