shuber 2004/08/16 17:02:13 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
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.57.2.3 +7 -10 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.2&r2=1.57.2.3&f=h
Index: JahiaAdministration.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/bin/Attic/JahiaAdministration.java,v
retrieving revision 1.57.2.2
retrieving revision 1.57.2.3
diff -u -r1.57.2.2 -r1.57.2.3
--- JahiaAdministration.java 13 Aug 2004 17:02:59 -0000 1.57.2.2
+++ JahiaAdministration.java 16 Aug 2004 15:02:12 -0000 1.57.2.3
@@ -1,4 +1,4 @@
-// $Id: JahiaAdministration.java,v 1.57.2.2 2004/08/13 17:02:59 shuber Exp $
+// $Id: JahiaAdministration.java,v 1.57.2.3 2004/08/16 15:02:12 shuber Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -148,9 +148,6 @@
/** properties filename */
static private final String PROPERTIES_FILENAME = "jahia.properties";
- static private Locale currentLocale = null;
-
-
//-------------------------------------------------------------------------
/**
* Default init inherited from HttpServlet. This method set config and
@@ -482,8 +479,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 +711,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 +725,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 +897,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);
}
}
