[MMBASE SCM] r41299 - openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite

[andre]

Author: andre
Date: 2010-03-08 23:26:56 +0100 (Mon, 08 Mar 2010)
New Revision: 41299

Modified:
   openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/LocaleUtil.java
Log:
oip-132 narrowing options 

Modified: 
openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/LocaleUtil.java
===================================================================
--- openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/LocaleUtil.java     
2010-03-08 20:53:35 UTC (rev 41298)
+++ openimages/trunk/mmsite/src/main/java/org/mmbase/mmsite/LocaleUtil.java     
2010-03-08 22:26:56 UTC (rev 41299)
@@ -48,6 +48,7 @@
     public static final String EXPLICIT_LOCALE_KEY = 
"org.mmbase.mmsite.language";
 
     protected final List<Locale> acceptedLocales = new ArrayList<Locale>();
+    protected final List<String> acceptedLocaleStrings = new 
ArrayList<String>();
 
 
     /**
@@ -72,9 +73,9 @@
         if (s != null && s.length() > 0) {
             for (String l : s.split(",")) {
                 acceptedLocales.add(new Locale(l));
+                acceptedLocaleStrings.add(l);
             }
             addDegraded(acceptedLocales);
-
         }
     }
 
@@ -119,7 +120,15 @@
         int lastDot = path.lastIndexOf(".");
         if (lastDot >= 0) {
             String lang = path.substring(lastDot + 1, path.length());
-            Locale language =  new Locale(lang);
+            
+            if (! acceptedLocaleStrings.contains(lang)) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Returning path because '" + lang + "' not in " 
+ acceptedLocaleStrings);
+                }
+                return path;
+            }
+            
+            Locale language = new Locale(lang);
             if (! acceptedLocales.contains(language)) {
                 throw new NotFoundException("Locale '" + language + "' is not 
supported (path: " + path + ")");
             }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs