svn commit: [jahia] r17603 - in /branches/JAHIA-5-0-SP-BRANCH/core/src/webapp: jsp/jahia/engines/ jsp/jahia/engines/audit/ jsp/jahia/engines/importexport/ jsp/jahia/engines/rights/ jsp/jahia/engines/shared/ jsp/jahia/engines/timebasedpublishing/ jsp/jahia/engines/workflow/ views/engines/

xlawrence Fri, 15 Jun 2007 08:31:19 -0700

Author: xlawrence
Date: Fri Jun 15 17:31:10 2007
New Revision: 17603

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17603&repname=
=3Djahia
Log:
implement improvement http://www.jahia.net/jira/browse/JAHIA-429: Language =
settings in the engine


We now have a complete engine language change when we switch languages

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/vi=
ewlogs.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/contentpick.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/export.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/import.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/rights/m=
anage_rights.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/rights/r=
eadonly_rights.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_application_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_bigtext_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_boolean_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_category_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_date_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_davfile_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_page_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_smalltext_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/readonly_timebasedpublishing.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/timebasedpublishing.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/changeworkflow.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/readonly_changeworkflow.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/engines_defa=
ult_layout.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/au=
dit/viewlogs.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/audit/viewlogs.jsp&rev=3D17603&re=
pname=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/audit/vi=
ewlogs.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/audit/vi=
ewlogs.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/en=
gine.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/engine.jsp&rev=3D17603&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp Fri Jun 15 17:31:10 2007
@@ -21,13 +21,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.lock.LockRegistry"%>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser"%>
 <%@ page import=3D"java.util.*"%>
 =

 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
@@ -129,7 +130,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");
 =

@@ -143,6 +144,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()%>">

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/im=
portexport/contentpick.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/importexport/contentpick.jsp&rev=
=3D17603&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/importex=
port/contentpick.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/contentpick.jsp Fri Jun 15 17:31:10 2007
@@ -226,6 +226,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());
@@ -1167,7 +1171,6 @@
 <%
 =

     sb =3D new StringBuffer();
-    EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(Jahi=
aEngine.ENGINE_LANGUAGE_HELPER);
     //EntryLoadRequest elr =3D elh.getCurrentEntryLoadRequest();
     for (int i =3D 0; i < sr.results().size(); i++) {
         JahiaSearchHit thisHit =3D (JahiaSearchHit) sr.results().get(i);

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/im=
portexport/export.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/importexport/export.jsp&rev=3D176=
03&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/importex=
port/export.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/export.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/im=
portexport/import.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/importexport/import.jsp&rev=3D176=
03&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/importex=
port/import.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/importex=
port/import.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ri=
ghts/manage_rights.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp&rev=3D17=
603&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/rights/m=
anage_rights.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/rights/m=
anage_rights.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ri=
ghts/readonly_rights.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/rights/readonly_rights.jsp&rev=3D=
17603&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/rights/r=
eadonly_rights.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/rights/r=
eadonly_rights.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_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/readonly_application_field=
.jsp&rev=3D17603&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/r=
eadonly_application_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_application_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_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/readonly_bigtext_field.jsp=
&rev=3D17603&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/r=
eadonly_bigtext_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_bigtext_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_boolean_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/readonly_boolean_field.jsp=
&rev=3D17603&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/r=
eadonly_boolean_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_boolean_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_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/readonly_category_field.js=
p&rev=3D17603&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/r=
eadonly_category_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_category_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_date_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/readonly_date_field.jsp&re=
v=3D17603&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/r=
eadonly_date_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_date_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_davfile_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/readonly_davfile_field.jsp=
&rev=3D17603&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/r=
eadonly_davfile_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_davfile_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_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/readonly_page_field.jsp&re=
v=3D17603&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/r=
eadonly_page_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_page_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/readonly_smalltext_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/readonly_smalltext_field.j=
sp&rev=3D17603&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/r=
eadonly_smalltext_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/r=
eadonly_smalltext_field.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ti=
mebasedpublishing/readonly_timebasedpublishing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/timebasedpublishing/readonly_time=
basedpublishing.jsp&rev=3D17603&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/timebase=
dpublishing/readonly_timebasedpublishing.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/readonly_timebasedpublishing.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/ti=
mebasedpublishing/timebasedpublishing.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/timebasedpublishing/timebasedpubl=
ishing.jsp&rev=3D17603&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/timebase=
dpublishing/timebasedpublishing.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/timebase=
dpublishing/timebasedpublishing.jsp Fri Jun 15 17:31:10 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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo=
rkflow/changeworkflow.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/changeworkflow.jsp&rev=
=3D17603&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/workflow=
/changeworkflow.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/changeworkflow.jsp Fri Jun 15 17:31:10 2007
@@ -20,11 +20,17 @@
                  org.jahia.services.workflow.WorkflowService,
                  java.security.Principal,
                  java.util.*" %>
+<%@ 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 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 ContentObject contentObject =3D (ContentObject) engineMap.get("c=
ontentObject");
 =

     final Integer userNameWidth =3D new Integer(15);

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo=
rkflow/readonly_changeworkflow.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/readonly_changeworkflow.=
jsp&rev=3D17603&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/workflow=
/readonly_changeworkflow.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/readonly_changeworkflow.jsp Fri Jun 15 17:31:10 2007
@@ -20,11 +20,17 @@
                  java.security.Principal,
                  java.util.*" %>
 <%@ page import=3D"org.jahia.services.workflow.ExternalWorkflowInstanceCur=
rentInfos" %>
+<%@ 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 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 Integer userNameWidth =3D new Integer(15);
     request.getSession().setAttribute("userNameWidth", userNameWidth);

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/engine=
s_default_layout.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/engines_default_layout.jsp&rev=3D1760=
3&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/views/engines/engines_defa=
ult_layout.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/engines_defa=
ult_layout.jsp Fri Jun 15 17:31:10 2007
@@ -11,6 +11,8 @@
 <%@ page import=3D"java.util.List" %>
 <%@ page import=3D"org.jahia.services.lock.LockRegistry" %>
 <%@ page import=3D"java.util.Map" %>
+<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
 =

 <%@ include file=3D"/views/engines/common/taglibs.jsp" %>
 =

@@ -55,6 +57,10 @@
 =

     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);
+    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()%>">

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

svn commit: [jahia] r17603 - in /branches/JAHIA-5-0-SP-BRANCH/core/src/webapp: jsp/jahia/engines/ jsp/jahia/engines/audit/ jsp/jahia/engines/importexport/ jsp/jahia/engines/rights/ jsp/jahia/engines/shared/ jsp/jahia/engines/timebasedpublishing/ jsp/jahia/engines/workflow/ views/engines/

Reply via email to