pvollenweider 2005/06/06 16:41:58 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java JahiaAdministrationResources.properties
JahiaAdministrationResources_en.properties
JahiaAdministrationResources_fr.properties
src/java/org/jahia/admin/access ViewAccess.java
src/java/org/jahia/admin/audit ManageLogs.java
src/java/org/jahia/admin/database ManageDatabase.java
src/java/org/jahia/admin/homepages HomePageTool.java
ManageHomepages.java
src/java/org/jahia/admin/pages ManagePages.java
src/java/org/jahia/admin/search ManageSearch.java
src/java/org/jahia/admin/server ManageServer.java
src/java/org/jahia/admin/sites ManageSites.java
src/java/org/jahia/admin/templates ManageTemplates.java
src/java/org/jahia/admin/users GroupMembersTool.java
ManageGroups.java
ManageUsers.java
src/java/org/jahia/bin AdminAction.java
JahiaAdministration.java
src/java/org/jahia/views/administration/htmleditors/actions
HtmlEditorsAdminAction.java
Log:
Add resource for copyright
Revision Changes Path
1.31.2.5.2.5 +1 -0
jahia/src/java/JahiaAdministrationResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaAdministrationResources.properties.diff?r1=1.31.2.5.2.4&r2=1.31.2.5.2.5&f=h
1.24.2.5.2.5 +1 -0
jahia/src/java/JahiaAdministrationResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaAdministrationResources_en.properties.diff?r1=1.24.2.5.2.4&r2=1.24.2.5.2.5&f=h
1.35.2.7.2.7 +1 -0
jahia/src/java/JahiaAdministrationResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/JahiaAdministrationResources_fr.properties.diff?r1=1.35.2.7.2.6&r2=1.35.2.7.2.7&f=h
1.6.6.1 +9 -2 jahia/src/java/org/jahia/admin/access/ViewAccess.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/access/ViewAccess.java.diff?r1=1.6&r2=1.6.6.1&f=h
1.7.6.1 +34 -7 jahia/src/java/org/jahia/admin/audit/ManageLogs.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/audit/ManageLogs.java.diff?r1=1.7&r2=1.7.6.1&f=h
1.16.4.2.2.1 +9 -3
jahia/src/java/org/jahia/admin/database/ManageDatabase.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/database/ManageDatabase.java.diff?r1=1.16.4.2&r2=1.16.4.2.2.1&f=h
1.15.6.1 +6 -2
jahia/src/java/org/jahia/admin/homepages/HomePageTool.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/homepages/HomePageTool.java.diff?r1=1.15&r2=1.15.6.1&f=h
1.15.4.1.2.1 +3 -1
jahia/src/java/org/jahia/admin/homepages/ManageHomepages.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/homepages/ManageHomepages.java.diff?r1=1.15.4.1&r2=1.15.4.1.2.1&f=h
1.8.6.1 +9 -2 jahia/src/java/org/jahia/admin/pages/ManagePages.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/pages/ManagePages.java.diff?r1=1.8&r2=1.8.6.1&f=h
1.8.6.3 +9 -1
jahia/src/java/org/jahia/admin/search/ManageSearch.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/search/ManageSearch.java.diff?r1=1.8.6.2&r2=1.8.6.3&f=h
1.8.6.1 +9 -7
jahia/src/java/org/jahia/admin/server/ManageServer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/server/ManageServer.java.diff?r1=1.8&r2=1.8.6.1&f=h
1.31.2.1.2.3 +47 -14 jahia/src/java/org/jahia/admin/sites/ManageSites.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/sites/ManageSites.java.diff?r1=1.31.2.1.2.2&r2=1.31.2.1.2.3&f=h
1.9.6.1 +9 -2
jahia/src/java/org/jahia/admin/templates/ManageTemplates.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/templates/ManageTemplates.java.diff?r1=1.9&r2=1.9.6.1&f=h
1.4.6.1 +10 -1
jahia/src/java/org/jahia/admin/users/GroupMembersTool.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/users/GroupMembersTool.java.diff?r1=1.4&r2=1.4.6.1&f=h
1.24.4.2.2.2 +22 -8
jahia/src/java/org/jahia/admin/users/ManageGroups.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/users/ManageGroups.java.diff?r1=1.24.4.2.2.1&r2=1.24.4.2.2.2&f=h
1.32.4.2.2.4 +16 -6 jahia/src/java/org/jahia/admin/users/ManageUsers.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/admin/users/ManageUsers.java.diff?r1=1.32.4.2.2.3&r2=1.32.4.2.2.4&f=h
1.1.6.2 +16 -6 jahia/src/java/org/jahia/bin/AdminAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/bin/AdminAction.java.diff?r1=1.1.6.1&r2=1.1.6.2&f=h
1.57.2.3.2.6 +13 -6 jahia/src/java/org/jahia/bin/JahiaAdministration.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/bin/JahiaAdministration.java.diff?r1=1.57.2.3.2.5&r2=1.57.2.3.2.6&f=h
1.2.6.2 +8 -1
jahia/src/java/org/jahia/views/administration/htmleditors/actions/HtmlEditorsAdminAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/views/administration/htmleditors/actions/HtmlEditorsAdminAction.java.diff?r1=1.2.6.1&r2=1.2.6.2&f=h
Index: JahiaAdministrationResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaAdministrationResources.properties,v
retrieving revision 1.31.2.5.2.4
retrieving revision 1.31.2.5.2.5
diff -u -r1.31.2.5.2.4 -r1.31.2.5.2.5
--- JahiaAdministrationResources.properties 6 Jun 2005 12:58:30 -0000
1.31.2.5.2.4
+++ JahiaAdministrationResources.properties 6 Jun 2005 14:41:54 -0000
1.31.2.5.2.5
@@ -105,6 +105,7 @@
org.jahia.admin.components.ManageComponents.webAppContext.label=
Web App Context
org.jahia.admin.components.ManageComponents.webAppName.label=
Web App Name
org.jahia.admin.confirmPassword.label= Confirm password
+org.jahia.admin.copyright=<font class=\"text\">© 2002-2005 <a
href=\"http://www.jahia.org\"; target=\"newJahia\">Jahia Ltd</a> - All rights
reserved.</font>
org.jahia.admin.database.ManageDatabase.backupCurrentDatabase.label= Backup
the current database
org.jahia.admin.database.ManageDatabase.backupDesc.label
= Backup desc
org.jahia.admin.database.ManageDatabase.backupName.label
= Backup name
Index: JahiaAdministrationResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaAdministrationResources_en.properties,v
retrieving revision 1.24.2.5.2.4
retrieving revision 1.24.2.5.2.5
diff -u -r1.24.2.5.2.4 -r1.24.2.5.2.5
--- JahiaAdministrationResources_en.properties 6 Jun 2005 12:58:30
-0000 1.24.2.5.2.4
+++ JahiaAdministrationResources_en.properties 6 Jun 2005 14:41:54
-0000 1.24.2.5.2.5
@@ -104,6 +104,7 @@
org.jahia.admin.components.ManageComponents.source.label= Source
org.jahia.admin.components.ManageComponents.webAppContext.label=
Web App Context
org.jahia.admin.components.ManageComponents.webAppName.label=
Web App Name
+org.jahia.admin.copyright=<font class=\"text\">© 2002-2005 <a
href=\"http://www.jahia.org\"; target=\"newJahia\">Jahia Ltd</a> - All rights
reserved.</font>
org.jahia.admin.confirmPassword.label= Confirm password
org.jahia.admin.database.ManageDatabase.backupCurrentDatabase.label= Backup
the current database
org.jahia.admin.database.ManageDatabase.backupDesc.label
= Backup desc
Index: JahiaAdministrationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/Attic/JahiaAdministrationResources_fr.properties,v
retrieving revision 1.35.2.7.2.6
retrieving revision 1.35.2.7.2.7
diff -u -r1.35.2.7.2.6 -r1.35.2.7.2.7
--- JahiaAdministrationResources_fr.properties 6 Jun 2005 12:58:30
-0000 1.35.2.7.2.6
+++ JahiaAdministrationResources_fr.properties 6 Jun 2005 14:41:54
-0000 1.35.2.7.2.7
@@ -102,6 +102,7 @@
org.jahia.admin.components.ManageComponents.webAppContext.label=Contexte de
la Webapp
org.jahia.admin.components.ManageComponents.webAppName.label=Nom de la
Webbapp
org.jahia.admin.confirmPassword.label=Confirmation du mot de passe
+org.jahia.admin.copyright=<font class=\"text\">© 2002-2005 <a
href=\"http://www.jahia.org\"; target=\"newJahia\">Jahia Ltd</a> - Tous droits
réservés.</font>
org.jahia.admin.database.ManageDatabase.backupCurrentDatabase.label=Sauvegarder
la base de données actuellement utilisée
org.jahia.admin.database.ManageDatabase.backupDesc.label=Description de la
sauvegarde
org.jahia.admin.database.ManageDatabase.backupName.label=Nom de la sauvegarde
Index: ViewAccess.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/access/Attic/ViewAccess.java,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -r1.6 -r1.6.6.1
--- ViewAccess.java 19 Sep 2003 16:37:15 -0000 1.6
+++ ViewAccess.java 6 Jun 2005 14:41:54 -0000 1.6.6.1
@@ -1,4 +1,4 @@
-// $Id: ViewAccess.java,v 1.6 2003/09/19 16:37:15 shuber Exp $
+// $Id: ViewAccess.java,v 1.6.6.1 2005/06/06 14:41:54 pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -208,7 +208,14 @@
}
// reset message...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ JahiaData jData = (JahiaData)request.getAttribute
("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
} // end displayAccess
Index: ManageLogs.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/audit/Attic/ManageLogs.java,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -u -r1.7 -r1.7.6.1
--- ManageLogs.java 6 Sep 2003 12:15:30 -0000 1.7
+++ ManageLogs.java 6 Jun 2005 14:41:54 -0000 1.7.6.1
@@ -1,4 +1,4 @@
-// $Id: ManageLogs.java,v 1.7 2003/09/06 12:15:30 shuber Exp $
+// $Id: ManageLogs.java,v 1.7.6.1 2005/06/06 14:41:54 pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -144,7 +144,16 @@
if(maxLogs == null) maxLogs = "0";
}
- if(jahiaDisplayMessage == null) jahiaDisplayMessage =
Jahia.COPYRIGHT;
+ if(jahiaDisplayMessage == null) {
+ JahiaData jData = (JahiaData)
req.getAttribute("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params();
+ }
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
// set request attributes...
req.setAttribute("logEnabled", new
Boolean(logEnabled));
@@ -197,7 +206,9 @@
ArrayList logData = lMgr.getLog(jParams);
// set default values...
- if(jahiaDisplayMessage == null) jahiaDisplayMessage =
Jahia.COPYRIGHT;
+ if(jahiaDisplayMessage == null) jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
// set session and request attributes...
Boolean keeprecentlogs = (Boolean)
sess.getAttribute("keeprecentlogs");
@@ -240,9 +251,16 @@
// set default values...
- if(jahiaDisplayMessage == null) jahiaDisplayMessage =
Jahia.COPYRIGHT;
-
-
+ if(jahiaDisplayMessage == null) {
+ JahiaData jData = (JahiaData)
req.getAttribute("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params();
+ }
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
if(lReg != null) {
// get log config
@@ -285,7 +303,16 @@
String jahiaDisplayMessage = (String)
sess.getAttribute(CLASS_NAME + "jahiaDisplayMessage");
// set default values...
- if(jahiaDisplayMessage == null) { jahiaDisplayMessage =
Jahia.COPYRIGHT; }
+ if(jahiaDisplayMessage == null) {
+ JahiaData jData = (JahiaData)
req.getAttribute("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params();
+ }
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
if(lReg != null) {
Index: ManageDatabase.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/database/Attic/ManageDatabase.java,v
retrieving revision 1.16.4.2
retrieving revision 1.16.4.2.2.1
diff -u -r1.16.4.2 -r1.16.4.2.2.1
--- ManageDatabase.java 23 Sep 2004 16:31:19 -0000 1.16.4.2
+++ ManageDatabase.java 6 Jun 2005 14:41:55 -0000 1.16.4.2.2.1
@@ -653,7 +653,9 @@
String dspMsg = JahiaResourceBundle.getAdminResource
("org.jahia.admin.processMessage.dbRestoreCompleted.label",
jParams, jParams.getLocale ());
request.setAttribute ("processMessage", dspMsg);
- session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
JahiaAdministration.doRedirect (request, response, session,
JSP_PATH + "finish.jsp");
@@ -712,7 +714,9 @@
String dspMsg = JahiaResourceBundle.getAdminResource
("org.jahia.admin.processMessage.selectedBackupFlushed.label",
jParams, jParams.getLocale ());
request.setAttribute ("processMessage", dspMsg);
- session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
displayRestore (request, response, session);
}
}
@@ -1056,7 +1060,9 @@
String dspMsg = JahiaResourceBundle.getAdminResource
("org.jahia.admin.processMessage.restartJahiaAfterDBChange.label",
jParams, jParams.getLocale ());
request.setAttribute ("processMessage", dspMsg);
- session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
JahiaAdministration.doRedirect (request, response, session, JSP_PATH
+ "finish.jsp");
} // end storeSettings
Index: HomePageTool.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/homepages/Attic/HomePageTool.java,v
retrieving revision 1.15
retrieving revision 1.15.6.1
diff -u -r1.15 -r1.15.6.1
--- HomePageTool.java 9 Sep 2003 17:05:52 -0000 1.15
+++ HomePageTool.java 6 Jun 2005 14:41:55 -0000 1.15.6.1
@@ -160,7 +160,9 @@
// check null jsp bottom message, and fill in if necessary...
if (request.getAttribute ("msg") == null) {
- request.setAttribute ("msg", Jahia.COPYRIGHT);
+ request.setAttribute ("msg",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
if (request.getAttribute ("focus") == null) {
@@ -219,7 +221,9 @@
}
request.setAttribute ("jahiaSite", jahiaSite);
request.setAttribute ("jspSource", JSP_PATH +
"homepages/popup/homepagetool.jsp");
- session.setAttribute ("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute ("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
request.setAttribute ("message", message);
doRedirect (request, response, session, JSP_PATH + "adminpopup.jsp");
message = "";
Index: ManageHomepages.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/homepages/Attic/ManageHomepages.java,v
retrieving revision 1.15.4.1
retrieving revision 1.15.4.1.2.1
diff -u -r1.15.4.1 -r1.15.4.1.2.1
--- ManageHomepages.java 6 Aug 2004 17:59:26 -0000 1.15.4.1
+++ ManageHomepages.java 6 Jun 2005 14:41:55 -0000 1.15.4.1.2.1
@@ -245,7 +245,9 @@
// check null jsp bottom message, and fill in if necessary...
if (request.getAttribute ("msg") == null) {
- request.setAttribute ("msg", Jahia.COPYRIGHT);
+ request.setAttribute ("msg",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
if (request.getAttribute ("focus") == null) {
Index: ManagePages.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/pages/Attic/ManagePages.java,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- ManagePages.java 1 Jul 2003 17:16:08 -0000 1.8
+++ ManagePages.java 6 Jun 2005 14:41:55 -0000 1.8.6.1
@@ -1,4 +1,4 @@
-// $Id: ManagePages.java,v 1.8 2003/07/01 17:16:08 knguyen Exp $
+// $Id: ManagePages.java,v 1.8.6.1 2005/06/06 14:41:55 pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -178,7 +178,14 @@
JahiaAdministration.doRedirect( request, response, session,
JSP_PATH + "pages_settings.jsp" );
// reset message...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ JahiaData jData = (JahiaData)request.getAttribute
("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
} catch (JahiaException je) {
}
} // end displayPagesSettings
Index: ManageSearch.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/search/Attic/ManageSearch.java,v
retrieving revision 1.8.6.2
retrieving revision 1.8.6.3
diff -u -r1.8.6.2 -r1.8.6.3
--- ManageSearch.java 3 Jun 2005 10:29:44 -0000 1.8.6.2
+++ ManageSearch.java 6 Jun 2005 14:41:56 -0000 1.8.6.3
@@ -212,7 +212,15 @@
// check null jsp bottom message, and fill in if necessary...
if (request.getAttribute ("msg") == null) {
- request.setAttribute ("msg", Jahia.COPYRIGHT);
+ JahiaData jData = (JahiaData)request.getAttribute
("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
+ request.setAttribute ("msg",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
+
}
if (request.getAttribute ("focus") == null) {
Index: ManageServer.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/server/Attic/ManageServer.java,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -r1.8 -r1.8.6.1
--- ManageServer.java 23 Sep 2003 14:57:46 -0000 1.8
+++ ManageServer.java 6 Jun 2005 14:41:56 -0000 1.8.6.1
@@ -1,4 +1,4 @@
-// $Id: ManageServer.java,v 1.8 2003/09/23 14:57:46 pvollenweider Exp $
+// $Id: ManageServer.java,v 1.8.6.1 2005/06/06 14:41:56 pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -225,11 +225,11 @@
HttpSession session )
throws IOException, ServletException
{
- JahiaData jData = (JahiaData)
request.getAttribute("org.jahia.data.JahiaData");
- ParamBean jParams = null;
- if (jData != null) {
- jParams = jData.params();
- }
+ JahiaData jData = (JahiaData)
request.getAttribute("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params();
+ }
// set new values in the properties manager...
properties.setProperty("mail_server", (String)
session.getAttribute(CLASS_NAME + "jahiaServerMailServer"));
properties.setProperty("mail_administrator", (String)
session.getAttribute(CLASS_NAME + "jahiaServerMailAdministrator"));
@@ -242,7 +242,9 @@
String dspMsg =
JahiaResourceBundle.getAdminResource("org.jahia.admin.JahiaDisplayMessage.restartJahiaAfterChange.label",
jParams, jParams.getLocale());
request.setAttribute ("processMessage", dspMsg);
- session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute (CLASS_NAME + "jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
JahiaAdministration.doRedirect (request, response, session, JSP_PATH
+ "finish.jsp");
} // end storeSettings
Index: ManageSites.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/sites/Attic/ManageSites.java,v
retrieving revision 1.31.2.1.2.2
retrieving revision 1.31.2.1.2.3
diff -u -r1.31.2.1.2.2 -r1.31.2.1.2.3
--- ManageSites.java 19 May 2005 09:29:37 -0000 1.31.2.1.2.2
+++ ManageSites.java 6 Jun 2005 14:41:56 -0000 1.31.2.1.2.3
@@ -1,4 +1,4 @@
-// $Id: ManageSites.java,v 1.31.2.1.2.2 2005/05/19 09:29:37 knguyen Exp $
+// $Id: ManageSites.java,v 1.31.2.1.2.3 2005/06/06 14:41:56 pvollenweider
Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -216,7 +216,11 @@
String jahiaDisplayMessage = (String)
request.getAttribute(CLASS_NAME + "jahiaDisplayMessage");
// set default values...
- if(jahiaDisplayMessage == null) { jahiaDisplayMessage =
Jahia.COPYRIGHT; }
+ if(jahiaDisplayMessage == null) {
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
try {
Enumeration siteEnum = sMgr.getSites();
@@ -812,7 +816,11 @@
String adminEmail = (String)
request.getAttribute("adminEmail");
// set default values...
- if(jahiaDisplayMessage == null) { jahiaDisplayMessage =
Jahia.COPYRIGHT; }
+ if(jahiaDisplayMessage == null) {
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
if(adminUsername == null) { adminUsername = ""; }
if(adminPassword == null) { adminPassword = ""; }
if(adminConfirm == null) { adminConfirm = ""; }
@@ -920,7 +928,9 @@
session.setAttribute( CLASS_NAME + "adminUsername",
adminUsername );
session.setAttribute( CLASS_NAME + "adminPassword",
adminPassword );
session.setAttribute( CLASS_NAME + "adminProps",
userProps );
- session.setAttribute( CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute( CLASS_NAME + "jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
// reset session
session.setAttribute( CLASS_NAME + "existantAdminUser", null );
@@ -962,7 +972,11 @@
String selectedSite = (String)
request.getAttribute("selectedSite");
// set default values...
- if(jahiaDisplayMessage == null) { jahiaDisplayMessage =
Jahia.COPYRIGHT; }
+ if(jahiaDisplayMessage == null) {
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
if(selectedSite == null) {
if(request.getParameter("site") == null) {
selectedSite = "0";
@@ -1040,7 +1054,9 @@
}
// set default values...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
} // end displaySelectExistantAdmin
@@ -1137,7 +1153,11 @@
SharedTemplatePackagesRegistry tmplSetReg =
SharedTemplatePackagesRegistry.getInstance();
// set default values...
- if(jahiaDisplayMessage == null) { jahiaDisplayMessage =
Jahia.COPYRIGHT; }
+ if(jahiaDisplayMessage == null) {
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
if(selectedTmplSet == null) {
selectedTmplSet = "0";
@@ -1176,7 +1196,9 @@
JahiaAdministration.doRedirect( request, response, session, JSP_PATH
+ "site_choose_template_set.jsp" );
// set default values...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
/**
@@ -1386,9 +1408,12 @@
if ( request.getAttribute("stagingEnabled") != null ){
stagingEnabled =
(Boolean)request.getAttribute("stagingEnabled");
}
-
// set default values...
- if(jahiaDisplayMessage == null) { jahiaDisplayMessage =
Jahia.COPYRIGHT; }
+ if(jahiaDisplayMessage == null) {
+ jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
+ }
if(siteTitle == null) { siteTitle =
site.getTitle(); }
if(siteServerName == null) { siteServerName =
site.getServerName(); }
if(siteKey == null) { siteKey =
site.getSiteKey(); }
@@ -1417,7 +1442,9 @@
displayList( request, response, session );
// reset display message...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
} // end displayEdit
@@ -1506,7 +1533,9 @@
}
// set message default values...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
// redirect...
displayList( request, response, session);
@@ -1609,7 +1638,9 @@
JahiaSite site = sMgr.getSite( siteID.intValue() );
// retrieve previous form values...
- String jahiaDisplayMessage = Jahia.COPYRIGHT;
+ String jahiaDisplayMessage =
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale());
String siteTitle = (String)
request.getAttribute("siteTitle");
String siteServerName = (String)
request.getAttribute("siteServerName");
String siteKey = (String)
request.getAttribute("siteKey");
@@ -1658,7 +1689,9 @@
}
// reset display message...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
} // end displayEdit
Index: ManageTemplates.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/templates/Attic/ManageTemplates.java,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -r1.9 -r1.9.6.1
--- ManageTemplates.java 19 Sep 2003 16:37:23 -0000 1.9
+++ ManageTemplates.java 6 Jun 2005 14:41:57 -0000 1.9.6.1
@@ -1,4 +1,4 @@
-// $Id: ManageTemplates.java,v 1.9 2003/09/19 16:37:23 shuber Exp $
+// $Id: ManageTemplates.java,v 1.9.6.1 2005/06/06 14:41:57 pvollenweider Exp
$
//
// ____.
// __/\ ______| |__/\. _______
@@ -976,7 +976,14 @@
JahiaAdministration.doRedirect( request, response, session,
JSP_PATH + "template_cleanpages.jsp" );
// reset message...
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ JahiaData jData = (JahiaData)request.getAttribute
("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
} catch (JahiaException je) {
}
} // end displaySwap
Index: GroupMembersTool.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/users/Attic/GroupMembersTool.java,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -r1.4 -r1.4.6.1
--- GroupMembersTool.java 9 Sep 2003 17:06:00 -0000 1.4
+++ GroupMembersTool.java 6 Jun 2005 14:41:57 -0000 1.4.6.1
@@ -22,9 +22,11 @@
import org.jahia.bin.Jahia;
import org.jahia.bin.JahiaAdministration;
+import org.jahia.data.JahiaData;
import org.jahia.data.viewhelper.principal.PrincipalViewHelper;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.usermanager.JahiaUserManagerService;
@@ -120,7 +122,14 @@
request.setAttribute("resultList",
PrincipalViewHelper.getSearchResult(request, jahiaSite.getID()));
request.setAttribute("userSearch", JSP_PATH +
"user_management/user_search.jsp");
request.setAttribute("jspSource", JSP_PATH +
"group_management/group_members_tool.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ JahiaData jData = (JahiaData)request.getAttribute
("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
doRedirect(request, response, session, JSP_PATH + "adminpopup.jsp");
}
Index: ManageGroups.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/users/Attic/ManageGroups.java,v
retrieving revision 1.24.4.2.2.1
retrieving revision 1.24.4.2.2.2
diff -u -r1.24.4.2.2.1 -r1.24.4.2.2.2
--- ManageGroups.java 6 Jun 2005 12:58:32 -0000 1.24.4.2.2.1
+++ ManageGroups.java 6 Jun 2005 14:41:57 -0000 1.24.4.2.2.2
@@ -1,4 +1,4 @@
-// $Id: ManageGroups.java,v 1.24.4.2.2.1 2005/06/06 12:58:32 pvollenweider
Exp $
+// $Id: ManageGroups.java,v 1.24.4.2.2.2 2005/06/06 14:41:57 pvollenweider
Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -208,7 +208,9 @@
// check null jsp bottom message, and fill in if necessary...
if( request.getAttribute("msg") == null ) {
- request.setAttribute("msg", Jahia.COPYRIGHT);
+ request.setAttribute("msg",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
if( request.getAttribute("focus") == null ) {
@@ -257,7 +259,9 @@
request.setAttribute("jspSource", JSP_PATH +
"group_management/group_management.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
request.setAttribute("groupSearch", JSP_PATH +
"group_management/group_search.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
session.setAttribute("groupMessage", groupMessage);
// Remove any home page definition from the session.
session.setAttribute("homePageID", null);
@@ -297,7 +301,9 @@
request.setAttribute("jspSource", JSP_PATH +
"group_management/group_create.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
session.setAttribute("groupMessage", groupMessage);
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
doRedirect(request, response, session, JSP_PATH + "admin.jsp" );
groupMessage = "";
}
@@ -464,7 +470,9 @@
}
request.setAttribute("jspSource", JSP_PATH +
"group_management/group_edit.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
session.setAttribute("groupMessage", groupMessage);
doRedirect(request, response, session, JSP_PATH + "admin.jsp");
groupMessage = "";
@@ -574,7 +582,9 @@
request.setAttribute("jspSource", JSP_PATH +
"group_management/group_view.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
doRedirect(request, response, session, JSP_PATH + "admin.jsp" );
groupMessage = "";
}
@@ -611,7 +621,9 @@
request.setAttribute("jspSource", JSP_PATH +
"group_management/group_copy.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
doRedirect(request, response, session, JSP_PATH + "admin.jsp" );
groupMessage = "";
}
@@ -708,7 +720,9 @@
request.setAttribute("jspSource", JSP_PATH +
"group_management/group_remove.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
session.setAttribute("groupMessage", groupMessage);
doRedirect(request, response, session, JSP_PATH + "admin.jsp");
}
Index: ManageUsers.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/admin/users/Attic/ManageUsers.java,v
retrieving revision 1.32.4.2.2.3
retrieving revision 1.32.4.2.2.4
diff -u -r1.32.4.2.2.3 -r1.32.4.2.2.4
--- ManageUsers.java 6 Jun 2005 14:06:46 -0000 1.32.4.2.2.3
+++ ManageUsers.java 6 Jun 2005 14:41:57 -0000 1.32.4.2.2.4
@@ -1,4 +1,4 @@
-// $Id: ManageUsers.java,v 1.32.4.2.2.3 2005/06/06 14:06:46 shuber Exp $
+// $Id: ManageUsers.java,v 1.32.4.2.2.4 2005/06/06 14:41:57 pvollenweider
Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -233,7 +233,9 @@
// check null jsp bottom message, and fill in if necessary...
if ( request.getAttribute("msg") == null ) {
- request.setAttribute("msg", Jahia.COPYRIGHT);
+ request.setAttribute("msg",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
// check null configuration step title, and fill in if
necessary...
@@ -277,7 +279,9 @@
request.setAttribute("jspSource", JSP_PATH +
"user_management/user_management.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
request.setAttribute("userSearch", JSP_PATH +
"user_management/user_search.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
session.setAttribute("userMessage", userMessage);
// Remove any home page definition from the session.
session.setAttribute("homePageID", null);
@@ -370,7 +374,9 @@
}
request.setAttribute("jspSource", JSP_PATH +
"user_management/user_create.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
doRedirect(request, response, session, JSP_PATH + "admin.jsp");
userMessage = "";
}
@@ -616,7 +622,9 @@
}
request.setAttribute("jspSource", JSP_PATH +
"user_management/user_edit.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
session.setAttribute("userMessage", userMessage);
doRedirect(request, response, session, JSP_PATH + "admin.jsp");
userMessage = "";
@@ -761,7 +769,9 @@
session.setAttribute("userMessage", userMessage);
request.setAttribute("jspSource", JSP_PATH +
"user_management/user_remove.jsp");
request.setAttribute("directMenu", JSP_PATH + "direct_menu.jsp");
- session.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute("jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
doRedirect(request, response, session, JSP_PATH + "admin.jsp");
userMessage = "";
}
Index: AdminAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/AdminAction.java,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -r1.1.6.1 -r1.1.6.2
--- AdminAction.java 15 Feb 2005 16:46:54 -0000 1.1.6.1
+++ AdminAction.java 6 Jun 2005 14:41:58 -0000 1.1.6.2
@@ -17,12 +17,12 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-
import org.jahia.bin.JahiaErrorDisplay;
import org.jahia.data.JahiaData;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.services.htmleditors.*;
@@ -52,16 +52,26 @@
protected void init(HttpServletRequest request, HttpServletResponse
response)
throws JahiaException {
+ JahiaData jData = (JahiaData)request.getAttribute
("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
+
try {
HttpSession session = request.getSession();
if(session.getAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage") == null) {
- request.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ request.setAttribute("jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
} else {
request.setAttribute("jahiaDisplayMessage",
(String)
session.getAttribute(JahiaAdministration.CLASS_NAME + "jahiaDisplayMessage") );
}
- session.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage", Jahia.COPYRIGHT);
+ session.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
request.setAttribute("requestURI", request.getRequestURI());
@@ -99,14 +109,14 @@
response.setHeader("Cache-Control", "no-cache");
response.setDateHeader("Expires", 0);
- JahiaData jData =
(JahiaData)request.getAttribute("org.jahia.data.JahiaData");
-
request.setAttribute("currentSite",jData.params().getSite());
request.setAttribute("user",jData.params().getUser());
// check null jsp bottom message, and fill in if necessary...
if( request.getAttribute("msg") == null ) {
- request.setAttribute("msg", Jahia.COPYRIGHT);
+ request.setAttribute("msg",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
if( request.getAttribute("focus") == null ) {
Index: JahiaAdministration.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/JahiaAdministration.java,v
retrieving revision 1.57.2.3.2.5
retrieving revision 1.57.2.3.2.6
diff -u -r1.57.2.3.2.5 -r1.57.2.3.2.6
--- JahiaAdministration.java 13 Apr 2005 14:57:53 -0000 1.57.2.3.2.5
+++ JahiaAdministration.java 6 Jun 2005 14:41:58 -0000 1.57.2.3.2.6
@@ -1,4 +1,4 @@
-// $Id: JahiaAdministration.java,v 1.57.2.3.2.5 2005/04/13 14:57:53 shuber
Exp $
+// $Id: JahiaAdministration.java,v 1.57.2.3.2.6 2005/06/06 14:41:58
pvollenweider Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -474,13 +474,21 @@
String
destination )
throws IOException, ServletException
{
+ JahiaData jData = (JahiaData)request.getAttribute
("org.jahia.data.JahiaData");
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
if(session.getAttribute(CLASS_NAME + "jahiaDisplayMessage") == null)
{
- request.setAttribute("jahiaDisplayMessage", Jahia.COPYRIGHT);
+ request.setAttribute("jahiaDisplayMessage",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
} else {
request.setAttribute("jahiaDisplayMessage", (String)
session.getAttribute(CLASS_NAME + "jahiaDisplayMessage") );
}
-
- session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
Jahia.COPYRIGHT);
+ session.setAttribute(CLASS_NAME + "jahiaDisplayMessage",
+ JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
request.setAttribute("URL", JahiaAdministration.installerURL);
request.setAttribute("requestURI", request.getRequestURI());
@@ -531,9 +539,8 @@
request, response);
*/
- JahiaData jData =
(JahiaData)request.getAttribute("org.jahia.data.JahiaData");
if ( jData != null ){
- ParamBean jParams = jData.getParamBean();
+ jParams = jData.getParamBean();
try {
String htmlContent = ServicesRegistry.getInstance().
getJahiaFetcherService()
Index: HtmlEditorsAdminAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/views/administration/htmleditors/actions/Attic/HtmlEditorsAdminAction.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -r1.2.6.1 -r1.2.6.2
--- HtmlEditorsAdminAction.java 15 Feb 2005 16:46:56 -0000 1.2.6.1
+++ HtmlEditorsAdminAction.java 6 Jun 2005 14:41:58 -0000 1.2.6.2
@@ -33,6 +33,7 @@
import org.jahia.exceptions.JahiaForbiddenAccessException;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.services.htmleditors.*;
import org.jahia.services.htmlparser.*;
import org.jahia.services.sites.*;
@@ -481,7 +482,13 @@
// check null jsp bottom message, and fill in if necessary...
if( request.getAttribute("msg") == null ) {
- request.setAttribute("msg", Jahia.COPYRIGHT);
+ ParamBean jParams = null;
+ if (jData != null) {
+ jParams = jData.params ();
+ }
+ request.setAttribute("msg",
+
JahiaResourceBundle.getAdminResource("org.jahia.admin.copyright",
+ jParams, jParams.getLocale()));
}
if( request.getAttribute("focus") == null ) {
