Author: awiner
Date: Tue Jan 16 16:48:01 2007
New Revision: 496905
URL: http://svn.apache.org/viewvc?view=rev&rev=496905
Log:
ADFFACES-347: TranslationsResourceLoader Get Wrong Resourcebundle For Locales
Who Have Country Code
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java?view=diff&rev=496905&r1=496904&r2=496905
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java
Tue Jan 16 16:48:01 2007
@@ -88,6 +88,9 @@
{
FacesContext context = FacesContext.getCurrentInstance();
String localeStr = getLocaleString(context);
+ // Make sure it's in IANA format
+ if (localeStr != null)
+ localeStr = localeStr.replace('_', '-');
Locale locale = LocaleUtils.getLocaleForIANAString(localeStr);
if (locale == null)
