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 16:00:01 UTC
[3/3] wicket git commit: [WICKET-6499] russian translation is improved
[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>