Author: simoneg
Date: Mon Oct 19 22:33:11 2009
New Revision: 826844
URL: http://svn.apache.org/viewvc?rev=826844&view=rev
Log:
Internal refactoring of locale string parsing
Modified:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj
Modified:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java?rev=826844&r1=826843&r2=826844&view=diff
==============================================================================
---
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java
(original)
+++
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java
Mon Oct 19 22:33:11 2009
@@ -36,6 +36,23 @@
private static CycleThreadLocal<LocaleHolder> current = new
CycleThreadLocal<LocaleHolder>();
+ public static boolean setLocale(String locale) {
+ Locale loc = null;
+ String[] localeElements = sessLocale.split("_");
+ if (localeElements.length == 1) {
+ loc = new Locale(localeElements[0]);
+ } else if (localeElements.length == 2) {
+ loc = new Locale(localeElements[0], localeElements[1]);
+ } else if (localeElements.length == 3) {
+ loc = new Locale(localeElements[0], localeElements[1],
localeElements[2]);
+ }
+ if (loc != null) {
+ setLocale(loc);
+ return true;
+ }
+ return false;
+ }
+
/**
* Sets the current {...@link Thread} locale.
* @param locale The locate to set.
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=826844&r1=826843&r2=826844&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
Mon Oct 19 22:33:11 2009
@@ -32,14 +32,7 @@
if (session != null) {
String sessLocale =
(String)session.getAttribute("magma_locale");
if (sessLocale != null) {
- String[] localeElements = sessLocale.split("_");
- if (localeElements.length == 1) {
- locale = new Locale(localeElements[0]);
- } else if (localeElements.length == 2) {
- locale = new Locale(localeElements[0],
localeElements[1]);
- } else if (localeElements.length == 3) {
- locale = new Locale(localeElements[0],
localeElements[1], localeElements[2]);
- }
+ if (CurrentLocale.setLocale(sessLocale)) return;
}
}
CurrentLocale.setLocale(locale);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
