Author: xlawrence
Date: Tue Jun 19 13:40:03 2007
New Revision: 17638
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17638&repname=
=3Djahia
Log:
resolve issue: http://www.jahia.net/jira/browse/JAHIA-1889
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
ategory_field.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_flat_filemanager.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/application_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp&rev=
=3D17638&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/a=
pplication_field.jsp Tue Jun 19 13:40:03 2007
@@ -16,19 +16,12 @@
limitations under the License.
--%>
<%@ page language=3D"java" %>
-<%@ page import=3D"org.jahia.data.applications.ApplicationBean" %>
-<%@ page import=3D"org.jahia.data.applications.EntryPointDefinition" %>
-<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
-<%@ page import=3D"org.jahia.data.viewhelper.principal.PrincipalViewHelper=
" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper" %>
+<%@ page import=3D"org.jahia.engines.JahiaEngine" %>
<%@ page import=3D"org.jahia.engines.rights.ManageRights" %>
-<%@ page import=3D"org.jahia.engines.shared.Application_Field" %>
<%@ page import=3D"org.jahia.gui.GuiBean" %>
-<%@ page import=3D"org.jahia.params.ParamBean" %>
-<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
-<%@ page import=3D"org.jahia.utils.*" %>
-<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
-<%@ page import=3D"java.security.Principal" %>
-<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
+<%@ page import=3D"org.jahia.utils.JahiaTools" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%!
@@ -43,6 +36,10 @@
String selectedEntryPointDefName =3D (String) engineMap.get(theField.g=
etDefinition().getName() + "_selectedEntryPointDefName");
final Enumeration appList =3D (Enumeration) engineMap.get("appList");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
final String theURL =3D jParams.settings().getJahiaEnginesHttpPath();
final String selectUsrGrp =3D (String) engineMap.get("selectUsrGrp");
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/bigtext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp&rev=3D17=
638&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp Tue Jun 19 13:40:03 2007
@@ -29,6 +29,8 @@
<%@ page import=3D"java.util.Iterator" %>
<%@ page import=3D"org.jahia.services.pages.JahiaPageDefinition"%>
<%@ page import=3D"org.jahia.services.pages.ContentPage"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
@@ -47,6 +49,10 @@
=
final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEditCal=
lingEngineName + ".theField");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.ge=
t(JahiaEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
final HtmlEditorsViewHelper heViewHelper =3D (HtmlEditorsViewHelper) e=
ngineMap.get(BigText_Field.HTMLEDITOR_VIEW_HELPER_ATTRIBUTE);
HtmlEditor defaultEditor =3D heViewHelper.getDefaultEditor(true);
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/category_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp&rev=3D1=
7638&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
ategory_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
ategory_field.jsp Tue Jun 19 13:40:03 2007
@@ -26,6 +26,8 @@
<%@ page import=3D"java.util.HashMap" %>
<%@ page import=3D"java.util.Iterator" %>
<%@ page import=3D"java.util.List" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
@@ -36,6 +38,10 @@
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
final ProcessingContext jParams =3D jData.getProcessingContext();
+ final EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.ge=
t(JahiaEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
final String fieldsEditCallingEngineName =3D (String) engineMap.get("f=
ieldsEditCallingEngineName");
=
final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEditCal=
lingEngineName + ".theField");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/embedded_filemanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp&r=
ev=3D17638&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_filemanager.jsp Tue Jun 19 13:40:03 2007
@@ -26,6 +26,7 @@
<%@ page import=3D"java.util.HashMap"%>
<%@ page import=3D"java.util.Set"%>
<%@ page import=3D"java.util.Iterator"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<jahia:i18n/>
@@ -38,6 +39,10 @@
<%
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.ge=
t(JahiaEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
final String engineUrl =3D (String) engineMap.get("fileManagerEngineUr=
l");
final String path =3D (String) jParams.getSessionState().getAttribute(=
"previousPath");
final String filename =3D (String) engineMap.get("filename");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/embedded_flat_filemanager.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_flat_filemanager.=
jsp&rev=3D17638&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_flat_filemanager.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e=
mbedded_flat_filemanager.jsp Tue Jun 19 13:40:03 2007
@@ -24,6 +24,8 @@
org.jahia.utils.JahiaString" %>
<%@ page import=3D"java.util.*" %>
<%@ page import=3D"org.jahia.services.webdav.DAVFileAccess"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<jahia:i18n/>
<%!
@@ -54,6 +56,10 @@
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.ge=
t(JahiaEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
final Set deniedUsers =3D (Set) engineMap.get("deniedUsers");
final Boolean canAdmin =3D (Boolean) engineMap.get("canAdmin");
final String filename =3D (String) engineMap.get("filename");
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/page_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp&rev=3D17638=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp Tue Jun 19 13:40:03 2007
@@ -33,6 +33,7 @@
<%@ page import=3D"org.jahia.utils.JahiaTools" %>
<%@ page import=3D"java.util.*" %>
<%@ page import=3D"org.jahia.registries.ServicesRegistry"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
=
<%!
@@ -59,6 +60,10 @@
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.=
data.JahiaData");
+ EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+ if (elh !=3D null) {
+ jParams.setCurrentLocale(elh.getCurrentLocale());
+ }
final String fieldsEditCallingEngineName =3D (String) engineMap.get("f=
ieldsEditCallingEngineName");
final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEditCal=
lingEngineName + ".theField");
final Boolean templateNotFound =3D (Boolean) engineMap.get("templateNo=
tFound");
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
