You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by dr...@apache.org on 2010/11/11 19:56:52 UTC
svn commit: r1034048 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java
Author: drobiazko
Date: Thu Nov 11 18:56:51 2010
New Revision: 1034048
URL: http://svn.apache.org/viewvc?rev=1034048&view=rev
Log:
TAP5-1345: A supported locale name is only recognized in lower case
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java?rev=1034048&r1=1034047&r2=1034048&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java Thu Nov 11 18:56:51 2010
@@ -193,7 +193,7 @@ public class LocalizationSetterImpl impl
public boolean isSupportedLocaleName(String localeName)
{
- return supportedLocaleNames.contains(localeName);
+ return supportedLocaleNames.contains(localeName.toLowerCase());
}
public SelectModel getSupportedLocalesModel()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java?rev=1034048&r1=1034047&r2=1034048&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java Thu Nov 11 18:56:51 2010
@@ -205,4 +205,28 @@ public class LocalizationSetterImplTest
verify();
}
+
+ @Test
+ public void is_supported_locale_name()
+ {
+ PersistentLocale pl = mockPersistentLocale();
+ ThreadLocale tl = mockThreadLocale();
+ Request request = mockRequest();
+
+
+ replay();
+
+ LocalizationSetterImpl setter = new LocalizationSetterImpl(request, pl, tl, "de, de_DE, de_CH,en");
+
+ assertTrue(setter.isSupportedLocaleName("de"));
+ assertTrue(setter.isSupportedLocaleName("de_de"));
+ assertTrue(setter.isSupportedLocaleName("de_de"));
+ assertTrue(setter.isSupportedLocaleName("de_DE"));
+ assertTrue(setter.isSupportedLocaleName("de_ch"));
+ assertTrue(setter.isSupportedLocaleName("de_CH"));
+ assertTrue(setter.isSupportedLocaleName("en"));
+
+ verify();
+
+ }
}