X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebEntryPoint.java;h=4f2521fd4fa718f0a99cc3a73cd56f5f2b4561ad;hb=9e220ea5f945806f9fd8ef9f60ac7cf7b4b1edd1;hp=9a023d6bc780f999ee3afa281f46209be413ae7c;hpb=bc03da7975e7c493aa839aa328fb76e0db4f4581;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
index 9a023d6bc..4f2521fd4 100644
--- a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
+++ b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
@@ -4,6 +4,7 @@ import static org.eclipse.rap.rwt.internal.service.ContextProvider.getApplicatio
 
 import java.security.PrivilegedAction;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 
@@ -14,6 +15,7 @@ import javax.security.auth.login.LoginException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
+import org.argeo.cms.LocaleUtils;
 import org.argeo.cms.auth.CmsSession;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
@@ -104,8 +106,13 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 					uxContext = new SimpleUxContext();
 					imageManager = new DefaultImageManager();
 					CmsSession cmsSession = getCmsSession();
-					if (cmsSession != null)
-						RWT.setLocale(cmsSession.getLocale());
+					if (cmsSession != null) {
+						UiContext.setLocale(cmsSession.getLocale());
+						LocaleUtils.setThreadLocale(cmsSession.getLocale());
+					} else {
+						Locale rwtLocale = RWT.getUISession().getLocale();
+						LocaleUtils.setThreadLocale(rwtLocale);
+					}
 					ui = cmsWebApp.getCmsApp().initUi(parent);
 					ui.setData(CmsApp.UI_NAME_PROPERTY, uiName);
 					ui.setLayoutData(CmsUiUtils.fillAll());