svn commit: [jahia] r17798 - in /trunk/core/src/webapp/jsp/jahia/engines: ./ audit/ containeredit/ importexport/ rights/ shared/ timebasedpublishing/ updatefield/

Wed, 27 Jun 2007 07:27:19 -0700 

Author: xlawrence
Date: Wed Jun 27 16:27:02 2007
New Revision: 17798

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17798&repname=
=3Djahia
Log:
backport fix translating all the languages in the engine when switching lan=
guages

Modified:
    trunk/core/src/webapp/jsp/jahia/engines/audit/viewlogs.jsp
    trunk/core/src/webapp/jsp/jahia/engines/containeredit/fieldedit.inc
    trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
    trunk/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp
    trunk/core/src/webapp/jsp/jahia/engines/importexport/export.jsp
    trunk/core/src/webapp/jsp/jahia/engines/importexport/import.jsp
    trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp
    trunk/core/src/webapp/jsp/jahia/engines/rights/readonly_rights.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_application_fie=
ld.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_bigtext_field.j=
sp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_boolean_field.j=
sp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_category_field.=
jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_date_field.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_davfile_field.j=
sp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_page_field.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_smalltext_field=
.jsp
    trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp
    trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/readonly_ti=
mebasedpublishing.jsp
    trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/timebasedpu=
blishing.jsp
    trunk/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp

Modified: trunk/core/src/webapp/jsp/jahia/engines/audit/viewlogs.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/audit/viewlogs.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/audit/viewlogs.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/audit/viewlogs.jsp Wed Jun 27 1=
6:27:02 2007
@@ -16,6 +16,8 @@
 limitations under the License.
 --%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%
@@ -25,6 +27,11 @@
     final Integer deletedRows =3D (Integer) engineMap.get("deletedRows");
     int areaSize =3D 50;
     final String theScreen =3D (String) engineMap.get("screen");
+    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 URLSep =3D (engineURL.indexOf("?") =3D=3D -1) ? "?" : "&";
     String userAgent =3D request.getHeader("user-agent");
     if (userAgent !=3D null) {

Modified: trunk/core/src/webapp/jsp/jahia/engines/containeredit/fieldedit.i=
nc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/containeredit/fieldedit.inc&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/containeredit/fieldedit.inc (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/containeredit/fieldedit.inc Wed=
 Jun 27 16:27:02 2007
@@ -36,7 +36,7 @@
     <span class=3D"error"><%=3DerrorMsg%></span><br/>
   <% } %>
   <%
-  if (localeList.size() > 1 &&
+  if (localeList.size() > 1 && !readOnlyMode &&
             ServicesRegistry.getInstance().getJahiaACLManagerService().has=
WriteAccesOnAllLangs(jParams)) {
   %>
     <input type=3D"checkbox" name=3D"apply_change_to_all_lang_<%=3DaField.=
getID()%>" value=3D"<%=3DaField.getID()%>"

Modified: trunk/core/src/webapp/jsp/jahia/engines/engine.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/engine.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/engine.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/engine.jsp Wed Jun 27 16:27:02 =
2007
@@ -20,13 +20,14 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 =

 <%@ page import=3D"org.jahia.bin.Jahia" %>
-<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper" %>
+<%@ page import=3D"org.jahia.engines.JahiaEngine" %>
 <%@ page import=3D"org.jahia.params.ProcessingContext" %>
-<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
-<%@ page import=3D"org.jahia.services.lock.LockPrerequisites" %>
 <%@ page import=3D"org.jahia.services.lock.LockKey" %>
+<%@ page import=3D"org.jahia.services.lock.LockPrerequisites" %>
 <%@ page import=3D"org.jahia.services.lock.LockPrerequisitesResult" %>
 <%@ page import=3D"org.jahia.services.lock.LockRegistry" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser"%>
 <%@ page import=3D"java.util.*"%>
 =

 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
@@ -41,7 +42,7 @@
             org.apache.log4j.Logger.getLogger("jsp.jahia.engines.engine");
 =

     // include pages
-    private final static Properties includes =3D new Properties();
+    private static final Properties includes =3D new Properties();
 =

     static {
        // shared jsp
@@ -70,6 +71,9 @@
     // delete container engine
     includes.setProperty("delete_container",                    "/jsp/jahi=
a/engines/deletecontainer/deletecontainer.jsp");
 =

+    // restore container engine
+    includes.setProperty("restore_container",                    "/jsp/jah=
ia/engines/restorelivecontainer/restorecontainer.jsp");
+
     // container list properties
     includes.setProperty("container_list_properties",           "/jsp/jahi=
a/engines/containerlistproperties/containerlistproperties.jsp");
 =

@@ -136,7 +140,7 @@
 =

 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
-    final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+    final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
     final String engineUrl =3D (String) engineMap.get("engineUrl");
     final String theScreen =3D (String) engineMap.get("screen");
 =

@@ -150,6 +154,11 @@
     logger.debug("JSP: " + includePage);
     final LockKey lockKey =3D (LockKey) engineMap.get("LockKey");
     final LockPrerequisitesResult results =3D LockPrerequisites.getInstanc=
e().getLockPrerequisitesResult(lockKey);
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    final Locale theLocale =3D jParams.getLocale();
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
 %>
 =

 <html xmlns=3D"http://www.w3.org/1999/xhtml"; xml:lang=3D"<%=3DjParams.getL=
ocale()%>" lang=3D"<%=3DjParams.getLocale()%>">
@@ -316,6 +325,7 @@
     setTimeout("sendKeepAlive()", sendKeepAliveTimeOut);
     =

     function handleOnLoad() {
+          if (workInProgress && !workInProgress.closed) workInProgress.clo=
se();  =

           setTimeout("checkParent()", checkParentTimeOut);
     }  =

 =


Modified: trunk/core/src/webapp/jsp/jahia/engines/importexport/contentpick.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/importexport/contentpick.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp We=
d Jun 27 16:27:02 2007
@@ -213,6 +213,10 @@
     //final JahiaData jData =3D (JahiaData) request.getAttribute("org.jahi=
a.data.JahiaData");
     final String URL =3D request.getContextPath();
     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());
+    }
 =

     // to bundle html labels
     ResourceBundle bundle =3D ResourceBundle.getBundle("JahiaEnginesResour=
ces", jParams.getLocale());

Modified: trunk/core/src/webapp/jsp/jahia/engines/importexport/export.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/importexport/export.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/importexport/export.jsp (origin=
al)
+++ trunk/core/src/webapp/jsp/jahia/engines/importexport/export.jsp Wed Jun=
 27 16:27:02 2007
@@ -16,13 +16,20 @@
 limitations under the License.
 --%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"java.util.HashMap" %>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final String theScreen =3D (String) engineMap.get("screen");
+    final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
     final String exportUrl =3D (String) engineMap.get("exportUrl");
     final String objectKey =3D (String) engineMap.get("objectKey");
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
 %>
 =

 <script type=3D"text/javascript">

Modified: trunk/core/src/webapp/jsp/jahia/engines/importexport/import.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/importexport/import.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/importexport/import.jsp (origin=
al)
+++ trunk/core/src/webapp/jsp/jahia/engines/importexport/import.jsp Wed Jun=
 27 16:27:02 2007
@@ -16,14 +16,21 @@
 limitations under the License.
 --%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"java.util.HashMap" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final String theScreen =3D (String) engineMap.get("screen");
+    final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
 =

     final Integer userNameWidth =3D new Integer(15);
     request.getSession().setAttribute("userNameWidth", userNameWidth);
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
 %>
 <script type=3D"text/javascript">
     document.mainForm.enctype =3D "multipart/form-data";

Modified: trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/rights/manage_rights.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp (origi=
nal)
+++ trunk/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp Wed Ju=
n 27 16:27:02 2007
@@ -26,6 +26,8 @@
 <%@ page import=3D"org.jahia.utils.JahiaTools" %>
 <%@ page import=3D"java.security.Principal" %>
 <%@ page import=3D"java.util.*"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 <%@ taglib uri=3D"contentLib" prefix=3D"content" %>
 <%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
@@ -43,6 +45,10 @@
     }
     final Integer userNameWidth =3D new Integer(showSiteKey.booleanValue()=
?10:15);
     request.getSession().setAttribute("userNameWidth", userNameWidth);
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
 %>
 =

 <!-- FIXME : The following javascript file path are hardcoded. -->

Modified: trunk/core/src/webapp/jsp/jahia/engines/rights/readonly_rights.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/rights/readonly_rights.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/rights/readonly_rights.jsp (ori=
ginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/rights/readonly_rights.jsp Wed =
Jun 27 16:27:02 2007
@@ -24,6 +24,9 @@
 <%@ page import=3D"org.jahia.utils.JahiaTools" %>
 <%@ page import=3D"java.security.Principal" %>
 <%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.params.ParamBean"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 <%@ taglib uri=3D"contentLib" prefix=3D"content" %>
 <%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
@@ -31,6 +34,11 @@
 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final String theScreen =3D (String) engineMap.get("screen");
+    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());
+    }
 =

     Boolean showSiteKey =3D (Boolean) engineMap.get("showSiteKey");
     if (showSiteKey =3D=3D null) {
@@ -112,7 +120,6 @@
 =

     if (theScreen.equals("ctneditview_rights") && (fieldnames !=3D null)) {
         final Vector fields =3D (Vector) engineMap.get("fields");
-        final ProcessingContext jParams =3D (ProcessingContext) request.ge=
tAttribute("org.jahia.params.ParamBean");
         final int pageDefID =3D jParams.getPage().getPageTemplateID();
         final String aclFieldName =3D (String) engineMap.get("aclfieldname=
");
 %>

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/application_field.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/application_field.jsp We=
d Jun 27 16:27:02 2007
@@ -16,6 +16,8 @@
 limitations under the License.
 --%>
 <%@ page language=3D"java" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper" %>
+<%@ page import=3D"org.jahia.engines.JahiaEngine" %>
 <%@ page import=3D"org.jahia.data.applications.ApplicationBean" %>
 <%@ page import=3D"org.jahia.data.applications.EntryPointDefinition" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
@@ -43,6 +45,10 @@
     final Enumeration appList =3D (Enumeration) engineMap.get("appList");
     final Vector entryPoinDefinitionFilter =3D (Vector) engineMap.get("ent=
ryPoinDefinitionFilter");
     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: trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/bigtext_field.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp (origi=
nal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp Wed Ju=
n 27 16:27:02 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);
 =

@@ -114,16 +120,9 @@
         </logic:iterate>
     </ul>
 </logic:present>
-<%
-    final JahiaSite site =3D ServicesRegistry.getInstance().
-            getJahiaSitesService().getSite(jParams.getSiteID());
-
-    if (site.getURLIntegrityCheck() + site.getWAIComplianceCheck() > 0) { =
%>
-<p><input type=3D"checkbox" name=3D"ignoreAllWarnings" />&nbsp;<jahia:engi=
neResourceBundle
-        resourceName=3D"org.jahia.engines.shared.BigText_Field.ignoreAllWa=
rning.label"/>
-</p>
-<% } %>
+<% boolean displayIgnoreCheckBox =3D false; %>
 <logic:present name=3D'<%=3DtheField.getID()+".warning.engineMessages"%>'>
+    <% displayIgnoreCheckBox =3D true; %>
     <p>
         <span class=3D"errorbold"><jahia:engineResourceBundle
                 resourceName=3D"org.jahia.engines.shared.BigText_Field.war=
ning.label"/>:</span>&nbsp;&nbsp;
@@ -136,6 +135,7 @@
     </p>
 </logic:present>
 <logic:present name=3D'<%=3DtheField.getID()+".WAIwarning.engineMessages"%=
>'>
+    <% displayIgnoreCheckBox =3D true; %>
     <p>
         <span class=3D"errorbold"><jahia:engineResourceBundle
             resourceName=3D"org.jahia.engines.shared.BigText_Field.WAIwarn=
ing.label"/>:</span>
@@ -148,6 +148,17 @@
     </ul>
     </p>
 </logic:present>
+<%
+    if (displayIgnoreCheckBox) {
+        final JahiaSite site =3D ServicesRegistry.getInstance().
+                getJahiaSitesService().getSite(jParams.getSiteID());
+
+        if (site.getURLIntegrityCheck() + site.getWAIComplianceCheck() > 0=
) { %>
+<p><input type=3D"checkbox" name=3D"ignoreAllWarnings"/>&nbsp;<jahia:engin=
eResourceBundle
+        resourceName=3D"org.jahia.engines.shared.BigText_Field.ignoreAllWa=
rning.label"/>
+</p>
+<% } %>
+<% } %>
 =

 <p>
     <select name=3D"htmlEditor" onchange=3D"changeHtmlEditor('<%=3DtheScre=
en%>');">

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/category_field.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp (orig=
inal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/category_field.jsp Wed J=
un 27 16:27:02 2007
@@ -14,7 +14,8 @@
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =

 See the License for the specific language governing permissions and =

 limitations under the License.
---%><%@ page contentType=3D"text/html;charset=3DUTF-8" language=3D"java" %>
+--%>
+<%@ page contentType=3D"text/html;charset=3DUTF-8" language=3D"java" %>
 <%@ page import=3D"org.jahia.data.JahiaData" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
 <%@ page import=3D"org.jahia.engines.shared.Category_Field" %>
@@ -25,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" %>
@@ -35,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: trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanag=
er.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/embedded_filemanager.jsp&rev=3D17798&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp=
 (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp=
 Wed Jun 27 16:27:02 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");
@@ -176,7 +181,6 @@
                             selectUnselectFile(document.mainForm.file_id.v=
alue);
                         }
                         document.mainForm.file_id.value =3D path[0];
-                        document.mainForm.selectedFileName.value =3D path[=
0];
                         window["complexTree_tree1"].getFolderWithKey(windo=
w.document.getElementById("addressBar").value);
                         selectUnselectFile(path[0]);
                     } else {
@@ -220,7 +224,10 @@
     }
 =

     function selectCallback(msg) {
-        //alert(msg);
+        if (msg) {
+            var tag =3D "value";
+            document.mainForm.selectedFileName.value =3D XmlUtils.getNodeV=
alue(msg.getDocXml(), tag);
+        }
     }
 =

     function getFileManagerBar(checkbox) {

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/page_field.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp Wed Jun 2=
7 16:27:02 2007
@@ -35,10 +35,12 @@
 <%@ 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" %>
 =

 <%!
-    private static final Logger logger =3D Logger.getLogger("jsp.jahia.eng=
ines.shared.Page_Field");
+    private static final org.apache.log4j.Logger logger =3D
+            org.apache.log4j.Logger.getLogger("jsp.jahia.engines.shared.Pa=
ge_Field");
 =

     /**
      * utility method
@@ -60,6 +62,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");

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_applicati=
on_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_application_field.jsp&rev=3D17798&repnam=
e=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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_application_fie=
ld.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_application_fie=
ld.jsp Wed Jun 27 16:27:02 2007
@@ -24,11 +24,17 @@
 <%@ page import=3D"java.security.Principal" %>
 <%@ page import=3D"org.jahia.engines.shared.Application_Field" %>
 <%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    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 int appID =3D ((Integer) engineMap.get(theField.getDefinition().=
getName() + "_appID")).intValue();

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_bigtext_f=
ield.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_bigtext_field.jsp&rev=3D17798&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_bigtext_field.j=
sp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_bigtext_field.j=
sp Wed Jun 27 16:27:02 2007
@@ -18,9 +18,17 @@
 <%@ page contentType=3D"text/html;charset=3DUTF-8" language=3D"java" %>
 <%@ page import=3D"java.util.HashMap" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.params.ProcessingContext"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
+    final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    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 String value =3D theField.getValue();

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_boolean_f=
ield.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_boolean_field.jsp&rev=3D17798&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_boolean_field.j=
sp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_boolean_field.j=
sp Wed Jun 27 16:27:02 2007
@@ -18,12 +18,20 @@
 <%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
 <%@ page import=3D"java.util.HashMap" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.params.ProcessingContext"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final String fieldsEditCallingEngineName =3D (String) engineMap.get("f=
ieldsEditCallingEngineName");
     final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEditCal=
lingEngineName + "." + "theField");
+    final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
 %>
 =

 <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.value.label"=
/>&nbsp;:&nbsp;

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_category_=
field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_category_field.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_category_field.=
jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_category_field.=
jsp Wed Jun 27 16:27:02 2007
@@ -18,6 +18,9 @@
 <%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
 <%@ page import=3D"java.util.HashMap" %>
+<%@ page import=3D"org.jahia.params.ProcessingContext"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 <%!
     private static String printArray(final String[] values) {
@@ -35,6 +38,11 @@
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final String fieldsEditCallingEngineName =3D (String) engineMap.get("f=
ieldsEditCallingEngineName");
     final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEditCal=
lingEngineName + "." + "theField");
+    final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
 %>
 =

 <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.value.label"=
/>&nbsp;:&nbsp;<%=3DprintArray(theField.getValues())%>

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_date_fiel=
d.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_date_field.jsp&rev=3D17798&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_date_field.jsp =
(original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_date_field.jsp =
Wed Jun 27 16:27:02 2007
@@ -17,12 +17,20 @@
 --%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
 <%@ page import=3D"java.util.HashMap" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
+<%@ page import=3D"org.jahia.params.ProcessingContext"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute( "org.jahia=
.engines.EngineHashMap" );
     final String fieldsEditCallingEngineName =3D (String) engineMap.get( "=
fieldsEditCallingEngineName" );
     final JahiaField  theField    =3D (JahiaField) engineMap.get( fieldsEd=
itCallingEngineName + "." + "theField" );
+    final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
 %>
 <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.value.label"=
/>&nbsp;:&nbsp;<%=3DtheField.getValue()%>&nbsp;<jahia:engineResourceBundle =
resourceName=3D"org.jahia.engines.shared.Date_Field.dateField.label"/>
 =


Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_davfile_f=
ield.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_davfile_field.jsp&rev=3D17798&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_davfile_field.j=
sp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_davfile_field.j=
sp Wed Jun 27 16:27:02 2007
@@ -20,10 +20,18 @@
 <%@ page import=3D"org.jahia.data.files.JahiaFileField" %>
 <%@ page import=3D"java.util.HashMap" %>
 <%@ page import=3D"org.jahia.services.webdav.DAVFileAccess" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.params.ProcessingContext"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
+    final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    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 JahiaFileField fField =3D (JahiaFileField) theField.getObject();

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_page_fiel=
d.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_page_field.jsp&rev=3D17798&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_page_field.jsp =
(original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_page_field.jsp =
Wed Jun 27 16:27:02 2007
@@ -27,6 +27,8 @@
 <%@ page import=3D"java.util.*" %>
 <%@ page import=3D"org.jahia.engines.shared.Page_Field"%>
 <%@ page import=3D"org.jahia.utils.JahiaTools"%>
+<%@ page import=3D"org.jahia.params.ProcessingContext"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%!
@@ -48,7 +50,11 @@
 <%
     // get engine context and all data we need from it...
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
-    final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+    final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    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");
     HashMap pageBeans =3D (HashMap) session.getAttribute("Page_Field.PageB=
eans");

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_smalltext=
_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/readonly_smalltext_field.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_smalltext_field=
.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/readonly_smalltext_field=
.jsp Wed Jun 27 16:27:02 2007
@@ -21,6 +21,8 @@
 <%@ page import=3D"org.jahia.services.pages.ContentPage" %>
 <%@ page import=3D"java.util.HashMap" %>
 <%@ page import=3D"org.jahia.exceptions.JahiaException"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <%!
@@ -32,6 +34,10 @@
     final String fieldsEditCallingEngineName =3D (String) engineMap.get("f=
ieldsEditCallingEngineName");
     final JahiaField theField =3D (JahiaField) engineMap.get(fieldsEditCal=
lingEngineName + "." + "theField");
     final ProcessingContext jParams =3D (ProcessingContext) request.getAtt=
ribute("org.jahia.params.ParamBean");
+    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
+    if (elh !=3D null) {
+        jParams.setCurrentLocale(elh.getCurrentLocale());
+    }
     final int pageID =3D theField.getPageID();
     String defValue =3D null;
     try {

Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/smalltext_field.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp (ori=
ginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/smalltext_field.jsp Wed =
Jun 27 16:27:02 2007
@@ -45,6 +45,7 @@
             org.apache.log4j.Logger.getLogger("jsp.jahia.engines.shared.sm=
alltext_field");  %>
 =

 <%
+
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final String fieldsEditCallingEngineName =3D (String) engineMap.get("f=
ieldsEditCallingEngineName");
 =


Modified: trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/reado=
nly_timebasedpublishing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/timebasedpublishing/readonly_timebasedpublishing.jsp&rev=
=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/readonly_ti=
mebasedpublishing.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/readonly_ti=
mebasedpublishing.jsp Wed Jun 27 16:27:02 2007
@@ -23,11 +23,19 @@
                  java.util.Iterator,
                  java.util.List" %>
 <%@ page import=3D"org.jahia.services.timebasedpublishing.RetentionRule"%>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.params.ParamBean"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 <%
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final HashMap subEngineMap =3D (HashMap) engineMap.get(TimeBasedPublis=
hingEngine.SUB_ENGINE_MAP_NAME);
     final String theScreen =3D (String) engineMap.get("screen");
+    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 List ruleDefs =3D (List) subEngineMap.get(TimeBasedPublishingEng=
ine.ENGINE_NAME + ".ruleDefs");
     final RetentionRuleDef currentRuleDef =3D (RetentionRuleDef) subEngine=
Map.get(

Modified: trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/timeb=
asedpublishing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/timebasedpublishing/timebasedpublishing.jsp&rev=3D17798&=
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
--- trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/timebasedpu=
blishing.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/timebasedpublishing/timebasedpu=
blishing.jsp Wed Jun 27 16:27:02 2007
@@ -22,12 +22,20 @@
                  java.util.HashMap,
                  java.util.Iterator,
                  java.util.List" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
+<%@ page import=3D"org.jahia.params.ParamBean"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 <%
     final String ruleViewInclude =3D "/jsp/jahia/engines/timebasedpublishi=
ng/rangerule.jsp";
     final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
     final HashMap subEngineMap =3D (HashMap) engineMap.get(TimeBasedPublis=
hingEngine.SUB_ENGINE_MAP_NAME);
     final String theScreen =3D (String) engineMap.get("screen");
+    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 List ruleDefs =3D (List) subEngineMap.get(TimeBasedPublishingEng=
ine.ENGINE_NAME + ".ruleDefs");
     final RetentionRuleDef currentRuleDef =3D (RetentionRuleDef) subEngine=
Map.
@@ -40,8 +48,7 @@
     } else {
         selectedRuleDef =3D "none";
     }
-%>
-<%
+
     final String labelResourceName =3D "org.jahia.engines.timebasedpublish=
ing.timebpstatus." +
             jahiaObjectDelegate.getTimeBPState() + ".label";
 %>

Modified: trunk/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/updatefield/updatefield.jsp&rev=3D17798&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
--- trunk/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/engines/updatefield/updatefield.jsp Wed=
 Jun 27 16:27:02 2007
@@ -193,7 +193,6 @@
         }
     }
     setfocus();
-
     // Edit In Word fix, so the popup does not close itself        =

     function checkParent() {}
 </script>
\ No newline at end of file

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to