Author: simoneg
Date: Fri Mar 12 16:41:45 2010
New Revision: 922326
URL: http://svn.apache.org/viewvc?rev=922326&view=rev
Log:
Support correctly the locale preselected in session
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj?rev=922326&r1=922325&r2=922326&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj
Fri Mar 12 16:41:45 2010
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpSession;
import org.apache.magma.i18n.CurrentLocale;
import org.apache.magma.website.Dispatch;
+import org.apache.magma.website.utils.OnDemandBinder;
public aspect Localizer {
@@ -30,7 +31,7 @@ public aspect Localizer {
Locale locale = req.getLocale();
HttpSession session = req.getSession(false);
if (session != null) {
- String sessLocale =
(String)session.getAttribute("magma_locale");
+ String sessLocale = (String)
OnDemandBinder.convertFetch(session.getAttribute("magma_locale"), String.class,
true);
if (sessLocale != null) {
if (CurrentLocale.setLocale(sessLocale)) return;
}
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java?rev=922326&r1=922325&r2=922326&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
Fri Mar 12 16:41:45 2010
@@ -210,7 +210,7 @@ public class OnDemandBinder {
return null;
}
- private Object convertFetch(Object value, Class type) {
+ public static Object convertFetch(Object value, Class type) {
if (value != null && value instanceof String) {
Converter converter = Converters.getConverterFor(type);
if (converter != null) {
@@ -220,7 +220,7 @@ public class OnDemandBinder {
return value;
}
- private Object convertFetch(Object value, Class type, boolean
parseType) {
+ public static Object convertFetch(Object value, Class type, boolean
parseType) {
if (value != null && value instanceof String) {
String strval = (String) value;
int iop = strval.indexOf(':');
@@ -335,7 +335,7 @@ public class OnDemandBinder {
}
}
- private Object convertStore(Object value) {
+ public static Object convertStore(Object value) {
if (value != null && !(value instanceof String)) {
Converter converter =
Converters.getConverterFor(value.getClass());
if (converter != null) {
@@ -345,7 +345,7 @@ public class OnDemandBinder {
return value;
}
- private Object convertStore(Object value, boolean withtype) {
+ public static Object convertStore(Object value, boolean withtype) {
Object ret = convertStore(value);
if (ret != null && ret instanceof String) {
ret = value.getClass().getName() + ":" + ret;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
