You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/12/10 22:29:18 UTC
svn commit: r1044517 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java
Author: jdonnerstag
Date: Fri Dec 10 21:29:18 2010
New Revision: 1044517
URL: http://svn.apache.org/viewvc?rev=1044517&view=rev
Log:
fixed WICKET-3207 Localizer.substitutePropertyExpressions() is called twice when Localizer.getString() is called
Issue: WICKET-3207
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java?rev=1044517&r1=1044516&r2=1044517&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Localizer.java Fri Dec 10 21:29:18 2010
@@ -206,6 +206,13 @@ public class Localizer
if (resourceSettings.getUseDefaultOnMissingResource())
{
value = defaultValue;
+
+ // If a property value has been found, or a default value was given,
+ // than replace the placeholder and we are done
+ if (value != null)
+ {
+ return substitutePropertyExpressions(component, value, model);
+ }
}
}
@@ -213,7 +220,7 @@ public class Localizer
// than replace the placeholder and we are done
if (value != null)
{
- return substitutePropertyExpressions(component, value, model);
+ return value;
}
if (resourceSettings.getThrowExceptionOnMissingResource())