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/05/25 23:22:28 UTC
git commit: WICKET-5206 provide default messages for upload exceptions
Updated Branches:
refs/heads/master 14e891a73 -> ae7ce5644
WICKET-5206 provide default messages for upload exceptions
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ae7ce564
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ae7ce564
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ae7ce564
Branch: refs/heads/master
Commit: ae7ce56448d69e43bc0b65a698d15ea09f308eab
Parents: 14e891a
Author: svenmeier <sv...@meiers.net>
Authored: Sat May 25 23:18:50 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Sat May 25 23:18:50 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/Application.properties | 5 +-
.../org/apache/wicket/Application_de.properties | 3 +
.../org/apache/wicket/Application_hu.properties | 3 +
.../org/apache/wicket/Application_ko.properties | 3 +
.../org/apache/wicket/Application_no.properties | 5 +-
.../apache/wicket/Application_ru.properties.xml | 3 +
.../org/apache/wicket/markup/html/form/Form.java | 99 +++++++--------
.../examples/upload/MultiUploadPage.properties | 16 ---
.../examples/upload/MultiUploadPage_de.properties | 16 ---
.../examples/upload/MultiUploadPage_hu.properties | 16 ---
.../examples/upload/MultiUploadPage_ko.properties | 16 ---
.../examples/upload/MultiUploadPage_no.properties | 16 ---
.../upload/MultiUploadPage_ru.properties.xml | 22 ----
13 files changed, 64 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-core/src/main/java/org/apache/wicket/Application.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.properties b/wicket-core/src/main/java/org/apache/wicket/Application.properties
index eee237f..0aed4c1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.properties
@@ -58,4 +58,7 @@ PagingNavigation.page=Go to page ${page}
org.apache.wicket.mfu.caption.unlimited=Files:
org.apache.wicket.mfu.caption.limited=Files (maximum ${max}):
-org.apache.wicket.mfu.delete=Delete
\ No newline at end of file
+org.apache.wicket.mfu.delete=Delete
+
+uploadTooLarge = File must be less than ${maxSize}.
+uploadFailed = File failed to upload: ${exception.localizedMessage}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_de.properties b/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
index 781eb59..7014ff2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_de.properties
@@ -48,3 +48,6 @@ PagingNavigation.page=Gehe zu Seite ${page}
org.apache.wicket.mfu.caption.unlimited=Dateien:
org.apache.wicket.mfu.caption.limited=Dateien (max. ${max}):
org.apache.wicket.mfu.delete=L\u00f6schen
+
+uploadTooLarge = Datei muss kleiner sein als ${maxSize}.
+uploadFailed = Hochladen der Datei ist gescheitert: ${exception.localizedMessage}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-core/src/main/java/org/apache/wicket/Application_hu.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_hu.properties b/wicket-core/src/main/java/org/apache/wicket/Application_hu.properties
index 847213a..5f3fcea 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_hu.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_hu.properties
@@ -50,3 +50,6 @@ PagingNavigation.page=Ugr\u00E1s a(z) ${page} oldalra
org.apache.wicket.mfu.caption.unlimited=Felt\u00F6ltend\u0151 \u00E1llom\u00E1nyok\:
org.apache.wicket.mfu.caption.limited=Felt\u00F6ltend\u0151 \u00E1llom\u00E1nyok (maximum ${max})\:
org.apache.wicket.mfu.delete=T\u00F6r\u00F6l
+
+uploadTooLarge = A f\u00E1jlnak kisebbnek kell lennie, mint ${maxSize}.
+uploadFailed = Hiba a f\u00E1jl felt\u00F6lt\u00E9sekor: ${exception.localizedMessage}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-core/src/main/java/org/apache/wicket/Application_ko.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_ko.properties b/wicket-core/src/main/java/org/apache/wicket/Application_ko.properties
index 6c4af99..d67763a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_ko.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_ko.properties
@@ -41,3 +41,6 @@ nullValid=
org.apache.wicket.mfu.caption.unlimited=\ud30c\uc77c\ub4e4:
org.apache.wicket.mfu.caption.limited=\ud30c\uc77c\ub4e4 (\ucd5c\ub300 ${max}):
+
+uploadTooLarge = \ud30c\uc77c \ud06c\uae30\ub294 \ubc18\ub4dc\uc2dc ${maxSize} \uc774\ud558\uc5ec\uc57c \ud569\ub2c8\ub2e4.
+uploadFailed = \ud30c\uc77c \uc5c5\ub85c\ub4dc\uc5d0 \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4: ${exception.localizedMessage}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-core/src/main/java/org/apache/wicket/Application_no.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_no.properties b/wicket-core/src/main/java/org/apache/wicket/Application_no.properties
index 04c6193..6a017eb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_no.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_no.properties
@@ -41,4 +41,7 @@ nullValid=
org.apache.wicket.mfu.caption.unlimited=Filer:
org.apache.wicket.mfu.caption.limited=Filer (maks ${max}):
-org.apache.wicket.mfu.delete=Slett
\ No newline at end of file
+org.apache.wicket.mfu.delete=Slett
+
+uploadTooLarge = Filen m� v�re mindre enn ${maxSize}.
+uploadFailed = Filen kunne ikke lastes opp: ${exception.localizedMessage}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml b/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
index e725b7e..f3f9b4a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
+++ b/wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
@@ -57,4 +57,7 @@
<entry key="org.apache.wicket.mfu.caption.unlimited">Файлы:</entry>
<entry key="org.apache.wicket.mfu.caption.limited">Файлы (всего не больше ${max}): </entry>
+
+ <entry key="uploadTooLarge">Размер файла не должен превышать ${maxSize}.</entry>
+ <entry key="uploadFailed">Ошибка загрузки файла на сервер: ${exception.localizedMessage}.</entry>
</properties>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index 0b550da..fdaec59 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -223,8 +223,8 @@ public class Form<T> extends WebMarkupContainer
{
if (form.isEnabledInHierarchy())
{
- if (component.isVisibleInHierarchy() &&
- component.isEnabledInHierarchy())
+ if (component.isVisibleInHierarchy()
+ && component.isEnabledInHierarchy())
{
((IFormModelUpdateListener)component).updateModel();
}
@@ -441,20 +441,20 @@ public class Form<T> extends WebMarkupContainer
{
String name = submittingComponent.getInputName();
IRequestParameters parameters = getRequest().getRequestParameters();
- if ((!parameters.getParameterValue(name).isNull()) ||
- !parameters.getParameterValue(name + ".x").isNull())
+ if ((!parameters.getParameterValue(name).isNull())
+ || !parameters.getParameterValue(name + ".x").isNull())
{
if (!component.isVisibleInHierarchy())
{
- throw new WicketRuntimeException("Submit Button " +
- submittingComponent.getInputName() + " (path=" +
- component.getPageRelativePath() + ") is not visible");
+ throw new WicketRuntimeException("Submit Button "
+ + submittingComponent.getInputName() + " (path="
+ + component.getPageRelativePath() + ") is not visible");
}
if (!component.isEnabledInHierarchy())
{
- throw new WicketRuntimeException("Submit Button " +
- submittingComponent.getInputName() + " (path=" +
- component.getPageRelativePath() + ") is not enabled");
+ throw new WicketRuntimeException("Submit Button "
+ + submittingComponent.getInputName() + " (path="
+ + component.getPageRelativePath() + ") is not enabled");
}
visit.stop(submittingComponent);
}
@@ -544,12 +544,9 @@ public class Form<T> extends WebMarkupContainer
}
Form<?> root = getRootForm();
- return new AppendingStringBuffer("document.getElementById('").append(
- root.getHiddenFieldId())
- .append("').value='")
- .append(url)
- .append("';document.getElementById('")
- .append(root.getMarkupId())
+ return new AppendingStringBuffer("document.getElementById('")
+ .append(root.getHiddenFieldId()).append("').value='").append(url)
+ .append("';document.getElementById('").append(root.getMarkupId())
.append("').submit();");
}
@@ -685,7 +682,8 @@ public class Form<T> extends WebMarkupContainer
if (getRequest().getContainerRequest() instanceof HttpServletRequest)
{
String desiredMethod = getMethod();
- String actualMethod = ((HttpServletRequest)getRequest().getContainerRequest()).getMethod();
+ String actualMethod = ((HttpServletRequest)getRequest().getContainerRequest())
+ .getMethod();
if (!actualMethod.equalsIgnoreCase(desiredMethod))
{
MethodMismatchResponse response = onMethodMismatch();
@@ -696,8 +694,8 @@ public class Form<T> extends WebMarkupContainer
case CONTINUE :
break;
default :
- throw new IllegalStateException("Invalid " +
- MethodMismatchResponse.class.getName() + " value: " + response);
+ throw new IllegalStateException("Invalid "
+ + MethodMismatchResponse.class.getName() + " value: " + response);
}
}
}
@@ -737,8 +735,7 @@ public class Form<T> extends WebMarkupContainer
// Tells FormComponents that a new user input has come
inputChanged();
- String url = getRequest().getRequestParameters()
- .getParameterValue(getHiddenFieldId())
+ String url = getRequest().getRequestParameters().getParameterValue(getHiddenFieldId())
.toString();
if (!Strings.isEmpty(url))
{
@@ -1191,7 +1188,8 @@ public class Form<T> extends WebMarkupContainer
buffer.append(defaultSubmittingComponent.getInputName());
buffer.append("\" onclick=\" var b=document.getElementById('");
buffer.append(submittingComponent.getMarkupId());
- buffer.append("'); if (b!=null&&b.onclick!=null&&typeof(b.onclick) != 'undefined') { var r = Wicket.bind(b.onclick, b)(); if (r != false) b.click(); } else { b.click(); }; return false;\" ");
+ buffer
+ .append("'); if (b!=null&&b.onclick!=null&&typeof(b.onclick) != 'undefined') { var r = Wicket.bind(b.onclick, b)(); if (r != false) b.click(); } else { b.click(); }; return false;\" ");
buffer.append(" />");
// close div
@@ -1404,20 +1402,12 @@ public class Form<T> extends WebMarkupContainer
{
if (e instanceof SizeLimitExceededException)
{
- // Resource key should be <form-id>.uploadTooLarge to
- // override default message
- final String defaultValue = "Upload must be less than " + getMaxSize();
- String msg = getString(getId() + '.' + UPLOAD_TOO_LARGE_RESOURCE_KEY,
- Model.ofMap(model), defaultValue);
+ String msg = getString(UPLOAD_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
error(msg);
}
else
{
- // Resource key should be <form-id>.uploadFailed to override
- // default message
- final String defaultValue = "Upload failed: " + e.getLocalizedMessage();
- String msg = getString(getId() + '.' + UPLOAD_FAILED_RESOURCE_KEY, Model.ofMap(model),
- defaultValue);
+ String msg = getString(UPLOAD_FAILED_RESOURCE_KEY, Model.ofMap(model));
error(msg);
log.warn(msg, e);
@@ -1646,12 +1636,9 @@ public class Form<T> extends WebMarkupContainer
String nameAndId = getHiddenFieldId();
// render the hidden field
- AppendingStringBuffer buffer = new AppendingStringBuffer(HIDDEN_DIV_START).append(
- "<input type=\"hidden\" name=\"")
- .append(nameAndId)
- .append("\" id=\"")
- .append(nameAndId)
- .append("\" />");
+ AppendingStringBuffer buffer = new AppendingStringBuffer(HIDDEN_DIV_START)
+ .append("<input type=\"hidden\" name=\"").append(nameAndId).append("\" id=\"")
+ .append(nameAndId).append("\" />");
// if it's a get, did put the parameters in the action attribute,
// and have to write the url parameters as hidden fields
@@ -1671,8 +1658,8 @@ public class Form<T> extends WebMarkupContainer
if (defaultSubmittingComponent instanceof Component)
{
final Component submittingComponent = (Component)defaultSubmittingComponent;
- if (submittingComponent.isVisibleInHierarchy() &&
- submittingComponent.isEnabledInHierarchy())
+ if (submittingComponent.isVisibleInHierarchy()
+ && submittingComponent.isEnabledInHierarchy())
{
appendDefaultButtonField(markupStream, openTag);
}
@@ -1694,10 +1681,8 @@ public class Form<T> extends WebMarkupContainer
{
String[] pair = Strings.split(param, '=');
- buffer.append("<input type=\"hidden\" name=\"")
- .append(recode(pair[0]))
- .append("\" value=\"")
- .append(pair.length > 1 ? recode(pair[1]) : "")
+ buffer.append("<input type=\"hidden\" name=\"").append(recode(pair[0]))
+ .append("\" value=\"").append(pair.length > 1 ? recode(pair[1]) : "")
.append("\" />");
}
}
@@ -1913,10 +1898,10 @@ public class Form<T> extends WebMarkupContainer
{
if (log.isWarnEnabled())
{
- log.warn("IFormValidator in form `" +
- getPageRelativePath() +
- "` depends on a component that has been removed from the page or is no longer visible. " +
- "Offending component id `" + dependent.getId() + "`.");
+ log.warn("IFormValidator in form `"
+ + getPageRelativePath()
+ + "` depends on a component that has been removed from the page or is no longer visible. "
+ + "Offending component id `" + dependent.getId() + "`.");
}
validate = false;
break;
@@ -2028,8 +2013,10 @@ public class Form<T> extends WebMarkupContainer
// register some metadata so we can later properly handle multipart ajax posts for
// embedded forms
registerJavaScriptNamespaces(response);
- response.render(JavaScriptHeaderItem.forScript("Wicket.Forms[\"" + getMarkupId() +
- "\"]={multipart:true};", Form.class.getName() + '.' + getMarkupId() + ".metadata"));
+ response
+ .render(JavaScriptHeaderItem.forScript("Wicket.Forms[\"" + getMarkupId()
+ + "\"]={multipart:true};", Form.class.getName() + '.' + getMarkupId()
+ + ".metadata"));
}
}
@@ -2040,9 +2027,11 @@ public class Form<T> extends WebMarkupContainer
*/
protected void registerJavaScriptNamespaces(IHeaderResponse response)
{
- response.render(JavaScriptHeaderItem.forScript(
- "if (typeof(Wicket)=='undefined') { Wicket={}; } if (typeof(Wicket.Forms)=='undefined') { Wicket.Forms={}; }",
- Form.class.getName()));
+ response
+ .render(JavaScriptHeaderItem
+ .forScript(
+ "if (typeof(Wicket)=='undefined') { Wicket={}; } if (typeof(Wicket.Forms)=='undefined') { Wicket.Forms={}; }",
+ Form.class.getName()));
}
/**
@@ -2061,8 +2050,8 @@ public class Form<T> extends WebMarkupContainer
{
inputName.prepend(id);
c = c.getParent();
- if (c == null || (c instanceof Form<?> && ((Form<?>)c).isRootForm()) ||
- c instanceof Page)
+ if (c == null || (c instanceof Form<?> && ((Form<?>)c).isRootForm())
+ || c instanceof Page)
{
break;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.properties
deleted file mode 100644
index 87320ea..0000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 = File must be less than ${maxSize}.
-simpleUpload.uploadFailed = File failed to upload: ${exception.localizedMessage}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_de.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_de.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_de.properties
deleted file mode 100644
index 1020cfd..0000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_de.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 = Datei muss kleiner sein als ${maxSize}.
-simpleUpload.uploadFailed = Hochladen der Datei ist gescheitert: ${exception.localizedMessage}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_hu.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_hu.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_hu.properties
deleted file mode 100644
index 530e325..0000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_hu.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 = A f\u00E1jlnak kisebbnek kell lennie, mint ${maxSize}.
-simpleUpload.uploadFailed = Hiba a f\u00E1jl felt\u00F6lt\u00E9sekor: ${exception.localizedMessage}.
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ko.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ko.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ko.properties
deleted file mode 100644
index 5ab3bda..0000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ko.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 = \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}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_no.properties
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_no.properties b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_no.properties
deleted file mode 100644
index da91c3b..0000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_no.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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 = Filen må være mindre enn ${maxSize}.
-simpleUpload.uploadFailed = Filen kunne ikke lastes opp: ${exception.localizedMessage}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ae7ce564/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ru.properties.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ru.properties.xml b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ru.properties.xml
deleted file mode 100644
index 0c737a1..0000000
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage_ru.properties.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
- <entry key="simpleUpload.uploadTooLarge">Размер файла не должен превышать ${maxSize}.</entry>
- <entry key="simpleUpload.uploadFailed">Ошибка загрузки файла на сервер: ${exception.localizedMessage}.</entry>
-</properties>
\ No newline at end of file