Skip to content

Commit

Permalink
Adding translations
Browse files Browse the repository at this point in the history
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
  • Loading branch information
macartur committed May 13, 2016
1 parent 58b369c commit f94953b
Show file tree
Hide file tree
Showing 5 changed files with 246 additions and 315 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def test_resend_email_verification_sending_email(self, verify_email_mock):

self.assertEquals(302, response.status_code)

msg = 'A email was sent by us. Verify your message box.'
msg = 'An email was sent to you. Verify your message box.'
response = self.client.get("/account/resend-email-verification/")
self.assertEquals(200, response.status_code)
self.assertIn(msg, response.content)
Expand Down
8 changes: 3 additions & 5 deletions colab/accounts/tests/test_view_signup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,9 @@ def test_user_authenticated_and_registered(self):
self.client.logout()

def test_signup_with_valid_email_and_inactive_user(self):
message = "This user already exists, but is not active. \
Please check your spam or \
<a href='/account/resend-email-verification/'>\
resend an email</a>"

message = ("This user already exists, but is not active. \
Please check your spam or <a href='/account/resend-email-verification/'> \
resend an email</a>")
options = {'username': 'another_user',
'email': 'usertest@colab.com.br'}
self.user.is_active = False
Expand Down
8 changes: 4 additions & 4 deletions colab/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ def signup(request):

if existent_user and existent_user.is_active is False:
message = _("This user already exists, but is not active. \
Please check your spam or \
<a href='/account/resend-email-verification/'>\
resend an email</a>")
Please check your spam or <a href='/account/resend-email-verification/'> \
resend an email</a>")

messages.info(request, message)

if not user_form.is_valid() or not lists_form.is_valid():
Expand Down Expand Up @@ -222,7 +222,7 @@ def resend_email_verification(request):
kwargs={'key': email.validation_key})
verification_url = request.build_absolute_uri(location)
if EmailAddressValidation.verify_email(email, verification_url):
msg = _('A email was sent by us. Verify your message box.')
msg = _('An email was sent to you. Verify your message box.')
messages.success(request, msg)
else:
msg = _('An error occurred while sending mail.')
Expand Down
Binary file modified colab/locale/pt_BR/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit f94953b

Please sign in to comment.