Improve contextual markers for userprofile app

6 files changed, 42 insertions, 18 deletions

diff --git a/saleor/userprofile/forms.py b/saleor/userprofile/forms.py
index 327bb2fd..fb185e52 100644
--- a/saleor/userprofile/forms.py
+++ b/saleor/userprofile/forms.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 from allauth.account.adapter import get_adapter
 from allauth.account.forms import SetPasswordField, UserForm, PasswordField
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext
 
 from .i18n import AddressMetaForm, get_address_form_class
 
@@ -37,7 +37,8 @@ def get_address_form(data, country_code, initial=None, instance=None, **kwargs):
 
 
 class SetPasswordForm(forms.Form):
-    password1 = SetPasswordField(label=_('New Password'))
+    password1 = SetPasswordField(
+        label=pgettext('Set password form label', 'New Password'))
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop('user', None)
@@ -51,8 +52,10 @@ class SetPasswordForm(forms.Form):
 
 class ChangePasswordForm(UserForm):
 
-    oldpassword = PasswordField(label=_('Current Password'))
-    password1 = SetPasswordField(label=_('New Password'))
+    oldpassword = PasswordField(
+        label=pgettext('Change password form label', 'Current Password'))
+    password1 = SetPasswordField(
+        label=pgettext('Change password form label', 'New Password'))
 
     def __init__(self, *args, **kwargs):
         super(ChangePasswordForm, self).__init__(*args, **kwargs)
@@ -62,8 +65,10 @@ class ChangePasswordForm(UserForm):
 
     def clean_oldpassword(self):
         if not self.user.check_password(self.cleaned_data.get('oldpassword')):
-            raise forms.ValidationError(_('Please type your current'
-                                          ' password.'))
+            raise forms.ValidationError(
+                pgettext(
+                    'Change password form error',
+                    'Please type your current password.'))
         return self.cleaned_data['oldpassword']
 
     def save(self):
diff --git a/saleor/userprofile/i18n.py b/saleor/userprofile/i18n.py
index 5f16b5b2..01d801b8 100644
--- a/saleor/userprofile/i18n.py
+++ b/saleor/userprofile/i18n.py
@@ -3,7 +3,7 @@ from collections import defaultdict
 import i18naddress
 from django import forms
 from django.forms.forms import BoundField
-from django.utils.translation import pgettext_lazy
+from django.utils.translation import pgettext_lazy, pgettext
 from django_countries.data import COUNTRIES
 
 from .models import Address
@@ -35,7 +35,9 @@ AREA_TYPE_TRANSLATIONS = {
 
 
 class AddressMetaForm(forms.ModelForm):
-    preview = forms.BooleanField(initial=False, required=False)
+    preview = forms.BooleanField(
+        label=pgettext('Address meta form label', 'preview'),
+        initial=False, required=False)
 
     class Meta:
         model = Address
diff --git a/saleor/userprofile/models.py b/saleor/userprofile/models.py
index 0adef2b9..832130ce 100644
--- a/saleor/userprofile/models.py
+++ b/saleor/userprofile/models.py
@@ -70,6 +70,10 @@ class Address(models.Model):
     def full_name(self):
         return '%s %s' % (self.first_name, self.last_name)
 
+    class Meta:
+        verbose_name = pgettext_lazy('Address model', 'address')
+        verbose_name_plural = pgettext_lazy('Address model', 'addresses')
+
     def __str__(self):
         if self.company_name:
             return '%s - %s' % (self.company_name, self.full_name)
@@ -105,8 +109,10 @@ class UserManager(BaseUserManager):
 
 
 class User(PermissionsMixin, AbstractBaseUser, index.Indexed):
-    email = models.EmailField(unique=True)
-    addresses = models.ManyToManyField(Address, blank=True)
+    email = models.EmailField(pgettext_lazy('User field', 'email'), unique=True)
+    addresses = models.ManyToManyField(
+        Address, blank=True,
+        verbose_name=pgettext_lazy('User field', 'addresses'))
     is_staff = models.BooleanField(
         pgettext_lazy('User field', 'staff status'),
         default=False)
@@ -132,6 +138,10 @@ class User(PermissionsMixin, AbstractBaseUser, index.Indexed):
     search_fields = [
         index.SearchField('email')]
 
+    class Meta:
+        verbose_name = pgettext_lazy('User model', 'user')
+        verbose_name_plural = pgettext_lazy('User model', 'users')
+
     def get_full_name(self):
         return self.email
 
diff --git a/saleor/userprofile/templatetags/__init__.py b/saleor/userprofile/templatetags/__init__.py
index 8b137891..e69de29b 100644
--- a/saleor/userprofile/templatetags/__init__.py
+++ b/saleor/userprofile/templatetags/__init__.py
@@ -1 +0,0 @@
-
diff --git a/saleor/userprofile/templatetags/i18n_address_tags.py b/saleor/userprofile/templatetags/i18n_address_tags.py
index a3d8d305..060d2f16 100644
--- a/saleor/userprofile/templatetags/i18n_address_tags.py
+++ b/saleor/userprofile/templatetags/i18n_address_tags.py
@@ -1,6 +1,8 @@
 from django import template
-import i18naddress
 from django.utils.safestring import mark_safe
+from django.utils.translation import pgettext
+import i18naddress
+
 from ...userprofile.models import Address
 
 register = template.Library()
@@ -9,9 +11,12 @@ register = template.Library()
 @register.simple_tag
 def format_address(address, latin=False):
     address_data = Address.objects.as_data(address)
-    address_data['name'] = '%(first_name)s %(last_name)s' % address_data
+    address_data['name'] = pgettext(
+        'Address data', '%(first_name)s %(last_name)s') % address_data
     address_data['country_code'] = address_data['country']
-    address_data['street_address'] = ('%(street_address_1)s\n'
-                                     '%(street_address_2)s' % address_data)
+    address_data['street_address'] = pgettext(
+        'Address data',
+        '%(street_address_1)s\n'
+        '%(street_address_2)s' % address_data)
     formatted_address = i18naddress.format_address(address_data, latin)
     return mark_safe(formatted_address)
diff --git a/saleor/userprofile/views.py b/saleor/userprofile/views.py
index a794b8e9..0ee7d2b1 100755
--- a/saleor/userprofile/views.py
+++ b/saleor/userprofile/views.py
@@ -8,7 +8,7 @@ from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
-from django.utils.translation import ugettext as _
+from django.utils.translation import pgettext
 from ..cart.utils import find_and_assign_anonymous_cart
 from .forms import ChangePasswordForm, get_address_form
 
@@ -43,19 +43,22 @@ def address_edit(request, pk):
         country_code=address.country.code)
     if address_form.is_valid() and not preview:
         address_form.save()
-        message = _('Address successfully updated.')
+        message = pgettext('Storefront message', 'Address successfully updated.')
         messages.success(request, message)
         return HttpResponseRedirect(reverse('profile:details'))
     return TemplateResponse(
         request, 'userprofile/address-edit.html',
         {'address_form': address_form})
 
+
 @login_required
 def address_delete(request, pk):
     address = get_object_or_404(request.user.addresses, pk=pk)
     if request.method == 'POST':
         address.delete()
-        messages.success(request, _('Address successfully deleted.'))
+        messages.success(
+            request,
+            pgettext('Storefront message', 'Address successfully deleted.'))
         return HttpResponseRedirect(reverse('profile:details') + '#addresses')
     return TemplateResponse(
         request, 'userprofile/address-delete.html', {'address': address})