Author: bpapez
Date: Wed Jun  6 17:46:58 2007
New Revision: 17478

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17478&repname=
=3Djahia
Log:
encoding problem with Javascript error msg =


Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/g=
roup_management/group_edit.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_components.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_languages.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_production.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_templates.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
tatistics_display.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
tatistics_display_summary.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
rlistproperties/containerlistproperties.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/info.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/view.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/shared/e=
mbedded_filemanager.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/f=
loat_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/i=
nteger_field.jsp
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ontainer/revisions-list.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/group_management/group_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/group_management/group_edi=
t.jsp&rev=3D17478&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/administration/g=
roup_management/group_edit.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/g=
roup_management/group_edit.jsp Wed Jun  6 17:46:58 2007
@@ -18,13 +18,17 @@
 <[EMAIL PROTECTED] import=3D"java.security.Principal" %>
 <[EMAIL PROTECTED] import =3D "java.util.*"%>
 <[EMAIL PROTECTED] import=3D"org.jahia.bin.*"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.utils.*"%>
 <[EMAIL PROTECTED] import =3D "org.jahia.services.pages.*"%>
-<%@ page import=3D"org.jahia.data.viewhelper.principal.PrincipalViewHelper=
" %>
+<[EMAIL PROTECTED] 
import=3D"org.jahia.data.viewhelper.principal.PrincipalViewHelper"=
 %>
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%>
 <[EMAIL PROTECTED] uri=3D"JahiaLib" prefix=3D"jahia" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
 <jsp:useBean id=3D"URL" class=3D"java.lang.String" scope=3D"request"/>   <=
% // http files path. %>
 <jsp:useBean id=3D"groupMessage" class=3D"java.lang.String" scope=3D"sessi=
on"/>
 =

 <%
+    final ParamBean jParams   =3D (ParamBean) request.getAttribute("org.ja=
hia.params.ParamBean" );
     String groupName =3D (String)session.getAttribute("selectedGroup");
     String homePageLabel =3D (String)session.getAttribute("homePageLabel");
 =

@@ -72,9 +76,10 @@
     if (index > 0) {
         var badName =3D "\n";
         for (i =3D 0; i < index; i++) {
-            badName +=3D "- " + usrgrpname[i].substr(1) + "\n";
+            badName +=3D "- " + usrgrpname[i].substr(1, usrgrpname[i].last=
IndexOf(':') - 1) + "\n";
         }
-    alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.user=
s.ManageGroups.alertUsersGroupAlreadyMember.label"/>" + badName);
+    alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResource(=
"org.jahia.admin.users.ManageGroups.alertUsersGroupAlreadyMember.label",
+        jParams, jParams.getLocale()))%>" + badName);
     index =3D 0;
     }
 }

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/manage_components.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/manage_components.jsp&rev=
=3D17478&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/administration/m=
anage_components.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_components.jsp Wed Jun  6 17:46:58 2007
@@ -21,7 +21,7 @@
 <[EMAIL PROTECTED] import   =3D "java.util.*,org.jahia.registries.*"%>
 <%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
 <%@ page import=3D"org.jahia.params.ProcessingContext"%>
-
+<[EMAIL PROTECTED] import=3D"org.jahia.utils.JahiaTools"%>
 =

 <%
 =

@@ -35,7 +35,6 @@
     ProcessingContext jParams =3D jData.getProcessingContext();
 %>
 =

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

         var myActionLauncher =3D new ActionLauncher();
@@ -150,7 +149,7 @@
                                 String url =3D jData.gui().html().drawUpda=
teApplicationLauncher(app);
                                 if ( url.equals("") ){
                                     url =3D "alert('" +
-                                          JahiaResourceBundle.getAdminReso=
urce("org.jahia.admin.components.ManageComponents.noRightToEdit.label", jPa=
rams, jParams.getLocale()) +
+                                        JahiaTools.html2text(JahiaResource=
Bundle.getAdminResource("org.jahia.admin.components.ManageComponents.noRigh=
tToEdit.label", jParams, jParams.getLocale())) +
                                           "')";
                                 }
                                 %>

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/manage_languages.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/manage_languages.jsp&rev=
=3D17478&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/administration/m=
anage_languages.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_languages.jsp Wed Jun  6 17:46:58 2007
@@ -14,7 +14,7 @@
 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.
---%><[EMAIL PROTECTED] import   =3D 
"org.jahia.bin.JahiaAdministration,org.jahia.para=
ms.ProcessingContext,org.jahia.services.sites.JahiaSite,org.jahia.services.=
sites.SiteLanguageMapping,org.jahia.services.sites.SiteLanguageSettings,org=
.jahia.utils.LanguageCodeConverters"%>
+--%><[EMAIL PROTECTED] import   =3D 
"org.jahia.bin.JahiaAdministration,org.jahia.para=
ms.*,org.jahia.services.sites.JahiaSite,org.jahia.services.sites.SiteLangua=
geMapping,org.jahia.services.sites.SiteLanguageSettings,org.jahia.utils.*,o=
rg.jahia.resourcebundle.*"%>
 <%@ page import=3D"java.util.Enumeration"%>
 <%@ page import=3D"java.util.Iterator"%>
 <%@ page import=3D"java.util.Locale"%>
@@ -23,7 +23,7 @@
 <[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
 =

 <%
-
+    ParamBean jParams   =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
     String theURL =3D "";
     Enumeration languageList =3D (Enumeration)request.getAttribute("langua=
geList");
     Iterator mappingList =3D (Iterator) request.getAttribute("mappingList"=
);
@@ -85,7 +85,8 @@
         }
         if ( <%=3DlanguageSet.size()%>=3D=3D count
             || count =3D=3D homePageLanguage.length ){
-            alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.ad=
min.languages.ManageSiteLanguages.homePageLangWarning"/>");
+            alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminR=
esource("org.jahia.admin.languages.ManageSiteLanguages.homePageLangWarning",
+                jParams, jParams.getLocale()))%>");
             return false;
         }
     }

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/manage_production.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/manage_production.jsp&rev=
=3D17478&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/administration/m=
anage_production.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_production.jsp Wed Jun  6 17:46:58 2007
@@ -16,8 +16,10 @@
 limitations under the License.
 --%><%@ include file=3D"/jsp/jahia/administration/include/header.inc" %>
 <%@ page import=3D"org.jahia.bin.JahiaAdministration,
-                 org.jahia.params.ProcessingContext,
+                 org.jahia.params.*,
                  org.jahia.services.importexport.ImportExportService,
+                 org.jahia.utils.*,
+                 org.jahia.resourcebundle.*,
                  java.util.Locale,
                  java.util.Properties" %>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
@@ -25,7 +27,7 @@
 <%
 =

     String theURL =3D "";
-
+    ParamBean jParams   =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
     JahiaSite currentSite =3D (JahiaSite) request.getAttribute("site");
 =

     Locale currentLocale =3D request.getLocale();
@@ -112,27 +114,33 @@
     var regexp =3D /[\w:\/\*\?\-,#]/ig;
     var form =3D document.mainForm;
     if(!form.targetSite.value.match(regexp)) {
-        alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.targetSite"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.targetSite",
+                jParams, jParams.getLocale()))%>");
         return false;
     }
     if(!form.username.value.match(regexp)) {
-        alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.username"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.username",
+                jParams, jParams.getLocale()))%>");
         return false;
     }
     if(!form.password.value.match(regexp)) {
-        alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.password"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.password",
+                jParams, jParams.getLocale()))%>");
         return false;
     }
     if(!form.cron.value.match(regexp)) {
-        alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.cron"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.cron",
+                jParams, jParams.getLocale()))%>");
         return false;
     }
     if(!form.profile.value.match(regexp)) {
-        alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.profile"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.profile",
+                jParams, jParams.getLocale()))%>");
         return false;
     }
     if(!form.alias.value.match(regexp)) {
-        alert("<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.=
productionManager.form.error.required.alias"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResou=
rce("org.jahia.admin.productionManager.form.error.required.alias",
+                jParams, jParams.getLocale()))%>");
         return false;
     }
     return true;

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/manage_templates.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/manage_templates.jsp&rev=
=3D17478&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/administration/m=
anage_templates.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/m=
anage_templates.jsp Wed Jun  6 17:46:58 2007
@@ -18,7 +18,7 @@
 <[EMAIL PROTECTED] import=3D"org.jahia.bin.*"%>
 <[EMAIL PROTECTED] import=3D"org.jahia.params.*"%>
 <[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.*"%>
-
+<[EMAIL PROTECTED] import=3D"org.jahia.utils.*"%>
 <[EMAIL PROTECTED] import   =3D "java.util.*,org.jahia.services.pages.*"%>
 <[EMAIL PROTECTED] import   =3D "java.util.*,org.jahia.data.JahiaData"%>
 =

@@ -110,7 +110,7 @@
                     String url =3D jData.gui().html().drawUpdateTemplateLa=
uncher(templ);
                     if ( url.equals("") ){
                         url =3D "alert('" +
-                              JahiaResourceBundle.getAdminResource("org.ja=
hia.admin.templates.ManageTemplates.noRightToEdit.label", jParams, jParams.=
getLocale()) +
+                            JahiaTools.html2text(JahiaResourceBundle.getAd=
minResource("org.jahia.admin.templates.ManageTemplates.noRightToEdit.label"=
, jParams, jParams.getLocale())) +
                               "')";
                     }
             %>
@@ -129,7 +129,7 @@
                     String url =3D jData.gui().html().drawUpdateTemplateLa=
uncher(templ);
                     if ( url.equals("") ){
                         url =3D "alert('" +
-                              JahiaResourceBundle.getAdminResource("org.ja=
hia.admin.templates.ManageTemplates.noRightToEdit.label", jParams, jParams.=
getLocale()) +
+                            JahiaTools.html2text(JahiaResourceBundle.getAd=
minResource("org.jahia.admin.templates.ManageTemplates.noRightToEdit.label"=
, jParams, jParams.getLocale())) +
                               "')";
                     }
   =


Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/statistics_display.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/statistics_display.jsp&rev=
=3D17478&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/administration/s=
tatistics_display.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
tatistics_display.jsp Wed Jun  6 17:46:58 2007
@@ -20,6 +20,9 @@
 <[EMAIL PROTECTED] import =3D "org.jahia.services.sites.JahiaSite" %>
 <[EMAIL PROTECTED] import =3D 
"org.jahia.services.statistics.JahiaStatisticsRecordBea=
n" %>
 <[EMAIL PROTECTED] import =3D 
"org.jahia.services.statistics.JahiaStatisticsListener"=
 %>
+<[EMAIL PROTECTED] import =3D "org.jahia.params.*" %>
+<[EMAIL PROTECTED] import =3D "org.jahia.resourcebundle.*"%>
+<[EMAIL PROTECTED] import =3D "org.jahia.utils.*"%>
 <[EMAIL PROTECTED] import =3D "java.util.*" %>
 <[EMAIL PROTECTED] import =3D "java.text.*" %>
 =

@@ -36,6 +39,8 @@
 <%@ taglib uri=3D"http://java.sun.com/jstl/core_rt";  prefix=3D"c"%>
 =

 <%
+    ParamBean jParams   =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
+
        List listSites =3D (ArrayList) request.getAttribute("listSites");
        List listObjectTypes =3D (ArrayList) 
request.getAttribute("listObjectType=
s");
        =

@@ -86,19 +91,23 @@
     var month =3D document.mainForm.month.value;
     var day =3D document.mainForm.day.value;
     if (year !=3D "" && (! isNumeric(year) || year<1) ) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.year.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.year.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     if ( month !=3D "" && (! isNumeric(month) || month<1 || month>12) ) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.month.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.month.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     if (day !=3D "" && (! isNumeric(day) || day<1 || day>31) ) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.day.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.day.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     if (year !=3D "" && month !=3D "" && day !=3D "" && ! isValidDate(year=
,month,day)) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.date.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.date.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     return true;

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/statistics_display_summary.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/statistics_display_summary=
.jsp&rev=3D17478&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/administration/s=
tatistics_display_summary.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
tatistics_display_summary.jsp Wed Jun  6 17:46:58 2007
@@ -20,6 +20,9 @@
 <[EMAIL PROTECTED] import =3D "org.jahia.services.sites.JahiaSite" %>
 <[EMAIL PROTECTED] import =3D 
"org.jahia.services.statistics.JahiaStatisticsSummaryRe=
cordBean" %>
 <[EMAIL PROTECTED] import =3D 
"org.jahia.services.statistics.JahiaStatisticsListener"=
 %>
+<[EMAIL PROTECTED] import =3D "org.jahia.params.*" %>
+<[EMAIL PROTECTED] import =3D "org.jahia.resourcebundle.*"%>
+<[EMAIL PROTECTED] import =3D "org.jahia.utils.*"%>
 <[EMAIL PROTECTED] import =3D "java.util.*" %>
 <[EMAIL PROTECTED] import =3D "java.text.*" %>
 <[EMAIL PROTECTED] import =3D "java.util.HashMap" %>
@@ -37,6 +40,8 @@
 <%@ taglib uri=3D"http://java.sun.com/jstl/core_rt"; prefix=3D"c"%>
 =

 <%
+    ParamBean jParams   =3D (ParamBean) request.getAttribute( "org.jahia.p=
arams.ParamBean" );
+
        List listSites =3D (ArrayList) request.getAttribute("listSites");
        List listObjectTypes =3D (ArrayList) 
request.getAttribute("listObjectType=
s");
        =

@@ -80,19 +85,23 @@
     var month =3D document.mainForm.month.value;
     var day =3D document.mainForm.day.value;
     if (year !=3D "" && (! isNumeric(year) || year<1) ) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.year.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.year.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     if ( month !=3D "" && (! isNumeric(month) || month<1 || month>12) ) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.month.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.month.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     if (day !=3D "" && (! isNumeric(day) || day<1 || day>31) ) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.day.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.day.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     if (year !=3D "" && month !=3D "" && day !=3D "" && ! isValidDate(year=
,month,day)) {
-      alert('<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.st=
atistics.error.date.label"/>');
+      alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getAdminResourc=
e("org.jahia.admin.statistics.error.date.label",
+              jParams, jParams.getLocale()))%>');
       return false;
     }
     return true;

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/co=
ntainerlistproperties/containerlistproperties.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/containerlistproperties/container=
listproperties.jsp&rev=3D17478&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/containe=
rlistproperties/containerlistproperties.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
rlistproperties/containerlistproperties.jsp Wed Jun  6 17:46:58 2007
@@ -23,6 +23,7 @@
 <%@ page import=3D"java.text.DateFormat"%>
 <%@ page import=3D"java.text.SimpleDateFormat"%>
 <%@ page import=3D"java.util.*"%>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
 <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
 =

 <jsp:useBean id=3D"jspSource" class=3D"java.lang.String" scope=3D"request"=
/>
@@ -190,7 +191,8 @@
             element.options[index] =3D null;
         }
     } else {
-        alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.containerlistproperties.ContainerListProperties_Engine.alertSelectValue.=
label"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.containerlistproperties.ContainerListProperties_Eng=
ine.alertSelectValue.label",
+            jParams, jParams.getLocale()))%>");
     }
 }
 //-->

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi=
lemanager/info.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp&rev=3D17478&=
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/filemana=
ger/info.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/info.jsp Wed Jun  6 17:46:58 2007
@@ -743,7 +743,8 @@
         for (i =3D 0; i < index; i++) {
             badName +=3D "- " + usrgrpname[i].substr(1) + "\n";
         }
-        alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.rights.ManageRights.alertAlreadyInAcl.label"/>" + badName);
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.rights.ManageRights.alertAlreadyInAcl.label",
+                jParams, jParams.getLocale()))%>" + badName);
         index =3D 0;
     }
 }

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/fi=
lemanager/view.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/filemanager/view.jsp&rev=3D17478&=
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/filemana=
ger/view.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/filemana=
ger/view.jsp Wed Jun  6 17:46:58 2007
@@ -18,6 +18,7 @@
                  org.jahia.params.ParamBean,
                  org.jahia.resourcebundle.JahiaResourceBundle,
                  org.jahia.taglibs.ajax.ComplexTreeInclude,
+                 org.jahia.utils.*,                 =

                  java.util.HashMap"%>
 <%@ page import=3D"org.jahia.engines.filemanager.TableEntry"%>
 <%@ page import=3D"java.util.List"%>
@@ -94,7 +95,8 @@
 =

     function selectFile(dir) {
         if (dir =3D=3D "<%=3D pathes[pathes.length - 1] %>") {
-            alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.template.Template_Engine.sourceDest.label"/>");
+            alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.template.Template_Engine.sourceDest.label",
+                    jParams, jParams.getLocale()))%>");
             return;
         }
         document.mainForm.selectDir.value =3D dir;

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=
478&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 Wed Jun  6 17:46:58 2007
@@ -17,6 +17,9 @@
 --%><%@ page language=3D"java" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaFieldDefinition" %>
 <%@ page import=3D"org.jahia.data.viewhelper.principal.PrincipalViewHelper=
" %>
+<%@ page import=3D"org.jahia.engines.rights.ManageRights"%>
+<%@ page import=3D"org.jahia.params.*" %>
+<%@ page import=3D"org.jahia.resourcebundle.*" %>
 <%@ page import=3D"org.jahia.services.usermanager.JahiaGroup" %>
 <%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
 <%@ page import=3D"org.jahia.utils.JahiaString" %>
@@ -30,6 +33,7 @@
 <%
     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.ja=
hia.params.ParamBean" );
 =

     final String selectUsrGrp =3D (String) engineMap.get("selectUsrGrp");
     final Integer inheritance =3D (Integer) engineMap.get("inheritance");
@@ -49,14 +53,14 @@
 =

 // Selection box option value bit position
 var vAddedACL =3D 0;
-var vResetChildPerm =3D 1;
-var vRemACLEntry =3D 2;
-var vRightChange =3D 3;
-var vDefaultPerm =3D 8;
-var vDefaultInherit =3D 11;
-var vName =3D 12;
+var vResetChildPerm =3D <%=3D ManageRights.V_RESET_CHILD_PERMISSION %>;
+var vRemACLEntry =3D <%=3D ManageRights.V_REM_ACL_ENTRY %>;
+var vRightChange =3D <%=3D ManageRights.V_RIGHT_CHANGE %>;
+var vDefaultPerm =3D <%=3D ManageRights.V_DEFAULT_PERMISSION %>;
+var vDefaultInherit =3D <%=3D ManageRights.getInstance().getVDefaultInheri=
t() %>;
+var vName =3D <%=3D ManageRights.getInstance().getVName() %>;
 var vNameSize =3D <%=3D userNameWidth.intValue() %>;
-var vKey =3D <%=3D userNameWidth.intValue() + 13 %>;
+var vKey =3D <%=3D ManageRights.getInstance().getVKey(userNameWidth) %>;
 =

 var nbOfPerm =3D 4;
 =

@@ -83,9 +87,9 @@
 function canSetPermissions()
 {
     var i =3D formular.aclEntries.selectedIndex;
-    var itemSelected =3D formular.aclEntries.options[i];
-
-    if (itemSelected.value =3D=3D "null") {
+    var itemSelected =3D i < 0 ? null
+                       : itemSelected =3D formular.aclEntries.options[i];
+    if (itemSelected =3D=3D null || itemSelected.value =3D=3D "null") {
         disableAllSettings();
         return;
     }
@@ -444,9 +448,10 @@
     if (index > 0) {
         var badName =3D "\n";
         for (i =3D 0; i < index; i++) {
-            badName +=3D "- " + usrgrpname[i].substr(1) + "\n";
+            badName +=3D "- " + usrgrpname[i].substr(1, usrgrpname[i].last=
IndexOf(':') - 1) + "\n";
         }
-        alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.rights.ManageRights.alertAlreadyInAcl.label"/>" + badName);
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.rights.ManageRights.alertAlreadyInAcl.label",
+            jParams, jParams.getLocale()))%>" + badName);
         index =3D 0;
     }
 }
@@ -482,7 +487,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/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=3D17478&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 Wed Jun  6 17:46:58 2007
@@ -21,6 +21,7 @@
                  org.jahia.engines.filemanager.TableEntry" %>
 <%@ page import=3D"org.jahia.params.ParamBean"%>
 <%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
 <%@ page import=3D"org.jahia.taglibs.ajax.ComplexTreeInclude"%>
 <%@ page import=3D"java.util.HashMap"%>
 <%@ page import=3D"java.util.Set"%>
@@ -190,7 +191,8 @@
                 openManager(path, screen);
             }
         } else {
-            alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.filemanager.Filemanager_Engine.empty.label"/>");
+            alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.filemanager.Filemanager_Engine.empty.label",
+                    jParams, jParams.getLocale()))%>');
         }
     }
 =


Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/float_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/float_field.jsp&rev=3D1747=
8&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/f=
loat_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/f=
loat_field.jsp Wed Jun  6 17:46:58 2007
@@ -17,6 +17,7 @@
 --%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
 <%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
 <%@ page import=3D"org.jahia.services.pages.ContentPage" %>
 <%@ page import=3D"org.jahia.utils.JahiaTools" %>
 <%@ page import=3D"java.util.HashMap" %>
@@ -154,7 +155,8 @@
     {  =

         document.mainForm.elements["_<%=3DtheField.getID()%>"].value =3D 0;
         document.mainForm.elements["_<%=3DtheField.getID()%>"].focus();
-        alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.shared.Float_Field.valueMustBeNumber.label"/>");
+        alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineReso=
urce("org.jahia.engines.shared.Float_Field.valueMustBeNumber.label",
+            jParams, jParams.getLocale()))%>");
         return false;
     }
 }

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/integer_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/integer_field.jsp&rev=3D17=
478&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/i=
nteger_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/i=
nteger_field.jsp Wed Jun  6 17:46:58 2007
@@ -17,6 +17,7 @@
 --%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %>
 <%@ page import=3D"org.jahia.data.fields.JahiaField" %>
 <%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
 <%@ page import=3D"org.jahia.services.pages.ContentPage" %>
 <%@ page import=3D"org.jahia.utils.JahiaTools" %>
 <%@ page import=3D"java.util.HashMap" %>
@@ -158,7 +159,8 @@
         {
             document.mainForm.elements["_<%=3DtheField.getID()%>"].value =
=3D 0;
             document.mainForm.elements["_<%=3DtheField.getID()%>"].focus();
-            alert("<jahia:engineResourceBundle resourceName=3D"org.jahia.e=
ngines.shared.Float_Field.valueMustBeNumber.label"/>");
+            alert("<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngine=
Resource("org.jahia.engines.shared.Integer_Field.valueMustBeInteger.label",
+                jParams, jParams.getLocale()))%>");
             return false;
         }
     }

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/container/revisions-list.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/container/revisions-list.j=
sp&rev=3D17478&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/versioning/c=
ontainer/revisions-list.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ontainer/revisions-list.jsp Wed Jun  6 17:46:58 2007
@@ -2,6 +2,7 @@
 <%@ page import=3D"org.jahia.content.JahiaObject" %>
 <%@ page import=3D"org.jahia.params.ProcessingContext" %>
 <%@ page import=3D"org.jahia.resourcebundle.*" %>
+<%@ page import=3D"org.jahia.utils.JahiaTools"%>
 <%@ page import=3D"org.jahia.services.pages.ContentPage" %>
 <%@ page import=3D"org.jahia.engines.calendar.CalendarHandler" %>
 <%@ page import=3D"org.jahia.services.version.*" %>
@@ -88,7 +89,8 @@
 =

 function handleCompare(){
   if (containerCompareHandler._count < 2 ){
-    alert('<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.v=
ersion.atLeastTwoRevisionsMustBeSelected" defaultValue=3D"At least two revi=
sions must be selected" />');
+    alert('<%=3DJahiaTools.html2text(JahiaResourceBundle.getEngineResource=
("org.jahia.engines.version.atLeastTwoRevisionsMustBeSelected" defaultValue=
=3D"At least two revisions must be selected",
+            jParams, jParams.getLocale()))%>');
     return;
   } =

   var actionURL =3D '<%=3DactionURL%>&engineview=3D<%=3DengineView%>&metho=
d=3DcontainerVersionCompare';

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

Reply via email to