diff options
| author | Eike Rathke <erack@redhat.com> | 2021-05-05 23:05:34 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-05-06 01:38:55 +0200 |
| commit | 9df3aa7ea72d61462e430643f2a80906dce4e15b (patch) | |
| tree | e574cdd9eaeb3cba91c0927986c80dbcf0f456e0 /basic | |
| parent | Update git submodules (diff) | |
| download | core-9df3aa7ea72d61462e430643f2a80906dce4e15b.tar.gz core-9df3aa7ea72d61462e430643f2a80906dce4e15b.zip | |
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@redhat.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/qa/vba_tests/weekdayname.vb | 5 |
1 files changed, 3 insertions, 2 deletions
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)") |