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 2011/07/04 20:01:26 UTC
svn commit: r1142751 -
/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/
Author: svenmeier
Date: Mon Jul 4 18:01:25 2011
New Revision: 1142751
URL: http://svn.apache.org/viewvc?rev=1142751&view=rev
Log:
language update, different messages for simple and progress failures, supply fileUpload to progressbar to show handling of empty fileUpload
Added:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_de.properties (with props)
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.properties
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ko.properties
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_no.properties
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ru.properties.xml
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html?rev=1142751&r1=1142750&r2=1142751&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.html Mon Jul 4 18:01:25 2011
@@ -23,15 +23,15 @@
</fieldset>
</form>
- <form wicket:id="ajax-simpleUpload">
+ <form wicket:id="progressUpload">
<fieldset>
- <legend>Upload form with ajax progress bar</legend>
+ <legend>Upload form with progress bar</legend>
<p>
<label for="upload">File</label>
<input wicket:id="fileInput" type="file"/>
</p>
<input type="submit" value="Upload!"/>
- <span wicket:id="progress">[[ajax upload progressbar]]</span>
+ <span wicket:id="progress">[[upload progressbar]]</span>
</fieldset>
</form>
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=1142751&r1=1142750&r2=1142751&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Mon Jul 4 18:01:25 2011
@@ -91,7 +91,7 @@ public class UploadPage extends WicketEx
*/
private class FileUploadForm extends Form<Void>
{
- private FileUploadField fileUploadField;
+ FileUploadField fileUploadField;
/**
* Construct.
@@ -185,11 +185,12 @@ public class UploadPage extends WicketEx
});
add(fileListView);
- // Add upload form with ajax progress bar
- final FileUploadForm ajaxSimpleUploadForm = new FileUploadForm("ajax-simpleUpload");
+ // Add upload form with progress bar
+ final FileUploadForm progressUploadForm = new FileUploadForm("progressUpload");
- ajaxSimpleUploadForm.add(new UploadProgressBar("progress", ajaxSimpleUploadForm));
- add(ajaxSimpleUploadForm);
+ progressUploadForm.add(new UploadProgressBar("progress", progressUploadForm,
+ progressUploadForm.fileUploadField));
+ add(progressUploadForm);
// Add upload form that uses HTML5 <input type="file" multiple />, so it can upload
// more than one file in browsers which support "multiple" attribute
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.properties?rev=1142751&r1=1142750&r2=1142751&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.properties (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.properties Mon Jul 4 18:01:25 2011
@@ -12,5 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-simpleUpload.uploadTooLarge = File must be less than ${maxSize}.
-simpleUpload.uploadFailed = File failed to upload: ${exception.localizedMessage}
+simpleUpload.uploadTooLarge = Simple - File must be less than ${maxSize}.
+simpleUpload.uploadFailed = Simple - File failed to upload: ${exception.localizedMessage}
+
+progressUpload.uploadTooLarge = Progress - File must be less than ${maxSize}.
+progressUpload.uploadFailed = Progress - File failed to upload: ${exception.localizedMessage}
Added: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_de.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_de.properties?rev=1142751&view=auto
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_de.properties (added)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_de.properties Mon Jul 4 18:01:25 2011
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+simpleUpload.uploadTooLarge = Simple - Datei muss kleiner sein als ${maxSize}.
+simpleUpload.uploadFailed = Simple - Hochladen der Datei gescheitert: ${exception.localizedMessage}
+
+progressUpload.uploadTooLarge = Progress - Datei muss kleiner sein als ${maxSize}.
+progressUpload.uploadFailed = Progress - Hochladen der Datei gescheitert: ${exception.localizedMessage}
Propchange: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_de.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ko.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ko.properties?rev=1142751&r1=1142750&r2=1142751&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ko.properties (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ko.properties Mon Jul 4 18:01:25 2011
@@ -12,5 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-simpleUpload.uploadTooLarge = \ud30c\uc77c \ud06c\uae30\ub294 \ubc18\ub4dc\uc2dc ${maxSize} \uc774\ud558\uc5ec\uc57c \ud569\ub2c8\ub2e4.
-simpleUpload.uploadFailed = \ud30c\uc77c \uc5c5\ub85c\ub4dc\uc5d0 \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4: ${exception.localizedMessage}
+simpleUpload.uploadTooLarge = Simple - \ud30c\uc77c \ud06c\uae30\ub294 \ubc18\ub4dc\uc2dc ${maxSize} \uc774\ud558\uc5ec\uc57c \ud569\ub2c8\ub2e4.
+simpleUpload.uploadFailed = Simple - \ud30c\uc77c \uc5c5\ub85c\ub4dc\uc5d0 \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4: ${exception.localizedMessage}
+
+progressUpload.uploadTooLarge = Progress - \ud30c\uc77c \ud06c\uae30\ub294 \ubc18\ub4dc\uc2dc ${maxSize} \uc774\ud558\uc5ec\uc57c \ud569\ub2c8\ub2e4.
+progressUpload.uploadFailed = Progress - \ud30c\uc77c \uc5c5\ub85c\ub4dc\uc5d0 \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4: ${exception.localizedMessage}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_no.properties
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_no.properties?rev=1142751&r1=1142750&r2=1142751&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_no.properties (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_no.properties Mon Jul 4 18:01:25 2011
@@ -12,5 +12,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-simpleUpload.uploadTooLarge = Filen må være mindre enn ${maxSize}.
-simpleUpload.uploadFailed = Filen kunne ikke lastes opp: ${exception.localizedMessage}
+simpleUpload.uploadTooLarge = Simple - Filen må være mindre enn ${maxSize}.
+simpleUpload.uploadFailed = Simple - Filen kunne ikke lastes opp: ${exception.localizedMessage}
+
+progressUpload.uploadTooLarge = Progress - Filen må være mindre enn ${maxSize}.
+progressUpload.uploadFailed = Progress - Filen kunne ikke lastes opp: ${exception.localizedMessage}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ru.properties.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ru.properties.xml?rev=1142751&r1=1142750&r2=1142751&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ru.properties.xml (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage_ru.properties.xml Mon Jul 4 18:01:25 2011
@@ -17,6 +17,8 @@
-->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
- <entry key="simpleUpload.uploadTooLarge">Ð Ð°Ð·Ð¼ÐµÑ Ñайла не должен пÑевÑÑаÑÑ ${maxSize}.</entry>
- <entry key="simpleUpload.uploadFailed">ÐÑибка загÑÑзки Ñайла на ÑеÑвеÑ: ${exception.localizedMessage}.</entry>
+ <entry key="simpleUpload.uploadTooLarge">Simple - Ð Ð°Ð·Ð¼ÐµÑ Ñайла не должен пÑевÑÑаÑÑ ${maxSize}.</entry>
+ <entry key="simpleUpload.uploadFailed">Simple - ÐÑибка загÑÑзки Ñайла на ÑеÑвеÑ: ${exception.localizedMessage}.</entry>
+ <entry key="progressUpload.uploadTooLarge">Progress - Ð Ð°Ð·Ð¼ÐµÑ Ñайла не должен пÑевÑÑаÑÑ ${maxSize}.</entry>
+ <entry key="progressUpload.uploadFailed">Progress - ÐÑибка загÑÑзки Ñайла на ÑеÑвеÑ: ${exception.localizedMessage}.</entry>
</properties>
\ No newline at end of file