make en_US as a default if lang is empty.

Thomasr · ludomikula · commit 9336cbb43fcb · 2025-01-13T09:02:16.000+01:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfiguration.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/configuration/CustomWebFluxConfiguration.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.lowcoder.api.framework.plugin.endpoint.ReloadableRouterFunctionMapping;
 import org.lowcoder.sdk.util.JsonUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -55,14 +56,16 @@ public LocaleContextResolver localeContextResolver() {
 		return new LocaleContextResolver() {
 			@Override
 			public LocaleContext resolveLocaleContext(ServerWebExchange exchange) {
-				List<String> language = exchange.getRequest().getQueryParams().getOrDefault("lang", List.of("en_US"));
+				String defaultLocaleStr = "en_US";
+				List<String> language = exchange.getRequest().getQueryParams().getOrDefault("lang", List.of(defaultLocaleStr));
 				String localeStr = language.get(0);
 				String[] parts = localeStr.split("_");
 				if(parts.length == 2) {
 					Locale locale = new Locale(parts[0], parts[1]);
 					return new SimpleLocaleContext(locale);
 				} else {
-					Locale locale = new Locale(parts[0]);
+					String safeLocaleStr = StringUtils.defaultIfBlank(parts[0], defaultLocaleStr);
+					Locale locale = new Locale(safeLocaleStr);
 					return new SimpleLocaleContext(locale);
 				}
 			}
