Commit9336cbb

Thomasr

authored and

committed

make en_US as a default if lang is empty.

1 parent62b795b commit9336cbbCopy full SHA for 9336cbb

File tree

-2

lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration
- CustomWebFluxConfiguration.java

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`importcom.fasterxml.jackson.databind.ObjectMapper;`
`4`	`4`	`importlombok.RequiredArgsConstructor;`
	`5`	`+importorg.apache.commons.lang3.StringUtils;`
`5`	`6`	`importorg.lowcoder.api.framework.plugin.endpoint.ReloadableRouterFunctionMapping;`
`6`	`7`	`importorg.lowcoder.sdk.util.JsonUtils;`
`7`	`8`	`importorg.springframework.beans.factory.annotation.Value;`
`@@ -55,14 +56,16 @@ public LocaleContextResolver localeContextResolver() {`
`55`	`56`	`returnnewLocaleContextResolver() {`
`56`	`57`	`@Override`
`57`	`58`	`publicLocaleContextresolveLocaleContext(ServerWebExchangeexchange) {`
`58`		`-List<String>language =exchange.getRequest().getQueryParams().getOrDefault("lang",List.of("en_US"));`
	`59`	`+StringdefaultLocaleStr ="en_US";`
	`60`	`+List<String>language =exchange.getRequest().getQueryParams().getOrDefault("lang",List.of(defaultLocaleStr));`
`59`	`61`	`StringlocaleStr =language.get(0);`
`60`	`62`	`String[]parts =localeStr.split("_");`
`61`	`63`	`if(parts.length ==2) {`
`62`	`64`	`Localelocale =newLocale(parts[0],parts[1]);`
`63`	`65`	`returnnewSimpleLocaleContext(locale);`
`64`	`66`	`}else {`
`65`		`-Localelocale =newLocale(parts[0]);`
	`67`	`+StringsafeLocaleStr =StringUtils.defaultIfBlank(parts[0],defaultLocaleStr);`
	`68`	`+Localelocale =newLocale(safeLocaleStr);`
`66`	`69`	`returnnewSimpleLocaleContext(locale);`
`67`	`70`	`}`
`68`	`71`	`}`

Comments

(0)