You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by so...@apache.org on 2017/11/26 15:59:59 UTC
[1/3] wicket git commit: [WICKET-6499] russian translation is added
Repository: wicket
Updated Branches:
refs/heads/master 39e731510 -> 897573d99
[WICKET-6499] russian translation is added
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eb41b000
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eb41b000
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eb41b000
Branch: refs/heads/master
Commit: eb41b00035e4089f32c7a9bbe7c53f36929bec89
Parents: 05259c2
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Nov 26 22:44:41 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Nov 26 22:44:41 2017 +0700
----------------------------------------------------------------------
.../PropertyValidator_ru.properties.xml | 44 ++++++++++++++++++++
1 file changed, 44 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/eb41b000/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml
new file mode 100644
index 0000000..7acbfe8
--- /dev/null
+++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml
@@ -0,0 +1,44 @@
+<?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="javax.validation.constraints.AssertFalse.message">'${label}' должно быть ложным</entry>
+ <entry key="javax.validation.constraints.AssertTrue.message">'${label}' должно быть истинным</entry>
+ <entry key="javax.validation.constraints.DecimalMax.message">'${label}' должно быть меньше или равно ${value}</entry>
+ <entry key="javax.validation.constraints.DecimalMin.message">'${label}' должно быть больше или равно ${value}</entry>
+ <entry key="javax.validation.constraints.Digits.message"><![CDATA['${label}' числовое значение не соответствует ограничениям (<${integer} знаков>.<${fraction} знаков> expected)]]></entry>
+ <entry key="javax.validation.constraints.Future.message">'${label}' должно быть в будующем</entry>
+ <entry key="javax.validation.constraints.Max.message">'${label}' должно быть меньше или равно ${value}</entry>
+ <entry key="javax.validation.constraints.Min.message">'${label}' должно быть больше или равно ${value}</entry>
+ <entry key="javax.validation.constraints.NotNull.message">'${label}' не может быть пусто</entry>
+ <entry key="javax.validation.constraints.Null.message">'${label}' должно быть пусто</entry>
+ <entry key="javax.validation.constraints.Past.message">'${label}' должно быть в прошлом</entry>
+ <entry key="javax.validation.constraints.Pattern.message">'${label}' должно соответствовать регулярному выражению "${regexp}"</entry>
+ <entry key="javax.validation.constraints.Size.message">'${label}' должно быть между ${min} и ${max}</entry>
+ <entry key="javax.validation.constraints.Size.message.String">'${label}' длина должна быть между ${min} и ${max}</entry>
+
+ <entry key="org.hibernate.validator.constraints.CreditCardNumber.message">'${label}' некорректный номер кредитной карты</entry>
+ <entry key="org.hibernate.validator.constraints.Email.message">'${label}' некорректный адрес электронной почты</entry>
+ <entry key="org.hibernate.validator.constraints.Length.message">'${label}' длина должна быть между ${min} и ${max}</entry>
+ <entry key="org.hibernate.validator.constraints.NotBlank.message">'${label}' не может быть пусто</entry>
+ <entry key="org.hibernate.validator.constraints.NotEmpty.message">'${label}' не может быть пусто</entry>
+ <entry key="org.hibernate.validator.constraints.Range.message">'${label}' должно быть между ${min} и ${max}</entry>
+ <entry key="org.hibernate.validator.constraints.SafeHtml.message">'${label}' не может содержать небезопасный html тэги</entry>
+ <entry key="org.hibernate.validator.constraints.ScriptAssert.message">'${label}' результат скриптового выражение "${script}" не является истинным</entry>
+ <entry key="org.hibernate.validator.constraints.URL.message">'${label}' не является корректным URL</entry>
+</properties>
[2/3] wicket git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/wicket
Posted by so...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b310085e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b310085e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b310085e
Branch: refs/heads/master
Commit: b310085e2a9e8a684a202822129c47d1ad202336
Parents: eb41b00 39e7315
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Nov 26 22:45:27 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Nov 26 22:45:27 2017 +0700
----------------------------------------------------------------------
.../bean/validation/PropertyValidator.java | 27 ++++++++------
.../validation/PropertyValidator.properties | 37 ++++++++++++--------
.../PropertyValidator_fr.properties.xml | 13 +++++--
.../PropertyValidatorRequiredTest.java | 37 +++++++++++++++-----
4 files changed, 79 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
[3/3] wicket git commit: [WICKET-6499] russian translation is improved
Posted by so...@apache.org.
[WICKET-6499] russian translation is improved
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/897573d9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/897573d9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/897573d9
Branch: refs/heads/master
Commit: 897573d997880b60fb976d1ec316702e130059cb
Parents: b310085
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Nov 26 22:59:50 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Nov 26 22:59:50 2017 +0700
----------------------------------------------------------------------
.../bean/validation/PropertyValidator_fr.properties.xml | 12 ++++++------
.../bean/validation/PropertyValidator_ru.properties.xml | 9 +++++++++
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/897573d9/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml
index 0354b5d..5375e13 100644
--- a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml
+++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_fr.properties.xml
@@ -29,10 +29,10 @@
<entry key="javax.validation.constraints.Min.message">Le champ '${label}' doit être supérieur ou égal à ${value}</entry>
<entry key="javax.validation.constraints.Negative.message">Le champ '${label}' doit être négatif,</entry>
<entry key="javax.validation.constraints.NegativeOrZero.message">Le champ '${label}' doit être négatif, ou zéro</entry>
- <entry key="javax.validation.constraints.NotBlank.message">Le champ '${label}' ne peut pas être vide</entry>
- <entry key="javax.validation.constraints.NotEmpty.message">Le champ '${label}' ne peut pas être vide</entry>
- <entry key="javax.validation.constraints.NotNull.message">Le champ '${label}' ne doit pas être null</entry>
- <entry key="javax.validation.constraints.Null.message">Le champ '${label}' doit être null</entry>
+ <entry key="javax.validation.constraints.NotBlank.message">Le champ '${label}' ne peut pas être vide</entry>
+ <entry key="javax.validation.constraints.NotEmpty.message">Le champ '${label}' ne peut pas être vide</entry>
+ <entry key="javax.validation.constraints.NotNull.message">Le champ '${label}' ne doit pas être null</entry>
+ <entry key="javax.validation.constraints.Null.message">Le champ '${label}' doit être null</entry>
<entry key="javax.validation.constraints.Past.message">Le champ '${label}' doit être dans le passé</entry>
<entry key="javax.validation.constraints.PastOrPresent.message">Le champ '${label}' doit être dans le passé ou le présent</entry>
<entry key="javax.validation.constraints.Positive.message">Le champ '${label}' doit être positif</entry>
@@ -46,9 +46,9 @@
<entry key="org.hibernate.validator.constraints.Length.message">La longueur du champ '${label}' doit être entre ${min} et ${max}</entry>
<entry key="org.hibernate.validator.constraints.NotBlank.message">Le champ '${label}' ne peut pas être vide</entry>
<entry key="org.hibernate.validator.constraints.NotEmpty.message">Le champ '${label}' ne peut pas être vide</entry>
- <entry key="org.hibernate.validator.constraints.SafeHtml.message">Le champ '${label}' pourrait contenir du contenu HTML dangereux</entry>
<entry key="org.hibernate.validator.constraints.Range.message">Le champ '${label}' doit être entre ${min} et ${max}</entry>
+ <entry key="org.hibernate.validator.constraints.SafeHtml.message">Le champ '${label}' pourrait contenir du contenu HTML dangereux</entry>
<entry key="org.hibernate.validator.constraints.ScriptAssert.message">Le script "${script}" du champ '${label}' n'a pas retourné true</entry>
<entry key="org.hibernate.validator.constraints.URL.message">Le champ '${label}' n'est pas une URL</entry>
-</properties>
\ No newline at end of file
+</properties>
http://git-wip-us.apache.org/repos/asf/wicket/blob/897573d9/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml
----------------------------------------------------------------------
diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml
index 7acbfe8..c5d6fb7 100644
--- a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml
+++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator_ru.properties.xml
@@ -22,12 +22,21 @@
<entry key="javax.validation.constraints.DecimalMax.message">'${label}' должно быть меньше или равно ${value}</entry>
<entry key="javax.validation.constraints.DecimalMin.message">'${label}' должно быть больше или равно ${value}</entry>
<entry key="javax.validation.constraints.Digits.message"><![CDATA['${label}' числовое значение не соответствует ограничениям (<${integer} знаков>.<${fraction} знаков> expected)]]></entry>
+ <entry key="javax.validation.constraints.Email.message">'${label}' '${label}' некорректный адрес электронной почты</entry>
<entry key="javax.validation.constraints.Future.message">'${label}' должно быть в будующем</entry>
+ <entry key="javax.validation.constraints.FutureOrPresent.message">'${label}' должно быть в будующем или в настоящем</entry>
<entry key="javax.validation.constraints.Max.message">'${label}' должно быть меньше или равно ${value}</entry>
<entry key="javax.validation.constraints.Min.message">'${label}' должно быть больше или равно ${value}</entry>
+ <entry key="javax.validation.constraints.Negative.message">'${label}' должно быть отрицательным</entry>
+ <entry key="javax.validation.constraints.NegativeOrZero.message">'${label}' должно быть отрицательным или нулём</entry>
+ <entry key="javax.validation.constraints.NotBlank.message">'${label}' не может быть пусто</entry>
+ <entry key="javax.validation.constraints.NotEmpty.message">'${label}' не может быть пусто</entry>
<entry key="javax.validation.constraints.NotNull.message">'${label}' не может быть пусто</entry>
<entry key="javax.validation.constraints.Null.message">'${label}' должно быть пусто</entry>
<entry key="javax.validation.constraints.Past.message">'${label}' должно быть в прошлом</entry>
+ <entry key="javax.validation.constraints.PastOrPresent.message">'${label}' должно быть в прошлом или настоящем</entry>
+ <entry key="javax.validation.constraints.Positive.message">'${label}' должно быть положительным</entry>
+ <entry key="javax.validation.constraints.PositiveOrZero.message">'${label}' должно быть положительным или нулём</entry>
<entry key="javax.validation.constraints.Pattern.message">'${label}' должно соответствовать регулярному выражению "${regexp}"</entry>
<entry key="javax.validation.constraints.Size.message">'${label}' должно быть между ${min} и ${max}</entry>
<entry key="javax.validation.constraints.Size.message.String">'${label}' длина должна быть между ${min} и ${max}</entry>