From 0d1cfe548c933c489416d3f81d07cf2e8e0a10a5 Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 24 Jun 2018 02:34:08 +0300 Subject: [PATCH 1/4] Make 'duplicate_username' message translatable Added ugettext_lazy and used it on the 'duplicate_username' message --- .../{{cookiecutter.project_slug}}/users/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py index 8da8f86a5..9c9fd8403 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py @@ -3,7 +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 +14,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): From 548a92a9390d8c56b4eb3d7b14f7ed246cbd89e5 Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 24 Jun 2018 02:36:43 +0300 Subject: [PATCH 2/4] Update CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 55ae6d722..6b3f00660 100644 --- a/CONTRIBUTORS.rst +++ b/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 ~~~~~~~~~~~~~~ From 2a7ab8be2f01fed4a9c9b7d8fdcae6d4e6daf658 Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 25 Jun 2018 21:08:33 +0300 Subject: [PATCH 3/4] Try to fix flake8 --- .../{{cookiecutter.project_slug}}/users/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py index 9c9fd8403..6b5a60c7e 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py @@ -5,6 +5,7 @@ from django.contrib.auth.forms import UserChangeForm, UserCreationForm from .models import User from django.utils.translation import ugettext_lazy as _ + class MyUserChangeForm(UserChangeForm): class Meta(UserChangeForm.Meta): From eb0297aeb32491de14fa2ae8fe2b6e85191c4198 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 26 Jun 2018 09:53:36 +0200 Subject: [PATCH 4/4] Update django-environ from 0.4.4 to 0.4.5 (#1695) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 5e8f78468..b553bb838 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -16,7 +16,7 @@ celery==4.2.0 # pyup: <5.0 # https://github.com/celery/celery # 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