Merge pull request FriendsOfSymfony#230 from zocimek/validation-messages

Validation messages
damonsson · Jul 11, 2014 · fdc9e1b · fdc9e1b
2 parents cab9c3d + 9e069c1
commit fdc9e1b
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 18 deletions.
diff --git a/Resources/config/validation.xml b/Resources/config/validation.xml
@@ -10,7 +10,7 @@
                 <constraint name="FOS\MessageBundle\Validator\Authorization" />
                 <constraint name="FOS\MessageBundle\Validator\SelfRecipient" />
                 <constraint name="NotBlank">
-                    <option name="message">No recipient specified</option>
+                    <option name="message">fos_message.recipients.blank</option>
                 </constraint>
                 <constraint name="Type">
                     <option name="type">FOS\MessageBundle\Model\ParticipantInterface</option>
@@ -19,23 +19,23 @@
         </property>
         <property name="subject">
             <constraint name="NotBlank">
-                <option name="message">Please enter a subject</option>
+                <option name="message">fos_message.subject.blank</option>
             </constraint>
             <constraint name="Length">
                 <option name="min">2</option>
                 <option name="max">255</option>
-                <option name="minMessage">The subject is too short|The subject is too short</option>
-                <option name="maxMessage">The subject is too long|The subject is too long</option>
+                <option name="minMessage">fos_message.subject.short</option>
+                <option name="maxMessage">fos_message.subject.long</option>
             </constraint>
         </property>
 
         <property name="body">
             <constraint name="NotBlank">
-                <option name="message">Please enter a body</option>
+                <option name="message">fos_message.body.blank</option>
             </constraint>
             <constraint name="Length">
                 <option name="min">2</option>
-                <option name="minMessage">The body is too short</option>
+                <option name="minMessage">fos_message.body.short</option>
             </constraint>
         </property>
     </class>
@@ -48,7 +48,7 @@
             <constraint name="FOS\MessageBundle\Validator\Authorization" />
             <constraint name="FOS\MessageBundle\Validator\SelfRecipient" />
             <constraint name="NotBlank">
-                <option name="message">No user with that username</option>
+                <option name="message">fos_message.recipient.blank</option>
             </constraint>
             <constraint name="Type">
                 <option name="type">FOS\MessageBundle\Model\ParticipantInterface</option>
@@ -57,23 +57,23 @@
 
         <property name="subject">
             <constraint name="NotBlank">
-                <option name="message">Please enter a subject</option>
+                <option name="message">fos_message.subject.blank</option>
             </constraint>
             <constraint name="Length">
                 <option name="min">2</option>
                 <option name="max">255</option>
-                <option name="minMessage">The subject is too short|The subject is too short</option>
-                <option name="maxMessage">The subject is too long|The subject is too long</option>
+                <option name="minMessage">fos_message.subject.short</option>
+                <option name="maxMessage">fos_message.subject.long</option>
             </constraint>
         </property>
 
         <property name="body">
             <constraint name="NotBlank">
-                <option name="message">Please enter a body</option>
+                <option name="message">fos_message.body.blank</option>
             </constraint>
             <constraint name="Length">
                 <option name="min">2</option>
-                <option name="minMessage">The body is too short|The body is too short</option>
+                <option name="minMessage">fos_message.body.short</option>
             </constraint>
         </property>
 
@@ -85,11 +85,11 @@
 
         <property name="body">
             <constraint name="NotBlank">
-                <option name="message">Please enter a body</option>
+                <option name="message">fos_message.body.blank</option>
             </constraint>
             <constraint name="Length">
                 <option name="min">2</option>
-                <option name="minMessage">The body is too short|The body is too short</option>
+                <option name="minMessage">fos_message.body.short</option>
             </constraint>
         </property>
 

diff --git a/Resources/translations/validators.en.yml b/Resources/translations/validators.en.yml
@@ -0,0 +1,17 @@
+fos_message:
+  recipient:
+    blank: No recipient specified
+  recipients:
+    blank: No recipients specified
+  subject:
+    blank: Please enter a subject
+    too_short: The subject is too short|The subject is too short
+    too_long: The subject is too long|The subject is too long
+  body:
+    blank: Please enter a body
+    too_short: The body is too short
+    spam: Sorry, your message looks like spam
+  not_authorized: You are not allowed to send this message
+  reply_not_authorized: You are not allowed to reply to this message
+  self_recipient: You cannot send a message to yourself
+
diff --git a/Resources/translations/validators.pl.yml b/Resources/translations/validators.pl.yml
@@ -0,0 +1,17 @@
+fos_message:
+  recipient:
+    blank: Nie zdefiniowano odbiorcy
+  recipients:
+    blank: Nie zdefiniowano żadnych odbiorców
+  subject:
+    blank: Wprowadź temat
+    short: Temat jest za krótki|Temat jest za krótki
+    long: Temat jest za długi|Temat jest za długi
+  body:
+    blank: Wprowadź treść
+    short: Treść jest za krótka
+    spam: Przykro mi, Twoja wiadomość wygląda jak spam
+  not_authorized: Nie masz uprawnień, aby wysłać tą wiadomość
+  reply_not_authorized: Nie masz uprawnień, aby odpowiadać na tą wiadomość
+  self_recipient: Nie możesz wysyłać wiadomości do siebie
+
diff --git a/Validator/Authorization.php b/Validator/Authorization.php
@@ -6,7 +6,7 @@
 
 class Authorization extends Constraint
 {
-    public $message = 'You are not allowed to send this message';
+    public $message = 'fos_message.not_authorized';
 
     public function validatedBy()
     {

diff --git a/Validator/ReplyAuthorization.php b/Validator/ReplyAuthorization.php
@@ -6,7 +6,7 @@
 
 class ReplyAuthorization extends Constraint
 {
-    public $message = 'You are not allowed to reply to this message';
+    public $message = 'fos_message.reply_not_authorized';
 
     public function validatedBy()
     {

diff --git a/Validator/SelfRecipient.php b/Validator/SelfRecipient.php
@@ -6,7 +6,7 @@
 
 class SelfRecipient extends Constraint
 {
-    public $message = 'You cannot send a message to yourself';
+    public $message = 'fos_message.self_recipient';
 
     public function validatedBy()
     {

diff --git a/Validator/Spam.php b/Validator/Spam.php
@@ -6,7 +6,7 @@
 
 class Spam extends Constraint
 {
-    public $message = 'Sorry, your message looks like spam';
+    public $message = 'fos_user.body.spam';
 
     public function validatedBy()
     {