Skip to content

Fix AirDatepicker crash when locale is not in airdatePickrLocales #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bamsejon wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix AirDatepicker crash when locale is not in airdatePickrLocales #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 48 additions & 20 deletions assets/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,37 @@ import airdatepickerLocaleEs from "air-datepicker/locale/es";
import airdatepickerLocaleNl from "air-datepicker/locale/nl";
import airdatepickerLocaleIt from "air-datepicker/locale/it";
import airdatepickerLocaleHu from "air-datepicker/locale/hu";
import airdatepickerLocaleSv from "air-datepicker/locale/sv";
import airdatepickerLocaleDa from "air-datepicker/locale/da";
import airdatepickerLocaleNb from "air-datepicker/locale/nb";
import airdatepickerLocaleFi from "air-datepicker/locale/fi";
import airdatepickerLocalePl from "air-datepicker/locale/pl";
import airdatepickerLocalePt from "air-datepicker/locale/pt";
import airdatepickerLocaleRu from "air-datepicker/locale/ru";
import airdatepickerLocaleUk from "air-datepicker/locale/uk";
import airdatepickerLocaleCs from "air-datepicker/locale/cs";
import airdatepickerLocaleJa from "air-datepicker/locale/ja";
import airdatepickerLocaleZh from "air-datepicker/locale/zh";
import airdatepickerLocaleKo from "air-datepicker/locale/ko";
import "moment/locale/de";
import "moment/locale/fr";
import "moment/locale/es";
import "moment/locale/nl";
import "moment/locale/it";
import "moment/locale/hu";
import "moment/locale/lv";
import "moment/locale/sv";
import "moment/locale/da";
import "moment/locale/nb";
import "moment/locale/fi";
import "moment/locale/pl";
import "moment/locale/pt";
import "moment/locale/ru";
import "moment/locale/uk";
import "moment/locale/cs";
import "moment/locale/ja";
import "moment/locale/zh-cn";
import "moment/locale/ko";
import QRCodeStyling from "qr-code-styling";
import { Presenter } from "./presenter";
import { Manager } from "./manager";
Expand All @@ -42,15 +66,28 @@ const supportedLocales = window.claperConfig?.supportedLocales || [
"lv",
];

const airdatePickrSupportedLocales = window.claperConfig?.supportedLocales || [
"en",
"fr",
"de",
"es",
"nl",
"it",
"hu",
];
// Define airdatePickrLocales first so we can check locale availability
let airdatePickrLocales = {
en: airdatepickerLocaleEn,
fr: airdatepickerLocaleFr,
de: airdatepickerLocaleDe,
es: airdatepickerLocaleEs,
nl: airdatepickerLocaleNl,
it: airdatepickerLocaleIt,
hu: airdatepickerLocaleHu,
sv: airdatepickerLocaleSv,
da: airdatepickerLocaleDa,
nb: airdatepickerLocaleNb,
fi: airdatepickerLocaleFi,
pl: airdatepickerLocalePl,
pt: airdatepickerLocalePt,
ru: airdatepickerLocaleRu,
uk: airdatepickerLocaleUk,
cs: airdatepickerLocaleCs,
ja: airdatepickerLocaleJa,
zh: airdatepickerLocaleZh,
ko: airdatepickerLocaleKo,
};

var locale =
document.querySelector("html").getAttribute("lang") ||
Expand All @@ -61,24 +98,15 @@ var airdatepickrLocale = locale;
if (!supportedLocales.includes(locale)) {
locale = "en";
}
if (!airdatePickrSupportedLocales.includes(locale)) {
// Check if locale is actually available in airdatePickrLocales, not just in supportedLocales
if (!(airdatepickrLocale in airdatePickrLocales)) {
airdatepickrLocale = "en";
}

window.moment.locale("en");
window.moment.locale(locale);
window.Alpine = Alpine;
Alpine.start();

let airdatePickrLocales = {
en: airdatepickerLocaleEn,
fr: airdatepickerLocaleFr,
de: airdatepickerLocaleDe,
es: airdatepickerLocaleEs,
nl: airdatepickerLocaleNl,
it: airdatepickerLocaleIt,
hu: airdatepickerLocaleHu,
};
let csrfToken = document
.querySelector("meta[name='csrf-token']")
.getAttribute("content");
Expand Down