You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/07/31 11:58:31 UTC
svn commit: r799564 -
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
Author: matzew
Date: Fri Jul 31 09:58:30 2009
New Revision: 799564
URL: http://svn.apache.org/viewvc?rev=799564&view=rev
Log:
TRINIDAD-1480 - XMLMenuModel resourceBundle does not use f:view (viewRoot) locale
Thanks to Abhijit S Ghosh for the patch
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java?rev=799564&r1=799563&r2=799564&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java Fri Jul 31 09:58:30 2009
@@ -217,18 +217,13 @@
Map<String, Object> applicationMap =
facesContext.getExternalContext().getApplicationMap();
- // Get the request Locale
- Locale requestLocale = facesContext.getExternalContext().getRequestLocale();
+ // Get the view root locale
+ Locale requestLocale = facesContext.getViewRoot().getLocale();
// Make sure it is not null
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?