Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

fix: translate backend asset includes in native #101

Merged
Thibaut merged 1 commits from dev into master 2026-01-16 13:22:09 +00:00
Conversation 0 Commits 1 Files Changed 4 +8 -7
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0150c4fac2 - Show all commits

4
src/main/java/fr/titionfire/ffsaf/UserInfoProvider.java
View File

@ -21,15 +21,11 @@ public class UserInfoProvider implements ContainerRequestFilter {
@Override @Override
public void filter(ContainerRequestContext requestContext) { public void filter(ContainerRequestContext requestContext) {
System.out.println(requestContext.getHeaders());
List<Locale> acceptableLanguages = requestContext.getAcceptableLanguages(); List<Locale> acceptableLanguages = requestContext.getAcceptableLanguages();
System.out.println(acceptableLanguages);
Locale selectedLocale = findFirstSupportedLanguage(acceptableLanguages); Locale selectedLocale = findFirstSupportedLanguage(acceptableLanguages);
if (selectedLocale == null) if (selectedLocale == null)
selectedLocale = TradService.fallbackLocale; selectedLocale = TradService.fallbackLocale;
System.out.println(selectedLocale);
requestContext.setProperty("userLocale", selectedLocale); requestContext.setProperty("userLocale", selectedLocale);
} }

2
src/main/resources/application.properties
View File

@ -68,7 +68,7 @@ quarkus.http.auth.permission.public.policy=permit
quarkus.keycloak.admin-client.server-url=https://auth.safca.fr quarkus.keycloak.admin-client.server-url=https://auth.safca.fr
quarkus.native.resources.includes=asset/** quarkus.native.resources.includes=asset/**,lang/**
# HelloAsso Connector # HelloAsso Connector
helloasso.api=https://api.helloasso.com helloasso.api=https://api.helloasso.com

4
src/main/webapp/public/competition.js
View File

@ -671,12 +671,14 @@ export async function initCompetitionApi(apiUrlRoot_, host) {
.use(i18nextHttpBackend) .use(i18nextHttpBackend)
.use(i18nextBrowserLanguagedetector) .use(i18nextBrowserLanguagedetector)
.init({ .init({
supportedLngs: ['fr', 'en'],
fallbackLng: 'fr', fallbackLng: 'fr',
debug: true, debug: host.startsWith('http://localhost'),
interpolation: { interpolation: {
escapeValue: true, escapeValue: true,
}, },
detection: options, detection: options,
backend: backend,
ns: ['result'], ns: ['result'],
defaultNS: 'result', defaultNS: 'result',
}) })

5
src/main/webapp/src/config/i18n.js
View File

@ -3,6 +3,8 @@ import Backend from 'i18next-http-backend';
import LanguageDetector from 'i18next-browser-languagedetector'; import LanguageDetector from 'i18next-browser-languagedetector';
import {initReactI18next} from 'react-i18next'; import {initReactI18next} from 'react-i18next';
const vite_url = import.meta.env.VITE_URL;
const options = { const options = {
order: [ 'querystring', 'cookie', 'localStorage', 'sessionStorage', 'navigator', 'htmlTag'], order: [ 'querystring', 'cookie', 'localStorage', 'sessionStorage', 'navigator', 'htmlTag'],
caches: [], caches: [],
@ -20,8 +22,9 @@ i18n
// init i18next // init i18next
// for all options read: https://www.i18next.com/overview/configuration-options // for all options read: https://www.i18next.com/overview/configuration-options
.init({ .init({
supportedLngs: ['fr', 'en'],
fallbackLng: 'fr', fallbackLng: 'fr',
debug: true, debug: vite_url.startsWith('http://localhost'),
interpolation: { interpolation: {
escapeValue: false, // not needed for react as it escapes by default escapeValue: false, // not needed for react as it escapes by default
}, },