[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - i18npool/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Dec 5 09:32:40 UTC 2018 

 i18npool/source/localedata/data/af_NA.xml      |    2 +-
 i18npool/source/localedata/data/bg_BG.xml      |    2 +-
 i18npool/source/localedata/data/bs_BA.xml      |    2 +-
 i18npool/source/localedata/data/ee_GH.xml      |    4 ++--
 i18npool/source/localedata/data/eu_ES.xml      |    4 ++--
 i18npool/source/localedata/data/ha_Latn_GH.xml |    4 ++--
 i18npool/source/localedata/data/ia.xml         |    4 ++--
 i18npool/source/localedata/data/km_KH.xml      |    4 ++--
 i18npool/source/localedata/data/ln_CD.xml      |    4 ++--
 i18npool/source/localedata/data/lo_LA.xml      |    2 +-
 i18npool/source/localedata/data/no_NO.xml      |    4 ++--
 i18npool/source/localedata/data/ny_MW.xml      |    4 ++--
 i18npool/source/localedata/data/vi_VN.xml      |    8 ++++----
 i18npool/source/localedata/data/wa_BE.xml      |    4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit bc89fd9ef06b528e096098bf7d605c71b1d9ffc5
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Tue Dec 4 17:13:25 2018 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Wed Dec 5 10:32:28 2018 +0100

    NNNN already includes LongDateDayOfWeekSeparator, do not duplicate
    
    Seems these were always wrong in some locales.
    
    Change-Id: I5dfc89a607d57c19034d6fac07a07bf3c5395ed8
    Reviewed-on: https://gerrit.libreoffice.org/64541
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit a40c56aae9fa3ccac4abb83f7d7ddb80f5d8b6a8)
    Reviewed-on: https://gerrit.libreoffice.org/64578

diff --git a/i18npool/source/localedata/data/bg_BG.xml b/i18npool/source/localedata/data/bg_BG.xml
index 926876f85ed9..fa6b8afc8261 100644
--- a/i18npool/source/localedata/data/bg_BG.xml
+++ b/i18npool/source/localedata/data/bg_BG.xml
@@ -112,7 +112,7 @@
       <FormatCode>D.M.YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN D MMMM YYYY" г."</FormatCode>
+      <FormatCode>NNNND MMMM YYYY" г."</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="20">
       <FormatCode>D.MM.YY</FormatCode>
diff --git a/i18npool/source/localedata/data/bs_BA.xml b/i18npool/source/localedata/data/bs_BA.xml
index 8ebc0c6404bc..8084ebf55353 100644
--- a/i18npool/source/localedata/data/bs_BA.xml
+++ b/i18npool/source/localedata/data/bs_BA.xml
@@ -57,7 +57,7 @@
       <FormatCode>D.M.YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey2" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN DD. MMMM YYYY</FormatCode>
+      <FormatCode>NNNNDD. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>D.M.YYYY</FormatCode>
diff --git a/i18npool/source/localedata/data/ee_GH.xml b/i18npool/source/localedata/data/ee_GH.xml
index c6dc3abb5a93..3c0d8df74402 100644
--- a/i18npool/source/localedata/data/ee_GH.xml
+++ b/i18npool/source/localedata/data/ee_GH.xml
@@ -108,7 +108,7 @@
       <FormatCode>M/D/YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN, MMMM DD, YYYY</FormatCode>
+      <FormatCode>NNNNMMMM DD, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>MM/DD/YY</FormatCode>
@@ -141,7 +141,7 @@
       <FormatCode>NN, MMMM D, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN, MMMM D, YYYY</FormatCode>
+      <FormatCode>NNNNMMMM D, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>MM/DD</FormatCode>
diff --git a/i18npool/source/localedata/data/eu_ES.xml b/i18npool/source/localedata/data/eu_ES.xml
index cc7c6d515d21..d445a352be64 100644
--- a/i18npool/source/localedata/data/eu_ES.xml
+++ b/i18npool/source/localedata/data/eu_ES.xml
@@ -108,7 +108,7 @@
       <FormatCode>YYYY/MM/DD</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN YYYY".eko" MMMM"k" D</FormatCode>
+      <FormatCode>NNNNYYYY".eko" MMMM"k" D</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>YY/MM/DD</FormatCode>
@@ -141,7 +141,7 @@
       <FormatCode>NN, MMMM"k" D, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN YYYY".eko" MMMM"k" D</FormatCode>
+      <FormatCode>NNNNYYYY".eko" MMMM"k" D</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>MM-DD</FormatCode>
diff --git a/i18npool/source/localedata/data/ha_Latn_GH.xml b/i18npool/source/localedata/data/ha_Latn_GH.xml
index 11559d9d913f..be2dff3095ac 100644
--- a/i18npool/source/localedata/data/ha_Latn_GH.xml
+++ b/i18npool/source/localedata/data/ha_Latn_GH.xml
@@ -109,7 +109,7 @@
       <FormatCode>M/D/YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN, MMMM DD, YYYY</FormatCode>
+      <FormatCode>NNNNMMMM DD, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>MM/DD/YY</FormatCode>
@@ -142,7 +142,7 @@
       <FormatCode>NN, MMMM D, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN, MMMM D, YYYY</FormatCode>
+      <FormatCode>NNNNMMMM D, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>MM/DD</FormatCode>
diff --git a/i18npool/source/localedata/data/ia.xml b/i18npool/source/localedata/data/ia.xml
index b1e73204c395..fdd9d682cd6a 100644
--- a/i18npool/source/localedata/data/ia.xml
+++ b/i18npool/source/localedata/data/ia.xml
@@ -78,7 +78,7 @@
       <FormatCode>DD/MM/YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN D MMMM YYYY</FormatCode>
+      <FormatCode>NNNND MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
       <FormatCode>D MMM YY</FormatCode>
@@ -96,7 +96,7 @@
       <FormatCode>NN "le" D "de" MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN "le" D "de" MMMM YYYY</FormatCode>
+      <FormatCode>NNNN"le" D "de" MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
       <FormatCode>D. MMM. YYYY</FormatCode>
diff --git a/i18npool/source/localedata/data/km_KH.xml b/i18npool/source/localedata/data/km_KH.xml
index 61195ea91c7a..d532fc3ba34d 100644
--- a/i18npool/source/localedata/data/km_KH.xml
+++ b/i18npool/source/localedata/data/km_KH.xml
@@ -132,7 +132,7 @@
       <FormatCode>D/M/YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>[NatNum1]NNNN "ទី" DD "ខែ" MMMM "ឆ្នាំ" YYYY</FormatCode>
+      <FormatCode>[NatNum1]NNNN"ទី" DD "ខែ" MMMM "ឆ្នាំ" YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>DD/MM/YY</FormatCode>
@@ -165,7 +165,7 @@
       <FormatCode>[NatNum1]NN "ថ្ងៃទី" D "ខែ" MMMM "ឆ្នាំ" YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>[NatNum1]NNNN "ទី" D "ខែ" MMM "ឆ្នាំ" YYYY</FormatCode>
+      <FormatCode>[NatNum1]NNNN"ទី" D "ខែ" MMM "ឆ្នាំ" YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>DD-MM</FormatCode>
diff --git a/i18npool/source/localedata/data/ln_CD.xml b/i18npool/source/localedata/data/ln_CD.xml
index f506417f8eee..70480cbae6ad 100644
--- a/i18npool/source/localedata/data/ln_CD.xml
+++ b/i18npool/source/localedata/data/ln_CD.xml
@@ -108,7 +108,7 @@
       <FormatCode>D-MM-YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN, DD, MMMM YYYY</FormatCode>
+      <FormatCode>NNNNDD, MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>DD-MM-YY</FormatCode>
@@ -141,7 +141,7 @@
       <FormatCode>NN, D, MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN, D, MMMM YYYY</FormatCode>
+      <FormatCode>NNNND, MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>MM-DD</FormatCode>
diff --git a/i18npool/source/localedata/data/lo_LA.xml b/i18npool/source/localedata/data/lo_LA.xml
index f9a9260e36c1..698e34c35820 100644
--- a/i18npool/source/localedata/data/lo_LA.xml
+++ b/i18npool/source/localedata/data/lo_LA.xml
@@ -169,7 +169,7 @@
       <FormatCode>WW</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey10" default="true" type="long" usage="DATE" formatindex="60">
-      <FormatCode>NNNN "ວັນທີ" DD "ເດືອນ" MMMM "ປີ" YYYY</FormatCode>
+      <FormatCode>NNNN"ວັນທີ" DD "ເດືອນ" MMMM "ປີ" YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39">
       <FormatCode>HH"ໂມງ":MM "ນາທີ"</FormatCode>
diff --git a/i18npool/source/localedata/data/no_NO.xml b/i18npool/source/localedata/data/no_NO.xml
index cd039c850cba..f04152c76843 100644
--- a/i18npool/source/localedata/data/no_NO.xml
+++ b/i18npool/source/localedata/data/no_NO.xml
@@ -81,7 +81,7 @@
       <FormatCode>DD.MM.YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN DD. MMMM YYYY</FormatCode>
+      <FormatCode>NNNNDD. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
       <FormatCode>D. MMM YY</FormatCode>
@@ -99,7 +99,7 @@
       <FormatCode>NN D. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN D. MMMM YYYY</FormatCode>
+      <FormatCode>NNNND. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
       <FormatCode>D. MMM  YYYY</FormatCode>
diff --git a/i18npool/source/localedata/data/ny_MW.xml b/i18npool/source/localedata/data/ny_MW.xml
index c544c0f50ddd..c8ed46427526 100644
--- a/i18npool/source/localedata/data/ny_MW.xml
+++ b/i18npool/source/localedata/data/ny_MW.xml
@@ -91,7 +91,7 @@
       <FormatCode>D/MM/YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN, DD, MMMM YYYY</FormatCode>
+      <FormatCode>NNNNDD, MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey6" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>DD/MM/YY</FormatCode>
@@ -124,7 +124,7 @@
       <FormatCode>NN, D, MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey20" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN, D, MMMM YYYY</FormatCode>
+      <FormatCode>NNNND, MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>MM/DD</FormatCode>
diff --git a/i18npool/source/localedata/data/vi_VN.xml b/i18npool/source/localedata/data/vi_VN.xml
index 703a2fd5d252..86f149dba1ca 100644
--- a/i18npool/source/localedata/data/vi_VN.xml
+++ b/i18npool/source/localedata/data/vi_VN.xml
@@ -108,7 +108,7 @@
       <FormatCode>D/M/YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN DD MMMM YYYY</FormatCode>
+      <FormatCode>NNNNDD MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>DD/MM/YY</FormatCode>
@@ -132,16 +132,16 @@
       <FormatCode>D MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
-      <FormatCode>NNNN, D MMMM YY</FormatCode>
+      <FormatCode>NNN, D MMMM YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
       <FormatCode>NN DD/MM/YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
-      <FormatCode>NNNN, D MMMM YYYY</FormatCode>
+      <FormatCode>NNN, D MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN D MMMM YYYY</FormatCode>
+      <FormatCode>NNNND MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>DD-MM</FormatCode>
diff --git a/i18npool/source/localedata/data/wa_BE.xml b/i18npool/source/localedata/data/wa_BE.xml
index 63387eebd780..6812230f0fea 100644
--- a/i18npool/source/localedata/data/wa_BE.xml
+++ b/i18npool/source/localedata/data/wa_BE.xml
@@ -108,7 +108,7 @@
       <FormatCode>D/MM/YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNN DD "di" MMMM YYYY</FormatCode>
+      <FormatCode>NNNNDD "di" MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
       <FormatCode>DD/MM/YY</FormatCode>
@@ -141,7 +141,7 @@
       <FormatCode>NN D "di" MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNN D "di" MMMM YYYY</FormatCode>
+      <FormatCode>NNNND "di" MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>MM-DD</FormatCode>
commit 539802775f3254cae67d51ced5b4e5b0b6c3f66f
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Tue Dec 4 17:39:25 2018 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Wed Dec 5 10:32:16 2018 +0100

    Fix af_NA wrong separator inheritance, use en_NA instead of af_ZA (en_ZA)
    
    It didn't matter originally, but en_ZA separators changed with
    
        commit 5c10c448b299faf43d9df28bdb9dc4fbb00540aa
        CommitDate: Mon Sep 3 13:38:13 2018 +0200
    
            tdf#119613 [*-ZA] decimal separator is comma, group separator is space
    
    and
    
        commit 464154aa26ae77883dd59fcbaab9e084aa035c9d
        CommitDate: Mon Sep 3 13:38:23 2018 +0200
    
            Related: tdf#119613 inherit af_ZA separators from identical en_ZA
    
    so the separators didn't match the formats inherited from en_NA
    anymore.
    
    Change-Id: Iccf951b27b5575706e0f6bae12b5df4b53e335ac
    (cherry picked from commit 7f64ec49425d967512b8f8ca95e6328795133fd8)
    Reviewed-on: https://gerrit.libreoffice.org/64549
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/af_NA.xml b/i18npool/source/localedata/data/af_NA.xml
index a69478328ead..c8462fa481ea 100644
--- a/i18npool/source/localedata/data/af_NA.xml
+++ b/i18npool/source/localedata/data/af_NA.xml
@@ -28,7 +28,7 @@
       <DefaultName>Namibia</DefaultName>
     </Country>
   </LC_INFO>
-  <LC_CTYPE ref="af_ZA"/>
+  <LC_CTYPE ref="en_NA"/>
   <LC_FORMAT ref="en_NA" replaceTo="[$$-8036]"/>
   <LC_COLLATION ref="en_US"/>
   <LC_SEARCH ref="en_US"/>

More information about the Libreoffice-commits mailing list