Commits

lior...@gmail.com  committed 2b41f0e Merge

merge

  • Participants
  • Parent commits c238374, 58eef83

Comments (0)

Files changed (2)

File registration/admin.py

     actions = ['activate_users', 'resend_activation_email']
     list_display = ('user', 'activation_key_expired')
     raw_id_fields = ['user']
-    search_fields = ('user__username', 'user__first_name')
+    search_fields = ('user__username', 'user__first_name', 'user__last_name')
 
     def activate_users(self, request, queryset):
         """

File registration/forms.py

                                 error_messages={'invalid': _("This value must contain only letters, numbers, dots, at sign (@) and underscores.")})
     email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict,
                                                                maxlength=75)),
-                             label=_("Email address"))
+                             label=_("E-mail"))
     password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False),
                                 label=_("Password"))
     password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False),