From 0150c4fac2228fc0fc525159eba3a0535d9a7f84 Mon Sep 17 00:00:00 2001 From: Thibaut Valentin Date: Fri, 16 Jan 2026 14:19:47 +0100 Subject: [PATCH] fix: translate backend asset includes in native --- src/main/java/fr/titionfire/ffsaf/UserInfoProvider.java | 4 ---- src/main/resources/application.properties | 2 +- src/main/webapp/public/competition.js | 4 +++- src/main/webapp/src/config/i18n.js | 5 ++++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/titionfire/ffsaf/UserInfoProvider.java b/src/main/java/fr/titionfire/ffsaf/UserInfoProvider.java index 4bae9a3..0360130 100644 --- a/src/main/java/fr/titionfire/ffsaf/UserInfoProvider.java +++ b/src/main/java/fr/titionfire/ffsaf/UserInfoProvider.java @@ -21,15 +21,11 @@ public class UserInfoProvider implements ContainerRequestFilter { @Override public void filter(ContainerRequestContext requestContext) { - System.out.println(requestContext.getHeaders()); - List acceptableLanguages = requestContext.getAcceptableLanguages(); - System.out.println(acceptableLanguages); Locale selectedLocale = findFirstSupportedLanguage(acceptableLanguages); if (selectedLocale == null) selectedLocale = TradService.fallbackLocale; - System.out.println(selectedLocale); requestContext.setProperty("userLocale", selectedLocale); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 423ffc7..f575a1d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -68,7 +68,7 @@ quarkus.http.auth.permission.public.policy=permit quarkus.keycloak.admin-client.server-url=https://auth.safca.fr -quarkus.native.resources.includes=asset/** +quarkus.native.resources.includes=asset/**,lang/** # HelloAsso Connector helloasso.api=https://api.helloasso.com diff --git a/src/main/webapp/public/competition.js b/src/main/webapp/public/competition.js index 5a97698..09b5c54 100644 --- a/src/main/webapp/public/competition.js +++ b/src/main/webapp/public/competition.js @@ -671,12 +671,14 @@ export async function initCompetitionApi(apiUrlRoot_, host) { .use(i18nextHttpBackend) .use(i18nextBrowserLanguagedetector) .init({ + supportedLngs: ['fr', 'en'], fallbackLng: 'fr', - debug: true, + debug: host.startsWith('http://localhost'), interpolation: { escapeValue: true, }, detection: options, + backend: backend, ns: ['result'], defaultNS: 'result', }) diff --git a/src/main/webapp/src/config/i18n.js b/src/main/webapp/src/config/i18n.js index 41dc448..c11ff67 100644 --- a/src/main/webapp/src/config/i18n.js +++ b/src/main/webapp/src/config/i18n.js @@ -3,6 +3,8 @@ import Backend from 'i18next-http-backend'; import LanguageDetector from 'i18next-browser-languagedetector'; import {initReactI18next} from 'react-i18next'; +const vite_url = import.meta.env.VITE_URL; + const options = { order: [ 'querystring', 'cookie', 'localStorage', 'sessionStorage', 'navigator', 'htmlTag'], caches: [], @@ -20,8 +22,9 @@ i18n // init i18next // for all options read: https://www.i18next.com/overview/configuration-options .init({ + supportedLngs: ['fr', 'en'], fallbackLng: 'fr', - debug: true, + debug: vite_url.startsWith('http://localhost'), interpolation: { escapeValue: false, // not needed for react as it escapes by default },