shuber 2004/08/16 17:03:32 CEST
Modified files:
core/src/java/org/jahia/bin JahiaAdministration.java
Log:
Removed static locale object that was never being initialized and replaced with
request.getLocale()
Revision Changes Path
1.4 +7 -7 jahia/core/src/java/org/jahia/bin/JahiaAdministration.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java.diff?r1=1.3&r2=1.4&f=h
Index: JahiaAdministration.java
===================================================================
RCS file: /cvs/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaAdministration.java 13 Aug 2004 17:36:27 -0000 1.3
+++ JahiaAdministration.java 16 Aug 2004 15:03:32 -0000 1.4
@@ -1,4 +1,4 @@
-// $Id: JahiaAdministration.java,v 1.3 2004/08/13 17:36:27 shuber Exp $
+// $Id: JahiaAdministration.java,v 1.4 2004/08/16 15:03:32 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -482,8 +482,8 @@
// set browser response content type
Locale defaultLocale =
(Locale)session.getAttribute(ParamBean.SESSION_LOCALE);
if (defaultLocale == null) {
- if ( currentLocale != null ){
- defaultLocale = currentLocale;
+ if ( request.getLocale() != null ){
+ defaultLocale = request.getLocale();
} else {
defaultLocale = Locale.ENGLISH;
}
@@ -714,12 +714,12 @@
logger.debug("Login granted: " + jahiaLoginUsername + "
entered correct password.");
} else {
String dspMsg =
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.isntadministrator1.label",
- currentLocale);
+ request.getLocale());
dspMsg += " ";
dspMsg += jahiaLoginUsername;
dspMsg += " ";
dspMsg +=
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.isntadministrator2.label",
- currentLocale);
+ request.getLocale());
request.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage", dspMsg);
JahiaException je = new JahiaException(
"JahiaAdministration",
"Login Error: User " + jahiaLoginUsername + " is not an
administrator.",
@@ -728,7 +728,7 @@
}
} else {
String dspMsg =
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.logininvalid.label",
- currentLocale);
+ request.getLocale());
request.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage", dspMsg);
JahiaException je = new JahiaException( "JahiaAdministration",
"Login Error: User " + jahiaLoginUsername + " entered bad
password.",
@@ -900,7 +900,7 @@
session.setAttribute( ParamBean.SESSION_SITE , currentSite);
} catch ( JahiaException je ) {
String dspMsg =
JahiaResourceBundle.getMessageResource("org.jahia.bin.JahiaConfigurationWizard.JahiaDisplayMessage.logininvalid.label",
- currentLocale);
+ request.getLocale());
request.setAttribute(JahiaAdministration.CLASS_NAME +
"jahiaDisplayMessage", dspMsg);
}
}
