Updated Branches: refs/heads/master d513e7b46 -> d9931af58
WICKET-4890 Bad validation messages after WICKET-2128 for _en, _de and _de_CH Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d9931af5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d9931af5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d9931af5 Branch: refs/heads/master Commit: d9931af583e923c10a6651981edf288692b9bf5a Parents: d513e7b Author: svenmeier <[email protected]> Authored: Thu Nov 29 16:47:49 2012 +0100 Committer: svenmeier <[email protected]> Committed: Thu Nov 29 17:04:56 2012 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/Application.properties | 38 +++++++------- .../org/apache/wicket/Application_de.properties | 26 +++++----- .../org/apache/wicket/Application_de_CH.properties | 27 +---------- .../html/form/LocalizedErrorMessageTest.java | 6 +- .../html/form/upload/FileUploadErrorTest.java | 12 ++-- 5 files changed, 42 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d9931af5/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 1991d83..eee237f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.properties +++ b/wicket-core/src/main/java/org/apache/wicket/Application.properties @@ -13,36 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. Required='${label}' is required. -IConverter='${label}' is not a valid ${type}. +IConverter=The value of '${label}' is not a valid ${type}. -RangeValidator.exact='${label}' must be exactly ${minimum}. -RangeValidator.range='${label}' must be between ${minimum} and ${maximum}. -RangeValidator.minimum='${label}' must be at least ${minimum}. -RangeValidator.maximum='${label}' must be at most ${maximum}. +RangeValidator.exact=The value of '${label}' must be exactly ${minimum}. +RangeValidator.range=The value of '${label}' must be between ${minimum} and ${maximum}. +RangeValidator.minimum=The value of '${label}' must be at least ${minimum}. +RangeValidator.maximum=The value of '${label}' must be at most ${maximum}. #deprecated, use RangeValidator.minimum -MinimumValidator='${label}' must be at least ${minimum}. +MinimumValidator=The value of '${label}' must be at least ${minimum}. #deprecated, use RangeValidator.maximum -MaximumValidator='${label}' must be at most ${maximum}. +MaximumValidator=The value of '${label}' must be at most ${maximum}. #raplaced with RangeValidator -NumberValidator.positive='${label}' must be a positive number. +NumberValidator.positive=The value of '${label}' must be a positive number. #replaced with RangeValidator -NumberValidator.negative='${label}' must be a negative number. +NumberValidator.negative=The value of '${label}' must be a negative number. -StringValidator.range='${label}' is not between ${minimum} and ${maximum} characters long. -StringValidator.minimum='${label}' is shorter than the minimum of ${minimum} characters. -StringValidator.maximum='${label}' is longer than the maximum of ${maximum} characters. -StringValidator.exact='${label}' is not exactly ${exact} characters long. +StringValidator.range=The value of '${label}' is not between ${minimum} and ${maximum} characters long. +StringValidator.minimum=The value of '${label}' is shorter than the minimum of ${minimum} characters. +StringValidator.maximum=The value of '${label}' is longer than the maximum of ${maximum} characters. +StringValidator.exact=The value of '${label}' is not exactly ${exact} characters long. -DateValidator.range='${label}' is not between ${minimum} and ${maximum}. -DateValidator.minimum='${label}' is less than the minimum of ${minimum}. -DateValidator.maximum='${label}' is larger than the maximum of ${maximum}. +DateValidator.range=The value of '${label}' is not between ${minimum} and ${maximum}. +DateValidator.minimum=The value of '${label}' is less than the minimum of ${minimum}. +DateValidator.maximum=The value of '${label}' is larger than the maximum of ${maximum}. -PatternValidator='${label}' does not match pattern '${pattern}'. -EmailAddressValidator='${label}' is not a valid email address. +PatternValidator=The value of '${label}' does not match pattern '${pattern}'. +EmailAddressValidator=The value of '${label}' is not a valid email address. CreditCardValidator=The credit card number is invalid. -UrlValidator='${label}' is not a valid URL. +UrlValidator=The value of '${label}' is not a valid URL. EqualInputValidator='${input0}' from ${label0} and '${input1}' from ${label1} must be equal. EqualPasswordInputValidator=${label0} and ${label1} must be equal. http://git-wip-us.apache.org/repos/asf/wicket/blob/d9931af5/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 91dc445..781eb59 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 @@ -13,23 +13,23 @@ # See the License for the specific language governing permissions and # limitations under the License. Required=Bitte tragen Sie einen Wert im Feld '${label}' ein. -IConverter='${label}' ist kein g\u00fcltiger Wert f\u00fcr '${type}'. +IConverter=Der Wert von '${label}' ist kein g\u00fcltiger Wert f\u00fcr '${type}'. -RangeValidator.range=${label} muss zwischen ${minimum} und ${maximum} liegen. -RangeValidator.minimum='${label}' ist kleiner als der erlaubte Minimalwert ${minimum}. -RangeValidator.maximum='${label}' ist gr\u00f6\u00dfer als der erlaubte Maximalwert ${maximum}. +RangeValidator.range=Der Wert von '${label}' muss zwischen ${minimum} und ${maximum} liegen. +RangeValidator.minimum=Der Wert von '${label}' ist kleiner als der erlaubte Minimalwert ${minimum}. +RangeValidator.maximum=Der Wert von '${label}' ist gr\u00f6\u00dfer als der erlaubte Maximalwert ${maximum}. -StringValidator.range='${label}' muss zwischen ${minimum} und ${maximum} Zeichen lang sein. -StringValidator.minimum='${label}' muss mindestens ${minimum} Zeichen lang sein. -StringValidator.maximum='${label}' darf maximal ${maximum} Zeichen lang sein. -StringValidator.exact='${label}' ist nicht exakt ${exact} Zeichen lang. +StringValidator.range=Der Wert von '${label}' muss zwischen ${minimum} und ${maximum} Zeichen lang sein. +StringValidator.minimum=Der Wert von '${label}' muss mindestens ${minimum} Zeichen lang sein. +StringValidator.maximum=Der Wert von '${label}' darf maximal ${maximum} Zeichen lang sein. +StringValidator.exact=Der Wert von '${label}' ist nicht exakt ${exact} Zeichen lang. -DateValidator.range='${label}' muss zwischen ${minimum} und ${maximum} liegen. -DateValidator.minimum='${label}' muss gr\u00f6\u00dfer sein als ${minimum}. -DateValidator.maximum='${label}' muss kleiner sein als ${maximum}. +DateValidator.range=Der Wert von '${label}' muss zwischen ${minimum} und ${maximum} liegen. +DateValidator.minimum=Der Wert von '${label}' muss gr\u00f6\u00dfer sein als ${minimum}. +DateValidator.maximum=Der Wert von '${label}' muss kleiner sein als ${maximum}. -PatternValidator='${label}' entspricht nicht dem erforderlichen Muster '${pattern}' -EmailAddressValidator='${label}' ist keine g\u00fcltige Email-Adresse. +PatternValidator=Der Wert von '${label}' entspricht nicht dem erforderlichen Muster '${pattern}' +EmailAddressValidator=Der Wert von '${label}' ist keine g\u00fcltige Email-Adresse. CreditCardValidator=Die Kreditkartennummer ist ung\u00fcltig. UrlValidator='${label}' ist keine g\u00fcltige URL. http://git-wip-us.apache.org/repos/asf/wicket/blob/d9931af5/wicket-core/src/main/java/org/apache/wicket/Application_de_CH.properties ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Application_de_CH.properties b/wicket-core/src/main/java/org/apache/wicket/Application_de_CH.properties index 6c8cd35..f10ec93 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application_de_CH.properties +++ b/wicket-core/src/main/java/org/apache/wicket/Application_de_CH.properties @@ -12,29 +12,4 @@ # 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. -Required=Bitte tragen Sie einen Wert im Feld '${label}' ein. -IConverter='${label}' ist kein g\u00fcltiger Wert f\u00fcr '${type}'. - -RangeValidator.range=${label} muss zwischen ${minimum} und ${maximum} liegen. -RangeValidator.minimum='${label}' ist kleiner als der erlaubte Minimalwert ${minimum}. -RangeValidator.maximum='${label}' ist gr\u00f6\u00dfer als der erlaubte Maximalwert ${maximum}. - -StringValidator.range='${label}' muss zwischen ${minimum} und ${maximum} Zeichen lang sein. -StringValidator.minimum='${label}' muss mindestens ${minimum} Zeichen lang sein. -StringValidator.maximum='${label}' darf maximal ${maximum} Zeichen lang sein. -StringValidator.exact='${label}' ist nicht exakt ${exact} Zeichen lang. - -DateValidator.range='${label}' muss zwischen ${minimum} und ${maximum} liegen. -DateValidator.minimum='${label}' muss gr\u00f6sser sein als ${minimum}. -DateValidator.maximum='${label}' muss kleiner sein als ${maximum}. - -PatternValidator='${label}' entspricht nicht dem erforderlichen Muster '${pattern}' -EmailAddressValidator='${label}' ist keine g\u00fcltige Email-Adresse. -CreditCardValidator=Die Kreditkartennummer ist ung\u00fcltig. -UrlValidator='${label}' ist keine g\u00fcltige URL. - -EqualInputValidator='${input0}' vom Label ${label0} und '${input1}' vom Label ${label1} m\u00fcssen gleich sein. -EqualPasswordInputValidator=${label0} und ${label1} m\u00fcssen gleich sein. - -null=Bitte w\u00e4hlen -nullValid= +DateValidator.minimum=Der Wert von '${label}' muss gr\u00f6sser sein als ${minimum}. http://git-wip-us.apache.org/repos/asf/wicket/blob/d9931af5/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java index b86dfd1..06c393b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java @@ -53,7 +53,7 @@ public class LocalizedErrorMessageTest extends WicketTestCase tester.submitForm(page.form); - tester.assertErrorMessages("'Number' is not a valid Double."); + tester.assertErrorMessages("The value of 'Number' is not a valid Double."); } /** @@ -71,7 +71,7 @@ public class LocalizedErrorMessageTest extends WicketTestCase tester.submitForm(page.form); // decimal separator is ',' in German - tester.assertErrorMessages("Number muss zwischen 0,5 und 1,5 liegen."); + tester.assertErrorMessages("Der Wert von 'Number' muss zwischen 0,5 und 1,5 liegen."); } /** @@ -93,7 +93,7 @@ public class LocalizedErrorMessageTest extends WicketTestCase tester.submitForm(page.form); - tester.assertErrorMessages("'Number' ist kein g\u00FCltiger Wert f\u00FCr 'Double'."); + tester.assertErrorMessages("Der Wert von 'Number' ist kein g\u00FCltiger Wert f\u00FCr 'Double'."); tester.getSession().setLocale(new Locale("pl")); tester.clearFeedbackMessages(); http://git-wip-us.apache.org/repos/asf/wicket/blob/d9931af5/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java index 0aab980..4bcdb21 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java @@ -78,8 +78,8 @@ public class FileUploadErrorTest extends WicketTestCase formTester.setValue(textFieldId, "te"); formTester.submit(); - tester.assertErrorMessages(String.format("'%1$s' is not between 3 and 10 characters long.", - textFieldId)); + tester.assertErrorMessages(String.format( + "The value of '%1$s' is not between 3 and 10 characters long.", textFieldId)); } /** @@ -90,8 +90,8 @@ public class FileUploadErrorTest extends WicketTestCase formTester.setValue(textFieldId, "12345678901"); formTester.submit(); - tester.assertErrorMessages(String.format("'%1$s' is not between 3 and 10 characters long.", - textFieldId)); + tester.assertErrorMessages(String.format( + "The value of '%1$s' is not between 3 and 10 characters long.", textFieldId)); } /** @@ -103,8 +103,8 @@ public class FileUploadErrorTest extends WicketTestCase formTester.setFile(fileUploadId, new File(testUploadFilePath), "UTF-8"); formTester.submit(); - tester.assertErrorMessages(String.format("'%1$s' is not between 3 and 10 characters long.", - textFieldId)); + tester.assertErrorMessages(String.format( + "The value of '%1$s' is not between 3 and 10 characters long.", textFieldId)); } /**
