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

[Winfried Donkers]

 i18npool/source/localedata/data/it_CH.xml  |    4 ++--
 i18npool/source/localedata/data/it_IT.xml  |   20 ++++++++++----------
 i18npool/source/localedata/data/vec_IT.xml |    4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit c531008ab30620ec7e2264d708b8c11e977b7c9a
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Thu Jan 25 16:26:46 2018 +0100

    Fix incorrect AM/PM symbols in locale it_CH and vec_IT.
    
    Follow up of tdf#105226.
    
    Change-Id: I31816a36e427338034a30492f2a7ac7f2d0fddd2
    Reviewed-on: https://gerrit.libreoffice.org/48616
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 8ff3d8821ef68069c1bdcf1a123b0c929d745566)
    Reviewed-on: https://gerrit.libreoffice.org/48638

diff --git a/i18npool/source/localedata/data/it_CH.xml b/i18npool/source/localedata/data/it_CH.xml
index 1514c671a367..aa19b9e2339d 100644
--- a/i18npool/source/localedata/data/it_CH.xml
+++ b/i18npool/source/localedata/data/it_CH.xml
@@ -47,8 +47,8 @@
       <DoubleQuotationStart>“</DoubleQuotationStart>
       <DoubleQuotationEnd>”</DoubleQuotationEnd>
     </Markers>
-    <TimeAM>m.</TimeAM>
-    <TimePM>p.</TimePM>
+    <TimeAM>a.m.</TimeAM>
+    <TimePM>p.m.</TimePM>
     <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT>
diff --git a/i18npool/source/localedata/data/vec_IT.xml b/i18npool/source/localedata/data/vec_IT.xml
index 705e1aafca4e..aa79dd8b519e 100644
--- a/i18npool/source/localedata/data/vec_IT.xml
+++ b/i18npool/source/localedata/data/vec_IT.xml
@@ -47,8 +47,8 @@
       <DoubleQuotationStart>“</DoubleQuotationStart>
       <DoubleQuotationEnd>”</DoubleQuotationEnd>
     </Markers>
-    <TimeAM>m.</TimeAM>
-    <TimePM>p.</TimePM>
+    <TimeAM>a.m.</TimeAM>
+    <TimePM>p.m.</TimePM>
     <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$€-695]">
commit ac709f527bbe0e871bafef9b8f0993f4b865bbc4
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Thu Jan 25 16:22:24 2018 +0100

    tdf#105226 follow up: change time separator for locale it_IT.
    
    Change-Id: If994f615b4a9b976086546a80357b75e93952528
    Reviewed-on: https://gerrit.libreoffice.org/48615
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit c97d67631724c29fa665c5f0aaad0a0fd9a061ee)
    Reviewed-on: https://gerrit.libreoffice.org/48639
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/i18npool/source/localedata/data/it_IT.xml b/i18npool/source/localedata/data/it_IT.xml
index 94ebb32f8f61..8a047c4aa882 100644
--- a/i18npool/source/localedata/data/it_IT.xml
+++ b/i18npool/source/localedata/data/it_IT.xml
@@ -33,7 +33,7 @@
       <DateSeparator>/</DateSeparator>
       <ThousandSeparator>.</ThousandSeparator>
       <DecimalSeparator>,</DecimalSeparator>
-      <TimeSeparator>.</TimeSeparator>
+      <TimeSeparator>:</TimeSeparator>
       <Time100SecSeparator>,</Time100SecSeparator>
       <ListSeparator>;</ListSeparator>
       <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
@@ -169,31 +169,31 @@
       <FormatCode>WW</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39">
-      <FormatCode>HH.MM</FormatCode>
+      <FormatCode>HH:MM</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40">
-      <FormatCode>HH.MM.SS</FormatCode>
+      <FormatCode>HH:MM:SS</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41">
-      <FormatCode>HH.MM AM/PM</FormatCode>
+      <FormatCode>HH:MM AM/PM</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42">
-      <FormatCode>HH.MM.SS AM/PM</FormatCode>
+      <FormatCode>HH:MM:SS AM/PM</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
-      <FormatCode>[HH].MM.SS</FormatCode>
+      <FormatCode>[HH]:MM:SS</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
-      <FormatCode>MM.SS,00</FormatCode>
+      <FormatCode>MM:SS,00</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
-      <FormatCode>[HH].MM.SS,00</FormatCode>
+      <FormatCode>[HH]:MM:SS,00</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
-      <FormatCode>GG/MM/AA HH.MM</FormatCode>
+      <FormatCode>GG/MM/AA HH:MM</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
-      <FormatCode>GG/MM/AAAA HH.MM.SS</FormatCode>
+      <FormatCode>GG/MM/AAAA HH:MM:SS</FormatCode>
     </FormatElement>
   </LC_FORMAT>
   <LC_COLLATION ref="en_US" />