Merge branch 'master' into integrate-flower-locally

CONTRIBUTORS.rst

@@ -162,6 +162,7 @@ Listed in alphabetical order.
   Will Farley              `@goldhand`_                 @g01dhand
   William Archinal         `@archinal`_
   Yaroslav Halchenko
+  Denis Bobrov             `@delneg`_       
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
@@ -265,7 +266,7 @@ Listed in alphabetical order.
 .. _@brentpayne: https://github.com/brentpayne
 .. _@afrowave: https://github.com/afrowave
 .. _@pchiquet: https://github.com/pchiquet
-
+.. _@delneg: https://github.com/delneg
 Special Thanks
 ~~~~~~~~~~~~~~
 

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -19,7 +19,7 @@ flower==0.9.2  # https://github.com/mher/flower
 # Django
 # ------------------------------------------------------------------------------
 django==2.0.6  # pyup: < 2.1  # https://www.djangoproject.com/
-django-environ==0.4.4  # https://github.com/joke2k/django-environ
+django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
 django-allauth==0.36.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py

@@ -3,6 +3,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
 from django.contrib.auth.forms import UserChangeForm, UserCreationForm
 from .models import User
+from django.utils.translation import ugettext_lazy as _
 
 
 class MyUserChangeForm(UserChangeForm):
@@ -14,7 +15,7 @@ class MyUserChangeForm(UserChangeForm):
 class MyUserCreationForm(UserCreationForm):
 
     error_message = UserCreationForm.error_messages.update(
-        {"duplicate_username": "This username has already been taken."}
+        {"duplicate_username": _("This username has already been taken.")}
     )
 
     class Meta(UserCreationForm.Meta):