You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/07/19 18:02:44 UTC
git commit: WICKET-3753 use component's locale if available
Updated Branches:
refs/heads/master a99ab59b3 -> 1dad22939
WICKET-3753 use component's locale if available
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1dad2293
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1dad2293
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1dad2293
Branch: refs/heads/master
Commit: 1dad22939b8e87c2392186332d3fb92b3b6192d2
Parents: a99ab59
Author: svenmeier <sv...@apache.org>
Authored: Thu Jul 19 18:01:20 2012 +0200
Committer: svenmeier <sv...@apache.org>
Committed: Thu Jul 19 18:01:20 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Localizer.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1dad2293/wicket-core/src/main/java/org/apache/wicket/Localizer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Localizer.java b/wicket-core/src/main/java/org/apache/wicket/Localizer.java
index 0e33c36..c9cb780 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Localizer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Localizer.java
@@ -536,22 +536,26 @@ public class Localizer
{
return new PropertyVariableInterpolator(string, model.getObject())
{
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected String toString(Object value)
{
IConverter converter;
+ Locale locale;
if (component == null)
{
converter = Application.get()
.getConverterLocator()
.getConverter(value.getClass());
+ locale = Session.get().getLocale();
}
else
{
converter = component.getConverter(value.getClass());
+ locale = component.getLocale();
}
- return converter.convertToString(value, Session.get().getLocale());
+ return converter.convertToString(value, locale);
}
}.toString();
}