Updated Branches:
  refs/heads/master 0c3dfda71 -> 1d87d3ad5

Fix test expectation. Remove 'variation'.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d87d3ad
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d87d3ad
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d87d3ad

Branch: refs/heads/master
Commit: 1d87d3ad52b1ed61bbf3cd5bfb69d73e7bb19fea
Parents: 0c3dfda
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Wed Jul 25 17:35:02 2012 +0300
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Wed Jul 25 17:35:02 2012 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/Localizer.java |    2 +-
 .../test/java/org/apache/wicket/LocalizerTest.java |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/1d87d3ad/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 f6cfd0a..313702d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Localizer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Localizer.java
@@ -233,7 +233,7 @@ public class Localizer
                                message.append(component.getPageRelativePath());
                                message.append(" 
[class=").append(component.getClass().getName()).append("]");
                        }
-                       message.append(". Locale: ").append(locale).append(", 
style: ").append(style).append(", variation: ");
+                       message.append(". Locale: ").append(locale).append(", 
style: ").append(style);
 
                        throw new MissingResourceException(message.toString(), 
(component != null
                                ? component.getClass().getName() : ""), key);

http://git-wip-us.apache.org/repos/asf/wicket/blob/1d87d3ad/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java 
b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java
index 16eec28..cf73e95 100644
--- a/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/LocalizerTest.java
@@ -273,7 +273,7 @@ public class LocalizerTest extends Assert
                {
                        assertEquals(
                                ex.getMessage(),
-                               "Unable to find property: 'dummy.null' for 
component: form:drop1 
[class=org.apache.wicket.markup.html.form.DropDownChoice]");
+                               "Unable to find property: 'dummy.null' for 
component: form:drop1 
[class=org.apache.wicket.markup.html.form.DropDownChoice]. Locale: null, style: 
null");
                }
        }
 

Reply via email to