Browse Source

Fix two translation string issues

The forms string is a duplicate of another string apart from the dot.

The regexp error text was a bit too techy.

Thanks to OdifYltsaeb for reporting.
master
Maik Hoepfel 12 years ago
parent
commit
edfec06e55
2 changed files with 3 additions and 2 deletions
  1. 2
    1
      oscar/apps/catalogue/abstract_models.py
  2. 1
    1
      oscar/apps/customer/forms.py

+ 2
- 1
oscar/apps/catalogue/abstract_models.py View File

@@ -709,7 +709,8 @@ class AbstractProductAttribute(models.Model):
709 709
         _('Code'), max_length=128,
710 710
         validators=[RegexValidator(
711 711
             regex=r'^[a-zA-Z_][0-9a-zA-Z_]*$',
712
-            message=_("Code must match ^[a-zA-Z_][0-9a-zA-Z_]*$"))])
712
+            message=_("Code can only contain the letters a-z, A-Z, digits "
713
+                      "and underscores, and can't start with a digit"))])
713 714
 
714 715
     TYPE_CHOICES = (
715 716
         ("text", _("Text")),

+ 1
- 1
oscar/apps/customer/forms.py View File

@@ -194,7 +194,7 @@ class EmailUserCreationForm(forms.ModelForm):
194 194
         email = normalise_email(self.cleaned_data['email'])
195 195
         if User._default_manager.filter(email=email).exists():
196 196
             raise forms.ValidationError(
197
-                _("A user with that email address already exists."))
197
+                _("A user with that email address already exists"))
198 198
         return email
199 199
 
200 200
     def clean_password2(self):

Loading…
Cancel
Save