X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebEntryPoint.java;h=9a023d6bc780f999ee3afa281f46209be413ae7c;hb=0e8e156b7f036a26901362ce66fb2522560680be;hp=470aa5edc0ccc7630e9caee2ace4f73d274212e7;hpb=6a44d45d5e60b6187ddca5fa280f468d5763c2ad;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 470aa5edc..9a023d6bc 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
@@ -103,6 +103,9 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 				try {
 					uxContext = new SimpleUxContext();
 					imageManager = new DefaultImageManager();
+					CmsSession cmsSession = getCmsSession();
+					if (cmsSession != null)
+						RWT.setLocale(cmsSession.getLocale());
 					ui = cmsWebApp.getCmsApp().initUi(parent);
 					ui.setData(CmsApp.UI_NAME_PROPERTY, uiName);
 					ui.setLayoutData(CmsUiUtils.fillAll());
@@ -205,7 +208,8 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 	public void navigateTo(String state) {
 		exception = null;
 		String title = setState(state);
-		doRefresh();
+		if (title != null)
+			doRefresh();
 		if (browserNavigation != null)
 			browserNavigation.pushState(state, title);
 	}