You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/08/19 04:57:21 UTC

svn commit: r567347 - /myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java

Author: awiner
Date: Sat Aug 18 19:57:20 2007
New Revision: 567347

URL: http://svn.apache.org/viewvc?view=rev&rev=567347
Log:
TRINIDAD-637: MenuModel is looking at the wrong locale
- Use the ViewRoot Locale first, the default locale second - ignore the request locale

Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java?view=diff&rev=567347&r1=567346&r2=567347
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java Sat Aug 18 19:57:20 2007
@@ -163,17 +163,11 @@
       facesContext.getExternalContext().getApplicationMap();
 
     // Get the request Locale
-    Locale requestLocale = facesContext.getExternalContext().getRequestLocale();
-
-    // Make sure it is not null
+    Locale requestLocale = facesContext.getViewRoot().getLocale();
+      
     if (requestLocale == null)
     {
-      requestLocale = facesContext.getViewRoot().getLocale();
-      
-      if (requestLocale == null)
-      {
-        requestLocale = facesContext.getApplication().getDefaultLocale();
-      }
+      requestLocale = facesContext.getApplication().getDefaultLocale();
     }
     
     // Is there a bundle with this key already on the session map?