Author: ivaynberg
Date: Sat Dec 15 11:39:14 2007
New Revision: 604492
URL: http://svn.apache.org/viewvc?rev=604492&view=rev
Log:
WICKET-1021 button 'delete' from MultiFileUploadField can not be localized
(I18N support missing)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.properties
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=604492&r1=604491&r2=604492&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
Sat Dec 15 11:39:14 2007
@@ -91,7 +91,7 @@
private static final ResourceReference JS = new
JavascriptResourceReference(
- MultiFileUploadField.class, "MultiFileUploadField.js");
+ MultiFileUploadField.class, "MultiFileUploadField.js");
private final WebComponent upload;
@@ -186,7 +186,7 @@
{
// woops
throw new IllegalStateException("Component " +
getClass().getName() + " must have a " +
- Form.class.getName() + " component
above in the hierarchy");
+ Form.class.getName() + " component above in the
hierarchy");
}
form.setMultiPart(true);
}
@@ -200,8 +200,9 @@
// initialize the javascript library
response.renderJavascriptReference(JS);
response.renderOnDomReadyJavascript("new MultiSelector('" +
getInputName() +
- "', document.getElementById('" +
container.getMarkupId() + "'), " + max +
- ").addElement(document.getElementById('" +
upload.getMarkupId() + "'));");
+ "', document.getElementById('" +
container.getMarkupId() + "'), " + max + ",'" +
+ getString("org.apache.wicket.mfu.delete") +
"').addElement(document.getElementById('" +
+ upload.getMarkupId() + "'));");
}
/**
@@ -232,8 +233,8 @@
final FileItem item =
(FileItem)entry.getValue();
if (!Strings.isEmpty(name) &&
-
name.startsWith(getInputName() + MAGIC_SEPARATOR) &&
-
!Strings.isEmpty(item.getName()))
+ name.startsWith(getInputName()
+ MAGIC_SEPARATOR) &&
+
!Strings.isEmpty(item.getName()))
{
// make sure the fileitem
belongs to this component and
@@ -301,9 +302,9 @@
{
// fail early if there is something interesting
in the model
throw new IllegalStateException("Model object
of " + getClass().getName() +
- " component must be of type `"
+ Collection.class.getName() + "<" +
- FileUpload.class.getName() +
">` but is of type `" +
- object.getClass().getName() +
"`");
+ " component must be of type `" +
Collection.class.getName() + "<" +
+ FileUpload.class.getName() + ">` but is
of type `" +
+ object.getClass().getName() + "`");
}
else
{
@@ -374,7 +375,7 @@
else
{
return getString(RESOURCE_LIMITED,
Model.valueOf(Collections.singletonMap("max",
- new Integer(max))));
+ new Integer(max))));
}
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js?rev=604492&r1=604491&r2=604492&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.js
Sat Dec 15 11:39:14 2007
@@ -38,7 +38,7 @@
* [for duplicate name bug]
* 'neal'
*/
-function MultiSelector( eprefix, list_target,max ){
+function MultiSelector( eprefix, list_target,max, del_label ){
// Where to write the list
this.list_target = list_target;
@@ -53,6 +53,7 @@
this.max = -1;
};
+ this.delete_label=del_label
this.element_name_prefix=eprefix;
/**
@@ -118,7 +119,7 @@
// Delete button
var new_row_button = document.createElement( 'input' );
new_row_button.type = 'button';
- new_row_button.value = 'Delete';
+ new_row_button.value = this.delete_label;
// References
new_row.element = element;
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.properties
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.properties?rev=604492&r1=604491&r2=604492&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.properties
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.properties
Sat Dec 15 11:39:14 2007
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
org.apache.wicket.mfu.caption.unlimited=Files:
-org.apache.wicket.mfu.caption.limited=Files (maximum ${max}):
\ No newline at end of file
+org.apache.wicket.mfu.caption.limited=Files (maximum ${max}):
+org.apache.wicket.mfu.delete=Delete
\ No newline at end of file
