From b4f9f19ed110458eaafc8a60d1d5763c6279fae1 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 14 Jun 2022 09:26:54 -0400 Subject: [PATCH] GrafanaData: Fix week start for non-English browsers (#50582) (#50784) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * grafana-data: Fix start week for non-English browsers * apply review suggestion (cherry picked from commit 99c8ce5ab96d5278c1d4a1a5e68ea8c026cd22de) Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com> --- packages/grafana-data/src/datetime/moment_wrapper.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/grafana-data/src/datetime/moment_wrapper.ts b/packages/grafana-data/src/datetime/moment_wrapper.ts index c22b045d796..4bcfab24659 100644 --- a/packages/grafana-data/src/datetime/moment_wrapper.ts +++ b/packages/grafana-data/src/datetime/moment_wrapper.ts @@ -126,10 +126,15 @@ export const getWeekdayIndex = (day: string) => { return moment.weekdays().findIndex((wd) => wd.toLowerCase() === day.toLowerCase()); }; +export const getWeekdayIndexByEnglishName = (day: string) => + ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'].findIndex( + (wd) => wd.toLowerCase() === day.toLowerCase() + ); + export const setWeekStart = (weekStart?: string) => { const suffix = '-weekStart'; const language = getLocale().replace(suffix, ''); - const dow = weekStart ? getWeekdayIndex(weekStart) : -1; + const dow = weekStart ? getWeekdayIndexByEnglishName(weekStart) : -1; if (dow !== -1) { moment.locale(language + suffix, { parentLocale: language,