Merge branch 'master' of github.com:bread-and-pepper/django-userena

bread-and-pepper · Aug 2, 2013 · 3175bfd · 3175bfd
2 parents fbba277 + 7f082e3
commit 3175bfd
Show file tree

Hide file tree

Showing 3 changed files with 181 additions and 139 deletions.
diff --git a/userena/forms.py b/userena/forms.py
@@ -53,7 +53,7 @@ def clean_username(self):
             pass
         else:
             if UserenaSignup.objects.filter(user__username__iexact=self.cleaned_data['username']).exclude(activation_key=userena_settings.USERENA_ACTIVATED):
-                raise forms.ValidationError(_('This username is already taken but not confirmed. Please check you email for verification steps.'))
+                raise forms.ValidationError(_('This username is already taken but not confirmed. Please check your email for verification steps.'))
             raise forms.ValidationError(_('This username is already taken.'))
         if self.cleaned_data['username'].lower() in userena_settings.USERENA_FORBIDDEN_USERNAMES:
             raise forms.ValidationError(_('This username is not allowed.'))
@@ -63,7 +63,7 @@ def clean_email(self):
         """ Validate that the e-mail address is unique. """
         if get_user_model().objects.filter(email__iexact=self.cleaned_data['email']):
             if UserenaSignup.objects.filter(user__email__iexact=self.cleaned_data['email']).exclude(activation_key=userena_settings.USERENA_ACTIVATED):
-                raise forms.ValidationError(_('This email is already in use but not confirmed. Please check you email for verification steps.'))
+                raise forms.ValidationError(_('This email is already in use but not confirmed. Please check your email for verification steps.'))
             raise forms.ValidationError(_('This email is already in use. Please supply a different email.'))
         return self.cleaned_data['email']
 

diff --git a/userena/locale/ru/LC_MESSAGES/django.mo b/userena/locale/ru/LC_MESSAGES/django.mo