[playframework#639] fix

ltullman · Mar 9, 2011 · aee53de · aee53de
1 parent ba95c0f
commit aee53de
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/framework/src/play/data/binding/AnnotationHelper.java b/framework/src/play/data/binding/AnnotationHelper.java
@@ -59,10 +59,13 @@ public static Tuple getLocale(String[] langs) {
             String[] commaSeparatedLang = l.split(",");
             for (String lang : commaSeparatedLang) {
                 if (Lang.get().equals(lang) || "*".equals(lang)) {
+                    Locale locale = null;
                     if ("*".equals(lang)) {
-                        lang = Locale.getDefault().getLanguage();
+                        locale = Lang.getLocale();
+                    }
+                    if (locale == null) {
+                        locale = Lang.getLocale(lang);
                     }
-                    Locale locale = Lang.getLocale(lang);
                     if (locale != null) {
                         return new Tuple(i, locale);
                     }