import java.security.PrivilegedAction;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.UUID;
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;
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());