You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/20 18:04:59 UTC
svn commit: r669962 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
Author: ivaynberg
Date: Fri Jun 20 09:04:59 2008
New Revision: 669962
URL: http://svn.apache.org/viewvc?rev=669962&view=rev
Log:
WICKET-1711
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java?rev=669962&r1=669961&r2=669962&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java Fri Jun 20 09:04:59 2008
@@ -21,6 +21,7 @@
import java.util.ResourceBundle;
import org.apache.wicket.Component;
+import org.apache.wicket.Session;
/**
@@ -61,12 +62,16 @@
* Not used for this implementation (see {@link org.apache.wicket.Session})
* @return The string resource value or null if resource not found
*/
- public final String loadStringResource(final Class< ? > clazz, final String key, Locale locale,
+ public final String loadStringResource(final Class<?> clazz, final String key, Locale locale,
final String style)
{
if (locale == null)
{
- locale = Locale.getDefault();
+ locale = Session.get().getLocale();
+ if (locale == null)
+ {
+ locale = Locale.getDefault();
+ }
}
try
{
@@ -89,7 +94,7 @@
* The key to obtain the string for
* @return The string resource value or null if resource not found
*/
- public final String loadStringResource(final Component< ? > component, final String key)
+ public final String loadStringResource(final Component<?> component, final String key)
{
final Locale locale = (component != null) ? component.getLocale() : null;
return loadStringResource(null, key, locale, null);