IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

GrafanaData: Fix week start for non-English browsers (#50582)

Browse Source 
* grafana-data: Fix start week for non-English browsers

* apply review suggestion
This commit is contained in:
Agnès Toulet 2022-06-14 15:12:52 +02:00 committed by GitHub
parent b184280cb3
commit 99c8ce5ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/grafana-data/src/datetime/moment_wrapper.ts
View File

@ -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,