[Libreoffice-commits] core.git: basic/qa i18npool/source

[Eike Rathke (via logerrit)]

 basic/qa/vba_tests/weekdayname.vb         |    5 +++--
 i18npool/source/localedata/data/en_GB.xml |   12 +++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 9df3aa7ea72d61462e430643f2a80906dce4e15b
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Wed May 5 23:05:34 2021 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Thu May 6 01:38:55 2021 +0200

    Change en_GB calendar StartDayOfWeek to Monday and MinimalDaysInFirstWeek to 4
    
    Inherit day, month and era names from en_US but with proper
    values. See https://lh.2xlibre.net/locale/en_GB/
    - Week definition (week)
    - First day of week (first_weekday)
    
    or
    
    % LC_TIME=en_US locale -k LC_TIME
    week-ndays=7
    week-1stday=19971130
    week-1stweek=1
    first_weekday=1
    first_workday=2
    
    % LC_TIME=en_GB locale -k LC_TIME
    week-ndays=7
    week-1stday=19971130
    week-1stweek=4
    first_weekday=2
    first_workday=2
    
    This makes it necessary to adapt basic/qa/vba_tests/weekdayname.vb
    because basic/qa/cppunit/test_vba.cxx sets LANGUAGE_ENGLISH_UK
    
    Change-Id: I752bf0e59396f0cbd601beb596c07e77e4e4cfaf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115160
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/basic/qa/vba_tests/weekdayname.vb b/basic/qa/vba_tests/weekdayname.vb
index 5cc7bd9571fe..bddbdb7732d7 100644
--- a/basic/qa/vba_tests/weekdayname.vb
+++ b/basic/qa/vba_tests/weekdayname.vb
@@ -18,10 +18,11 @@ End Function
 Sub verify_testWeekDayName()
     On Error GoTo errorHandler
 
-    TestUtil.AssertEqual(WeekdayName(1),                    "Sunday", "WeekdayName(1)")
+    ' basic/qa/cppunit/test_vba.cxx sets LANGUAGE_ENGLISH_UK
+    TestUtil.AssertEqual(WeekdayName(1),                    "Monday", "WeekdayName(1)")
     TestUtil.AssertEqual(WeekdayName(1, , vbSunday),        "Sunday", "WeekdayName(1, , vbSunday)")
     TestUtil.AssertEqual(WeekdayName(1, , vbMonday),        "Monday", "WeekdayName(1, , vbMonday)")
-    TestUtil.AssertEqual(WeekdayName(2),                    "Monday", "WeekdayName(2)")
+    TestUtil.AssertEqual(WeekdayName(2),                    "Tuesday","WeekdayName(2)")
     TestUtil.AssertEqual(WeekdayName(2, True, vbMonday),    "Tue",    "WeekdayName(2, True, vbMonday)")
     TestUtil.AssertEqual(WeekdayName(2, True, vbTuesday),   "Wed",    "WeekdayName(2, True, vbTuesday)")
     TestUtil.AssertEqual(WeekdayName(2, True, vbWednesday), "Thu",    "WeekdayName(2, True, vbWednesday)")
diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml
index f12fad0dc56e..2928b62529da 100644
--- a/i18npool/source/localedata/data/en_GB.xml
+++ b/i18npool/source/localedata/data/en_GB.xml
@@ -215,7 +215,17 @@
   <LC_COLLATION ref="en_US"/>
   <LC_SEARCH ref="en_US"/>
   <LC_INDEX ref="en_US"/>
-  <LC_CALENDAR ref="en_US"/>
+  <LC_CALENDAR>
+    <Calendar unoid="gregorian" default="true">
+      <DaysOfWeek ref="en_US_gregorian"/>
+      <MonthsOfYear ref="en_US_gregorian"/>
+      <Eras ref="en_US_gregorian"/>
+      <StartDayOfWeek>
+        <DayID>mon</DayID>
+      </StartDayOfWeek>
+      <MinimalDaysInFirstWeek>4</MinimalDaysInFirstWeek>
+    </Calendar>
+  </LC_CALENDAR>
   <LC_CURRENCY>
     <Currency default="true" usedInCompatibleFormatCodes="true">
       <CurrencyID>GBP</CurrencyID>