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 2013/02/08 09:49:32 UTC
git commit: WICKET-5029 allow non-localized display values
Updated Branches:
refs/heads/master c9845b238 -> f2e235572
WICKET-5029 allow non-localized display values
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f2e23557
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f2e23557
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f2e23557
Branch: refs/heads/master
Commit: f2e2355720c5d97bfdd49384ae1e00cea64fc5f6
Parents: c9845b2
Author: svenmeier <sv...@apache.org>
Authored: Fri Feb 8 09:48:55 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Fri Feb 8 09:48:55 2013 +0100
----------------------------------------------------------------------
.../markup/html/form/palette/Palette.java | 23 +++++++++++++++
.../form/palette/component/AbstractOptions.java | 19 +++++++++++-
2 files changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f2e23557/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
index 48e8afc..c5ab371 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
@@ -387,6 +387,12 @@ public class Palette<T> extends GenericPanel<Collection<? extends T>>
{
return Palette.this.getAdditionalAttributesForSelection(choice);
}
+
+ @Override
+ protected boolean localizeDisplayValues()
+ {
+ return Palette.this.localizeDisplayValues();
+ }
};
}
@@ -416,10 +422,27 @@ public class Palette<T> extends GenericPanel<Collection<? extends T>>
{
return Palette.this.getAdditionalAttributesForChoices(choice);
}
+
+ @Override
+ protected boolean localizeDisplayValues()
+ {
+ return Palette.this.localizeDisplayValues();
+ }
};
}
/**
+ * Override this method if you do <strong>not</strong> want to localize the display values of
+ * the generated options. By default true is returned.
+ *
+ * @return true If you want to localize the display values, default == true
+ */
+ protected boolean localizeDisplayValues()
+ {
+ return true;
+ }
+
+ /**
* @param choice
* @return null
* @see org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes(Object)
http://git-wip-us.apache.org/repos/asf/wicket/blob/f2e23557/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
index 59ebc90..73d6e82 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
@@ -19,13 +19,13 @@ package org.apache.wicket.extensions.markup.html.form.palette.component;
import java.util.Iterator;
import java.util.Map;
+import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.IValueMap;
@@ -73,6 +73,8 @@ public abstract class AbstractOptions<T> extends FormComponent<T>
Iterator<T> options = getOptionsIterator();
IChoiceRenderer<T> renderer = getPalette().getChoiceRenderer();
+ boolean localizeDisplayValues = localizeDisplayValues();
+
while (options.hasNext())
{
final T choice = options.next();
@@ -99,7 +101,10 @@ public abstract class AbstractOptions<T> extends FormComponent<T>
@SuppressWarnings("unchecked")
IConverter<Object> converter = (IConverter<Object>)getConverter(displayClass);
String displayString = converter.convertToString(displayValue, getLocale());
- displayString = getLocalizer().getString(displayString, this, displayString);
+ if (localizeDisplayValues)
+ {
+ displayString = getLocalizer().getString(displayString, this, displayString);
+ }
if (getEscapeModelStrings())
{
@@ -135,6 +140,16 @@ public abstract class AbstractOptions<T> extends FormComponent<T>
}
/**
+ * Should display values be localized.
+ *
+ * @return default {@code true}
+ */
+ protected boolean localizeDisplayValues()
+ {
+ return true;
+ }
+
+ /**
* @param choice
* @return map of attribute/value pairs (String/String)
*/