projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve CMS dialogs and localisation.
[lgpl/argeo-commons.git]
/
org.argeo.cms.ui.rap
/
src
/
org
/
argeo
/
cms
/
web
/
CmsWebEntryPoint.java
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 9a023d6bc780f999ee3afa281f46209be413ae7c..4f2521fd4fa718f0a99cc3a73cd56f5f2b4561ad 100644
(file)
--- 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.security.PrivilegedAction;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.UUID;
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.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;
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();
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());
ui = cmsWebApp.getCmsApp().initUi(parent);
ui.setData(CmsApp.UI_NAME_PROPERTY, uiName);
ui.setLayoutData(CmsUiUtils.fillAll());