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

Mihkel Tõnnov (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 29 19:29:27 UTC 2020


 i18npool/source/localedata/data/et_EE.xml |   32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit d227316b22ffc08426baa5ad4a2365ed3850362c
Author:     Mihkel Tõnnov <mihhkel at gmail.com>
AuthorDate: Thu Jul 23 02:57:54 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed Jul 29 21:28:33 2020 +0200

    tdf#130154: update locale data for Estonian [et-EE] - follow-up
    
    Follow-up for 4804d969bacd25ad586b3bf70d3dc8c27adb48ef:
    * change abbreviations to omit trailing periods, as officially preferred
    * add quotes around literal characters in date formats
      (so those formats wouldn't be mistakenly detected as "user-defined")
    * revert sorting of a few date formats for backwards compatibility's sake:
      - when opening files created in 7.0, previous versions shouldn't add
        ". a" anymore to formats that aren't supposed to have it
    
    Change-Id: I666273aa32e7ca363aa929b8a1fd83bf46533f6f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99205
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml
index 5154760778ce..bdc06c16f5fe 100644
--- a/i18npool/source/localedata/data/et_EE.xml
+++ b/i18npool/source/localedata/data/et_EE.xml
@@ -47,8 +47,8 @@
       <DoubleQuotationStart>„</DoubleQuotationStart>
       <DoubleQuotationEnd>”</DoubleQuotationEnd>
     </Markers>
-    <TimeAM>e.l.</TimeAM>
-    <TimePM>p.l.</TimePM>
+    <TimeAM>e.l</TimeAM>
+    <TimePM>p.l</TimePM>
     <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
   <LC_FORMAT>
@@ -111,7 +111,7 @@
       <FormatCode>DD.MM.YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="true" type="long" usage="DATE" formatindex="19">
-      <FormatCode>NNNND. MMMM YYYY</FormatCode>
+      <FormatCode>NNNND. MMMM YYYY". a"</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey22" default="false" type="short" usage="DATE" formatindex="20">
       <FormatCode>D.M.YYYY</FormatCode>
@@ -122,17 +122,17 @@
     <FormatElement msgid="DateFormatskey10" default="false" type="short" usage="DATE" formatindex="22">
       <FormatCode>D. MMMMM YYYY</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="23">
-      <FormatCode>D. MMM YYYY</FormatCode>
+    <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="23">
+      <FormatCode>D. MMM YYYY". a"</FormatCode>
     </FormatElement>
-    <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="24">
-      <FormatCode>D. MMM YYYY. a</FormatCode>
+    <FormatElement msgid="DateFormatskey11" default="false" type="medium" usage="DATE" formatindex="24">
+      <FormatCode>D. MMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="25">
-      <FormatCode>D. MMMM YYYY</FormatCode>
+      <FormatCode>D. MMMM YYYY". a"</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="26">
-      <FormatCode>D. MMMM YYYY. a</FormatCode>
+      <FormatCode>D. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey23" default="false" type="medium" usage="DATE" formatindex="27">
       <FormatCode>NN, D. MMMMM YYYY</FormatCode>
@@ -141,10 +141,10 @@
       <FormatCode>NN, D. MMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey2" default="false" type="long" usage="DATE" formatindex="29">
-      <FormatCode>NN, D. MMMM YYYY</FormatCode>
+      <FormatCode>NN, D. MMMM YYYY". a"</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="30">
-      <FormatCode>NNNND. MMMM YYYY. a</FormatCode>
+      <FormatCode>NNNNDD. MMMM YYYY". a"</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
       <FormatCode>MM-DD</FormatCode>
@@ -172,13 +172,13 @@
       <FormatCode>WW</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey25" default="false" type="medium" usage="DATE" formatindex="66">
-      <FormatCode>WW. "nädal"</FormatCode>
+      <FormatCode>WW". nädal"</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey26" default="false" type="long" usage="DATE" formatindex="67">
-      <FormatCode>WW. "nädal" YYYY</FormatCode>
+      <FormatCode>WW". nädal "YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="68">
-      <FormatCode>NN, D. MMMM YYYY. a</FormatCode>
+      <FormatCode>NN, D. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey27" default="false" type="short" usage="DATE" formatindex="69">
       <FormatCode>D.MM.YYYY</FormatCode>
@@ -250,8 +250,8 @@
     <UnicodeScript>0</UnicodeScript>
     <UnicodeScript>1</UnicodeScript>
     <UnicodeScript>2</UnicodeScript>
-    <FollowPageWord> jj.</FollowPageWord>
-    <FollowPageWord> jj.</FollowPageWord>
+    <FollowPageWord> jj</FollowPageWord>
+    <FollowPageWord> jj</FollowPageWord>
   </LC_INDEX>
   <LC_CALENDAR>
     <Calendar unoid="gregorian" default="true">


More information about the Libreoffice-commits mailing list