amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #642 from pcoder/fix_de_translation

Browse source 
Fix DE translation
This commit is contained in:
Pcoder 2018-07-07 21:50:20 +02:00 • committed by GitHub
commit 5c6528aa03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
utils/forms.py
View file

@ -1,10 +1,11 @@
from django import forms from django import forms
from .models import ContactMessage, BillingAddress, UserBillingAddress
from django.template.loader import render_to_string
from django.core.mail import EmailMultiAlternatives
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth import authenticate from django.contrib.auth import authenticate
from django.core.mail import EmailMultiAlternatives
from django.template.loader import render_to_string
from django.utils.translation import ugettext_lazy as _
from membership.models import CustomUser from membership.models import CustomUser
from .models import ContactMessage, BillingAddress, UserBillingAddress
# from utils.fields import CountryField # from utils.fields import CountryField
@ -66,7 +67,8 @@ class ResendActivationEmailForm(forms.Form):
try: try:
c = CustomUser.objects.get(email=email) c = CustomUser.objects.get(email=email)
if c.validated == 1: if c.validated == 1:
raise forms.ValidationError(_("The account is already active.")) raise forms.ValidationError(
_("The account is already active."))
return email return email
except CustomUser.DoesNotExist: except CustomUser.DoesNotExist:
raise forms.ValidationError(_("User does not exist")) raise forms.ValidationError(_("User does not exist"))
@ -156,8 +158,9 @@ class BillingAddressFormSignup(BillingAddressForm):
try: try:
CustomUser.objects.get(email=email) CustomUser.objects.get(email=email)
raise forms.ValidationError( raise forms.ValidationError(
_("The email {} is already registered with us. Please reset " _("The email %(email)s is already registered with us. "
"your password and access your account.".format(email)) "Please reset your password and access your account.") %
{'email': email}
) )
except CustomUser.DoesNotExist: except CustomUser.DoesNotExist:
return email return email

8
utils/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-05 23:18+0000\n" "POT-Creation-Date: 2018-07-07 19:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -781,10 +781,10 @@ msgid "Email"
msgstr "E-Mail" msgstr "E-Mail"
msgid "" msgid ""
"The email {} is already registered with us. Please reset your password and " "The email %(email)s is already registered with us. Please reset your "
"access your account." "password and access your account."
msgstr "" msgstr ""
"Diese E-Mail-Adresse {} existiert bereits. Bitte setze dein Passwort zurück " "Diese E-Mail-Adresse %(email)s existiert bereits. Bitte setze dein Passwort zurück "
"auf dein Konto zuzugreifen." "auf dein Konto zuzugreifen."
msgid "Street Building" msgid "Street Building"