Author: tdraier
Date: Fri Sep 21 11:36:08 2007
New Revision: 18610
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18610&repname=
=3Djahia
Log:
look into message resource and engine resource properties ( JAHIA-2292 ) ( =
port 18536 )
Modified:
trunk/core/src/webapp/jsp/jahia/processing/displaylog.jsp
Modified: trunk/core/src/webapp/jsp/jahia/processing/displaylog.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/processing/displaylog.jsp&rev=3D18610&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/processing/displaylog.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/processing/displaylog.jsp Fri Sep 21 11=
:36:08 2007
@@ -16,21 +16,27 @@
limitations under the License.
--%>
<%@ page import=3D"org.apache.log4j.Logger,
+ org.jahia.ajax.monitors.SiteIndexingJobDisplayAction,
org.jahia.bin.Jahia,
org.jahia.content.NodeOperationResult,
+ org.jahia.content.ObjectKey,
org.jahia.content.TreeOperationResult,
org.jahia.engines.EngineMessage,
org.jahia.exceptions.JahiaException,
org.jahia.params.ParamBean,
org.jahia.registries.ServicesRegistry,
- org.jahia.services.scheduler.SchedulerService,
- org.jahia.services.usermanager.JahiaUser,
- org.quartz.JobDetail,
- java.text.MessageFormat,
- java.util.ArrayList,
- java.util.List,
- java.util.Locale,
- java.util.ResourceBundle" %>
+ org.jahia.services.importexport.ImportJob,
+ org.jahia.services.importexport.ProductionJob" %>
+<%@ page import=3D"org.jahia.services.scheduler.BackgroundJob" %>
+<%@ page import=3D"org.jahia.services.scheduler.SchedulerService" %>
+<%@ page import=3D"org.jahia.services.timebasedpublishing.TimeBasedPublish=
ingJob" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
+<%@ page import=3D"org.jahia.services.workflow.ActivationJob" %>
+<%@ page import=3D"org.quartz.JobDataMap" %>
+<%@ page import=3D"org.quartz.JobDetail" %>
+<%@ page import=3D"java.text.MessageFormat" %>
+<%@ page import=3D"java.text.SimpleDateFormat" %>
+<%@ page import=3D"java.util.*" %>
<%@ page contentType=3D"text/html;charset=3DUTF-8" language=3D"java" %>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
@@ -56,7 +62,11 @@
try {
return ResourceBundle.getBundle("JahiaEnginesResources", l).ge=
tString(label);
} catch (Exception e) {
- return "";
+ try {
+ return ResourceBundle.getBundle("JahiaMessageResources", l=
).getString(label);
+ } catch (Exception e1) {
+ return "";
+ }
}
}
%><%
@@ -122,7 +132,7 @@
NodeOperationResult thenode =3D (NodeOperationResult) =
iterator.next();
count++;
EngineMessage msg =3D thenode.getMsg();
- String keyValue =3D ResourceBundle.getBundle("JahiaEng=
inesResources", locale).getString(msg.getKey());
+ String keyValue =3D getRessource(msg.getKey(), locale);
if (keyValue !=3D null && msg.getValues() !=3D null) {
MessageFormat msgFormat =3D new MessageFormat(keyV=
alue);
msgFormat.setLocale(locale);
@@ -142,7 +152,7 @@
NodeOperationResult thenode =3D
(NodeOperationResult) iterator.next();
count++;
EngineMessage msg =3D thenode.getMsg();
- String keyValue =3D ResourceBundle.getBundle("JahiaEng=
inesResources", locale).getString(msg.getKey());
+ String keyValue =3D getRessource(msg.getKey(), locale);
if (keyValue !=3D null && msg.getValues() !=3D null) {
MessageFormat msgFormat =3D new MessageFormat(keyV=
alue);
msgFormat.setLocale(locale);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
