Author: scottbw
Date: Sat Mar 9 15:11:14 2013
New Revision: 1454733
URL: http://svn.apache.org/r1454733
Log:
Minor change to LocaleHandler to support "widget.locales=*" as a valid option.
Modified:
wookie/trunk/src/org/apache/wookie/server/LocaleHandler.java
Modified: wookie/trunk/src/org/apache/wookie/server/LocaleHandler.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/server/LocaleHandler.java?rev=1454733&r1=1454732&r2=1454733&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/server/LocaleHandler.java (original)
+++ wookie/trunk/src/org/apache/wookie/server/LocaleHandler.java Sat Mar 9
15:11:14 2013
@@ -77,7 +77,7 @@ public class LocaleHandler {
private void getLocalesFromConfig(Configuration configuration) {
List<Locale> localeList = new ArrayList<Locale>();
List<String> localeStringList =
configuration.getList("widget.locales");
- if ((localeStringList != null) && (localeStringList.size() > 0)) {
+ if ((localeStringList != null) && (localeStringList.size() > 0) &&
(!localeStringList.get(0).equals("*"))) {
for (final String language : localeStringList) {
localeList.add(new Locale(language));
}
@@ -93,16 +93,6 @@ public class LocaleHandler {
public List<Locale> getLocales() {
return fLocales;
}
-
- public Locale getDefaultLocale() {
- return fDefaultLocale;
- }
-
- public void showLocales(){
- for(Locale locale : fLocales){
- _logger.debug("locale found:"+locale.toString());
- }
- }
private void initResourceBundles() {
resourceBundles = new HashMap<Locale, Messages>();