Merge lp:~pskoli93/postorius/Fixes into lp:postorius

[Pavan Koli]

Messages like 'Please a domain name' are being displayed for leaving the Mail Host and Web Host field blank while adding a new domain. Now they are fixed and the messages 'Please enter a Mail Host' and 'Please enter a Web Host' are displayed if the fields are kept blank.

[Terri (terriko)]

Good idea, but probably more work for our translators that isn't super necessary at this point. Thanks for submitting, and sorry this one didn't work out!

review: Disapprove

Unmerged revisions

221. By pkoli <email address hidden> on 2015-04-14

Better messages added

=== modified file 'src/postorius/forms.py'
--- src/postorius/forms.py	2015-02-09 14:35:44 +0000
+++ src/postorius/forms.py	2015-04-14 07:32:32 +0000
@@ -30,13 +30,13 @@
     """
     mail_host = forms.CharField(
         label=_('Mail Host'),
-        error_messages={'required': _('Please a domain name'),
-                        'invalid': _('Please enter a valid domain name.')},
+        error_messages={'required': _('Please enter a Mail Host'),
+                        'invalid': _('Please enter a valid Mail Host.')},
         required=True)
     web_host = forms.CharField(
         label=_('Web Host'),
-        error_messages={'required': _('Please a domain name'),
-                        'invalid': _('Please enter a valid domain name.')},
+        error_messages={'required': _('Please enter a Web Host'),
+                        'invalid': _('Please enter a valid Web Host.')},
         required=True)
     description = forms.CharField(
         label=_('Description'),
@@ -50,7 +50,7 @@
         try:
             validate_email('mail@' + mail_host)
         except:
-            raise forms.ValidationError(_("Enter a valid Mail Host"))
+            raise forms.ValidationError(_("Please enter a valid Mail Host"))
         return mail_host
 
     def clean_web_host(self):