cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-09 06:24:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pytest-everywhere

Browse Source
This commit is contained in:
Nikita P. Shupeyko 2018-06-27 19:27:32 +03:00
commit c73071bbb4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.rst
View File

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

2
{{cookiecutter.project_slug}}/requirements/base.txt
View File

@ -16,7 +16,7 @@ celery==4.2.0 # pyup: <5.0 # https://github.com/celery/celery
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
django==2.0.6 # pyup: < 2.1 # https://www.djangoproject.com/ 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-model-utils==3.1.2 # https://github.com/jazzband/django-model-utils
django-allauth==0.36.0 # https://github.com/pennersr/django-allauth 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 django-crispy-forms==1.7.2 # https://github.com/django-crispy-forms/django-crispy-forms

3
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
View File

@ -1,5 +1,6 @@
from django.contrib.auth import get_user_model, forms from django.contrib.auth import get_user_model, forms
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _
User = get_user_model() User = get_user_model()
@ -13,7 +14,7 @@ class UserChangeForm(forms.UserChangeForm):
class UserCreationForm(forms.UserCreationForm): class UserCreationForm(forms.UserCreationForm):
error_message = forms.UserCreationForm.error_messages.update( error_message = forms.UserCreationForm.error_messages.update(
{"duplicate_username": "This username has already been taken."} {"duplicate_username": _("This username has already been taken.")}
) )
class Meta(forms.UserCreationForm.Meta): class Meta(forms.UserCreationForm.Meta):