web: bump @lingui/cli from 3.17.2 to 4.0.0 in /web (#5387)
* web: bump @lingui/cli from 3.17.2 to 4.0.0 in /web Bumps [@lingui/cli](https://github.com/lingui/js-lingui) from 3.17.2 to 4.0.0. - [Release notes](https://github.com/lingui/js-lingui/releases) - [Changelog](https://github.com/lingui/js-lingui/blob/main/CHANGELOG.md) - [Commits](https://github.com/lingui/js-lingui/compare/v3.17.2...v4.0.0) --- updated-dependencies: - dependency-name: "@lingui/cli" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * update Signed-off-by: Jens Langhammer <jens@goauthentik.io> * also bump typescript Signed-off-by: Jens Langhammer <jens@goauthentik.io> * fix logic error Signed-off-by: Jens Langhammer <jens@goauthentik.io> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Jens Langhammer <jens@goauthentik.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
@ -1,8 +1,6 @@
|
||||
import { EVENT_LOCALE_CHANGE } from "@goauthentik/common/constants";
|
||||
import { globalAK } from "@goauthentik/common/global";
|
||||
import { messages as enLocale } from "@goauthentik/locales/en";
|
||||
import { PluralCategory } from "make-plural";
|
||||
import { en } from "make-plural/plurals";
|
||||
|
||||
import { Messages, i18n } from "@lingui/core";
|
||||
import { fromNavigator, fromUrl } from "@lingui/detect-locale";
|
||||
@ -10,7 +8,6 @@ import { t } from "@lingui/macro";
|
||||
|
||||
interface Locale {
|
||||
locale: Messages;
|
||||
plurals: (n: string | number, ord?: boolean | undefined) => PluralCategory;
|
||||
}
|
||||
|
||||
export const LOCALES: {
|
||||
@ -24,7 +21,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: enLocale,
|
||||
plurals: en,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -34,7 +30,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/pseudo-LOCALE")).messages,
|
||||
plurals: en,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -44,7 +39,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/fr_FR")).messages,
|
||||
plurals: (await import("make-plural/plurals")).fr,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -54,7 +48,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/tr")).messages,
|
||||
plurals: (await import("make-plural/plurals")).tr,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -64,7 +57,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/es")).messages,
|
||||
plurals: (await import("make-plural/plurals")).es,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -74,7 +66,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/pl")).messages,
|
||||
plurals: (await import("make-plural/plurals")).pl,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -84,7 +75,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/zh_TW")).messages,
|
||||
plurals: (await import("make-plural/plurals")).zh,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -94,7 +84,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/zh-Hans")).messages,
|
||||
plurals: (await import("make-plural/plurals")).zh,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -104,7 +93,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/zh-Hant")).messages,
|
||||
plurals: (await import("make-plural/plurals")).zh,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -114,7 +102,6 @@ export const LOCALES: {
|
||||
locale: async () => {
|
||||
return {
|
||||
locale: (await import("@goauthentik/locales/de")).messages,
|
||||
plurals: (await import("make-plural/plurals")).de,
|
||||
};
|
||||
},
|
||||
},
|
||||
@ -124,7 +111,6 @@ const DEFAULT_FALLBACK = () => "en";
|
||||
|
||||
export function autoDetectLanguage() {
|
||||
// Always load en locale at the start so we have something and don't error
|
||||
i18n.loadLocaleData("en", { plurals: en });
|
||||
i18n.load("en", enLocale);
|
||||
i18n.activate("en");
|
||||
|
||||
@ -180,7 +166,6 @@ export function activateLocale(code: string) {
|
||||
if (i18n.locale === code) {
|
||||
return;
|
||||
}
|
||||
i18n.loadLocaleData(locale.code, { plurals: localeData.plurals });
|
||||
i18n.load(locale.code, localeData.locale);
|
||||
i18n.activate(locale.code);
|
||||
window.dispatchEvent(
|
||||
|
@ -199,7 +199,7 @@ export class AuthenticatorValidateStage
|
||||
.host=${this}
|
||||
.challenge=${this.challenge}
|
||||
.deviceChallenge=${this.selectedDeviceChallenge}
|
||||
.showBackButton=${(this.challenge?.deviceChallenges.length || []) > 1}
|
||||
.showBackButton=${(this.challenge?.deviceChallenges || []).length > 1}
|
||||
>
|
||||
</ak-stage-authenticator-validate-code>`;
|
||||
case DeviceClassesEnum.Webauthn:
|
||||
@ -207,7 +207,7 @@ export class AuthenticatorValidateStage
|
||||
.host=${this}
|
||||
.challenge=${this.challenge}
|
||||
.deviceChallenge=${this.selectedDeviceChallenge}
|
||||
.showBackButton=${(this.challenge?.deviceChallenges.length || []) > 1}
|
||||
.showBackButton=${(this.challenge?.deviceChallenges || []).length > 1}
|
||||
>
|
||||
</ak-stage-authenticator-validate-webauthn>`;
|
||||
case DeviceClassesEnum.Duo:
|
||||
@ -215,7 +215,7 @@ export class AuthenticatorValidateStage
|
||||
.host=${this}
|
||||
.challenge=${this.challenge}
|
||||
.deviceChallenge=${this.selectedDeviceChallenge}
|
||||
.showBackButton=${(this.challenge?.deviceChallenges.length || []) > 1}
|
||||
.showBackButton=${(this.challenge?.deviceChallenges || []).length > 1}
|
||||
>
|
||||
</ak-stage-authenticator-validate-duo>`;
|
||||
}
|
||||
|
Reference in New Issue
Block a user