diff --git a/front/src/Components/Login/LoginScene.svelte b/front/src/Components/Login/LoginScene.svelte index d79d27933a..251cd63002 100644 --- a/front/src/Components/Login/LoginScene.svelte +++ b/front/src/Components/Login/LoginScene.svelte @@ -5,7 +5,7 @@ import logoImg from "../images/logo.png"; import poweredByWorkAdventureImg from "../images/Powered_By_WorkAdventure_Big.png"; import { gameManager } from "../../Phaser/Game/GameManager"; - import LL, {locale} from "../../i18n/i18n-svelte"; + import LL, { locale } from "../../i18n/i18n-svelte"; import { NameNotValidError, NameTooLongError } from "../../Exception/NameError"; export let game: Game; @@ -21,23 +21,29 @@ let legalStrings: string[] = []; if (legals?.termsOfUseUrl) { - legalStrings.push("" + $LL.login.termsOfUse() + ""); + legalStrings.push( + '' + $LL.login.termsOfUse() + "" + ); } if (legals?.privacyPolicyUrl) { - legalStrings.push("" + $LL.login.privacyPolicy() + ""); + legalStrings.push( + '' + $LL.login.privacyPolicy() + "" + ); } if (legals?.cookiePolicyUrl) { - legalStrings.push("" + $LL.login.cookiePolicy() + ""); + legalStrings.push( + '' + $LL.login.cookiePolicy() + "" + ); } let legalString: string | undefined; if (legalStrings.length > 0) { if (Intl.ListFormat) { - const formatter = new Intl.ListFormat(locale, { style: 'long', type: 'conjunction' }); + const formatter = new Intl.ListFormat(locale as unknown as string, { style: "long", type: "conjunction" }); legalString = formatter.format(legalStrings); } else { // For old browsers - legalString = legalStrings.join(', '); + legalString = legalStrings.join(", "); } } @@ -94,7 +100,7 @@ Needed for translation CSS

{@html $LL.login.terms({ - links: legalString + links: legalString, })}

diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts index 12c52024ef..c3233bbfcf 100644 --- a/front/src/Connexion/Room.ts +++ b/front/src/Connexion/Room.ts @@ -2,7 +2,7 @@ import { CONTACT_URL, PUSHER_URL, DISABLE_ANONYMOUS } from "../Enum/EnvironmentV import { localUserStore } from "./LocalUserStore"; import axios from "axios"; import { axiosWithRetry } from "./AxiosUtils"; -import {isMapDetailsData, LegalsData, MapDetailsData} from "../Messages/JsonMessages/MapDetailsData"; +import { isMapDetailsData, LegalsData, MapDetailsData } from "../Messages/JsonMessages/MapDetailsData"; import { isRoomRedirect } from "../Messages/JsonMessages/RoomRedirect"; import { MucRoomDefinitionInterface } from "../Messages/JsonMessages/MucRoomDefinitionInterface"; @@ -106,7 +106,9 @@ export class Room { const data = result.data; if ((data as MapDetailsData).authenticationMandatory !== undefined) { - (data as MapDetailsData).authenticationMandatory = Boolean((data as MapDetailsData).authenticationMandatory); + (data as MapDetailsData).authenticationMandatory = Boolean( + (data as MapDetailsData).authenticationMandatory + ); } const roomRedirectChecking = isRoomRedirect.safeParse(data); diff --git a/front/src/i18n/de-DE/login.ts b/front/src/i18n/de-DE/login.ts index 4df7548700..7ff39a4786 100644 --- a/front/src/i18n/de-DE/login.ts +++ b/front/src/i18n/de-DE/login.ts @@ -10,7 +10,7 @@ const login: DeepPartial = { notValidError: "Der Name ist ungültig", }, }, - terms: 'Wenn du fortfährst, akzeptierst du die {links}.', + terms: "Wenn du fortfährst, akzeptierst du die {links}.", termsOfUse: "Nutzungsbedingungen", privacyPolicy: "Datenschutzerklärung", cookiePolicy: "Cookierichtlinien", diff --git a/front/src/i18n/en-US/login.ts b/front/src/i18n/en-US/login.ts index c3932d7828..5f69701cea 100644 --- a/front/src/i18n/en-US/login.ts +++ b/front/src/i18n/en-US/login.ts @@ -9,7 +9,7 @@ const login: BaseTranslation = { notValidError: "Incorrect name format", }, }, - terms: 'By continuing, you are agreeing our {links}.', + terms: "By continuing, you are agreeing our {links}.", termsOfUse: "terms of use", privacyPolicy: "privacy policy", cookiePolicy: "cookie policy", diff --git a/front/src/i18n/es-ES/login.ts b/front/src/i18n/es-ES/login.ts index 3b4457f68b..5a16ab7b73 100644 --- a/front/src/i18n/es-ES/login.ts +++ b/front/src/i18n/es-ES/login.ts @@ -10,7 +10,7 @@ const login: DeepPartial = { notValidError: "El nombre no es válido", }, }, - terms: 'Si continúa, está de acuerdo con nuestros {links}.', + terms: "Si continúa, está de acuerdo con nuestros {links}.", termsOfUse: "términos de uso", privacyPolicy: "política de privacidad", cookiePolicy: "política de cookie", diff --git a/front/src/i18n/fr-FR/login.ts b/front/src/i18n/fr-FR/login.ts index d4ac9bae8e..fae46e7f35 100644 --- a/front/src/i18n/fr-FR/login.ts +++ b/front/src/i18n/fr-FR/login.ts @@ -10,7 +10,7 @@ const login: DeepPartial = { notValidError: "Le nom n'est pas valide", }, }, - terms: 'En continuant, vous acceptez nos {links}.', + terms: "En continuant, vous acceptez nos {links}.", termsOfUse: "nos conditions d'utilisation", privacyPolicy: "notre politique de confidentialité", cookiePolicy: "notre politique relative aux cookies", diff --git a/front/src/i18n/pt-BR/login.ts b/front/src/i18n/pt-BR/login.ts index 5a3db89905..d2a968ecf7 100644 --- a/front/src/i18n/pt-BR/login.ts +++ b/front/src/i18n/pt-BR/login.ts @@ -10,7 +10,7 @@ const login: DeepPartial = { notValidError: "O nome não é válido", }, }, - terms: 'Ao continuar, você concorda com nossos {links}.', + terms: "Ao continuar, você concorda com nossos {links}.", termsOfUse: "termos de uso", privacyPolicy: "política de privacidade", cookiePolicy: "política de cookies", diff --git a/front/src/i18n/zh-CN/login.ts b/front/src/i18n/zh-CN/login.ts index f3dca5ef69..df624f1833 100644 --- a/front/src/i18n/zh-CN/login.ts +++ b/front/src/i18n/zh-CN/login.ts @@ -8,7 +8,7 @@ const login: DeepPartial = { empty: "名字为空", }, }, - terms: '点击继续,意味着你同意我们的{links}.', + terms: "点击继续,意味着你同意我们的{links}.", termsOfUse: "使用协议", privacyPolicy: "隐私政策", cookiePolicy: "Cookie策略", diff --git a/messages/JsonMessages/MapDetailsData.ts b/messages/JsonMessages/MapDetailsData.ts index ea475d4991..56acf1d51b 100644 --- a/messages/JsonMessages/MapDetailsData.ts +++ b/messages/JsonMessages/MapDetailsData.ts @@ -158,7 +158,7 @@ export const isMapDetailsData = z.object({ description: "Configuration of the 'Customize your Woka' scene (WIP)", }), backgroundColor: extendApi(z.string().nullable().optional(), { - description: 'The background color used on configuration scenes (enter your name, select a woka, etc...) (WIP)', + description: "The background color used on configuration scenes (enter your name, select a woka, etc...) (WIP)", example: "#330033", }), });