From 8893568be50154bbc26b81a6102f6748e1fa84e9 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 2 Jun 2020 21:11:49 +0500 Subject: [PATCH 01/31] Change rbtools from github to pypi lib --- .gitmodules | 3 --- anytask/rbtools | 1 - requirements_local.txt | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 120000 anytask/rbtools diff --git a/.gitmodules b/.gitmodules index a46667ac8..f26047e3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "bootbox"] path = dependencies/bootbox url = https://github.com/makeusabrew/bootbox.git -[submodule "rbtools"] - path = dependencies/rbtools - url = https://github.com/reviewboard/rbtools.git diff --git a/anytask/rbtools b/anytask/rbtools deleted file mode 120000 index 9c94132b0..000000000 --- a/anytask/rbtools +++ /dev/null @@ -1 +0,0 @@ -../dependencies/rbtools/rbtools \ No newline at end of file diff --git a/requirements_local.txt b/requirements_local.txt index 0f0434874..0c2e02349 100644 --- a/requirements_local.txt +++ b/requirements_local.txt @@ -33,3 +33,4 @@ flake8==3.7.9 django_premailer==0.2.0 django-environ==0.4 nose==1.3.7 +rbtools==1.0.3 From 6c15109e8002b4bd2e5fd07e8fa7c21d52b9ccba Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 2 Jun 2020 21:17:36 +0500 Subject: [PATCH 02/31] Delete dependency rbtools --- dependencies/rbtools | 1 - 1 file changed, 1 deletion(-) delete mode 160000 dependencies/rbtools diff --git a/dependencies/rbtools b/dependencies/rbtools deleted file mode 160000 index 3d347ad30..000000000 --- a/dependencies/rbtools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3d347ad307e3a5075c2379071b6420f2f8d9b377 From 5f9618b7504653fc8500188d9065191a10fa0a03 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 2 Jun 2020 22:17:22 +0500 Subject: [PATCH 03/31] fix some python errors --- anytask/anysvn/urls.py | 7 +++---- anytask/courses/management/commands/course_copy.py | 4 ++-- .../management/commands/fix_seminar_status.py | 2 +- .../commands/send_not_contest_to_contest.py | 2 +- anytask/simple.py | 14 +++++++++----- .../tasks/management/commands/import_perltask.py | 2 +- anytask/users/management/commands/create_shad.py | 2 +- .../users/management/commands/import_cs_users.py | 4 ++-- .../users/management/commands/import_shad_users.py | 2 +- .../registration/backends/__init__.py | 2 +- .../management/commands/cleanupregistration.py | 2 +- .../django-registration/registration/tests/urls.py | 4 ++-- 12 files changed, 25 insertions(+), 22 deletions(-) diff --git a/anytask/anysvn/urls.py b/anytask/anysvn/urls.py index 4e5cb7977..fe4e17bf7 100644 --- a/anytask/anysvn/urls.py +++ b/anytask/anysvn/urls.py @@ -1,8 +1,7 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from anysvn.views import SvnAccesss -urlpatterns = patterns( - 'anysvn.views', +urlpatterns = [ url(r'^access/$', SvnAccesss.as_view(), name="anysvn.views.SvnAccesss.as_view"), -) +] diff --git a/anytask/courses/management/commands/course_copy.py b/anytask/courses/management/commands/course_copy.py index d63417435..d27d6c7f7 100644 --- a/anytask/courses/management/commands/course_copy.py +++ b/anytask/courses/management/commands/course_copy.py @@ -4,7 +4,7 @@ from courses.models import Course from tasks.models import Task -from xml.dom.minidom import parse +from xml.etree.ElementTree import parse from optparse import make_option import copy @@ -33,7 +33,7 @@ class Command(BaseCommand): ), ) - @transaction.commit_on_success + @transaction.atomic def handle(self, **options): course_id = options['course_id'] if course_id: diff --git a/anytask/issues/management/commands/fix_seminar_status.py b/anytask/issues/management/commands/fix_seminar_status.py index ab6b0290e..43ec95144 100644 --- a/anytask/issues/management/commands/fix_seminar_status.py +++ b/anytask/issues/management/commands/fix_seminar_status.py @@ -5,7 +5,7 @@ from optparse import make_option from django.core.management.base import BaseCommand -from django.db.transaction import commit_on_success +from django.db.transaction import atomic as commit_on_success from django.contrib.auth.models import User from django.db.models import Sum diff --git a/anytask/issues/management/commands/send_not_contest_to_contest.py b/anytask/issues/management/commands/send_not_contest_to_contest.py index 1c898b28c..bb8f01624 100644 --- a/anytask/issues/management/commands/send_not_contest_to_contest.py +++ b/anytask/issues/management/commands/send_not_contest_to_contest.py @@ -6,7 +6,7 @@ from django.conf import settings from django.core.management.base import BaseCommand -from django.db.transaction import commit_on_success +from django.db.transaction import atomic as commit_on_success from django.utils import translation from issues.models import Issue diff --git a/anytask/simple.py b/anytask/simple.py index 1a8e857dc..b1a231262 100644 --- a/anytask/simple.py +++ b/anytask/simple.py @@ -2,12 +2,16 @@ from django.conf import settings from django.core.exceptions import ImproperlyConfigured -from django.db.models import get_app, get_apps -from django.test import _doctest as doctest +# from django.db.models.aggreg import get_app, get_apps +from django.apps import apps +get_app = apps.get_app_config +get_apps = apps.get_app_configs + +import doctest from django.test.utils import setup_test_environment, teardown_test_environment -from django.test.testcases import OutputChecker, DocTestRunner -from django.utils import unittest -from django.utils.importlib import import_module +from doctest import OutputChecker, DocTestRunner +import unittest +from importlib import import_module from django.utils.module_loading import module_has_submodule __all__ = ('DjangoTestSuiteRunner') diff --git a/anytask/tasks/management/commands/import_perltask.py b/anytask/tasks/management/commands/import_perltask.py index 171618e6c..6c484daf1 100644 --- a/anytask/tasks/management/commands/import_perltask.py +++ b/anytask/tasks/management/commands/import_perltask.py @@ -10,7 +10,7 @@ from django.core.management.base import BaseCommand from django.contrib.auth.models import User -from xml.dom.minidom import parse +from xml.etree.ElementTree import parse import sys import datetime from optparse import make_option diff --git a/anytask/users/management/commands/create_shad.py b/anytask/users/management/commands/create_shad.py index ba4afa844..12c3cfefa 100644 --- a/anytask/users/management/commands/create_shad.py +++ b/anytask/users/management/commands/create_shad.py @@ -16,7 +16,7 @@ from years.common import get_or_create_current_year from years.models import Year -from xml.dom.minidom import parse +from xml.etree.ElementTree import parse from optparse import make_option import sys import random diff --git a/anytask/users/management/commands/import_cs_users.py b/anytask/users/management/commands/import_cs_users.py index 31cd29fe4..b7b2911da 100644 --- a/anytask/users/management/commands/import_cs_users.py +++ b/anytask/users/management/commands/import_cs_users.py @@ -7,10 +7,10 @@ """ -from django.core.management.base import NoArgsCommand +from django.core.management.base import BaseCommand as NoArgsCommand from django.contrib.auth.models import User -from xml.dom.minidom import parse +from xml.etree.ElementTree import parse import sys import random import string diff --git a/anytask/users/management/commands/import_shad_users.py b/anytask/users/management/commands/import_shad_users.py index 59db53e79..bbe80aa91 100644 --- a/anytask/users/management/commands/import_shad_users.py +++ b/anytask/users/management/commands/import_shad_users.py @@ -1,4 +1,4 @@ -from django.core.management.base import NoArgsCommand +from django.core.management.base import BaseCommand as NoArgsCommand from django.contrib.auth.models import User from groups.models import Group from django.contrib.auth.forms import PasswordResetForm diff --git a/dependencies/django-registration/registration/backends/__init__.py b/dependencies/django-registration/registration/backends/__init__.py index 39d77f81a..cfe28728f 100644 --- a/dependencies/django-registration/registration/backends/__init__.py +++ b/dependencies/django-registration/registration/backends/__init__.py @@ -6,7 +6,7 @@ try: # pragma: no cover from importlib import import_module # pragma: no cover except ImportError: # pragma: no cover - from django.utils.importlib import import_module # pragma: no cover + from importlib import import_module # pragma: no cover def get_backend(path): """ diff --git a/dependencies/django-registration/registration/management/commands/cleanupregistration.py b/dependencies/django-registration/registration/management/commands/cleanupregistration.py index abec5aed3..e8433564b 100644 --- a/dependencies/django-registration/registration/management/commands/cleanupregistration.py +++ b/dependencies/django-registration/registration/management/commands/cleanupregistration.py @@ -7,7 +7,7 @@ """ -from django.core.management.base import NoArgsCommand +from django.core.management.base import BaseCommand as NoArgsCommand from registration.models import RegistrationProfile diff --git a/dependencies/django-registration/registration/tests/urls.py b/dependencies/django-registration/registration/tests/urls.py index 344a44f02..c834e1a2d 100644 --- a/dependencies/django-registration/registration/tests/urls.py +++ b/dependencies/django-registration/registration/tests/urls.py @@ -17,7 +17,7 @@ from registration.views import register -urlpatterns = patterns('', +urlpatterns = [ # Test the 'activate' view with custom template # name. url(r'^activate-with-template-name/(?P\w+)/$', @@ -85,4 +85,4 @@ url(r'^shad2017/register', 'admission.views.register'), url(r'^shad2017/activate/(?P\w+)/', 'admission.views.activate'), url(r'^shad2017/decline/(?P\w+)/', 'admission.views.decline'), - ) + ] From 7128df468a96b25c0cd85047f4e7a035614963f8 Mon Sep 17 00:00:00 2001 From: Sergey Date: Tue, 2 Jun 2020 23:52:45 +0500 Subject: [PATCH 04/31] Works on python 3.8 --- requirements3_local.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 requirements3_local.txt diff --git a/requirements3_local.txt b/requirements3_local.txt new file mode 100644 index 000000000..67c5e0f5c --- /dev/null +++ b/requirements3_local.txt @@ -0,0 +1,36 @@ +tornado==5 +ipykernel==4.5.2 +django==1.11.29 +pillow==6.2.2 +django-recaptcha==1.4.0 +python-gettext==3.0 +beautifulsoup4 +Werkzeug==0.15.3 +django-extensions==1.6.7 +ipython[notebook]==5.3.0 +ipdb==0.10.2 +sqlparse==0.1.15 +django-debug-toolbar==1.3.2 +django-bootstrap-breadcrumbs==0.9.1 +pycrypto==2.6.1 +python-magic==0.4.15 +django-filemanager==0.0.5 +requests==2.20.0 +flup==1.0.3 +unidecode==1.0.22 +django-dprog-jfu +django-filter==1.1.0 +yandex-oauth-py==0.1.1 +xmltodict==0.11.0 +django-crispy-forms==1.6.0 +mock==3.0.5 +django-colorfield==0.1.14 +django-haystack==2.8.1 +Whoosh==2.7.4 +django-reversion==1.10 +dateutils==0.6.6 +flake8==3.7.9 +django_premailer==0.2.0 +django-environ==0.4 +nose==1.3.7 +rbtools==1.0.3 From 8f70bd22345fd2fb83aa40f365c750f0476639a6 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 3 Jun 2020 00:03:54 +0500 Subject: [PATCH 05/31] Start fixing tests. Fails 76 tests --- anytask/admission/views.py | 4 ++-- anytask/anycontest/common.py | 2 +- .../management/commands/check_contest.py | 4 ++-- .../commands/send_freezed_run_id_notify.py | 4 ++-- anytask/anycontest/models.py | 2 +- anytask/anyrb/common.py | 2 +- anytask/anyrb/unpacker.py | 2 +- anytask/api/tests.py | 6 +++--- anytask/api/views.py | 4 ++-- anytask/common/ordered_dict.py | 4 ++-- anytask/courses/course_statistics.py | 4 ++-- .../management/commands/course_copy.py | 4 ++-- anytask/courses/models.py | 20 +++++++++---------- anytask/courses/pythontask.py | 6 +++--- anytask/courses/tests.py | 16 +++++++-------- anytask/courses/views.py | 12 +++++------ anytask/django_bootstrap | 1 - anytask/filemanager | 1 - .../groups/management/commands/group_copy.py | 2 +- anytask/groups/models.py | 6 +++--- anytask/invites/models.py | 2 +- .../management/commands/fix_seminar_status.py | 16 +++++++-------- .../management/commands/rewrite_comments.py | 10 +++++----- .../commands/send_issue_duplicate_notify.py | 6 +++--- .../commands/send_not_contest_to_contest.py | 4 ++-- .../management/commands/send_notifications.py | 4 ++-- anytask/issues/model_issue_field.py | 2 +- anytask/issues/model_issue_status.py | 4 ++-- anytask/issues/model_issue_student_filter.py | 2 +- anytask/issues/models.py | 4 ++-- anytask/issues/tests.py | 8 ++++---- anytask/issues/views.py | 2 +- anytask/lessons/models.py | 4 ++-- .../commands/send_mail_notifications.py | 4 ++-- anytask/mail/models.py | 2 +- anytask/mail/views.py | 2 +- anytask/schools/models.py | 6 +++--- anytask/search/views.py | 4 ++-- .../commands/check_task_taken_expires.py | 2 +- .../management/commands/import_perltask.py | 14 ++++++------- .../commands/send_task_notifications.py | 6 +++--- anytask/tasks/models.py | 18 ++++++++--------- anytask/tasks/templatetags/sanitize_html.py | 2 +- anytask/tasks/tests.py | 2 +- .../users/management/commands/create_shad.py | 8 ++++---- .../management/commands/import_cs_users.py | 2 +- .../management/commands/import_shad_users.py | 4 ++-- anytask/users/model_user_status.py | 4 ++-- anytask/users/models.py | 8 ++++---- anytask/users/views.py | 16 +++++++-------- anytask/years/models.py | 2 +- .../registration/backends/__init__.py | 2 +- .../registration/models.py | 6 +++--- .../registration/tests/models.py | 2 +- 54 files changed, 144 insertions(+), 146 deletions(-) delete mode 120000 anytask/django_bootstrap delete mode 120000 anytask/filemanager diff --git a/anytask/admission/views.py b/anytask/admission/views.py index 144fa554a..c8b8d23de 100644 --- a/anytask/admission/views.py +++ b/anytask/admission/views.py @@ -123,10 +123,10 @@ def register(request): if request.META['HTTP_EMAIL'] and request.META['HTTP_EMAIL'] != 'None': user_info['ya_email'] = request.META['HTTP_EMAIL'] - for key, post_data_key in settings.YA_FORMS_FIELDS.iteritems(): + for key, post_data_key in settings.YA_FORMS_FIELDS.items(): user_info[key] = get_post_value(post_data, post_data_key) - for key, post_data_keys in settings.YA_FORMS_FIELDS_ADDITIONAL.iteritems(): + for key, post_data_keys in settings.YA_FORMS_FIELDS_ADDITIONAL.items(): info_json = [] for post_data_key in post_data_keys: info_json.append({ diff --git a/anytask/anycontest/common.py b/anytask/anycontest/common.py index 984af6fbc..0b49bd7e3 100644 --- a/anytask/anycontest/common.py +++ b/anytask/anycontest/common.py @@ -2,7 +2,7 @@ import requests import logging import xmltodict -from BeautifulSoup import BeautifulStoneSoup +from bs4 import BeautifulStoneSoup from django.conf import settings diff --git a/anytask/anycontest/management/commands/check_contest.py b/anytask/anycontest/management/commands/check_contest.py index 27c96da52..ffedd3d1c 100644 --- a/anytask/anycontest/management/commands/check_contest.py +++ b/anytask/anycontest/management/commands/check_contest.py @@ -72,5 +72,5 @@ def handle(self, **options): # set_contest_marks(contest_id, students_info) # logging to cron log - print "Command check_contest check {0} submissions ({1} - with marks) took {2} seconds" \ - .format(len(contest_submissions), contest_marks_len, time.time() - start_time) + print("Command check_contest check {0} submissions ({1} - with marks) took {2} seconds" + .format(len(contest_submissions), contest_marks_len, time.time() - start_time)) diff --git a/anytask/anycontest/management/commands/send_freezed_run_id_notify.py b/anytask/anycontest/management/commands/send_freezed_run_id_notify.py index ef10d1260..b2c23130e 100644 --- a/anytask/anycontest/management/commands/send_freezed_run_id_notify.py +++ b/anytask/anycontest/management/commands/send_freezed_run_id_notify.py @@ -56,5 +56,5 @@ def handle(self, **options): send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [email, "anytask@yandex.ru"]) # logging to cron log - print "Command send_freezed_run_id_notify check {0} submissions took {1} seconds" \ - .format(len(contest_submissions), time.time() - start_time) + print("Command send_freezed_run_id_notify check {0} submissions took {1} seconds" + .format(len(contest_submissions), time.time() - start_time)) diff --git a/anytask/anycontest/models.py b/anytask/anycontest/models.py index 69139e0ba..8e312ba07 100644 --- a/anytask/anycontest/models.py +++ b/anytask/anycontest/models.py @@ -49,7 +49,7 @@ class ContestSubmission(models.Model): sended_notify = models.BooleanField(default=False) - def __unicode__(self): + def __str__(self): return u"{0} {1}".format(self.issue, self.run_id) def upload_contest(self, extension=None, compiler_id=None): diff --git a/anytask/anyrb/common.py b/anytask/anyrb/common.py index 104d06ede..ae907aa4f 100644 --- a/anytask/anyrb/common.py +++ b/anytask/anyrb/common.py @@ -8,7 +8,7 @@ from django.utils.translation import ugettext as _ from rbtools.api.client import RBClient -from unpacker import unpack_files +from .unpacker import unpack_files logger = logging.getLogger('django.request') diff --git a/anytask/anyrb/unpacker.py b/anytask/anyrb/unpacker.py index 7a58d0b01..e35e0bada 100644 --- a/anytask/anyrb/unpacker.py +++ b/anytask/anyrb/unpacker.py @@ -40,7 +40,7 @@ def filename(self): def get_archiver(filename): - for suffix, archiver in ARCHIVERS.iteritems(): + for suffix, archiver in iter(ARCHIVERS.items()): if filename.lower().endswith(suffix): return archiver return None diff --git a/anytask/api/tests.py b/anytask/api/tests.py index 459d57265..05105a8c6 100644 --- a/anytask/api/tests.py +++ b/anytask/api/tests.py @@ -35,7 +35,7 @@ def clean_timestamps(cls, x): x.pop("update_time", None) x.pop("timestamp", None) - for k, v in x.iteritems(): + for k, v in iter(x.items()): cls.clean_timestamps(k) cls.clean_timestamps(v) @@ -94,8 +94,8 @@ def _request(self, username, password, method=None, *args, **kwargs): if method is None: method = self.client.get - http_authorization = "basic " + \ - base64.b64encode("{}:{}".format(username, password)) + http_authorization = "basic " + base64.b64encode("{}:{}".format(username, password) + .encode('utf8')).decode('utf8') kwargs.update({"HTTP_AUTHORIZATION": http_authorization}) return method(*args, **kwargs) diff --git a/anytask/api/views.py b/anytask/api/views.py index bd31b1223..b387e6475 100644 --- a/anytask/api/views.py +++ b/anytask/api/views.py @@ -37,7 +37,7 @@ def check_auth(request, *args, **kwargs): if auth_str_parts[0].lower() != "basic": return get_401_response() - username, password = base64.b64decode(auth_str_parts[1]).split(":", 1) + username, password = base64.b64decode(auth_str_parts[1].encode('utf8')).decode('utf8').split(":", 1) user = authenticate(username=username, password=password) if user is None or not user.is_active: return get_401_response() @@ -153,7 +153,7 @@ def get_issue_filter(data): status_arg = data['status'] filter_args['status_field__id' if status_arg.isdigit() else 'status_field__tag'] = status_arg - for arg, qs_arg in ISSUE_FILTER.iteritems(): + for arg, qs_arg in ISSUE_FILTER.items(): if arg in data: filter_args[qs_arg] = data[arg] diff --git a/anytask/common/ordered_dict.py b/anytask/common/ordered_dict.py index e0d336b22..09f6ee69a 100644 --- a/anytask/common/ordered_dict.py +++ b/anytask/common/ordered_dict.py @@ -4,7 +4,7 @@ try: from thread import get_ident as _get_ident except ImportError: - from dummy_thread import get_ident as _get_ident + from _dummy_thread import get_ident as _get_ident try: from _abcoll import KeysView, ValuesView, ItemsView @@ -134,7 +134,7 @@ def itervalues(self): for k in self: yield self[k] - def iteritems(self): + def items(self): 'od.iteritems -> an iterator over the (key, value) items in od' for k in self: yield (k, self[k]) diff --git a/anytask/courses/course_statistics.py b/anytask/courses/course_statistics.py index 72aaa9f49..039b1ce1d 100644 --- a/anytask/courses/course_statistics.py +++ b/anytask/courses/course_statistics.py @@ -29,7 +29,7 @@ def get_course_statistics(self): ) groups_statistics_list = [] - for group, statistics in self.groups_statistics.iteritems(): + for group, statistics in self.groups_statistics.items(): groups_statistics_list.append(( group, statistics['group_summ_scores'], statistics['number_group_students'], @@ -51,7 +51,7 @@ def get_course_statistics(self): def get_groups_statistics(self): group_student_list = [] - for group, statistics in self.groups_statistics.iteritems(): + for group, statistics in self.groups_statistics.items(): group_student_list.append((group, statistics['students_statistics'])) return group_student_list diff --git a/anytask/courses/management/commands/course_copy.py b/anytask/courses/management/commands/course_copy.py index d27d6c7f7..8d70ae896 100644 --- a/anytask/courses/management/commands/course_copy.py +++ b/anytask/courses/management/commands/course_copy.py @@ -54,7 +54,7 @@ def handle(self, **options): if task_src.has_parent(): continue - print "Copy task {0}".format(task_src.title.encode("utf-8")) + print("Copy task {0}".format(task_src.title.encode("utf-8"))) task_dst = Task() task_dst.__dict__ = copy.deepcopy(task_src.__dict__) task_dst.id = None @@ -62,7 +62,7 @@ def handle(self, **options): task_dst.save() for subtask_src in task_src.get_subtasks(): - print ">Copy subtask {0}".format(subtask_src.title.encode("utf-8")) + print(">Copy subtask {0}".format(subtask_src.title.encode("utf-8"))) subtask_dst = Task() subtask_dst.__dict__ = copy.deepcopy(subtask_src.__dict__) diff --git a/anytask/courses/models.py b/anytask/courses/models.py index 4746d0f3a..2ffe1f9f3 100644 --- a/anytask/courses/models.py +++ b/anytask/courses/models.py @@ -66,7 +66,7 @@ def get_deleted_issue_fields(self): class FilenameExtension(models.Model): name = models.CharField(max_length=10, db_index=False, null=False, blank=False) - def __unicode__(self): + def __str__(self): return self.name @@ -74,7 +74,7 @@ class MarkField(models.Model): name = models.CharField(max_length=191, db_index=True, null=False, blank=False) name_int = models.IntegerField(db_index=False, null=False, blank=False, default=-1) - def __unicode__(self): + def __str__(self): return self.name if self.name else '--' class Meta: @@ -85,8 +85,8 @@ class CourseMarkSystem(models.Model): name = models.CharField(max_length=191, db_index=False, null=False, blank=False) marks = models.ManyToManyField(MarkField, null=True, blank=True) - def __unicode__(self): - return unicode(self.name) + def __str__(self): + return str(self.name) class Course(models.Model): @@ -149,11 +149,11 @@ class Course(models.Model): show_contest_run_id = models.BooleanField(db_index=False, null=False, blank=False, default=True) - def __unicode__(self): - return unicode(self.name) + def __str__(self): + return str(self.name) def get_full_name(self): - return unicode(self.name) + return str(self.name) def get_absolute_url(self): return reverse('courses.views.course_page', args=[str(self.id)]) @@ -267,7 +267,7 @@ class DefaultTeacher(models.Model): course = models.ForeignKey(Course, db_index=True, null=False, blank=False) group = models.ForeignKey(Group, db_index=True, null=True, blank=True) - def __unicode__(self): + def __str__(self): return u"|".join((self.course.name, self.group.name, self.teacher.username)) class Meta: @@ -282,8 +282,8 @@ class StudentCourseMark(models.Model): teacher = models.ForeignKey(User, related_name='teacher_change_mark', db_index=False, null=True, blank=True) update_time = models.DateTimeField(auto_now=True) # remove default=timezone.now - def __unicode__(self): - return unicode(self.mark) + def __str__(self): + return str(self.mark) class Meta: unique_together = (("student", "course"),) diff --git a/anytask/courses/pythontask.py b/anytask/courses/pythontask.py index dca4cacf1..a4abdcb96 100644 --- a/anytask/courses/pythontask.py +++ b/anytask/courses/pythontask.py @@ -26,12 +26,12 @@ def update(self, group): self._course_update(group) def get_group_stat(self): - return [(group, stat['student_stat']) for (group, stat) in self.group_stat.iteritems()] + return [(group, stat['student_stat']) for (group, stat) in self.group_stat.items()] def get_course_stat(self): stat = [ (group, stat['total'], stat['active_students'], stat['avg_score']) - for (group, stat) in self.group_stat.iteritems() + for (group, stat) in self.group_stat.items() ] stat.append( @@ -172,7 +172,7 @@ def get_task(request, course_id, task_id): task_taken.issue = issue task_taken.save() - task_taken.issue.add_comment(unicode(_("zapisalsya_na_task"))) + task_taken.issue.add_comment(str(_("zapisalsya_na_task"))) return redirect('courses.views.course_page', course_id=course_id) diff --git a/anytask/courses/tests.py b/anytask/courses/tests.py index 836afb9e4..b6a19098d 100644 --- a/anytask/courses/tests.py +++ b/anytask/courses/tests.py @@ -14,7 +14,7 @@ from tasks.models import Task, TaskTaken from tasks.management.commands.check_task_taken_expires import Command as CheckTastTakenExpiresCommand -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from django.core.urlresolvers import reverse import courses.pythontask import courses.views @@ -23,7 +23,7 @@ def save_result_html(html): with open(r'../test_page.html', 'w') as f: - print html + print(html) f.write(html) @@ -74,14 +74,14 @@ def test_course_create_filled(self): self.assertEqual(course.information, 'information') self.assertEqual(course.year, year) self.assertEqual(course.is_active, True) - self.assertItemsEqual(course.teachers.all(), teachers) - self.assertItemsEqual(course.groups.all(), groups) - self.assertItemsEqual(course.issue_fields.all(), IssueField.objects.exclude(id=10).exclude(id=11)) + self.assertCountEqual(course.teachers.all(), teachers) + self.assertCountEqual(course.groups.all(), groups) + self.assertCountEqual(course.issue_fields.all(), IssueField.objects.exclude(id=10).exclude(id=11)) self.assertEqual(course.contest_integrated, False) self.assertEqual(course.send_rb_and_contest_together, False) self.assertEqual(course.rb_integrated, False) self.assertEqual(course.send_to_contest_from_users, True) - self.assertItemsEqual(course.filename_extensions.all(), filename_extensions) + self.assertCountEqual(course.filename_extensions.all(), filename_extensions) self.assertEqual(course.full_transcript, False) self.assertEqual(course.private, True) self.assertEqual(course.can_be_chosen_by_extern, True) @@ -1196,7 +1196,7 @@ def test_take_subtasks_limit(self): response = client.get( reverse(courses.pythontask.get_task, kwargs={'course_id': self.course.id, 'task_id': self.subtask1.id}), follow=True) - self.assertNotIn("{} {}".format(user.last_name, user.first_name), response.content) + self.assertNotIn("{} {}".format(user.last_name, user.first_name), response.content.decode('utf8')) def test_take_cant_take_tasks_from_one_subtask(self): client = self.client @@ -1204,7 +1204,7 @@ def test_take_cant_take_tasks_from_one_subtask(self): self.assertTrue(client.login(username=user.username, password="password0")) response = client.get(reverse(courses.views.course_page, kwargs={'course_id': self.course.id})) - self.assertNotIn("{} {}".format(user.last_name, user.first_name), response.content) + self.assertNotIn("{} {}".format(user.last_name, user.first_name), response.content.decode('utf8')) response = client.get( reverse(courses.pythontask.get_task, kwargs={'course_id': self.course.id, 'task_id': self.subtask1.id}), diff --git a/anytask/courses/views.py b/anytask/courses/views.py index 47e6f172a..a7a31f413 100644 --- a/anytask/courses/views.py +++ b/anytask/courses/views.py @@ -432,7 +432,7 @@ def tasklist_shad_cpp(request, course, seminar=None, group=None): default_teacher[group] = None group_x_student_information = OrderedDict() - for group, student_x_task_x_task_takens in group_x_student_x_task_takens.iteritems(): + for group, student_x_task_x_task_takens in group_x_student_x_task_takens.items(): group_x_student_information.setdefault(group, []) for student in sorted(student_x_task_x_task_takens.keys(), @@ -494,7 +494,7 @@ def get_course_mark(course, student): student_course_mark = StudentCourseMark.objects.get(course=course, student=student) if student_course_mark.mark: mark_id = student_course_mark.mark.id - course_mark = unicode(student_course_mark) + course_mark = str(student_course_mark) course_mark_int = student_course_mark.mark.name_int except StudentCourseMark.DoesNotExist: pass @@ -627,7 +627,7 @@ def course_settings(request, course_id): context['file_extensions'] = get_filename_extensions(course) return render(request, 'courses/settings.html', context) - for group_key, teacher_id in form.cleaned_data.iteritems(): + for group_key, teacher_id in form.cleaned_data.items(): teacher_id = int(teacher_id) group = form.groups[group_key] if teacher_id == 0: @@ -714,7 +714,7 @@ def set_course_mark(request): student_course_mark.update_time = datetime.datetime.now() student_course_mark.mark = mark student_course_mark.save() - return HttpResponse(json.dumps({'mark': unicode(mark), 'mark_id': mark.id, 'mark_int': mark.name_int}), + return HttpResponse(json.dumps({'mark': str(mark), 'mark_id': mark.id, 'mark_int': mark.name_int}), content_type="application/json") @@ -755,7 +755,7 @@ def change_table_tasks_pos(request): group = get_object_or_404(Group, id=int(request.POST['group_id'])) deleting_ids_from_groups = json.loads(request.POST['deleting_ids_from_groups']) if deleting_ids_from_groups: - for task_id, group_ids in deleting_ids_from_groups.iteritems(): + for task_id, group_ids in deleting_ids_from_groups.items(): group_ids = list(set(group_ids)) task = get_object_or_404(Task, id=int(task_id)) @@ -951,7 +951,7 @@ def attendance_list(request, course, group=None): except DefaultTeacher.DoesNotExist: default_teacher[group] = None group_x_student_information = OrderedDict() - for group, students_x_lessons in group_x_student_x_lessons.iteritems(): + for group, students_x_lessons in group_x_student_x_lessons.items(): group_x_student_information.setdefault(group, []) for student in sorted(students_x_lessons.keys(), diff --git a/anytask/django_bootstrap b/anytask/django_bootstrap deleted file mode 120000 index fa68b9c04..000000000 --- a/anytask/django_bootstrap +++ /dev/null @@ -1 +0,0 @@ -../dependencies/django-bootstrap/bootstrap \ No newline at end of file diff --git a/anytask/filemanager b/anytask/filemanager deleted file mode 120000 index 87c71f8d0..000000000 --- a/anytask/filemanager +++ /dev/null @@ -1 +0,0 @@ -../dependencies/django-filemanager/filemanager \ No newline at end of file diff --git a/anytask/groups/management/commands/group_copy.py b/anytask/groups/management/commands/group_copy.py index 0044c3c92..34c3d8d0e 100644 --- a/anytask/groups/management/commands/group_copy.py +++ b/anytask/groups/management/commands/group_copy.py @@ -36,5 +36,5 @@ def handle(self, **options): group_dst.save() for student_src in group_src.students.all(): - print "Copy student {0}".format(student_src.get_full_name().encode("utf-8")) + print("Copy student {0}".format(student_src.get_full_name().encode("utf-8"))) group_dst.students.add(student_src) diff --git a/anytask/groups/models.py b/anytask/groups/models.py index 17d5f383b..29f5f57c9 100644 --- a/anytask/groups/models.py +++ b/anytask/groups/models.py @@ -15,8 +15,8 @@ class Group(models.Model): class Meta: unique_together = (("year", "name"),) - def __unicode__(self): - return u"{0}|{1}".format(self.year, unicode(self.name)) + def __str__(self): + return u"{0}|{1}".format(self.year, str(self.name)) def get_full_name(self): - return unicode(self.name) + return str(self.name) diff --git a/anytask/invites/models.py b/anytask/invites/models.py index dd01abfdf..b3339fa57 100644 --- a/anytask/invites/models.py +++ b/anytask/invites/models.py @@ -23,7 +23,7 @@ class Invite(models.Model): added_time = models.DateTimeField(auto_now_add=True) # remove default=timezone.now update_time = models.DateTimeField(auto_now=True) # remove default=timezone.now - def __unicode__(self): + def __str__(self): return u"{0}".format(self.key) @staticmethod diff --git a/anytask/issues/management/commands/fix_seminar_status.py b/anytask/issues/management/commands/fix_seminar_status.py index 43ec95144..584e25930 100644 --- a/anytask/issues/management/commands/fix_seminar_status.py +++ b/anytask/issues/management/commands/fix_seminar_status.py @@ -17,10 +17,10 @@ def get_mark(task_id, student_id): return Issue.objects \ - .filter(task__parent_task_id=task_id, student_id=student_id) \ - .exclude(task__is_hidden=True) \ - .exclude(task__score_after_deadline=False, status_field__tag=IssueStatus.STATUS_ACCEPTED_AFTER_DEADLINE) \ - .aggregate(Sum('mark'))['mark__sum'] or 0 + .filter(task__parent_task_id=task_id, student_id=student_id) \ + .exclude(task__is_hidden=True) \ + .exclude(task__score_after_deadline=False, status_field__tag=IssueStatus.STATUS_ACCEPTED_AFTER_DEADLINE) \ + .aggregate(Sum('mark'))['mark__sum'] or 0 class Command(BaseCommand): @@ -86,11 +86,11 @@ def handle(self, **options): issues_created += 1 issues_synced += 1 - print "Student: {0}/{1}\tSeminar: {2}/{3}\tCreated: {4}\tChanged: {5}" \ - .format(i + 1, len(student_ids), j + 1, len(tasks_ids), created, old_mark != new_mark) + print("Student: {0}/{1}\tSeminar: {2}/{3}\tCreated: {4}\tChanged: {5}" + .format(i + 1, len(student_ids), j + 1, len(tasks_ids), created, old_mark != new_mark)) - print ("Command fix_seminar_status fixed status for {0} issues, synced {1} issues " - "(changed mark {2} issues, created {3} issues) for {4} students and took {5} seconds").format( + print("Command fix_seminar_status fixed status for {0} issues, synced {1} issues " + "(changed mark {2} issues, created {3} issues) for {4} students and took {5} seconds").format( len(issues), issues_synced, issues_changed, diff --git a/anytask/issues/management/commands/rewrite_comments.py b/anytask/issues/management/commands/rewrite_comments.py index 3df619bcc..96e79c97a 100644 --- a/anytask/issues/management/commands/rewrite_comments.py +++ b/anytask/issues/management/commands/rewrite_comments.py @@ -42,11 +42,11 @@ def handle(self, **options): raise Exception("--replace is required!") for event in Event.objects.all(): - print "======= {0} =========".format(event.id) - print event.value - print "-----------------------" + print("======= {0} =========".format(event.id)) + print(event.value) + print("-----------------------") event.value = re.sub(pattern, replace, event.value) - print event.value - print "=======================" + print(event.value) + print("=======================") if not dry_run: event.save() diff --git a/anytask/issues/management/commands/send_issue_duplicate_notify.py b/anytask/issues/management/commands/send_issue_duplicate_notify.py index 735e9bfaa..45f2bae41 100644 --- a/anytask/issues/management/commands/send_issue_duplicate_notify.py +++ b/anytask/issues/management/commands/send_issue_duplicate_notify.py @@ -33,7 +33,7 @@ def handle(self, **options): subject = "Duplicate issue" message = "" issues_len = 0 - for key, issues_ids in issues_duplicates.iteritems(): + for key, issues_ids in issues_duplicates.items(): if len(issues_ids) > 1: issues_len += 1 for issue_id in issues_ids: @@ -44,5 +44,5 @@ def handle(self, **options): send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, ["anytask@yandex.ru"]) # logging to cron log - print "Command send_issue_duplicate_notify find {0} issues and took {1} seconds" \ - .format(issues_len, time.time() - start_time) + print("Command send_issue_duplicate_notify find {0} issues and took {1} seconds" + .format(issues_len, time.time() - start_time)) diff --git a/anytask/issues/management/commands/send_not_contest_to_contest.py b/anytask/issues/management/commands/send_not_contest_to_contest.py index bb8f01624..8ef346f90 100644 --- a/anytask/issues/management/commands/send_not_contest_to_contest.py +++ b/anytask/issues/management/commands/send_not_contest_to_contest.py @@ -44,7 +44,7 @@ def handle(self, *args, **options): start_time = time.time() if len(args) == 0: - print "Specify file name" + print("Specify file name") return with open(args[0], 'r') as f: @@ -104,4 +104,4 @@ def handle(self, *args, **options): time.time() - start_time ) - print message + print(message) diff --git a/anytask/issues/management/commands/send_notifications.py b/anytask/issues/management/commands/send_notifications.py index 50813257e..93640e10e 100644 --- a/anytask/issues/management/commands/send_notifications.py +++ b/anytask/issues/management/commands/send_notifications.py @@ -74,8 +74,8 @@ def handle(self, **options): event.save() # logging to cron log - print "Command send_issue_notifications send {0} email(s) and took {1} seconds (sleep {2} seconds)" \ - .format(num_sent, time.time() - start_time, sleep_time) + print("Command send_issue_notifications send {0} email(s) and took {1} seconds (sleep {2} seconds)" + .format(num_sent, time.time() - start_time, sleep_time)) def get_message(user, user_type, issue, events, from_email, domain): diff --git a/anytask/issues/model_issue_field.py b/anytask/issues/model_issue_field.py index 5855028b0..eccc00b74 100644 --- a/anytask/issues/model_issue_field.py +++ b/anytask/issues/model_issue_field.py @@ -155,7 +155,7 @@ def is_loggable(self): def get_value(self, issue): return self.get_plugin().get_value(issue) - def __unicode__(self): + def __str__(self): return u'{0}: {1}/{2} - {3}'.format(self.id, self.plugin, self.name, self.title) diff --git a/anytask/issues/model_issue_status.py b/anytask/issues/model_issue_status.py index baac9b1eb..b0578d92c 100644 --- a/anytask/issues/model_issue_status.py +++ b/anytask/issues/model_issue_status.py @@ -43,7 +43,7 @@ class IssueStatus(models.Model): def get_name(self, lang='ru'): return get_value_from_json(self.name, lang) - def __unicode__(self): + def __str__(self): return u'{0}'.format(self.get_name()) class Meta: @@ -55,7 +55,7 @@ class IssueStatusSystem(models.Model): name = models.CharField(max_length=191, db_index=False, null=False, blank=False) statuses = models.ManyToManyField(IssueStatus, null=True, blank=True) - def __unicode__(self): + def __str__(self): return u'{0}'.format(self.name) def has_accepted_after_deadline(self): diff --git a/anytask/issues/model_issue_student_filter.py b/anytask/issues/model_issue_student_filter.py index 97b1e89e7..a483e1ce3 100644 --- a/anytask/issues/model_issue_student_filter.py +++ b/anytask/issues/model_issue_student_filter.py @@ -34,7 +34,7 @@ def set_user(self, user): status_set = set() for course in courses: course_choices.add((course.id, course.name)) - year_choices.add((course.year.id, unicode(course.year))) + year_choices.add((course.year.id, str(course.year))) for teacher in course.get_teachers(): teacher_set.add(teacher) diff --git a/anytask/issues/models.py b/anytask/issues/models.py index 4f6630bae..ad21cb88f 100644 --- a/anytask/issues/models.py +++ b/anytask/issues/models.py @@ -460,7 +460,7 @@ def get_history(self): | Q(field__name='review_id')).order_by('timestamp') return events - def __unicode__(self): + def __str__(self): return u'Issue: {0} {1}'.format(self.id, self.task.get_title()) def get_absolute_url(self): @@ -544,7 +544,7 @@ def is_change(self): # traceback.print_stack() # return super(self.__class__, self).save(*a, **ka) - def __unicode__(self): + def __str__(self): if not self.author: ret = u'{0} nobody'.format(self.issue.id) else: diff --git a/anytask/issues/tests.py b/anytask/issues/tests.py index 729cfe4f9..4bfe92fe4 100644 --- a/anytask/issues/tests.py +++ b/anytask/issues/tests.py @@ -19,7 +19,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile from mock import patch -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from datetime import datetime, timedelta from django.core.urlresolvers import reverse @@ -239,15 +239,15 @@ def test_get_or_create_with_teacher(self): self.assertEqual(len(forms[2]('option')), 3, '6th issue field select option len is not 4') self.assertIn('value="3"', str(forms[2]('option')[0]), '6th issue field select 1st option value wrong') self.assertIn(u'На проверке', - unicode(forms[2]('option')[0]), + str(forms[2]('option')[0]), '6th issue field select 1st option text wrong') self.assertIn('value="4"', str(forms[2]('option')[1]), '6th issue field select 2st option value wrong') self.assertIn(u'На доработке', - unicode(forms[2]('option')[1]), + str(forms[2]('option')[1]), '6th issue field select 2st option text wrong') self.assertIn('value="5"', str(forms[2]('option')[2]), '6th issue field select 3st option value wrong') self.assertIn(u'Зачтено', - unicode(forms[2]('option')[2]), + str(forms[2]('option')[2]), '6th issue field select 3st option text wrong') self.assertEqual(len(forms[2]('button')), 1, '6th issue field button len is not 1') self.assertEqual(forms[2]('button')[0].string.strip().strip('\n'), diff --git a/anytask/issues/views.py b/anytask/issues/views.py index 1facdb157..4861cb970 100644 --- a/anytask/issues/views.py +++ b/anytask/issues/views.py @@ -270,7 +270,7 @@ def upload(request): event_value = {'files': [], 'comment': '', 'compilers': []} event_value['comment'] = request.POST['comment'] file_counter = 0 - for field, value in dict(request.POST).iteritems(): + for field, value in dict(request.POST).items(): if 'compiler' in field: pk = int(field[13:]) file = File.objects.get(pk=pk) diff --git a/anytask/lessons/models.py b/anytask/lessons/models.py index ea3b0aa89..0442effd5 100644 --- a/anytask/lessons/models.py +++ b/anytask/lessons/models.py @@ -33,8 +33,8 @@ class Lesson(models.Model): date_end = models.DateTimeField(auto_now=False, null=True, default=None) days = models.CharField(max_length=100, db_index=True, null=True, blank=True) - def __unicode__(self): - return unicode(self.title) + def __str__(self): + return str(self.title) def set_position(self): self.position = int(self.date_starttime.strftime('%y%m%d%H%M')) diff --git a/anytask/mail/management/commands/send_mail_notifications.py b/anytask/mail/management/commands/send_mail_notifications.py index 089e05231..93f7b1b0b 100644 --- a/anytask/mail/management/commands/send_mail_notifications.py +++ b/anytask/mail/management/commands/send_mail_notifications.py @@ -41,8 +41,8 @@ def handle(self, **options): sleep_time += 1 # logging to cron log - print "Command send_mail_notifications send {0} email(s) and took {1} seconds (sleep {2} seconds)" \ - .format(num_sent, time.time() - start_time, sleep_time) + print("Command send_mail_notifications send {0} email(s) and took {1} seconds (sleep {2} seconds)" + .format(num_sent, time.time() - start_time, sleep_time)) def send_only_notify(domain, from_email): diff --git a/anytask/mail/models.py b/anytask/mail/models.py index 2c8d31ebd..813863959 100644 --- a/anytask/mail/models.py +++ b/anytask/mail/models.py @@ -27,7 +27,7 @@ class Message(models.Model): create_time = models.DateTimeField(auto_now_add=True) # remove default=timezone.now - def __unicode__(self): + def __str__(self): return u'%s %s' % (self.sender.username, self.title) def read_message(self, user): diff --git a/anytask/mail/views.py b/anytask/mail/views.py index 20143a77b..4e38e0423 100644 --- a/anytask/mail/views.py +++ b/anytask/mail/views.py @@ -150,7 +150,7 @@ def format_date(date): if now.day == date.day and now.month == date.month: date_str = date.strftime("%H:%M") else: - date_str = unicode(date.day) + u" " + MONTH[date.month] + date_str = str(date.day) + u" " + MONTH[date.month] else: date_str = date.strftime("%d.%m.%y") diff --git a/anytask/schools/models.py b/anytask/schools/models.py index fdc1587a1..c5db87900 100644 --- a/anytask/schools/models.py +++ b/anytask/schools/models.py @@ -10,11 +10,11 @@ class School(models.Model): link = models.CharField(max_length=191, db_index=False, null=False, blank=False) courses = models.ManyToManyField(Course, null=True, blank=True) - def __unicode__(self): - return unicode(self.name) + def __str__(self): + return str(self.name) def get_full_name(self): - return unicode(self.name) + return str(self.name) def get_absolute_url(self): return reverse('schools.views.school_page', args=[str(self.link)]) diff --git a/anytask/search/views.py b/anytask/search/views.py index 1c984fd7b..736c1bcff 100644 --- a/anytask/search/views.py +++ b/anytask/search/views.py @@ -175,8 +175,8 @@ def search_courses(query, user, max_result=None): for sg in sgs_name[:max_result]: result.append({ - 'name': unicode(sg.object.name), - 'year': unicode(sg.object.year), + 'name': str(sg.object.name), + 'year': str(sg.object.year), 'url': sg.object.get_absolute_url(), 'schools': [sch.name for sch in sg.object.school_set.all()], 'is_active': sg.object.is_active diff --git a/anytask/tasks/management/commands/check_task_taken_expires.py b/anytask/tasks/management/commands/check_task_taken_expires.py index 8a57c38d0..f51e08bb8 100644 --- a/anytask/tasks/management/commands/check_task_taken_expires.py +++ b/anytask/tasks/management/commands/check_task_taken_expires.py @@ -91,4 +91,4 @@ def handle(self, *args, **options): self.check_blacklist_expires(course) if self.need_print: - print "\n".join(self.out_lines) + print("\n".join(self.out_lines)) diff --git a/anytask/tasks/management/commands/import_perltask.py b/anytask/tasks/management/commands/import_perltask.py index 6c484daf1..6f0b5ce83 100644 --- a/anytask/tasks/management/commands/import_perltask.py +++ b/anytask/tasks/management/commands/import_perltask.py @@ -58,8 +58,8 @@ def import_tasktakens(task_obj, tasktakens_el, year): except User.MultipleObjectsReturned: user_count = User.objects.filter(first_name=first_name, last_name=last_name).count() user = User.objects.filter(first_name=first_name, last_name=last_name)[user_count - 1] - print "WARNING user '{0}' MultipleObjectsReturned, selected: '{1}'".format( - user.get_full_name().encode("utf-8"), user) + print("WARNING user '{0}' MultipleObjectsReturned, selected: '{1}'".format( + user.get_full_name().encode("utf-8"), user)) task_taken, _ = TaskTaken.objects.get_or_create(user=user, task=task_obj) group, _ = Group.objects.get_or_create(year=year, name=group_name) @@ -83,14 +83,14 @@ def import_tasktakens(task_obj, tasktakens_el, year): if field.name == "update_time": field.auto_now = True - print ">>>>{0} {1} {2} {3}".format(user, user.get_full_name().encode("utf-8"), group, score) + print(">>>>{0} {1} {2} {3}".format(user, user.get_full_name().encode("utf-8"), group, score)) def import_task_no_subtasks(task_el, course, year): max_score = task_el.getAttribute('b') title = task_el.getElementsByTagName('th')[0].firstChild.data.rsplit('[', 1)[0].strip() weight = task_el.getAttribute('n') - print title + print(title) text = "\n".join(get_task_lines(task_el)) task_obj, _ = Task.objects.get_or_create(title=title, course=course, task_text=text, score_max=max_score) task_obj.weight = weight @@ -104,7 +104,7 @@ def import_task_no_subtasks(task_el, course, year): def import_task_with_subtasks(task_el, course, year): title = task_el.getElementsByTagName('th')[0].firstChild.data.rsplit('[', 1)[0] weight = task_el.getAttribute('n') - print title + print(title) text = "\n".join(get_task_lines(task_el)) parent_task, _ = Task.objects.get_or_create(title=title, course=course, task_text=text) parent_task.weight = weight @@ -112,7 +112,7 @@ def import_task_with_subtasks(task_el, course, year): for subtask_el in task_el.getElementsByTagName('tm')[0].getElementsByTagName('t'): title = subtask_el.getAttribute('h').rsplit('[', 1)[0] weight = subtask_el.getAttribute('m') - print ">>" + title + print(">>" + title) max_score = subtask_el.getAttribute('b') subtask_obj, _ = Task.objects.get_or_create(title=title, course=course, score_max=max_score, parent_task=parent_task) @@ -129,7 +129,7 @@ def import_perltask(perltask_xml, year=None): year = get_or_create_current_year() course, created = Course.objects.get_or_create(year=year, name='Perltask') if created: - print "WARNING: NEW Course created!" + print("WARNING: NEW Course created!") course.type = Course.TYPE_POTOK course.take_policy = Course.TAKE_POLICY_SELF_TAKEN course.max_users_per_task = 8 diff --git a/anytask/tasks/management/commands/send_task_notifications.py b/anytask/tasks/management/commands/send_task_notifications.py index 6feee0c1e..d8d2280da 100644 --- a/anytask/tasks/management/commands/send_task_notifications.py +++ b/anytask/tasks/management/commands/send_task_notifications.py @@ -113,7 +113,7 @@ def handle(self, **options): domain = Site.objects.get_current().domain from_email = settings.DEFAULT_FROM_EMAIL notify_messages = [] - for key_user, courses_info in students_tasks_info.iteritems(): + for key_user, courses_info in students_tasks_info.items(): user = courses_info['user'] if not user.email: continue @@ -139,5 +139,5 @@ def handle(self, **options): num_sent = send_mass_mail_html(notify_messages) # logging to cron log - print "Command send_task_notifications send {0} email(s) and took {1} seconds"\ - .format(num_sent, time.time() - start_time) + print("Command send_task_notifications send {0} email(s) and took {1} seconds" + .format(num_sent, time.time() - start_time)) diff --git a/anytask/tasks/models.py b/anytask/tasks/models.py index 6b095a35c..4f7f2a32f 100644 --- a/anytask/tasks/models.py +++ b/anytask/tasks/models.py @@ -33,7 +33,7 @@ def get_lang_text(text, lang): if text_: lang = lang if lang in text_ else settings.LANGUAGE_CODE return text_[lang] - return unicode(text) + return str(text) class Task(models.Model): @@ -91,8 +91,8 @@ class Task(models.Model): nb_assignment_name = models.CharField(max_length=255, null=True, blank=True) - def __unicode__(self): - return unicode(self.title) + def __str__(self): + return str(self.title) def get_title(self, lang=settings.LANGUAGE_CODE): return escape(get_lang_text(self.title, lang)) @@ -277,8 +277,8 @@ class TaskLog(models.Model): contest_id = models.IntegerField(db_index=True, null=False, blank=False, default=0) problem_id = models.CharField(max_length=128, db_index=True, null=True, blank=True) - def __unicode__(self): - return unicode(self.title) + def __str__(self): + return str(self.title) class TaskTaken(models.Model): @@ -367,8 +367,8 @@ def mark_deleted(self): class Meta: unique_together = (("user", "task"),) - def __unicode__(self): - return unicode(self.task) + " (" + unicode(self.user) + ")" + def __str__(self): + return str(self.task) + " (" + str(self.user) + ")" class TaskGroupRelations(models.Model): @@ -382,8 +382,8 @@ class TaskGroupRelations(models.Model): class Meta: unique_together = ("task", "group") - def __unicode__(self): - return ' '.join([unicode(self.task), unicode(self.group), unicode(self.position)]) + def __str__(self): + return ' '.join([str(self.task), str(self.group), str(self.position)]) def task_save_to_log_post_save(sender, instance, created, **kwargs): diff --git a/anytask/tasks/templatetags/sanitize_html.py b/anytask/tasks/templatetags/sanitize_html.py index c7566395f..4b0323627 100644 --- a/anytask/tasks/templatetags/sanitize_html.py +++ b/anytask/tasks/templatetags/sanitize_html.py @@ -1,4 +1,4 @@ -from BeautifulSoup import BeautifulSoup, Comment +from bs4 import BeautifulSoup, Comment from django import template register = template.Library() diff --git a/anytask/tasks/tests.py b/anytask/tasks/tests.py index 058924ba2..a4ead334c 100644 --- a/anytask/tasks/tests.py +++ b/anytask/tasks/tests.py @@ -16,7 +16,7 @@ from tasks.models import Task, TaskGroupRelations from mock import patch -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from datetime import datetime, timedelta from django.core.urlresolvers import reverse diff --git a/anytask/users/management/commands/create_shad.py b/anytask/users/management/commands/create_shad.py index 12c3cfefa..f549f223e 100644 --- a/anytask/users/management/commands/create_shad.py +++ b/anytask/users/management/commands/create_shad.py @@ -56,12 +56,12 @@ def handle(self, **options): school, created = School.objects.get_or_create(link='shad', name='School of Data Analysis') if created: - print "WARNING: NEW School created!" + print("WARNING: NEW School created!") school.save() course, created = Course.objects.get_or_create(year=year, name='Python') if created: - print "WARNING: NEW Course created!" + print("WARNING: NEW Course created!") course.is_active = True course.contest_integrated = True course.save() @@ -76,7 +76,7 @@ def handle(self, **options): try: user = User.objects.get(username__iexact=username) except User.DoesNotExist: - print "Creating new user! : {0}".format(username.encode("utf-8")) + print("Creating new user! : {0}".format(username.encode("utf-8"))) user = User.objects.create(username=username) user.last_name = last_name user.first_name = first_name @@ -88,4 +88,4 @@ def handle(self, **options): group, _ = Group.objects.get_or_create(year=year, name=group_name) course.groups.add(group) group.students.add(user) - print "{0} {1} {2}".format(user, user.get_full_name().encode("utf-8"), group) + print("{0} {1} {2}".format(user, user.get_full_name().encode("utf-8"), group)) diff --git a/anytask/users/management/commands/import_cs_users.py b/anytask/users/management/commands/import_cs_users.py index b7b2911da..aaeec791d 100644 --- a/anytask/users/management/commands/import_cs_users.py +++ b/anytask/users/management/commands/import_cs_users.py @@ -44,4 +44,4 @@ def handle_noargs(self, **options): user.set_password(''.join(random.choice(string.letters) for i in xrange(20))) user.save() - print "{0} {1}".format(user, user.get_full_name().encode("utf-8")) + print("{0} {1}".format(user, user.get_full_name().encode("utf-8"))) diff --git a/anytask/users/management/commands/import_shad_users.py b/anytask/users/management/commands/import_shad_users.py index bbe80aa91..2375269b7 100644 --- a/anytask/users/management/commands/import_shad_users.py +++ b/anytask/users/management/commands/import_shad_users.py @@ -23,14 +23,14 @@ def handle_noargs(self, **options): username = email.split('@')[0] last_name = fields[1] first_name = fields[2] - print email, username, last_name, first_name + print(email, username, last_name, first_name) user, created = User.objects.get_or_create(username=username, first_name=first_name, last_name=last_name, email=email) group.students.add(user) reset_form = PasswordResetForm({'email': email}) - print reset_form + print(reset_form) reset_form.save() group.save() diff --git a/anytask/users/model_user_status.py b/anytask/users/model_user_status.py index 139ba64b3..3b7955f31 100644 --- a/anytask/users/model_user_status.py +++ b/anytask/users/model_user_status.py @@ -44,11 +44,11 @@ class UserStatus(models.Model): tag = models.CharField(max_length=254, db_index=False, null=True, blank=True, choices=USER_STATUSES) color = ColorField(default=COLOR_DEFAULT) - def __unicode__(self): + def __str__(self): return u'{0}'.format(self.name) def get_full_name(self): - return unicode(self.name) + return str(self.name) def get_statuses(): diff --git a/anytask/users/models.py b/anytask/users/models.py index 205ba8ae3..ab28e2553 100644 --- a/anytask/users/models.py +++ b/anytask/users/models.py @@ -82,8 +82,8 @@ class UserProfile(models.Model): def is_current_year_student(self): return Group.objects.filter(year=get_current_year()).filter(students=self.user).count() > 0 - def __unicode__(self): - return unicode(self.user) + def __str__(self): + return str(self.user) def is_active(self): for status in self.user_status.all(): @@ -169,8 +169,8 @@ class UserProfileLog(models.Model): def is_current_year_student(self): return Group.objects.filter(year=get_current_year()).filter(students=self.user).count() > 0 - def __unicode__(self): - return unicode(self.user) + def __str__(self): + return str(self.user) def create_user_profile(sender, instance, created, **kwargs): diff --git a/anytask/users/views.py b/anytask/users/views.py index 0cb51ecdb..a7baae128 100644 --- a/anytask/users/views.py +++ b/anytask/users/views.py @@ -33,7 +33,7 @@ from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML from dateutil.relativedelta import relativedelta -from urlparse import urlparse +from urllib.parse import urlparse import yandex_oauth import requests @@ -170,7 +170,7 @@ def profile(request, username=None, year=None): 'groups': group_by_year(groups), 'teacher_in_courses': group_by_year(teacher_in_courses), 'teacher_in_courses_archive': group_by_year(teacher_in_courses_archive), - 'current_year': unicode(current_year) if current_year is not None else '', + 'current_year': str(current_year) if current_year is not None else '', 'can_generate_invites': can_generate_invites, 'invite_form': invite_form, 'user_to_show_profile': user_to_show_profile, @@ -186,13 +186,13 @@ def profile(request, username=None, year=None): def group_by_year(objects): group_dict = {} for obj in objects: - year = unicode(obj.year) + year = str(obj.year) if year in group_dict: group_dict[year].append(obj) else: group_dict[year] = [obj] - return sorted(group_dict.iteritems()) + return sorted(group_dict.items()) @login_required @@ -288,7 +288,7 @@ def set_user_statuses(request, username=None): reversion.set_comment("Change from user profile") except Exception as e: is_error = True - error = unicode(e) + error = str(e) user_statuses = list(user_profile.user_status.all().values("name", "color")) @@ -576,7 +576,7 @@ def user_courses(request, username=None, year=None): new_course_statistics['summ_score'] = student_summ_score is_archive = int(not course.is_active) - table_year = unicode(course.year) + table_year = str(course.year) table_key = course.issue_status_system.id if table_year not in tables[is_archive]: @@ -588,8 +588,8 @@ def user_courses(request, username=None, year=None): tables[is_archive][table_year][table_key] = [new_course_statistics] context = { - 'tables': [sorted(x.iteritems()) for x in tables], - 'current_year': unicode(current_year) if current_year is not None else '', + 'tables': [sorted(x.items()) for x in tables], + 'current_year': str(current_year) if current_year is not None else '', 'user_to_show': user_to_show, 'user': user, } diff --git a/anytask/years/models.py b/anytask/years/models.py index 6c0014cbe..8afd5e1d3 100644 --- a/anytask/years/models.py +++ b/anytask/years/models.py @@ -8,7 +8,7 @@ class Year(models.Model): added_time = models.DateTimeField(auto_now_add=True) # remove default=timezone.now update_time = models.DateTimeField(auto_now=True) # remove default=timezone.now - def __unicode__(self): + def __str__(self): return u"{0}-{1}".format(self.start_year, self.start_year + 1) def get_absolute_url(self): diff --git a/dependencies/django-registration/registration/backends/__init__.py b/dependencies/django-registration/registration/backends/__init__.py index cfe28728f..01a4c6847 100644 --- a/dependencies/django-registration/registration/backends/__init__.py +++ b/dependencies/django-registration/registration/backends/__init__.py @@ -23,7 +23,7 @@ def get_backend(path): module, attr = path[:i], path[i+1:] try: mod = import_module(module) - except ImportError, e: + except ImportError as e: raise ImproperlyConfigured('Error loading registration backend %s: "%s"' % (module, e)) try: backend_class = getattr(mod, attr) diff --git a/dependencies/django-registration/registration/models.py b/dependencies/django-registration/registration/models.py index ff08f89d4..8736df1a7 100644 --- a/dependencies/django-registration/registration/models.py +++ b/dependencies/django-registration/registration/models.py @@ -94,9 +94,9 @@ def create_profile(self, user): username and a random salt. """ - salt = hashlib.sha1(str(random.random())).hexdigest()[:5] + salt = hashlib.sha1(str(random.random()).encode('utf8')).hexdigest()[:5].encode('utf8') username = user.username - if isinstance(username, unicode): + if isinstance(username, str): username = username.encode('utf-8') activation_key = hashlib.sha1(salt+username).hexdigest() return self.create(user=user, @@ -179,7 +179,7 @@ class Meta: verbose_name = _('registration profile') verbose_name_plural = _('registration profiles') - def __unicode__(self): + def __str__(self): return u"Registration information for %s" % self.user def activation_key_expired(self): diff --git a/dependencies/django-registration/registration/tests/models.py b/dependencies/django-registration/registration/tests/models.py index 5d733a189..64f402a6c 100644 --- a/dependencies/django-registration/registration/tests/models.py +++ b/dependencies/django-registration/registration/tests/models.py @@ -41,7 +41,7 @@ def test_profile_creation(self): self.assertEqual(RegistrationProfile.objects.count(), 1) self.assertEqual(profile.user.id, new_user.id) self.failUnless(re.match('^[a-f0-9]{40}$', profile.activation_key)) - self.assertEqual(unicode(profile), + self.assertEqual(str(profile), "Registration information for alice") def test_activation_email(self): From 7ba61fd1356e2a87c2821d533dfacb2b28baa28c Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 3 Jun 2020 22:07:24 +0500 Subject: [PATCH 06/31] Some more fixes. Has 38 errors --- anytask/admission/tests.py | 2 +- anytask/anycontest/tests.py | 29 ++++++++++--------- anytask/anyrb/tests.py | 4 +-- anytask/anyrb/unpacker.py | 2 +- anytask/api/tests.py | 2 +- anytask/api/views.py | 6 ++-- anytask/courses/tests.py | 25 +++++++++------- anytask/courses/views.py | 5 ++-- anytask/issues/tests.py | 12 ++++---- anytask/mail/tests.py | 22 +++++++------- anytask/tasks/tests.py | 16 +++++----- .../registration/tests/models.py | 2 +- 12 files changed, 66 insertions(+), 61 deletions(-) diff --git a/anytask/admission/tests.py b/anytask/admission/tests.py index 722add71b..31135c540 100644 --- a/anytask/admission/tests.py +++ b/anytask/admission/tests.py @@ -113,7 +113,7 @@ def test_register_activate(self, mock_contest_register): # post register response = client.post(reverse(admission.views.register), post_data, **test_header) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, "OK") + self.assertEqual(response.content, b"OK") registration_profile = AdmissionRegistrationProfile.objects.all() self.assertEqual(len(registration_profile), 1) diff --git a/anytask/anycontest/tests.py b/anytask/anycontest/tests.py index e38c3c674..d78af046e 100644 --- a/anytask/anycontest/tests.py +++ b/anytask/anycontest/tests.py @@ -9,18 +9,18 @@ from tasks.models import Task from issues.models import Issue, File, Event from issues.model_issue_status import IssueStatus -from common import get_contest_info +from .common import get_contest_info from anycontest.models import ContestSubmission from django.core.files.uploadedfile import SimpleUploadedFile from django.utils.translation import ugettext as _ import threading -import BaseHTTPServer -import SocketServer +import http.server as BaseHTTPServer +import socketserver as SocketServer import time import json -import tests_data +from . import tests_data import cgi CONTEST_PORT = 8079 @@ -39,13 +39,14 @@ def do_GET(self): # NOQA if self.path.startswith("/anytask/contest?contestId="): self.send_response(200) self.end_headers() - json.dump(tests_data.CONTEST_INFO, self.wfile) + self.wfile.write(json.dumps(tests_data.CONTEST_INFO).encode('utf8')) return if self.path.startswith("/anytask/problems?contestId="): self.send_response(200) self.end_headers() - json.dump(tests_data.CONTEST_PROBLEMS, self.wfile) + data = json.dumps(tests_data.CONTEST_PROBLEMS).encode('utf8') + self.wfile.write(data) return if self.path == "/anytask/results?runId=1&contestId=0": @@ -59,7 +60,7 @@ def do_GET(self): # NOQA } self.send_response(200) self.end_headers() - json.dump(reply, self.wfile) + self.wfile.write(json.dumps(reply).encode('utf8')) return if self.path == "/anytask/results?runId=2&contestId=0": @@ -78,7 +79,7 @@ def do_GET(self): # NOQA } self.send_response(200) self.end_headers() - json.dump(reply, self.wfile) + self.wfile.write(json.dumps(reply).encode('utf8')) return if self.path == "/anytask/results?runId=3&contestId=0": @@ -105,25 +106,27 @@ def do_GET(self): # NOQA } self.send_response(200) self.end_headers() - json.dump(reply, self.wfile) + self.wfile.write(json.dumps(reply).encode('utf8')) return if self.path == "/anytask/results?runId=5&contestId=0": reply = {"bad_answer": True} self.send_response(200) self.end_headers() - json.dump(reply, self.wfile) + self.wfile.write(json.dumps(reply).encode('utf8')) return self.send_response(501) self.end_headers() def do_POST(self): # NOQA - content_type, pdict = cgi.parse_header(self.headers.getheader("content-type")) + content_type, pdict = cgi.parse_header(self.headers.get("Content-Type")) + pdict['CONTENT-LENGTH'] = int(self.headers.get("Content-Length")) + pdict['boundary'] = pdict['boundary'].encode('ascii') fields = cgi.parse_multipart(self.rfile, pdict) if self.path.startswith("/anytask/submit"): - if "_failed_" in fields["file"][0]: + if b"_failed_" in fields["file"][0]: reply = { 'error': { 'message': "Submit error in fake server!" @@ -138,7 +141,7 @@ def do_POST(self): # NOQA self.send_response(200) self.end_headers() - json.dump(reply, self.wfile) + self.wfile.write(json.dumps(reply).encode('utf8')) return self.send_response(501) diff --git a/anytask/anyrb/tests.py b/anytask/anyrb/tests.py index 6be987592..61ca7612d 100644 --- a/anytask/anyrb/tests.py +++ b/anytask/anyrb/tests.py @@ -1,7 +1,7 @@ import os from django.test import TestCase -from unpacker import UnpackedFile, unpack_files +from .unpacker import UnpackedFile, unpack_files CUR_DIR = os.path.dirname(os.path.abspath(__file__)) TEST_DIR = os.path.join(CUR_DIR, "test_data") @@ -28,7 +28,7 @@ def _test_unpack(self, arcfilename): ] with unpack_files(files) as unpacked_files: - unpacked_filenames = map(lambda x: x.filename(), unpacked_files) + unpacked_filenames = list(map(lambda x: x.filename(), unpacked_files)) self.assertListEqual(['1.txt', arcfilename + '/1.py', arcfilename + '/dir/1.pl'], unpacked_filenames) def test_unpack_zip(self): diff --git a/anytask/anyrb/unpacker.py b/anytask/anyrb/unpacker.py index e35e0bada..3f4409b78 100644 --- a/anytask/anyrb/unpacker.py +++ b/anytask/anyrb/unpacker.py @@ -66,7 +66,7 @@ def unpack_files(files): try: unpacked_filepath = os.path.join(root, unpacked_file) unpacked_filename = unpacked_filepath[len(dst_dir):] - unpacked_filename = unpacked_filename.decode("utf-8", errors="ignore") + unpacked_filename = unpacked_filename unpacked_file = UnpackedFile(unpacked_filepath, f.filename() + unpacked_filename) res.append(unpacked_file) except Exception as e: diff --git a/anytask/api/tests.py b/anytask/api/tests.py index 05105a8c6..55fd0cc56 100644 --- a/anytask/api/tests.py +++ b/anytask/api/tests.py @@ -334,7 +334,7 @@ def test_get_issue(self, username=None, password=None): self.assertDictEqual(issue, response_data) response = self.client.get(url) - self.assertEqual('print "_failed_"', ''.join(response.streaming_content)) + self.assertEqual(b'print "_failed_"', b''.join(response.streaming_content)) def test_get_issue_no_access(self): response = self._request(self.anytask, self.anytask_password, diff --git a/anytask/api/views.py b/anytask/api/views.py index b387e6475..17e79dc55 100644 --- a/anytask/api/views.py +++ b/anytask/api/views.py @@ -76,7 +76,7 @@ def unpack_issue(issue, add_events=False, request=None, lang=settings.API_LANGUA "create_time": issue.create_time.isoformat() + "Z", "update_time": issue.update_time.isoformat() + "Z", "responsible": None, - "followers": map(lambda x: unpack_user(x), issue.followers.all()), + "followers": list(map(lambda x: unpack_user(x), issue.followers.all())), "status": unpack_status(issue.status_field, lang), "student": unpack_user(issue.student), "task": unpack_task(task) @@ -86,7 +86,7 @@ def unpack_issue(issue, add_events=False, request=None, lang=settings.API_LANGUA ret["responsible"] = unpack_user(issue.responsible) if add_events and request: - ret["events"] = map(lambda x: unpack_event(request, x), issue.get_history()) + ret["events"] = list(map(lambda x: unpack_event(request, x), issue.get_history())) return ret @@ -122,7 +122,7 @@ def unpack_event(request, event): "author": unpack_user(event.author), "message": event.get_message(), # "files": list(event.file_set.all()) - "files": map(lambda x: unpack_file(request, x), event.file_set.filter(deleted=False)), + "files": list(map(lambda x: unpack_file(request, x), event.file_set.filter(deleted=False))), } return ret diff --git a/anytask/courses/tests.py b/anytask/courses/tests.py index b6a19098d..bf5d8a604 100644 --- a/anytask/courses/tests.py +++ b/anytask/courses/tests.py @@ -268,8 +268,8 @@ def test_gradebook_with_teacher(self): table_body_rows_cells = table_body_rows[0]('td') self.assertEqual(len(table_body_rows_cells), 4) self.assertEqual(table_body_rows_cells[1].a['href'], u'/users/student/') - self.assertEqual(table_body_rows_cells[1].a.string.strip().strip('\n'), u'student_last_name student_name') - self.assertEqual(table_body_rows_cells[2].string.strip().strip('\n'), u' ') + self.assertEqual(table_body_rows_cells[1].a.string.strip().strip('\n'), u'student_last_name\xa0student_name') + self.assertEqual(table_body_rows_cells[2].string.strip('\n'), u'\xa0') self.assertEqual(table_body_rows_cells[3].span.string.strip().strip('\n'), u'0') def test_queue_page_with_teacher(self): @@ -348,7 +348,7 @@ def test_edit_course_information_with_teacher(self): {'course_id': self.course.id, 'course_information': 'course_information'}) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, '{"info": "
course_information
"}') + self.assertEqual(response.content, b'{"info": "
course_information
"}') # get course page response = client.get(reverse(courses.views.gradebook, kwargs={'course_id': self.course.id})) @@ -468,13 +468,14 @@ def test_change_visibility_hidden_tasks_with_teacher(self): self.assertIsNone(table_head.string) table_body = table.tbody('td')[2] - self.assertEqual(table_body.string.strip().strip('\n'), u' ') + test = table_body.string + self.assertEqual(test.strip('\n'), '\xa0') # post page response = client.post(reverse(courses.views.change_visibility_hidden_tasks), {'course_id': self.course.id}) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, 'OK') + self.assertEqual(response.content, b'OK') # get course page response = client.get(reverse(courses.views.gradebook, kwargs={'course_id': self.course.id})) @@ -559,7 +560,7 @@ def test_set_course_mark_with_teacher(self): 'student_id': self.student.id, 'mark_id': mark_fields[0].id}) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, '{"mark_int": -1, "mark_id": 1, "mark": "mark1"}') + self.assertEqual(response.content, b'{"mark_int": -1, "mark_id": 1, "mark": "mark1"}') # get course page response = client.get(reverse(courses.views.gradebook, kwargs={'course_id': self.course.id})) @@ -651,7 +652,8 @@ def test_set_task_mark_with_teacher(self): 'mark_max': task.score_max, 'mark_value': '3'}) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, '{"color": "' + IssueStatus.objects.get(pk=5).color + '", "mark": 3.0}') + self.assertEqual(response.content, + b'{"color": "' + IssueStatus.objects.get(pk=5).color.encode('utf8') + b'", "mark": 3.0}') # get course page response = client.get(reverse(courses.views.gradebook, kwargs={'course_id': self.course.id})) @@ -750,8 +752,8 @@ def test_gradebook_with_student(self): table_body_rows_cells = table_body_rows[0]('td') self.assertEqual(len(table_body_rows_cells), 4) self.assertEqual(table_body_rows_cells[1].a['href'], u'/users/student/') - self.assertEqual(table_body_rows_cells[1].a.string.strip().strip('\n'), u'student_last_name student_name') - self.assertEqual(table_body_rows_cells[2].string.strip().strip('\n'), u' ') + self.assertEqual(table_body_rows_cells[1].a.string.strip().strip('\n'), u'student_last_name\xa0student_name') + self.assertEqual(table_body_rows_cells[2].string.strip('\n'), u'\xa0') self.assertEqual(table_body_rows_cells[3].span.string.strip().strip('\n'), u'0') def test_queue_page_with_student(self): @@ -861,7 +863,7 @@ def test_set_course_mark_with_student(self): 'student_id': self.student.id, 'mark_id': mark_fields[0].id}) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, '{"mark_int": -1, "mark_id": 1, "mark": "mark1"}') + self.assertEqual(response.content, b'{"mark_int": -1, "mark_id": 1, "mark": "mark1"}') # get course page self.assertTrue(client.login(username=self.student.username, password=self.student_password)) @@ -936,7 +938,8 @@ def test_set_task_mark_with_student(self): 'mark_max': task.score_max, 'mark_value': '3'}) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, '{"color": "' + IssueStatus.objects.get(pk=5).color + '", "mark": 3.0}') + self.assertEqual(response.content, + b'{"color": "' + IssueStatus.objects.get(pk=5).color.encode('utf8') + b'", "mark": 3.0}') # get course page self.assertTrue(client.login(username=self.student.username, password=self.student_password)) diff --git a/anytask/courses/views.py b/anytask/courses/views.py index a7a31f413..ace6ad6e4 100644 --- a/anytask/courses/views.py +++ b/anytask/courses/views.py @@ -714,7 +714,7 @@ def set_course_mark(request): student_course_mark.update_time = datetime.datetime.now() student_course_mark.mark = mark student_course_mark.save() - return HttpResponse(json.dumps({'mark': str(mark), 'mark_id': mark.id, 'mark_int': mark.name_int}), + return HttpResponse(json.dumps({'mark_int': mark.name_int, 'mark_id': mark.id, 'mark': str(mark)}), content_type="application/json") @@ -740,8 +740,7 @@ def set_task_mark(request): issue.set_byname('mark', mark) - return HttpResponse(json.dumps({'mark': mark, - 'color': issue.status_field.color}), + return HttpResponse(json.dumps({'color': issue.status_field.color, 'mark': mark}), content_type="application/json") diff --git a/anytask/issues/tests.py b/anytask/issues/tests.py index 4bfe92fe4..228116bc4 100644 --- a/anytask/issues/tests.py +++ b/anytask/issues/tests.py @@ -70,7 +70,7 @@ def test_issue_create_filled(self): self.assertEqual(issue.mark, 3) self.assertEqual(issue.responsible, responsible) self.assertEqual(issue.status_field, status) - self.assertItemsEqual(issue.followers.all(), followers) + self.assertCountEqual(issue.followers.all(), followers) class ViewsTest(TestCase): @@ -761,7 +761,7 @@ def test_deadline(self): self.assertEqual(len(history), 2, 'History len is not 2') self.assertIsNotNone(history[0].find('div', {'id': 'event_alert'}), 'No info message for deadline') self.assertNotIn('after_deadline', - history[1].find('div', 'history-body')['class'].split(' '), + history[1].find('div', 'history-body')['class'], 'Wrong deadline end comment color') # login via student @@ -786,10 +786,10 @@ def test_deadline(self): self.assertEqual(len(history), 3, 'History len is not 3') self.assertIsNotNone(history[0].find('div', {'id': 'event_alert'}), 'No info messege for deadline') self.assertNotIn('after_deadline', - history[1].find('div', 'history-body')['class'].split(' '), + history[1].find('div', 'history-body')['class'], 'Wrong deadline end comment color') self.assertIn('after_deadline', - history[2].find('div', 'history-body')['class'].split(' '), + history[2].find('div', 'history-body')['class'], 'Wrong deadline end comment color') # check if deadline greater @@ -812,10 +812,10 @@ def test_deadline(self): self.assertEqual(len(history), 2, 'History len is not 2') self.assertIsNone(history[0].find('div', {'id': 'event_alert'}), 'No info messege for deadline') self.assertNotIn('after_deadline', - history[0].find('div', 'history-body')['class'].split(' '), + history[0].find('div', 'history-body')['class'], 'Wrong deadline end comment color') self.assertNotIn('after_deadline', - history[1].find('div', 'history-body')['class'].split(' '), + history[1].find('div', 'history-body')['class'], 'Wrong deadline end comment color') @patch('anyrb.common.AnyRB.upload_review') diff --git a/anytask/mail/tests.py b/anytask/mail/tests.py index 3fb926324..42c59142a 100644 --- a/anytask/mail/tests.py +++ b/anytask/mail/tests.py @@ -55,10 +55,10 @@ def test_message_create_filled(self): self.assertEqual(message.sender, self.sender) self.assertEqual(message.title, u"title") self.assertEqual(message.text, u"text") - self.assertItemsEqual(message.recipients.all(), self.recipients) - self.assertItemsEqual(message.recipients_user.all(), self.recipients) - self.assertItemsEqual(message.recipients_course.all(), self.recipients_course) - self.assertItemsEqual(message.recipients_group.all(), self.recipients_group) + self.assertCountEqual(message.recipients.all(), self.recipients) + self.assertCountEqual(message.recipients_user.all(), self.recipients) + self.assertCountEqual(message.recipients_course.all(), self.recipients_course) + self.assertCountEqual(message.recipients_group.all(), self.recipients_group) class ViewsTest(TestCase): @@ -264,7 +264,7 @@ def test_ajax_send_message_user(self): # get page response = client.post(reverse(mail.views.ajax_send_message), post_data) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, 'OK') + self.assertEqual(response.content, b'OK') # check msg creation messages_count = Message.objects.count() @@ -273,10 +273,10 @@ def test_ajax_send_message_user(self): self.assertEqual(message.sender, self.sender) self.assertEqual(message.title, u"title") self.assertEqual(message.text, u"text") - self.assertItemsEqual(message.recipients.all(), self.recipients) - self.assertItemsEqual(message.recipients_user.all(), self.recipients_user) - self.assertItemsEqual(message.recipients_course.all(), self.recipients_course) - self.assertItemsEqual(message.recipients_group.all(), self.recipients_group) + self.assertCountEqual(message.recipients.all(), self.recipients) + self.assertCountEqual(message.recipients_user.all(), self.recipients_user) + self.assertCountEqual(message.recipients_course.all(), self.recipients_course) + self.assertCountEqual(message.recipients_group.all(), self.recipients_group) # check sent sender get_data = { @@ -364,13 +364,13 @@ def test_message_manipulation(self): # get page response = client.post(reverse(mail.views.ajax_send_message), post_data) self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, 'OK') + self.assertEqual(response.content, b'OK') message = Message.objects.get(id=1) # have unread msg for recipient in message.recipients.all(): - self.assertItemsEqual(recipient.profile.unread_messages.all(), [message]) + self.assertCountEqual(recipient.profile.unread_messages.all(), [message]) # make read get_data = { diff --git a/anytask/tasks/tests.py b/anytask/tasks/tests.py index a4ead334c..8eeca454e 100644 --- a/anytask/tasks/tests.py +++ b/anytask/tasks/tests.py @@ -68,7 +68,7 @@ def test_task_create_filled(self): self.assertIsInstance(task, Task) self.assertEqual(task.title, 'title') self.assertEqual(task.course, course) - self.assertItemsEqual(task.groups.all(), group) + self.assertCountEqual(task.groups.all(), group) self.assertEqual(task.weight, 1) self.assertEqual(task.is_hidden, True) self.assertEqual(task.parent_task, parent_task) @@ -234,14 +234,14 @@ def test_task_create_or_edit_page_with_teacher(self): 'task_text': 'task_text'}) self.assertEqual(response.status_code, 200) self.assertEqual(response.content, - '{"page_title": "task_title | course_name | 2016-2017", "redirect_page": "/task/edit/2"}') + b'{"page_title": "task_title | course_name | 2016-2017", "redirect_page": "/task/edit/2"}') # check created task self.assertEqual(len(Task.objects.all()), 2, 'Must be 2 tasks') created_task = Task.objects.get(id=2) self.assertEqual(created_task.title, 'task_title', 'Created task wrong title') self.assertEqual(created_task.course, self.course, 'Created task wrong course') - self.assertItemsEqual(created_task.groups.all(), [self.group], 'Created task wrong group') + self.assertCountEqual(created_task.groups.all(), [self.group], 'Created task wrong group') self.assertEqual(created_task.is_hidden, True, 'Created task wrong is_hidden') self.assertIsNone(created_task.parent_task, 'Created task wrong parent_task') self.assertEqual(created_task.task_text, 'task_text', 'Created task wrong task_text') @@ -343,7 +343,7 @@ def test_task_create_or_edit_page_with_teacher(self): response = client.post(reverse(courses.views.change_visibility_hidden_tasks), {'course_id': self.course.id}) self.assertEqual(response.status_code, 200, "Can't get change_visibility_hidden_tasks via teacher") - self.assertEqual(response.content, 'OK') + self.assertEqual(response.content, b'OK') response = client.get(reverse(courses.views.gradebook, kwargs={'course_id': self.course.id})) self.assertEqual(response.status_code, 200, "Can't get course_page via teacher") @@ -362,7 +362,7 @@ def test_task_create_or_edit_page_with_teacher(self): '/issue/get_or_create/1/2', 'Wrong link to issue in table for 1st task') self.assertEqual(table_body.span.string.strip().strip('\n'), '0', 'Wrong mark in table for 1st task') - self.assertIn('no-issue', table_body.span['class'].split(' '), "No 'no-issue' class in table for 1st task") + self.assertIn('no-issue', table_body.span['class'], "No 'no-issue' class in table for 1st task") table_head = table.thead('th')[3] self.assertEqual(table_head.a.string.strip().strip('\n'), 'task_title', 'Wrong title 2nd task') @@ -442,7 +442,7 @@ def test_import_contest(self, mock_get_contest_info): response = client.post(reverse(tasks.views.contest_task_import), post_data) self.assertEqual(response.status_code, 200, "Can't get get_contest_info via teacher") self.assertEqual(response.content, - '{"is_error": true, "error": "net_prav_na_kontest"}', + b'{"is_error": true, "error": "net_prav_na_kontest"}', 'Wrong response text') # get contest_task_import page with unknown error @@ -454,7 +454,7 @@ def test_import_contest(self, mock_get_contest_info): mock_get_contest_info.return_value = (True, {'problems': problems}) response = client.post(reverse(tasks.views.contest_task_import), post_data) self.assertEqual(response.status_code, 200, "Can't get get_contest_info via teacher") - self.assertEqual(response.content, 'OK', 'Wrong response text') + self.assertEqual(response.content, b'OK', 'Wrong response text') tasks = Task.objects.exclude(id=1) self.assertEqual(len(tasks), 2, 'Wrong number of tasks') @@ -462,7 +462,7 @@ def test_import_contest(self, mock_get_contest_info): for idx, task in enumerate(tasks): self.assertEqual(task.title, problems[problems_idx]['problemTitle'], 'Wrong task title') self.assertEqual(task.course, self.course) - self.assertItemsEqual(task.groups.all(), [self.group]) + self.assertCountEqual(task.groups.all(), [self.group]) self.assertEqual(task.is_hidden, True) self.assertIsNone(task.parent_task) self.assertEqual(task.task_text, problems[problems_idx]['statement']) diff --git a/dependencies/django-registration/registration/tests/models.py b/dependencies/django-registration/registration/tests/models.py index 64f402a6c..1ca291b32 100644 --- a/dependencies/django-registration/registration/tests/models.py +++ b/dependencies/django-registration/registration/tests/models.py @@ -183,7 +183,7 @@ def test_activation_nonexistent_key(self): """ # Due to the way activation keys are constructed during # registration, this will never be a valid key. - invalid_key = sha_constructor('foo').hexdigest() + invalid_key = sha_constructor(b'foo').hexdigest() self.failIf(RegistrationProfile.objects.activate_user(invalid_key)) def test_expired_user_deletion(self): From ffde73e5bebdcd108d68943ee0f15ed14124bad9 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 3 Jun 2020 23:12:52 +0500 Subject: [PATCH 07/31] 25 Errrrrors --- .../django-registration/registration/tests/backends.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dependencies/django-registration/registration/tests/backends.py b/dependencies/django-registration/registration/tests/backends.py index f13cc52dd..e1b748647 100644 --- a/dependencies/django-registration/registration/tests/backends.py +++ b/dependencies/django-registration/registration/tests/backends.py @@ -34,7 +34,7 @@ def request(self, **request): """ environ = { - 'HTTP_COOKIE': self.cookies, + 'HTTP_COOKIE': str(self.cookies), 'PATH_INFO': '/', 'QUERY_STRING': '', 'REMOTE_ADDR': '127.0.0.1', @@ -43,16 +43,17 @@ def request(self, **request): 'SERVER_NAME': 'testserver', 'SERVER_PORT': '80', 'SERVER_PROTOCOL': 'HTTP/1.1', - 'wsgi.version': (1,0), + 'wsgi.version': (1, 0), 'wsgi.url_scheme': 'http', 'wsgi.errors': self.errors, - 'wsgi.multiprocess':True, + 'wsgi.multiprocess': True, 'wsgi.multithread': False, 'wsgi.run_once': False, 'wsgi.input': None, } environ.update(self.defaults) environ.update(request) + request = WSGIRequest(environ) # We have to manually add a session since we'll be bypassing From f7a8e36c896fc8e890b3eab15f1f89305caa33af Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 12 Jun 2020 12:43:39 +0500 Subject: [PATCH 08/31] 18 errors --- anytask/tasks/templatetags/sanitize_html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anytask/tasks/templatetags/sanitize_html.py b/anytask/tasks/templatetags/sanitize_html.py index 4b0323627..a01abb2d7 100644 --- a/anytask/tasks/templatetags/sanitize_html.py +++ b/anytask/tasks/templatetags/sanitize_html.py @@ -14,7 +14,7 @@ def sanitize_html(value): if not value: return '' - soup = BeautifulSoup(value) + soup = BeautifulSoup(value, features="html.parser") if not (soup.find('div', 'not-sanitize')): for comment in soup.findAll(text=lambda text: isinstance(text, Comment)): From 5e700fd2ab16da1ffbb5bd6d136d423bc0eb4757 Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 12 Jun 2020 16:19:22 +0500 Subject: [PATCH 09/31] Change django-registration version. Now 7 errors --- anytask/templates/base.html | 6 +- .../registration/activation_complete.html | 2 +- .../registration/password_reset_complete.html | 2 +- .../registration/password_reset_email.html | 2 +- .../registration/password_reset_email.txt | 2 +- .../registration/registration_form.html | 2 +- anytask/users/tests.py | 9 +- .../.hg_archival.txt | 0 .../.hgignore | 0 .../.hgtags | 0 .../django-registration(restore)/AUTHORS | 36 + .../django-registration(restore)/CHANGELOG | 239 ++++ .../INSTALL | 0 .../django-registration(restore)/LICENSE | 28 + .../django-registration(restore)/MANIFEST.in | 8 + .../README | 0 .../docs/Makefile | 88 ++ .../docs/backend-api.rst | 0 .../django-registration(restore)/docs/conf.py | 194 +++ .../docs/default-backend.rst | 239 ++++ .../django-registration(restore)/docs/faq.rst | 195 +++ .../docs/forms.rst | 100 ++ .../docs/index.rst | 55 + .../docs/make.bat | 112 ++ .../docs/quickstart.rst | 294 +++++ .../docs/release-notes.rst | 69 + .../docs/signals.rst | 56 + .../docs/simple-backend.rst | 61 + .../docs/upgrade.rst | 118 ++ .../docs/views.rst | 122 ++ .../registration/__init__.py | 30 + .../registration/admin.py | 46 + .../registration/auth_urls.py | 57 + .../registration/backends/__init__.py | 32 + .../registration/backends/default/__init__.py | 136 ++ .../registration/backends/default/urls.py | 51 + .../backends/default_with_names/__init__.py | 306 +++++ .../backends/default_with_names/urls.py | 83 ++ .../registration/backends/simple/__init__.py | 64 + .../registration/backends/simple/urls.py | 34 + .../registration/forms.py | 123 ++ .../locale/ar/LC_MESSAGES/django.po | 81 ++ .../locale/bg/LC_MESSAGES/django.po | 78 ++ .../locale/ca/LC_MESSAGES/django.po | 97 ++ .../locale/cs/LC_MESSAGES/django.po | 94 ++ .../locale/da/LC_MESSAGES/django.po | 92 ++ .../locale/de/LC_MESSAGES/django.po | 93 ++ .../locale/el/LC_MESSAGES/django.po | 84 ++ .../locale/en/LC_MESSAGES/django.po | 137 ++ .../locale/es/LC_MESSAGES/django.po | 85 ++ .../locale/es_AR/LC_MESSAGES/django.po | 83 ++ .../locale/fa/LC_MESSAGES/django.po | 80 ++ .../locale/fr/LC_MESSAGES/django.po | 91 ++ .../locale/he/LC_MESSAGES/django.po | 86 ++ .../locale/hr/LC_MESSAGES/django.po | 86 ++ .../locale/is/LC_MESSAGES/django.po | 74 ++ .../locale/it/LC_MESSAGES/django.po | 89 ++ .../locale/ja/LC_MESSAGES/django.po | 78 ++ .../locale/ko/LC_MESSAGES/django.po | 89 ++ .../locale/nb/LC_MESSAGES/django.po | 91 ++ .../locale/nl/LC_MESSAGES/django.po | 77 ++ .../locale/pl/LC_MESSAGES/django.po | 84 ++ .../locale/pt/LC_MESSAGES/django.po | 88 ++ .../locale/pt_BR/LC_MESSAGES/django.po | 81 ++ .../locale/ru/LC_MESSAGES/django.po | 92 ++ .../locale/sl/LC_MESSAGES/django.po | 87 ++ .../locale/sr/LC_MESSAGES/django.po | 80 ++ .../locale/sv/LC_MESSAGES/django.po | 81 ++ .../locale/tr_TR/LC_MESSAGES/django.po | 92 ++ .../locale/zh_CN/LC_MESSAGES/django.po | 77 ++ .../locale/zh_TW/LC_MESSAGES/django.po | 77 ++ .../registration/management/__init__.py | 0 .../management/commands/__init__.py | 0 .../commands/cleanupregistration.py | 19 + .../registration/migrations/0001_initial.py | 31 + .../registration/migrations/__init__.py | 0 .../registration/models.py | 262 ++++ .../registration/signals.py | 8 + .../registration/tests/__init__.py | 8 + .../registration/tests/backends.py | 0 .../registration/tests/forms.py | 121 ++ .../registration/tests/models.py | 225 ++++ .../registration/tests/urls.py | 88 ++ .../registration/tests/views.py | 0 .../registration/urls.py | 0 .../registration/views.py | 229 ++++ .../django-registration(restore)/setup.py | 48 + dependencies/django-registration/.coveragerc | 16 + dependencies/django-registration/.gitignore | 63 + dependencies/django-registration/.travis.yml | 20 + dependencies/django-registration/AUTHORS | 11 +- dependencies/django-registration/CHANGELOG | 290 ++++- dependencies/django-registration/LICENSE | 4 +- dependencies/django-registration/MANIFEST.in | 4 +- dependencies/django-registration/Makefile | 37 + dependencies/django-registration/README.rst | 110 ++ .../docs/admin-approval-backend.rst | 42 + dependencies/django-registration/docs/conf.py | 20 +- .../docs/default-backend.rst | 121 +- dependencies/django-registration/docs/faq.rst | 138 +- .../django-registration/docs/forms.rst | 39 +- .../django-registration/docs/index.rst | 45 +- .../django-registration/docs/quickstart.rst | 292 +++-- .../docs/release-notes.rst | 66 +- .../django-registration/docs/signals.rst | 8 +- .../docs/simple-backend.rst | 37 +- .../django-registration/docs/upgrade.rst | 231 ++-- .../django-registration/docs/views.rst | 243 ++-- dependencies/django-registration/manage.py | 10 + .../registration/__init__.py | 30 +- .../django-registration/registration/admin.py | 31 +- .../registration/auth_urls.py | 68 +- .../registration/backends/__init__.py | 32 - .../backends/admin_approval/__init__.py | 0 .../backends/admin_approval/urls.py | 77 ++ .../backends/admin_approval/views.py | 72 ++ .../registration/backends/default/__init__.py | 136 -- .../registration/backends/default/urls.py | 76 +- .../registration/backends/default/views.py | 180 +++ .../backends/default_with_names/__init__.py | 4 +- .../backends/default_with_names/urls.py | 50 +- .../backends/default_with_names/views.py | 202 +++ .../registration/backends/simple/__init__.py | 64 - .../registration/backends/simple/urls.py | 41 +- .../registration/backends/simple/views.py | 46 + .../django-registration/registration/forms.py | 105 +- .../locale/ar/LC_MESSAGES/django.po | 434 ++++++- .../locale/bg/LC_MESSAGES/django.po | 438 ++++++- .../locale/ca/LC_MESSAGES/django.po | 412 +++++- .../locale/cs/LC_MESSAGES/django.po | 426 ++++++- .../locale/da/LC_MESSAGES/django.po | 429 ++++++- .../locale/de/LC_MESSAGES/django.po | 508 +++++++- .../locale/el/LC_MESSAGES/django.po | 460 ++++++- .../locale/en/LC_MESSAGES/django.po | 402 +++++- .../locale/es/LC_MESSAGES/django.po | 492 +++++++- .../locale/es_AR/LC_MESSAGES/django.po | 437 ++++++- .../locale/fa/LC_MESSAGES/django.po | 436 ++++++- .../locale/fr/LC_MESSAGES/django.po | 523 +++++++- .../locale/he/LC_MESSAGES/django.po | 436 ++++++- .../locale/hr/LC_MESSAGES/django.po | 439 ++++++- .../locale/hu/LC_MESSAGES/django.po | 478 +++++++ .../locale/is/LC_MESSAGES/django.po | 425 ++++++- .../locale/it/LC_MESSAGES/django.po | 434 ++++++- .../locale/ja/LC_MESSAGES/django.po | 443 ++++++- .../locale/ko/LC_MESSAGES/django.po | 424 ++++++- .../locale/nb/LC_MESSAGES/django.po | 430 ++++++- .../locale/nl/LC_MESSAGES/django.po | 449 ++++++- .../locale/pl/LC_MESSAGES/django.po | 427 ++++++- .../locale/pt/LC_MESSAGES/django.po | 427 ++++++- .../locale/pt_BR/LC_MESSAGES/django.po | 474 ++++++- .../locale/ru/LC_MESSAGES/django.po | 459 ++++++- .../locale/sl/LC_MESSAGES/django.po | 433 ++++++- .../locale/sr/LC_MESSAGES/django.po | 446 ++++++- .../locale/sv/LC_MESSAGES/django.po | 427 ++++++- .../locale/th/LC_MESSAGES/django.po | 503 ++++++++ .../locale/tr_TR/LC_MESSAGES/django.po | 419 ++++++- .../locale/zh_CN/LC_MESSAGES/django.po | 434 ++++++- .../locale/zh_TW/LC_MESSAGES/django.po | 434 ++++++- .../commands/cleanupregistration.py | 10 +- .../registration/migrations/0001_initial.py | 14 +- .../0002_registrationprofile_activated.py | 20 + .../0003_migrate_activatedstatus.py | 31 + .../0004_supervisedregistrationprofile.py | 29 + .../migrations/0005_activation_key_sha256.py | 20 + .../registration/models.py | 679 ++++++++-- .../registration/signals.py | 18 + .../registration/tests/__init__.py | 11 +- .../registration/tests/admin_actions.py | 70 ++ .../tests/admin_approval_backend.py | 117 ++ .../registration/tests/default_backend.py | 254 ++++ .../registration/tests/forms.py | 89 +- .../registration/tests/forms_custom_user.py | 50 + .../registration/tests/models.py | 1112 +++++++++++++++-- .../registration/tests/simple_backend.py | 86 ++ .../registration/tests/urls.py | 137 +- .../django-registration/registration/users.py | 15 + .../django-registration/registration/utils.py | 6 + .../django-registration/registration/views.py | 327 ++--- .../django-registration/requirements.txt | 5 + dependencies/django-registration/setup.cfg | 15 + dependencies/django-registration/setup.py | 98 +- dependencies/django-registration/tasks.py | 30 + .../django-registration/test-requirements.txt | 8 + .../django-registration/test_app/__init__.py | 1 + .../django-registration/test_app/models.py | 12 + .../django-registration/test_app/settings.py | 61 + .../test_app/settings_test.py | 64 + .../test_app/templates/base.html | 38 + .../test_app/templates/index.html | 7 + .../test_app/templates/profile.html | 7 + .../test_app/urls_admin_approval.py | 28 + .../test_app/urls_default.py | 28 + .../test_app/urls_simple.py | 28 + dependencies/django-registration/tox.ini | 31 + 194 files changed, 24802 insertions(+), 2697 deletions(-) rename dependencies/{django-registration => django-registration(restore)}/.hg_archival.txt (100%) rename dependencies/{django-registration => django-registration(restore)}/.hgignore (100%) rename dependencies/{django-registration => django-registration(restore)}/.hgtags (100%) create mode 100644 dependencies/django-registration(restore)/AUTHORS create mode 100644 dependencies/django-registration(restore)/CHANGELOG rename dependencies/{django-registration => django-registration(restore)}/INSTALL (100%) create mode 100644 dependencies/django-registration(restore)/LICENSE create mode 100644 dependencies/django-registration(restore)/MANIFEST.in rename dependencies/{django-registration => django-registration(restore)}/README (100%) create mode 100644 dependencies/django-registration(restore)/docs/Makefile rename dependencies/{django-registration => django-registration(restore)}/docs/backend-api.rst (100%) create mode 100644 dependencies/django-registration(restore)/docs/conf.py create mode 100644 dependencies/django-registration(restore)/docs/default-backend.rst create mode 100644 dependencies/django-registration(restore)/docs/faq.rst create mode 100644 dependencies/django-registration(restore)/docs/forms.rst create mode 100644 dependencies/django-registration(restore)/docs/index.rst create mode 100644 dependencies/django-registration(restore)/docs/make.bat create mode 100644 dependencies/django-registration(restore)/docs/quickstart.rst create mode 100644 dependencies/django-registration(restore)/docs/release-notes.rst create mode 100644 dependencies/django-registration(restore)/docs/signals.rst create mode 100644 dependencies/django-registration(restore)/docs/simple-backend.rst create mode 100644 dependencies/django-registration(restore)/docs/upgrade.rst create mode 100644 dependencies/django-registration(restore)/docs/views.rst create mode 100644 dependencies/django-registration(restore)/registration/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/admin.py create mode 100644 dependencies/django-registration(restore)/registration/auth_urls.py create mode 100644 dependencies/django-registration(restore)/registration/backends/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/backends/default/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/backends/default/urls.py create mode 100644 dependencies/django-registration(restore)/registration/backends/default_with_names/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/backends/default_with_names/urls.py create mode 100644 dependencies/django-registration(restore)/registration/backends/simple/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/backends/simple/urls.py create mode 100644 dependencies/django-registration(restore)/registration/forms.py create mode 100644 dependencies/django-registration(restore)/registration/locale/ar/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/bg/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/ca/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/cs/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/da/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/de/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/el/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/en/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/es/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/es_AR/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/fa/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/fr/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/he/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/hr/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/is/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/it/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/ja/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/ko/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/nb/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/nl/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/pl/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/pt/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/pt_BR/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/ru/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/sl/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/sr/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/sv/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/tr_TR/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/zh_CN/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/locale/zh_TW/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration(restore)/registration/management/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/management/commands/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/management/commands/cleanupregistration.py create mode 100644 dependencies/django-registration(restore)/registration/migrations/0001_initial.py create mode 100644 dependencies/django-registration(restore)/registration/migrations/__init__.py create mode 100644 dependencies/django-registration(restore)/registration/models.py create mode 100644 dependencies/django-registration(restore)/registration/signals.py create mode 100644 dependencies/django-registration(restore)/registration/tests/__init__.py rename dependencies/{django-registration => django-registration(restore)}/registration/tests/backends.py (100%) create mode 100644 dependencies/django-registration(restore)/registration/tests/forms.py create mode 100644 dependencies/django-registration(restore)/registration/tests/models.py create mode 100644 dependencies/django-registration(restore)/registration/tests/urls.py rename dependencies/{django-registration => django-registration(restore)}/registration/tests/views.py (100%) rename dependencies/{django-registration => django-registration(restore)}/registration/urls.py (100%) create mode 100644 dependencies/django-registration(restore)/registration/views.py create mode 100644 dependencies/django-registration(restore)/setup.py create mode 100644 dependencies/django-registration/.coveragerc create mode 100644 dependencies/django-registration/.gitignore create mode 100644 dependencies/django-registration/.travis.yml create mode 100644 dependencies/django-registration/Makefile create mode 100644 dependencies/django-registration/README.rst create mode 100644 dependencies/django-registration/docs/admin-approval-backend.rst create mode 100644 dependencies/django-registration/manage.py create mode 100644 dependencies/django-registration/registration/backends/admin_approval/__init__.py create mode 100644 dependencies/django-registration/registration/backends/admin_approval/urls.py create mode 100644 dependencies/django-registration/registration/backends/admin_approval/views.py create mode 100644 dependencies/django-registration/registration/backends/default/views.py create mode 100644 dependencies/django-registration/registration/backends/default_with_names/views.py create mode 100644 dependencies/django-registration/registration/backends/simple/views.py create mode 100644 dependencies/django-registration/registration/locale/hu/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration/registration/locale/th/LC_MESSAGES/django.po create mode 100644 dependencies/django-registration/registration/migrations/0002_registrationprofile_activated.py create mode 100644 dependencies/django-registration/registration/migrations/0003_migrate_activatedstatus.py create mode 100644 dependencies/django-registration/registration/migrations/0004_supervisedregistrationprofile.py create mode 100644 dependencies/django-registration/registration/migrations/0005_activation_key_sha256.py create mode 100644 dependencies/django-registration/registration/tests/admin_actions.py create mode 100644 dependencies/django-registration/registration/tests/admin_approval_backend.py create mode 100644 dependencies/django-registration/registration/tests/default_backend.py create mode 100644 dependencies/django-registration/registration/tests/forms_custom_user.py create mode 100644 dependencies/django-registration/registration/tests/simple_backend.py create mode 100644 dependencies/django-registration/registration/users.py create mode 100644 dependencies/django-registration/registration/utils.py create mode 100644 dependencies/django-registration/requirements.txt create mode 100644 dependencies/django-registration/setup.cfg create mode 100644 dependencies/django-registration/tasks.py create mode 100644 dependencies/django-registration/test-requirements.txt create mode 100644 dependencies/django-registration/test_app/__init__.py create mode 100644 dependencies/django-registration/test_app/models.py create mode 100644 dependencies/django-registration/test_app/settings.py create mode 100644 dependencies/django-registration/test_app/settings_test.py create mode 100644 dependencies/django-registration/test_app/templates/base.html create mode 100644 dependencies/django-registration/test_app/templates/index.html create mode 100644 dependencies/django-registration/test_app/templates/profile.html create mode 100644 dependencies/django-registration/test_app/urls_admin_approval.py create mode 100644 dependencies/django-registration/test_app/urls_default.py create mode 100644 dependencies/django-registration/test_app/urls_simple.py create mode 100644 dependencies/django-registration/tox.ini diff --git a/anytask/templates/base.html b/anytask/templates/base.html index 610ef85fe..e6667cd13 100644 --- a/anytask/templates/base.html +++ b/anytask/templates/base.html @@ -709,16 +709,16 @@
{% if user.get_full_name %}{{ user.get_full_name }}{ {% trans "adminka" %} {% endif %}
- {% trans "smenit_parol" %} + {% trans "smenit_parol" %}
- {% trans "vyjti" %} + {% trans "vyjti" %} {% else %}
  • - {% trans "vojdite" %} + {% trans "vojdite" %}
  • {% trans "zaregistrirujtes" %} diff --git a/anytask/templates/registration/activation_complete.html b/anytask/templates/registration/activation_complete.html index 0110bc08f..e6674a470 100644 --- a/anytask/templates/registration/activation_complete.html +++ b/anytask/templates/registration/activation_complete.html @@ -5,6 +5,6 @@ {% trans "akkaunt_aktivirovan" %} -{% trans "vojti" %} +{% trans "vojti" %} {% endblock %} diff --git a/anytask/templates/registration/password_reset_complete.html b/anytask/templates/registration/password_reset_complete.html index a6cb8b6d0..7d5f5d39e 100644 --- a/anytask/templates/registration/password_reset_complete.html +++ b/anytask/templates/registration/password_reset_complete.html @@ -5,7 +5,7 @@ {% block content %}

    {% trans "vosstanovlenie_parolja_zaversheno" %}

    {% trans "teper_novij_parol" %}

    -{% trans "vojti" %} +{% trans "vojti" %} {% endblock %} diff --git a/anytask/templates/registration/password_reset_email.html b/anytask/templates/registration/password_reset_email.html index fff287e4e..929eaa1b5 100644 --- a/anytask/templates/registration/password_reset_email.html +++ b/anytask/templates/registration/password_reset_email.html @@ -36,7 +36,7 @@ - {% trans "smenit_parol" %} diff --git a/anytask/templates/registration/password_reset_email.txt b/anytask/templates/registration/password_reset_email.txt index a0dbc396c..9f2a57b21 100644 --- a/anytask/templates/registration/password_reset_email.txt +++ b/anytask/templates/registration/password_reset_email.txt @@ -3,7 +3,7 @@ {% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} {% trans "Please go to the following page and choose a new password:" %} -{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb64=uid token=token %} +{{ domain }}{% url 'auth_password_reset_confirm' uidb64=uid token=token %} {% trans "Your username, in case you've forgotten:" %} {{ user.username }} diff --git a/anytask/templates/registration/registration_form.html b/anytask/templates/registration/registration_form.html index 8ba3e289b..0b65d8219 100644 --- a/anytask/templates/registration/registration_form.html +++ b/anytask/templates/registration/registration_form.html @@ -82,7 +82,7 @@ email: { required : "{% trans 'objazatelnoe_pole' %}", email : "{% trans 'vvedite_korrektnyj_adres' %}", - remote : "{% trans 'polzovatel_s_adresom_sushestvuet' %} {% trans 'vojdite' %}" + remote : "{% trans 'polzovatel_s_adresom_sushestvuet' %} {% trans 'vojdite' %}" }, password1: { required : "{% trans 'objazatelnoe_pole' %}" diff --git a/anytask/users/tests.py b/anytask/users/tests.py index 5dbd6d27a..ebd0e1ad9 100644 --- a/anytask/users/tests.py +++ b/anytask/users/tests.py @@ -24,8 +24,11 @@ def test_login_form(self): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'registration/login.html') - self.assertContains(response, u"Логин / E-mail") - self.assertContains(response, u"Пароль") + + content = response.content.decode('utf8') + + self.assertContains(response, "Логин / E-mail") + self.assertContains(response, "Пароль") def test_register_form(self): client = self.client @@ -91,7 +94,7 @@ def test_login_user__bad_email(self): self.assertEqual(response.status_code, 200) self.assertContains( response, - u"Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." + "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." ) def test_register_user(self): diff --git a/dependencies/django-registration/.hg_archival.txt b/dependencies/django-registration(restore)/.hg_archival.txt similarity index 100% rename from dependencies/django-registration/.hg_archival.txt rename to dependencies/django-registration(restore)/.hg_archival.txt diff --git a/dependencies/django-registration/.hgignore b/dependencies/django-registration(restore)/.hgignore similarity index 100% rename from dependencies/django-registration/.hgignore rename to dependencies/django-registration(restore)/.hgignore diff --git a/dependencies/django-registration/.hgtags b/dependencies/django-registration(restore)/.hgtags similarity index 100% rename from dependencies/django-registration/.hgtags rename to dependencies/django-registration(restore)/.hgtags diff --git a/dependencies/django-registration(restore)/AUTHORS b/dependencies/django-registration(restore)/AUTHORS new file mode 100644 index 000000000..14b438b63 --- /dev/null +++ b/dependencies/django-registration(restore)/AUTHORS @@ -0,0 +1,36 @@ +The primary author of django-registration is James Bennett +, who may be found online at +. + + +Others who have contributed to the application: + +* Samuel Adam (French translation) +* Jannis Leidel (German translation) +* Rapahel Hertzog (helpful suggestions on packaging and distribution) +* Panos Laganakos (Greek translation) +* Ilya Filippov and Andy Mikhailenko (Russian translation) +* Jarek Zgoda (Polish translation) +* Meir Kriheli (Hebrew translation) +* Italo Maia (Brazilian Portuguese translation) +* Shinya Okano (Japanese translation) +* A. Al-Ibrahim (Arabic translation) +* Ernesto Rico Schmidt (Spanish translation) +* Vladislav Mitov (Bulgarian translation) +* Leonardo Manuel Rocha (Argentinean Spanish translation) +* Emil Stenström (Swedish translation) +* Liang Feng (Chinese translations) +* Nebojsa Djordjevic (Serbian translation) +* Nicola Larosa (Italian translation) +* Joost Cassee (Dutch translation) +* Björn Kristinsson (Icelandic translation) +* Rune Bromer (Danish translation) +* Domen Kožar (Slovenian translation) +* Young Gyu Park (Korean translation) +* Flavio Curella (updated Italian translation) +* Jon Lønne (Bokmål translation) +* Carles Barrobés (Catalan translation) +* Nuno Mariz (Portuguese translation) +* Patrick Samson (French translation) +* Recep Kirmizi (Turkish translation) +* Mohsen Mansouryar (Persian translation) \ No newline at end of file diff --git a/dependencies/django-registration(restore)/CHANGELOG b/dependencies/django-registration(restore)/CHANGELOG new file mode 100644 index 000000000..81a6daad1 --- /dev/null +++ b/dependencies/django-registration(restore)/CHANGELOG @@ -0,0 +1,239 @@ +============================= +django-registration changelog +============================= + +Version 0.8, 24 March 2012: +--------------------------- + +* Backend-based rewrite. See docs/upgrade.rst for details. + +* Compatibility through Django 1.4. + + +Version 0.7, 6 November 2008: +----------------------------- + +* Project hosting moved from Google Code to Bitbucket, and from a + Subversion repository to Mercurial. + +* Added test suite. + +* Full Django 1.0 compatibility. + +* Registration and activation views now accept an ``extra_context`` + argument, identical to the way that argument works in Django's + generic views. + +* Added a custom management command for cleaning up expired + registrations; you can now run ``manage.py cleanupregistration`` to + handle this. + +* BACKWARDS-INCOMPATIBLE CHANGE: The "username" field in + ``RegistrationForm`` is now a ``RegexField``. + +* BACKWARDS-INCOMPATIBLE CHANGE: Removed the standalone script for + deleting expired user registrations; use the new management command + instead. + + +Version 0.6, 29 July 2008: +-------------------------- + +* Packaged from revision 166 in Subversion. + +* Fixed a multiple-objects exception in + ``RegistrationFormUniqueEmail`` when multiple users already have the + same email address. + +* Changed the ``success_url`` of the ``register()`` view to use + reverse URL resolution. + +* Added an ``extra_context`` argument to the ``register`` and + ``activate`` views, mimicking its functionality in Django's generic + views. + +* BACKWARDS-INCOMPATIBLE CHANGE: Switched the admin declaration to be + compliant with the newforms-admin refactor; the admin declaration + now lives in ``registration/admin.py``. + +* BACKWARDS-INCOMPATIBLE CHANGE: Switched form imports from using + ``django.newforms`` to using ``django.forms``; the old style now + raises a deprecation warning on Django trunk and on Django 1.0 + alpha. + + +Version 0.5, 4 June 2008: +------------------------- + +* Packaged from revision 155 in Subversion. + +* Added Serbian translation. + +* Added Italian translation. + +* Username/email uniqueness checks are now case-insensitive. This is + potentially backwards-incompatible if you relied on them being + case-sensitive, but I don't know of any reason why you'd be doing + that. + +* Included forms now use lazy translations. + +* The ``register`` view can now handle files submitted for use in form + processing. + +* Reactivation of a manually-deactivated account is now prevented by + changing the activation key, on successful activation, to a dummy + string which will fail on subsequent activation attempts. + + +Version 0.4p2, 10 Feburary 2008: +-------------------------------- + +* Added Brazilian Portuguese translation. + +* Added Japanese translation. + +* Added Hebrew translation. + +* Minor documentation fixes. + + +Version 0.4p1, 16 December 2007: +-------------------------------- + +* Packaged from revision 129 in Subversion. + +* Added Polish translation. + + +Version 0.4, 8 December 2007: +----------------------------- + +* Packaged from revision 122 in Subversion. + +* Added Greek translation. + +* Added Russian translation. + +* Changed ``maxlength`` to ``max_length`` now that Django issues a + deprecation warning for it. + +* BACKWARDS-INCOMPATIBLE CHANGE: Changed the password validation to be + on ``clean()`` instead of ``clean_password2()``. This means that + errors from this must be accessed via ``non_field_errors()``. + + +Version 0.3p5, 6 October 2007: +------------------------------ + +* Packaged from revision 112 in Subversion. + +* Added German translation. + +* Fixed a mismatch between the default ``RegistrationForm``'s maximum + length on email addresses and the actual maximum length on Django's + ``User`` model. + +* Fixed a situation where bad input for the ``password1`` field on + ``RegistrationForm`` could cause validation of ``password2`` to fail + with an exception. + + +Version 0.3p4, 4 October 2007: +------------------------------ + +* Packaged from revision 101 in Subversion. + +* BACKWARDS-INCOMPATIBLE CHANGE: In response to larger numbers of + complaints from people trying to use the example templates as-is, + the example templates have been removed. + + +Version 0.3p2, 23 September 2007: +--------------------------------- + +* Packaged from revision 100 in Subversion. + +* Fixed ``activate`` view to actually take the ``template_name`` + argument. + + +Version 0.3p1, 22 September 2007: +--------------------------------- + +* Packaged from revision 99 in Subversion. + +* Fixed a typo in docs/overview.txt. + +* Fixed a typo in bin/delete_expired_users.py. + +* Added French translation. + + +Version 0.3, 19 September 2007: +------------------------------- + +Packaged from revision 89 in Subversion; download at +http://django-registration.googlecode.com/files/registration-0.3.tar.gz + +* Changed ``register`` and ``activate`` views to accept + ``template_name`` keyword argument for selecting a custom template. + +* Changed ``register`` view to accept ``form_class`` keyword + argument specifying the form to use. + +* BACKWARDS-INCOMPATIBLE CHANGE: Changed + ``RegistrationManager.create_inactive_user`` to use a template for + the subject of the activation email. + +* BACKWARDS-INCOMPATIBLE CHANGE: Removed the ``tos`` field from + ``RegistrationForm``; if you were relying on it, switch to using + ``RegistrationFormTermsOfService`` instead. + +* BACKWARDS-INCOMPATIBLE CHANGE: The activation email template now + receives the current ``Site`` object as the context variable + ``site``, and the ``current_site`` variable, which only held the + domain, is no longer available. + +* Added script ``bin/delete_expired_users.py`` with instructions on + how to use it as a cron job to clean up expired/inactive accounts. + +* Marked strings for translation and added ``locale`` directory so + that translations can be added. + +* Updated to deal with merge of Django's Unicode branch into trunk; + now using Unicode-aware functions everywhere. + + +Version 0.2, 29 May 2007: +------------------------- + +Packaged from revision 76 in Subversion; download at +http://django-registration.googlecode.com/files/registration-0.2.tar.gz + +* Added ability to specify a callback in + ``RegistrationManager.create_inactive_user`` or in the ``register`` + view to enable creation of site-specific user profile. + +* Separated out the logic of creating the profile into a new method on + ``RegistrationManager``: ``create_profile``. + +* Added URLConf support for various useful views in + ``django.contrib.auth``. + +* BACKWARDS-INCOMPATIBLE CHANGE: removed the ``key_generated`` field + from ``RegistrationProfile``; activation key expiration is now + calculated based on the ``date_joined`` field in the ``User`` model. + Drop the ``key_generated`` column from your database when upgrading + from 0.1. + + +Version 0.1, 23 May 2007: +------------------------- + +Packaged from revision 56 in Subversion; download at +http://django-registration.googlecode.com/files/registration-0.1.tar.gz + +* First packaged version using distutils. + +* Added docs/ directory and overview. diff --git a/dependencies/django-registration/INSTALL b/dependencies/django-registration(restore)/INSTALL similarity index 100% rename from dependencies/django-registration/INSTALL rename to dependencies/django-registration(restore)/INSTALL diff --git a/dependencies/django-registration(restore)/LICENSE b/dependencies/django-registration(restore)/LICENSE new file mode 100644 index 000000000..d3587f388 --- /dev/null +++ b/dependencies/django-registration(restore)/LICENSE @@ -0,0 +1,28 @@ +Copyright (c) 2007-2012, James Bennett +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of the author nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/dependencies/django-registration(restore)/MANIFEST.in b/dependencies/django-registration(restore)/MANIFEST.in new file mode 100644 index 000000000..2ee0377c0 --- /dev/null +++ b/dependencies/django-registration(restore)/MANIFEST.in @@ -0,0 +1,8 @@ +include CHANGELOG +include INSTALL +include LICENSE +include MANIFEST.in +include README +include AUTHORS +recursive-include docs * +recursive-include registration/locale * diff --git a/dependencies/django-registration/README b/dependencies/django-registration(restore)/README similarity index 100% rename from dependencies/django-registration/README rename to dependencies/django-registration(restore)/README diff --git a/dependencies/django-registration(restore)/docs/Makefile b/dependencies/django-registration(restore)/docs/Makefile new file mode 100644 index 000000000..c84c16a0d --- /dev/null +++ b/dependencies/django-registration(restore)/docs/Makefile @@ -0,0 +1,88 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . + +.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest + +help: + @echo "Please use \`make ' where is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +clean: + -rm -rf _build/* + +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html + @echo + @echo "Build finished. The HTML pages are in _build/html." + +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml + @echo + @echo "Build finished. The HTML pages are in _build/dirhtml." + +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json + @echo + @echo "Build finished; now you can process the JSON files." + +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in _build/htmlhelp." + +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in _build/qthelp, like this:" + @echo "# qcollectiongenerator _build/qthelp/django-registration.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile _build/qthelp/django-registration.qhc" + +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex + @echo + @echo "Build finished; the LaTeX files are in _build/latex." + @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ + "run these through (pdf)latex." + +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes + @echo + @echo "The overview file is in _build/changes." + +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in _build/linkcheck/output.txt." + +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in _build/doctest/output.txt." diff --git a/dependencies/django-registration/docs/backend-api.rst b/dependencies/django-registration(restore)/docs/backend-api.rst similarity index 100% rename from dependencies/django-registration/docs/backend-api.rst rename to dependencies/django-registration(restore)/docs/backend-api.rst diff --git a/dependencies/django-registration(restore)/docs/conf.py b/dependencies/django-registration(restore)/docs/conf.py new file mode 100644 index 000000000..068994bd5 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/conf.py @@ -0,0 +1,194 @@ +# -*- coding: utf-8 -*- +# +# django-registration documentation build configuration file, created by +# sphinx-quickstart on Mon Jun 22 02:57:42 2009. +# +# This file is execfile()d with the current directory set to its containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys, os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.append(os.path.abspath('.')) + +# -- General configuration ----------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be extensions +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = [] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'django-registration' +copyright = u'2007-2012, James Bennett' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '0.8' +# The full version, including alpha/beta/rc tags. +release = '0.8' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of documents that shouldn't be included in the build. +#unused_docs = [] + +# List of directories, relative to source directory, that shouldn't be searched +# for source files. +exclude_trees = ['_build'] + +# The reST default role (used for this markup: `text`) to use for all documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + + +# -- Options for HTML output --------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. Major themes that come with +# Sphinx are currently 'default' and 'sphinxdoc'. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_use_modindex = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = '' + +# Output file base name for HTML help builder. +htmlhelp_basename = 'django-registrationdoc' + + +# -- Options for LaTeX output -------------------------------------------------- + +# The paper size ('letter' or 'a4'). +#latex_paper_size = 'letter' + +# The font size ('10pt', '11pt' or '12pt'). +#latex_font_size = '10pt' + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass [howto/manual]). +latex_documents = [ + ('index', 'django-registration.tex', u'django-registration Documentation', + u'James Bennett', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# Additional stuff for the LaTeX preamble. +#latex_preamble = '' + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_use_modindex = True diff --git a/dependencies/django-registration(restore)/docs/default-backend.rst b/dependencies/django-registration(restore)/docs/default-backend.rst new file mode 100644 index 000000000..a557a64ad --- /dev/null +++ b/dependencies/django-registration(restore)/docs/default-backend.rst @@ -0,0 +1,239 @@ +.. _default-backend: +.. module:: registration.backends.default + +The default backend +=================== + +A default :ref:`registration backend ` is bundled with +django-registration, as the class +``registration.backends.default.DefaultBackend``, and implements a +simple two-step workflow in which a new user first registers, then +confirms and activates the new account by following a link sent to the +email address supplied during registration. + + +Default behavior and configuration +---------------------------------- + +This backend makes use of the following settings: + +``ACCOUNT_ACTIVATION_DAYS`` + This is the number of days users will have to activate their + accounts after registering. Failing to activate during that period + will leave the account inactive (and possibly subject to + deletion). This setting is required, and must be an integer. + +``REGISTRATION_OPEN`` + A boolean (either ``True`` or ``False``) indicating whether + registration of new accounts is currently permitted. This setting + is optional, and a default of ``True`` will be assumed if it is + not supplied. + +By default, this backend uses +:class:`registration.forms.RegistrationForm` as its form class for +user registration; this can be overridden by passing the keyword +argument ``form_class`` to the :func:`~registration.views.register` +view. + +Upon successful registration -- not activation -- the default redirect +is to the URL pattern named ``registration_complete``; this can be +overridden by passing the keyword argument ``success_url`` to the +:func:`~registration.views.register` view. + +Upon successful activation, the default redirect is to the URL pattern +named ``registration_activation_complete``; this can be overridden by +passing the keyword argument ``success_url`` to the +:func:`~registration.views.activate` view. + + +How account data is stored for activation +----------------------------------------- + +During registration, a new instance of +``django.contrib.auth.models.User`` is created to represent the new +account, with the ``is_active`` field set to ``False``. An email is +then sent to the email address of the account, containing a link the +user must click to activate the account; at that point the +``is_active`` field is set to ``True``, and the user may log in +normally. + +Activation is handled by generating and storing an activation key in +the database, using the following model: + + +.. currentmodule:: registration.models + +.. class:: RegistrationProfile + + A simple representation of the information needed to activate a new + user account. This is **not** a user profile; it simply provides a + place to temporarily store the activation key and determine whether + a given account has been activated. + + Has the following fields: + + .. attribute:: user + + A ``ForeignKey`` to ``django.contrib.auth.models.User``, + representing the user account for which activation information + is being stored. + + .. attribute:: activation_key + + A 40-character ``CharField``, storing the activation key for the + account. Initially, the activation key is the hexdigest of a + SHA1 hash; after activation, this is reset to :attr:`ACTIVATED`. + + Additionally, one class attribute exists: + + .. attribute:: ACTIVATED + + A constant string used as the value of :attr:`activation_key` + for accounts which have been activated. + + And the following methods: + + .. method:: activation_key_expired() + + Determines whether this account's activation key has expired, + and returns a boolean (``True`` if expired, ``False`` + otherwise). Uses the following algorithm: + + 1. If :attr:`activation_key` is :attr:`ACTIVATED`, the account + has already been activated and so the key is considered to + have expired. + + 2. Otherwise, the date of registration (obtained from the + ``date_joined`` field of :attr:`user`) is compared to the + current date; if the span between them is greater than the + value of the setting ``ACCOUNT_ACTIVATION_DAYS``, the key is + considered to have expired. + + :rtype: bool + + .. method:: send_activation_email(site) + + Sends an activation email to the address of the account. + + The activation email will make use of two templates: + ``registration/activation_email_subject.txt`` and + ``registration/activation_email.txt``, which are used for the + subject of the email and the body of the email, + respectively. Each will receive the following context: + + ``activation_key`` + The value of :attr:`activation_key`. + + ``expiration_days`` + The number of days the user has to activate, taken from the + setting ``ACCOUNT_ACTIVATION_DAYS``. + + ``site`` + An object representing the site on which the account was + registered; depending on whether ``django.contrib.sites`` is + installed, this may be an instance of either + ``django.contrib.sites.models.Site`` (if the sites + application is installed) or + ``django.contrib.sites.models.RequestSite`` (if + not). Consult `the documentation for the Django sites + framework + `_ + for details regarding these objects' interfaces. + + Because email subjects must be a single line of text, the + rendered output of ``registration/activation_email_subject.txt`` + will be forcibly condensed to a single line. + + :param site: An object representing the site on which account + was registered. + :type site: ``django.contrib.sites.models.Site`` or + ``django.contrib.sites.models.RequestSite`` + :rtype: ``None`` + + +Additionally, :class:`RegistrationProfile` has a custom manager +(accessed as ``RegistrationProfile.objects``): + + +.. class:: RegistrationManager + + This manager provides several convenience methods for creating and + working with instances of :class:`RegistrationProfile`: + + .. method:: activate_user(activation_key) + + Validates ``activation_key`` and, if valid, activates the + associated account by setting its ``is_active`` field to + ``True``. To prevent re-activation of accounts, the + :attr:`~RegistrationProfile.activation_key` of the + :class:`RegistrationProfile` for the account will be set to + :attr:`RegistrationProfile.ACTIVATED` after successful + activation. + + Returns the ``User`` instance representing the account if + activation is successful, ``False`` otherwise. + + :param activation_key: The activation key to use for the + activation. + :type activation_key: string, a 40-character SHA1 hexdigest + :rtype: ``User`` or bool + + .. method:: delete_expired_users + + Removes expired instances of :class:`RegistrationProfile`, and + their associated user accounts, from the database. This is + useful as a periodic maintenance task to clean out accounts + which registered but never activated. + + Accounts to be deleted are identified by searching for instances + of :class:`RegistrationProfile` with expired activation keys and + with associated user accounts which are inactive (have their + ``is_active`` field set to ``False``). To disable a user account + without having it deleted, simply delete its associated + :class:`RegistrationProfile`; any ``User`` which does not have + an associated :class:`RegistrationProfile` will not be deleted. + + A custom management command is provided which will execute this + method, suitable for use in cron jobs or other scheduled + maintenance tasks: ``manage.py cleanupregistration``. + + :rtype: ``None`` + + .. method:: create_inactive_user(username, email, password, site[, send_email]) + + Creates a new, inactive user account and an associated instance + of :class:`RegistrationProfile`, sends the activation email and + returns the new ``User`` object representing the account. + + :param username: The username to use for the new account. + :type username: string + :param email: The email address to use for the new account. + :type email: string + :param password: The password to use for the new account. + :type password: string + :param site: An object representing the site on which the + account is being registered. + :type site: ``django.contrib.sites.models.Site`` or + ``django.contrib.sites.models.RequestSite`` + :param send_email: If ``True``, the activation email will be + sent to the account (by calling + :meth:`RegistrationProfile.send_activation_email`). If + ``False``, no email will be sent (but the account will still + be inactive) + :type send_email: bool + :rtype: ``User`` + + .. method:: create_profile(user) + + Creates and returns a :class:`RegistrationProfile` instance for + the account represented by ``user``. + + The ``RegistrationProfile`` created by this method will have its + :attr:`~RegistrationProfile.activation_key` set to a SHA1 hash + generated from a combination of the account's username and a + random salt. + + :param user: The user account; an instance of + ``django.contrib.auth.models.User``. + :type user: ``User`` + :rtype: ``RegistrationProfile`` diff --git a/dependencies/django-registration(restore)/docs/faq.rst b/dependencies/django-registration(restore)/docs/faq.rst new file mode 100644 index 000000000..cd03cd5d5 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/faq.rst @@ -0,0 +1,195 @@ +.. _faq: + +Frequently-asked questions +========================== + +The following are miscellaneous common questions and answers related +to installing/using django-registration, culled from bug reports, +emails and other sources. + + +General +------- + +**What license is django-registration under?** + django-registration is offered under a three-clause BSD-style + license; this is `an OSI-approved open-source license + `_, and allows + you a large degree of freedom in modifiying and redistributing the + code. For the full terms, see the file ``LICENSE`` which came with + your copy of django-registration; if you did not receive a copy of + this file, you can view it online at + . + +**Why are the forms and models for the default backend not in the default backend?** + The model and manager used by :ref:`the default backend + ` are in ``registration.models``, and the default + form class (and various subclasses) are in ``registration.forms``; + logically, they might be expected to exist in + ``registration.backends.default``, but there are several reasons + why that's not such a good idea: + + 1. Older versions of django-registration made use of the model and + form classes, and moving them would create an unnecessary + backwards incompatibility: ``import`` statements would need to + be changed, and some database updates would be needed to + reflect the new location of the + :class:`~registration.models.RegistrationProfile` model. + + 2. Due to the design of Django's ORM, the ``RegistrationProfile`` + model would end up with an ``app_label`` of ``default``, which + isn't particularly descriptive and may conflict with other + applications. By keeping it in ``registration.models``, it + retains an ``app_label`` of ``registration``, which more + accurately reflects what it does and is less likely to cause + problems. + + 3. Although the ``RegistrationProfile`` model and the various + :ref:`form classes ` are used by the default backend, + they can and are meant to be reused as needed by other + backends. Any backend which uses an activation step should feel + free to reuse the ``RegistrationProfile`` model, for example, + and the registration form classes are in no way tied to a + specific backend (and cover a number of common use cases which + will crop up regardless of the specific backend logic in use). + + +Installation and setup +---------------------- + +**How do I install django-registration?** + Full instructions are available in :ref:`the quick start guide `. + +**Do I need to put a copy of django-registration in every project I use it in?** + No; putting applications in your project directory is a very bad + habit, and you should stop doing it. If you followed the + instructions mentioned above, django-registration was installed + into a location that's on your Python import path, so you'll only + ever need to add ``registration`` to your ``INSTALLED_APPS`` + setting (in any project, or in any number of projects), and it + will work. + +**Does django-registration come with any sample templates I can use right away?** + No, for two reasons: + + 1. Providing default templates with an application is generally + hard to impossible, because different sites can have such + wildly different design and template structure. Any attempt to + provide templates which would work with all the possibilities + would probably end up working with none of them. + + 2. A number of things in django-registration depend on the + specific :ref:`registration backend ` you use, + including the variables which end up in template + contexts. Since django-registration has no way of knowing in + advance what backend you're going to be using, it also has no + way of knowing what your templates will need to look like. + + Fortunately, however, django-registration has good documentation + which explains what context variables will be available to + templates, and so it should be easy for anyone who knows Django's + template system to create templates which integrate with their own + site. + + +Configuration +------------- + +**Do I need to rewrite the views to change the way they behave?** + No. There are several ways you can customize behavior without + making any changes whatsoever: + + * Pass custom arguments -- e.g., to specify forms, template names, + etc. -- to :ref:`the registration views `. + + * Use the :ref:`signals ` sent by the views to add custom + behavior. + + * Write a custom :ref:`registration backend ` which + implements the behavior you need, and have the views use your + backend. + + If none of these are sufficient, your best option is likely to + simply write your own views; however, it is hoped that the level + of customization exposed by these options will be sufficient for + nearly all user-registration workflows. + +**How do I pass custom arguments to the views?** + Part 3 of the official Django tutorial, when it `introduces + generic views + `_, + covers the necessary mechanism: simply provide a dictionary of + keyword arguments in your URLconf. + +**Does that mean I should rewrite django-registration's default URLconf?** + No; if you'd like to pass custom arguments to the registration + views, simply write and include your own URLconf instead of + including the default one provided with django-registration. + +**I don't want to write my own URLconf because I don't want to write patterns for all the auth views!** + You're in luck, then; django-registration provides a URLconf which + *only* contains the patterns for the auth views, and which you can + include in your own URLconf anywhere you'd like; it lives at + ``registration.auth_urls``. + +**I don't like the names you've given to the URL patterns!** + In that case, you should feel free to set up your own URLconf + which uses the names you want. + + +Troubleshooting +--------------- + +**I've got functions listening for the registration/activation signals, but they're not getting called!** + + The most common cause of this is placing django-registration in a + sub-directory that's on your Python import path, rather than + installing it directly onto the import path as normal. Importing + from django-registration in that case can cause various issues, + including incorrectly connecting signal handlers. For example, if + you were to place django-registration inside a directory named + ``django_apps``, and refer to it in that manner, you would end up + with a situation where your code does this:: + + from django_apps.registration.signals import user_registered + + But django-registration will be doing:: + + from registration.signals import user_registered + + From Python's point of view, these import statements refer to two + different objects in two different modules, and so signal handlers + connected to the signal from the first import will not be called + when the signal is sent using the second import. + + To avoid this problem, follow the standard practice of installing + django-registration directly on your import path and always + referring to it by its own module name: ``registration`` (and in + general, it is always a good idea to follow normal Python + practices for installing and using Django applications). + + +Tips and tricks +--------------- + +**How do I log a user in immediately after registration or activation?** + You can most likely do this simply by writing a function which + listens for the appropriate :ref:`signal `; your function + should set the ``backend`` attribute of the user to the correct + authentication backend, and then call + ``django.contrib.auth.login()`` to log the user in. + +**How do I re-send an activation email?** + Assuming you're using :ref:`the default backend + `, a `custom admin action + `_ + is provided for this; in the admin for the + :class:`~registration.models.RegistrationProfile` model, simply + click the checkbox for the user(s) you'd like to re-send the email + for, then select the "Re-send activation emails" action. + +**How do I manually activate a user?** + In the default backend, a custom admin action is provided for + this. In the admin for the ``RegistrationProfile`` model, click + the checkbox for the user(s) you'd like to activate, then select + the "Activate users" action. \ No newline at end of file diff --git a/dependencies/django-registration(restore)/docs/forms.rst b/dependencies/django-registration(restore)/docs/forms.rst new file mode 100644 index 000000000..ce5ca419f --- /dev/null +++ b/dependencies/django-registration(restore)/docs/forms.rst @@ -0,0 +1,100 @@ +.. _forms: +.. module:: registration.forms + +Forms for user registration +=========================== + +Several form classes are provided with django-registration, covering +common cases for gathering account information and implementing common +constraints for user registration. These forms were designed with +django-registration's :ref:`default backend ` in +mind, but may also be useful in other situations. + + +.. class:: RegistrationForm + + A simple form for registering an account. Has the following fields, + all of which are required: + + ``username`` + The username to use for the new account. This is represented as + a text input which validates that the username is unique, + consists entirely of alphanumeric characters and underscores + and is at most 30 characters in length. + + ``email`` + The email address to use for the new account. This is + represented as a text input which accepts email addresses up to + 75 characters in length. + + ``password1`` + The password to use for the new account. This represented as a + password input (``input type="password"`` in the rendered HTML). + + ``password2`` + The password to use for the new account. This represented as a + password input (``input type="password"`` in the rendered HTML). + + The constraints on usernames and email addresses match those + enforced by Django's default authentication backend for instances + of ``django.contrib.auth.models.User``. The repeated entry of the + password serves to catch typos. + + Because it does not apply to any single field of the form, the + validation error for mismatched passwords is attached to the form + itself, and so must be accessed via the form's + ``non_field_errors()`` method. + + +.. class:: RegistrationFormTermsOfService + + A subclass of :class:`RegistrationForm` which adds one additional, + required field: + + ``tos`` + A checkbox indicating agreement to the site's terms of + service/user agreement. + + +.. class:: RegistrationFormUniqueEmail + + A subclass of :class:`RegistrationForm` which enforces uniqueness + of email addresses in addition to uniqueness of usernames. + + +.. class:: RegistrationFormNoFreeEmail + + A subclass of :class:`RegistrationForm` which disallows + registration using addresses from some common free email + providers. This can, in some cases, cut down on automated + registration by spambots. + + By default, the following domains are disallowed for email + addresses: + + * ``aim.com`` + + * ``aol.com`` + + * ``email.com`` + + * ``gmail.com`` + + * ``googlemail.com`` + + * ``hotmail.com`` + + * ``hushmail.com`` + + * ``msn.com`` + + * ``mail.ru`` + + * ``mailinator.com`` + + * ``live.com`` + + * ``yahoo.com`` + + To change this, subclass this form and set the class attribute + ``bad_domains`` to a list of domains you wish to disallow. diff --git a/dependencies/django-registration(restore)/docs/index.rst b/dependencies/django-registration(restore)/docs/index.rst new file mode 100644 index 000000000..35c6b361e --- /dev/null +++ b/dependencies/django-registration(restore)/docs/index.rst @@ -0,0 +1,55 @@ +.. django-registration documentation master file, created by + sphinx-quickstart on Mon Jun 22 02:57:42 2009. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +django-registration 0.8 documentation +===================================== + +This documentation covers the 0.8 release of django-registration, a +simple but extensible application providing user registration +functionality for `Django `_-powered +websites. + +Although nearly all aspects of the registration process are +customizable, the default setup of django-registration attempts to +cover the most common use case: two-phase registration, consisting of +initial signup followed by a confirmation email which contains +instructions for activating the new account. + +To get up and running quickly, consult the :ref:`quick-start guide +`, which describes all the necessary steps to install +django-registration and configure it for the default workflow. For +more detailed information, including how to customize the registration +process (and support for alternate registration systems), read through +the documentation listed below. + +If you are upgrading from a previous release, please read the +:ref:`upgrade guide ` for information on what's changed. + +Contents: + +.. toctree:: + :maxdepth: 1 + + quickstart + release-notes + upgrade + backend-api + default-backend + simple-backend + forms + views + signals + faq + +.. seealso:: + + * `Django's authentication documentation + `_; Django's + authentication system is used by django-registration's default + configuration. + + * `django-profiles + `_, an + application which provides simple user-profile management. diff --git a/dependencies/django-registration(restore)/docs/make.bat b/dependencies/django-registration(restore)/docs/make.bat new file mode 100644 index 000000000..b80dbdda6 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/make.bat @@ -0,0 +1,112 @@ +@ECHO OFF + +REM Command file for Sphinx documentation + +set SPHINXBUILD=sphinx-build +set ALLSPHINXOPTS=-d _build/doctrees %SPHINXOPTS% . +if NOT "%PAPER%" == "" ( + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% +) + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end +) + +if "%1" == "clean" ( + for /d %%i in (_build\*) do rmdir /q /s %%i + del /q /s _build\* + goto end +) + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% _build/html + echo. + echo.Build finished. The HTML pages are in _build/html. + goto end +) + +if "%1" == "dirhtml" ( + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% _build/dirhtml + echo. + echo.Build finished. The HTML pages are in _build/dirhtml. + goto end +) + +if "%1" == "pickle" ( + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% _build/pickle + echo. + echo.Build finished; now you can process the pickle files. + goto end +) + +if "%1" == "json" ( + %SPHINXBUILD% -b json %ALLSPHINXOPTS% _build/json + echo. + echo.Build finished; now you can process the JSON files. + goto end +) + +if "%1" == "htmlhelp" ( + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% _build/htmlhelp + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ +.hhp project file in _build/htmlhelp. + goto end +) + +if "%1" == "qthelp" ( + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% _build/qthelp + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ +.qhcp project file in _build/qthelp, like this: + echo.^> qcollectiongenerator _build\qthelp\django-registration.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile _build\qthelp\django-registration.ghc + goto end +) + +if "%1" == "latex" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% _build/latex + echo. + echo.Build finished; the LaTeX files are in _build/latex. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% _build/changes + echo. + echo.The overview file is in _build/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% _build/linkcheck + echo. + echo.Link check complete; look for any errors in the above output ^ +or in _build/linkcheck/output.txt. + goto end +) + +if "%1" == "doctest" ( + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% _build/doctest + echo. + echo.Testing of doctests in the sources finished, look at the ^ +results in _build/doctest/output.txt. + goto end +) + +:end diff --git a/dependencies/django-registration(restore)/docs/quickstart.rst b/dependencies/django-registration(restore)/docs/quickstart.rst new file mode 100644 index 000000000..b04ba4941 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/quickstart.rst @@ -0,0 +1,294 @@ +.. _quickstart: + +Quick start guide +================= + +Before installing django-registration, you'll need to have a copy of +`Django `_ already installed. For the +|version| release, Django 1.1 or newer is required. + +For further information, consult the `Django download page +`_, which offers convenient +packaged downloads and installation instructions. + + +Installing django-registration +------------------------------ + +There are several ways to install django-registration: + +* Automatically, via a package manager. + +* Manually, by downloading a copy of the release package and + installing it yourself. + +* Manually, by performing a Mercurial checkout of the latest code. + +It is also highly recommended that you learn to use `virtualenv +`_ for development and +deployment of Python software; ``virtualenv`` provides isolated Python +environments into which collections of software (e.g., a copy of +Django, and the necessary settings and applications for deploying a +site) can be installed, without conflicting with other installed +software. This makes installation, testing, management and deployment +far simpler than traditional site-wide installation of Python +packages. + + +Automatic installation via a package manager +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Several automatic package-installation tools are available for Python; +the most popular are `easy_install +`_ and `pip +`_. Either can be used to install +django-registration. + +Using ``easy_install``, type:: + + easy_install -Z django-registration + +Note that the ``-Z`` flag is required, to tell ``easy_install`` not to +create a zipped package; zipped packages prevent certain features of +Django from working properly. + +Using ``pip``, type:: + + pip install django-registration + +It is also possible that your operating system distributor provides a +packaged version of django-registration (for example, `Debian +GNU/Linux `_ provides a package, installable via +``apt-get-install python-django-registration``). Consult your +operating system's package list for details, but be aware that +third-party distributions may be providing older versions of +django-registration, and so you should consult the documentation which +comes with your operating system's package. + + +Manual installation from a downloaded package +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If you prefer not to use an automated package installer, you can +download a copy of django-registration and install it manually. The +latest release package can be downloaded from `django-registration's +listing on the Python Package Index +`_. + +Once you've downloaded the package, unpack it (on most operating +systems, simply double-click; alternately, type ``tar zxvf +django-registration-0.8.tar.gz`` at a command line on Linux, Mac OS X +or other Unix-like systems). This will create the directory +``django-registration-0.8``, which contains the ``setup.py`` +installation script. From a command line in that directory, type:: + + python setup.py install + +Note that on some systems you may need to execute this with +administrative privileges (e.g., ``sudo python setup.py install``). + + +Manual installation from a Mercurial checkout +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If you'd like to try out the latest in-development code, you can +obtain it from the django-registration repository, which is hosted at +`Bitbucket `_ and uses `Mercurial +`_ for version control. To +obtain the latest code and documentation, you'll need to have +Mercurial installed, at which point you can type:: + + hg clone http://bitbucket.org/ubernostrum/django-registration/ + +You can also obtain a copy of a particular release of +django-registration by specifying the ``-r`` argument to ``hg clone``; +each release is given a tag of the form ``vX.Y``, where "X.Y" is the +release number. So, for example, to check out a copy of the 0.8 +release, type:: + + hg clone -r v0.8 http://bitbucket.org/ubernostrum/django-registration/ + +In either case, this will create a copy of the django-registration +Mercurial repository on your computer; you can then add the +``django-registration`` directory inside the checkout your Python +import path, or use the ``setup.py`` script to install as a package. + + +Basic configuration and use +--------------------------- + +Once installed, you can add django-registration to any Django-based +project you're developing. The default setup will enable user +registration with the following workflow: + +1. A user signs up for an account by supplying a username, email + address and password. + +2. From this information, a new ``User`` object is created, with its + ``is_active`` field set to ``False``. Additionally, an activation + key is generated and stored, and an email is sent to the user + containing a link to click to activate the account. + +3. Upon clicking the activation link, the new account is made active + (the ``is_active`` field is set to ``True``); after this, the user + can log in. + +Note that the default workflow requires ``django.contrib.auth`` to be +installed, and it is recommended that ``django.contrib.sites`` be +installed as well. You will also need to have a working mail server +(for sending activation emails), and provide Django with the necessary +settings to make use of this mail server (consult `Django's +email-sending documentation +`_ for details). + + +Required settings +~~~~~~~~~~~~~~~~~ + +Begin by adding ``registration`` to the ``INSTALLED_APPS`` setting of +your project, and specifying one additional setting: + +``ACCOUNT_ACTIVATION_DAYS`` + This is the number of days users will have to activate their + accounts after registering. If a user does not activate within + that period, the account will remain permanently inactive and may + be deleted by maintenance scripts provided in django-registration. + +For example, you might have something like the following in your +Django settings file:: + + INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.sites', + 'registration', + # ...other installed applications... + ) + + ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value. + +Once you've done this, run ``manage.py syncdb`` to install the model +used by the default setup. + + +Setting up URLs +~~~~~~~~~~~~~~~ + +The :ref:`default backend ` includes a Django +``URLconf`` which sets up URL patterns for :ref:`the views in +django-registration `, as well as several useful views in +``django.contrib.auth`` (e.g., login, logout, password +change/reset). This ``URLconf`` can be found at +``registration.backends.default.urls``, and so can simply be included +in your project's root URL configuration. For example, to place the +URLs under the prefix ``/accounts/``, you could add the following to +your project's root ``URLconf``:: + + (r'^accounts/', include('registration.backends.default.urls')), + +Users would then be able to register by visiting the URL +``/accounts/register/``, login (once activated) at +``/accounts/login/``, etc. + + +Required templates +~~~~~~~~~~~~~~~~~~ + +In the default setup, you will need to create several templates +required by django-registration, and possibly additional templates +required by views in ``django.contrib.auth``. The templates requires +by django-registration are as follows; note that, with the exception +of the templates used for account activation emails, all of these are +rendered using a ``RequestContext`` and so will also receive any +additional variables provided by `context processors +`_. + +**registration/registration_form.html** + +Used to show the form users will fill out to register. By default, has +the following context: + +``form`` + The registration form. This will be an instance of some subclass + of ``django.forms.Form``; consult `Django's forms documentation + `_ for + information on how to display this in a template. + +**registration/registration_complete.html** + +Used after successful completion of the registration form. This +template has no context variables of its own, and should simply inform +the user that an email containing account-activation information has +been sent. + +**registration/activate.html** + +Used if account activation fails. With the default setup, has the following context: + +``activation_key`` + The activation key used during the activation attempt. + +**registration/activation_complete.html** + +Used after successful account activation. This template has no context +variables of its own, and should simply inform the user that their +account is now active. + +**registration/activation_email_subject.txt** + +Used to generate the subject line of the activation email. Because the +subject line of an email must be a single line of text, any output +from this template will be forcibly condensed to a single line before +being used. This template has the following context: + +``activation_key`` + The activation key for the new account. + +``expiration_days`` + The number of days remaining during which the account may be + activated. + +``site`` + An object representing the site on which the user registered; + depending on whether ``django.contrib.sites`` is installed, this + may be an instance of either ``django.contrib.sites.models.Site`` + (if the sites application is installed) or + ``django.contrib.sites.models.RequestSite`` (if not). Consult `the + documentation for the Django sites framework + `_ for + details regarding these objects' interfaces. + +**registration/activation_email.txt** + +Used to generate the body of the activation email. Should display a +link the user can click to activate the account. This template has the +following context: + +``activation_key`` + The activation key for the new account. + +``expiration_days`` + The number of days remaining during which the account may be + activated. + +``site`` + An object representing the site on which the user registered; + depending on whether ``django.contrib.sites`` is installed, this + may be an instance of either ``django.contrib.sites.models.Site`` + (if the sites application is installed) or + ``django.contrib.sites.models.RequestSite`` (if not). Consult `the + documentation for the Django sites framework + `_ for + details regarding these objects' interfaces. + +Note that the templates used to generate the account activation email +use the extension ``.txt``, not ``.html``. Due to widespread antipathy +toward and interoperability problems with HTML email, +django-registration defaults to plain-text email, and so these +templates should simply output plain text rather than HTML. + +To make use of the views from ``django.contrib.auth`` (which are set +up for you by the default URLconf mentioned above), you will also need +to create the templates required by those views. Consult `the +documentation for Django's authentication system +`_ +for details regarding these templates. diff --git a/dependencies/django-registration(restore)/docs/release-notes.rst b/dependencies/django-registration(restore)/docs/release-notes.rst new file mode 100644 index 000000000..261725d11 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/release-notes.rst @@ -0,0 +1,69 @@ +.. _release-notes: + +Release notes +============= + +The |version| release of django-registration represents a complete +rewrite of the previous codebase, and as such introduces a number of +new features and greatly enhances the flexibility and customizability +of django-registration. This document summarizes those features; for a +list of changes which impact existing installations, consult :ref:`the +upgrade guide `. + + +The backend system +------------------ + +The largest overall change consists of factoring out the logic of user +registration into pluggable/swappable backend classes. The +:ref:`registration views ` now accept a (required) argument, +``backend``, which indicates the backend class to use, and that class +has full control over the registration (and, if needed, activation) +process, including: + +* Determining whether registration will be allowed at all, on a + per-request basis. + +* Specifying a form class to use for account registration. + +* Implementing the actual process of account creation. + +* Determining whether a separate activation step is needed, and if so + what it will entail. + +* Specifying actions to take (e.g., redirects, automatic login, etc.) + following successful registration or activation. + +For full details, see the documentation for :ref:`the backend API +`. + +The workflow used by previous releases of django-registration +(two-step registration/activation) has been implemented using this +system, and is shipped as :ref:`the default backend ` +in django-registration |version|. + + +Other new features +------------------ + +An alternate :ref:`one-step registration system ` is +provided, for use by sites which do not require a two-step +registration/activation system. + +During the registration and (optional) activation process, +:ref:`custom signals ` are now sent, allowing easy injection +of custom processing into the registration workflow without needing to +write a full backend. + +The default backend now supplies several `custom admin actions +`_ to +make the process of administering a site with django-registration +simpler. + +The :func:`~registration.views.activate` view now supplies any +captured keyword arguments from the URL (in the case of the default +backend, this is the activation key) to its template in case of +unsuccessful activation; this greatly simplifies the process of +determining why activation failed and displaying appropriate error +messages. + diff --git a/dependencies/django-registration(restore)/docs/signals.rst b/dependencies/django-registration(restore)/docs/signals.rst new file mode 100644 index 000000000..a66fd5672 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/signals.rst @@ -0,0 +1,56 @@ +.. _signals: +.. module:: registration.signals + + +Custom signals used by django-registration +========================================== + +Much of django-registration's customizability comes through the +ability to write and use :ref:`registration backends ` +implementing different workflows for user registration. However, there +are many cases where only a small bit of additional logic needs to be +injected into the registration process, and writing a custom backend +to support this represents an unnecessary amount of work. A more +lightweight customization option is provided through two custom +signals which backends are required to send at specific points during +the registration process; functions listening for these signals can +then add whatever logic is needed. + +For general documentation on signals and the Django dispatcher, +consult `Django's signals documentation +`_. This +documentation assumes that you are familiar with how signals work and +the process of writing and connecting functions which will listen for +signals. + + +.. data:: user_activated + + Sent when a user account is activated (not applicable to all + backends). Provides the following arguments: + + ``sender`` + The backend class used to activate the user. + + ``user`` + An instance of ``django.contrib.auth.models.User`` + representing the activated account. + + ``request`` + The ``HttpRequest`` in which the account was activated. + + +.. data:: user_registered + + Sent when a new user account is registered. Provides the following + arguments: + + ``sender`` + The backend class used to register the account. + + ``user`` + An instance of ``django.contrib.auth.models.User`` + representing the new account. + + ``request`` + The ``HttpRequest`` in which the new account was registered. diff --git a/dependencies/django-registration(restore)/docs/simple-backend.rst b/dependencies/django-registration(restore)/docs/simple-backend.rst new file mode 100644 index 000000000..03efa87e9 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/simple-backend.rst @@ -0,0 +1,61 @@ +.. _simple-backend: +.. module:: registration.backends.simple + +The "simple" (one-step) backend +=============================== + +As an alternative to :ref:`the default backend `, and +an example of writing :ref:`registration backends `, +django-registration bundles a one-step registration system in +``registration.backend.simple``. This backend's workflow is +deliberately as simple as possible: + +1. A user signs up by filling out a registration form. + +2. The user's account is created and is active immediately, with no + intermediate confirmation or activation step. + +3. The new user is logged in immediately. + + +Configuration +------------- + +To use this backend, simply include the URLconf +``registration.backends.simple.urls`` somewhere in your site's own URL +configuration. For example:: + + (r'^accounts/', include('registration.backends.simple.urls')), + +No additional settings are required, but one optional setting is +supported: + +``REGISTRATION_OPEN`` + A boolean (either ``True`` or ``False``) indicating whether + registration of new accounts is currently permitted. A default of + ``True`` will be assumed if this setting is not supplied. + +Upon successful registration, the default redirect is to the URL +specified by the ``get_absolute_url()`` method of the newly-created +``User`` object; by default, this will be ``/users//``, +although it can be overridden in either of two ways: + +1. Specify a custom URL pattern for the + :func:`~registration.views.register` view, passing the keyword + argument ``success_url``. + +2. Override the default ``get_absolute_url()`` of the ``User`` model + in your Django configuration, as covered in `Django's settings + documentation + `_. + +The default form class used for account registration will be +:class:`registration.forms.RegistrationForm`, although this can be +overridden by supplying a custom URL pattern for the ``register()`` +view and passing the keyword argument ``form_class``. + +Note that because this backend does not use an activation step, +attempting to use the :func:`~registration.views.activate` view with +this backend or calling the backend's ``activate()`` or +``post_activation_redirect()`` methods will raise +``NotImplementedError``. diff --git a/dependencies/django-registration(restore)/docs/upgrade.rst b/dependencies/django-registration(restore)/docs/upgrade.rst new file mode 100644 index 000000000..3cd7a4ebe --- /dev/null +++ b/dependencies/django-registration(restore)/docs/upgrade.rst @@ -0,0 +1,118 @@ +.. _upgrade: + +Upgrade guide +============= + +The |version| release of django-registration represents a complete +rewrite of the previous codebase, and introduces several new features +which greatly enhance the customizability and extensibility of +django-registration. Whenever possible, changes were made in ways +which preserve backwards compatibility with previous releases, but +some changes to existing installations will still be required in order +to upgrade to |version|. This document provides a summary of those +changes, and of the new features available in the |version| release. + + +Django version requirement +-------------------------- + +As of |version|, django-registration requires Django 1.3 or newer; +older Django releases may work, but are officially unsupported. + + +Backwards-incompatible changes +------------------------------ + +If you're upgrading from an older release of django-registration, and +if you were using the default setup (i.e., the included default +URLconf and no custom URL patterns or custom arguments to views), most +things will continue to work as normal (although you will need to +create one new template; see the section on views below). However, the +old default URLconf has been deprecated and will be removed in version +1.0 of django-registration, so it is recommended that you begin +migrating now. To do so, change any use of ``registration.urls`` to +``registration.backends.default.urls``. For example, if you had the +following in your root URLconf:: + + (r'^accounts/', include('registration.urls')), + +you should change it to:: + + (r'^accounts/', include('registration.backends.default.urls')), + +The older include will continue to work until django-registration 1.0; +in |version| it raises a ``PendingDeprecationWarning`` (which is +ignored by default in Python), in 0.9 it will raise +``DeprecationWarning`` (which will begin printing warning messages on +import) and in 1.0 it will be removed entirely. + + +Changes to registration views +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:ref:`The views used to handle user registration ` have changed +significantly as of django-registration |version|. Both views now +require the keyword argument ``backend``, which specifies the +:ref:`registration backend ` to use, and so any URL +pattern for these views must supply that argument. The URLconf +provided with :ref:`the default backend ` properly +passes this argument. + +The ``profile_callback`` argument of the +:func:`~registration.views.register` view has been removed; the +functionality it provided can now be implemented easily via a custom +backend, or by connecting listeners to :ref:`the signals sent during +the registration process `. + +The :func:`~registration.views.activate` view now issues a redirect +upon successful activation; in the default backend this is to the URL +pattern named ``registration_activation_complete``; in the default +setup, this will redirect to a view which renders the template +``registration/activation_complete.html``, and so this template should +be present when using the default backend and default +configuration. Other backends can specify the location to redirect to +through their ``post_activation_redirect()`` method, and this can be +overridden on a case-by-case basis by passing the (new) keyword +argument ``success_url`` to the ``activate()`` view. On unsuccessful +activation, the ``activate()`` view still displays the same template, +but its context has changed: the context will simply consist of any +keyword arguments captured in the URL and passed to the view. + + +Changes to registration forms +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Previously, the form used to collect data during registration was +expected to implement a ``save()`` method which would create the new +user account. This is no longer the case; creating the account is +handled by the backend, and so any custom logic should be moved into a +custom backend, or by connecting listeners to :ref:`the signals sent +during the registration process `. + + +Changes to the :class:`~registration.models.RegistrationProfile` model +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The +:meth:`~registration.models.RegistrationManager.create_inactive_user` +method of :class:`~registration.models.RegistrationManager` now has an +additional required argument: ``site``. This allows +django-registration to easily be used regardless of whether +``django.contrib.sites`` is installed, since a ``RequestSite`` object +can be passed in place of a regular ``Site`` object. + +The :data:`~registration.signals.user_registered` signal is no longer +sent by ``create_inactive_user()``, and the +:data:`~registration.signals.user_activated` signal is no longer sent +by :meth:`~registration.models.RegistrationManager.activate_user`; +these signals are now sent by the backend after these methods have +been called. Note that :ref:`these signals ` were added after +the django-registration 0.7 release but before the refactoring which +introduced :ref:`the backend API `, so only installations +which were tracking the in-development codebase will have made use of +them. + +The sending of activation emails has been factored out of +``create_inactive_user()``, and now exists as the method +:meth:`~registration.models.RegistrationProfile.send_activation_email` +on instances of ``RegistrationProfile``. diff --git a/dependencies/django-registration(restore)/docs/views.rst b/dependencies/django-registration(restore)/docs/views.rst new file mode 100644 index 000000000..faca64437 --- /dev/null +++ b/dependencies/django-registration(restore)/docs/views.rst @@ -0,0 +1,122 @@ +.. _views: +.. module:: registration.views + +Registration views +================== + +In order to allow users to register using whatever workflow is +implemented by the :ref:`registration backend ` in use, +django-registration provides two views. Both are designed to allow +easy configurability without writing or rewriting view code. + +.. function:: activate(request, backend[, template_name[, success_url[, extra_context[, **kwargs]]]]) + + Activate a user's account, for workflows which require a separate + activation step. + + The actual activation of the account will be delegated to the + backend specified by the ``backend`` keyword argument; the + backend's ``activate()`` method will be called, passing the + ``HttpRequest`` and any keyword arguments captured from the URL, + and will be assumed to return a ``User`` if activation was + successful, or a value which evaluates to ``False`` in boolean + context if not. + + Upon successful activation, the backend's + ``post_activation_redirect()`` method will be called, passing the + ``HttpRequest`` and the activated ``User`` to determine the URL to + redirect the user to. To override this, pass the argument + ``success_url`` (see below). + + On unsuccessful activation, will render the template + ``registration/activate.html`` to display an error message; to + override thise, pass the argument ``template_name`` (see below). + + **Context** + + The context will be populated from the keyword arguments captured + in the URL. This view uses ``RequestContext``, so variables + populated by context processors will also be present in the + context. + + :param backend: The dotted Python path to the backend class to use. + :type backend: string + :param extra_context: Optionally, variables to add to the template + context. Any callable object in this dictionary will be called + to produce the final result which appears in the context. + :type extra_context: dict + :param template_name: Optional. A custom template name to use. If + not specified, this will default to + ``registration/activate.html``. + :type template_name: string + :param **kwargs: Any keyword arguments captured from the URL, such + as an activation key, which will be passed to the backend's + ``activate()`` method. + + +.. function:: register(request, backend[, success_url[, form_class[, disallowed_url[, template_name[, extra_context]]]]]) + + Allow a new user to register an account. + + The actual registration of the account will be delegated to the + backend specified by the ``backend`` keyword argument. The backend + is used as follows: + + 1. The backend's ``registration_allowed()`` method will be called, + passing the ``HttpRequest``, to determine whether registration + of an account is to be allowed; if not, a redirect is issued to + a page indicating that registration is not permitted. + + 2. The form to use for account registration will be obtained by + calling the backend's ``get_form_class()`` method, passing the + ``HttpRequest``. To override this, pass the keyword argument + ``form_class``. + + 3. If valid, the form's ``cleaned_data`` will be passed (as keyword + arguments, and along with the ``HttpRequest``) to the backend's + ``register()`` method, which should return a ``User`` object + representing the new account. + + 4. Upon successful registration, the backend's + ``post_registration_redirect()`` method will be called, passing + the ``HttpRequest`` and the new ``User``, to determine the URL + to redirect to. To override this, pass the keyword argument + ``success_url``. + + **Context** + + ``form`` + The form instance being used to collect registration data. + + This view uses ``RequestContext``, so variables populated by + context processors will also be present in the context. + + :param backend: The dotted Python path to the backend class to use. + :type backend: string + :param disallowed_url: The URL to redirect to if registration is + not permitted (e.g., if registration is closed). This should be + a string suitable for passing as the ``to`` argument to + `Django's "redirect" shortcut + `_. If + not specified, this will default to ``registration_disallowed``. + :type disallowed_url: string + :param extra_context: Optionally, variables to add to the template + context. Any callable object in this dictionary will be called + to produce the final result which appears in the context. + :type extra_context: dict + :param form_class: The form class to use for registration; this + should be some subclass of ``django.forms.Form``. If not + specified, the backend's ``get_form_class()`` method will be + called to obtain the form class. + :type form_class: subclass of ``django.forms.Form`` + :param success_url: The URL to redirect to after successful + registration. This should be a string suitable for passing as + the ``to`` argument to `Django's "redirect" shortcut + `_. If + not specified, the backend's ``post_registration_redirect()`` + method will be called to obtain the URL. + :type success_url: string + :param template_name: Optional. A custom template name to use. If + not specified, this will default to + ``registration/registration_form.html``. + :type template_name: string diff --git a/dependencies/django-registration(restore)/registration/__init__.py b/dependencies/django-registration(restore)/registration/__init__.py new file mode 100644 index 000000000..a5fec6d4f --- /dev/null +++ b/dependencies/django-registration(restore)/registration/__init__.py @@ -0,0 +1,30 @@ +VERSION = (0, 8, 0, 'final', 0) + +def get_version(version=None): + """Derives a PEP386-compliant version number from VERSION.""" + if version is None: + version = VERSION + assert len(version) == 5 + assert version[3] in ('alpha', 'beta', 'rc', 'final') + + # Now build the two parts of the version number: + # main = X.Y[.Z] + # sub = .devN - for pre-alpha releases + # | {a|b|c}N - for alpha, beta and rc releases + + parts = 2 if version[2] == 0 else 3 + main = '.'.join(str(x) for x in version[:parts]) + + sub = '' + if version[3] == 'alpha' and version[4] == 0: + # At the toplevel, this would cause an import loop. + from django.utils.version import get_svn_revision + svn_revision = get_svn_revision()[4:] + if svn_revision != 'unknown': + sub = '.dev%s' % svn_revision + + elif version[3] != 'final': + mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'} + sub = mapping[version[3]] + str(version[4]) + + return main + sub diff --git a/dependencies/django-registration(restore)/registration/admin.py b/dependencies/django-registration(restore)/registration/admin.py new file mode 100644 index 000000000..032455394 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/admin.py @@ -0,0 +1,46 @@ +from django.contrib import admin +from django.contrib.sites.requests import RequestSite +from django.contrib.sites.models import Site +from django.utils.translation import ugettext_lazy as _ + +from registration.models import RegistrationProfile + + +class RegistrationAdmin(admin.ModelAdmin): + actions = ['activate_users', 'resend_activation_email'] + list_display = ('user', 'activation_key_expired') + raw_id_fields = ['user'] + search_fields = ('user__username', 'user__first_name', 'user__last_name') + + def activate_users(self, request, queryset): + """ + Activates the selected users, if they are not alrady + activated. + + """ + for profile in queryset: + RegistrationProfile.objects.activate_user(profile.activation_key) + activate_users.short_description = _("Activate users") + + def resend_activation_email(self, request, queryset): + """ + Re-sends activation emails for the selected users. + + Note that this will *only* send activation emails for users + who are eligible to activate; emails will not be sent to users + whose activation keys have expired or who have already + activated. + + """ + if Site._meta.installed: + site = Site.objects.get_current() + else: + site = RequestSite(request) + + for profile in queryset: + if not profile.activation_key_expired(): + profile.send_activation_email(site) + resend_activation_email.short_description = _("Re-send activation emails") + + +admin.site.register(RegistrationProfile, RegistrationAdmin) diff --git a/dependencies/django-registration(restore)/registration/auth_urls.py b/dependencies/django-registration(restore)/registration/auth_urls.py new file mode 100644 index 000000000..4fddea10a --- /dev/null +++ b/dependencies/django-registration(restore)/registration/auth_urls.py @@ -0,0 +1,57 @@ +""" +URL patterns for the views included in ``django.contrib.auth``. + +Including these URLs (via the ``include()`` directive) will set up the +following patterns based at whatever URL prefix they are included +under: + +* User login at ``login/``. + +* User logout at ``logout/``. + +* The two-step password change at ``password/change/`` and + ``password/change/done/``. + +* The four-step password reset at ``password/reset/``, + ``password/reset/confirm/``, ``password/reset/complete/`` and + ``password/reset/done/``. + +The default registration backend already has an ``include()`` for +these URLs, so under the default setup it is not necessary to manually +include these views. Other backends may or may not include them; +consult a specific backend's documentation for details. + +""" + +from django.conf.urls import * + +import django.contrib.auth.views as auth_views + +urlpatterns = [url(r'^login/$', + auth_views.login, + {'template_name': 'registration/login.html'}, + name='django.contrib.auth.views.login'), + url(r'^logout/$', + auth_views.logout, + {'template_name': 'registration/logout.html'}, + name='django.contrib.auth.views.logout'), + url(r'^password/change/$', + auth_views.password_change, + name='django.contrib.auth.views.password_change'), + url(r'^password/change/done/$', + auth_views.password_change_done, + name='django.contrib.auth.views.password_change_done'), + url(r'^password/reset/$', + auth_views.password_reset, + name='django.contrib.auth.views.password_reset'), + url( + r'^password/reset/confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', + auth_views.password_reset_confirm, + name='django.contrib.auth.views.password_reset_confirm'), + url(r'^password/reset/complete/$', + auth_views.password_reset_complete, + name='django.contrib.auth.views.password_reset_complete'), + url(r'^password/reset/done/$', + auth_views.password_reset_done, + name='django.contrib.auth.views.password_reset_done'), + ] diff --git a/dependencies/django-registration(restore)/registration/backends/__init__.py b/dependencies/django-registration(restore)/registration/backends/__init__.py new file mode 100644 index 000000000..01a4c6847 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/backends/__init__.py @@ -0,0 +1,32 @@ +from django.core.exceptions import ImproperlyConfigured + + +# Python 2.7 has an importlib with import_module; for older Pythons, +# Django's bundled copy provides it. +try: # pragma: no cover + from importlib import import_module # pragma: no cover +except ImportError: # pragma: no cover + from importlib import import_module # pragma: no cover + +def get_backend(path): + """ + Return an instance of a registration backend, given the dotted + Python import path (as a string) to the backend class. + + If the backend cannot be located (e.g., because no such module + exists, or because the module does not contain a class of the + appropriate name), ``django.core.exceptions.ImproperlyConfigured`` + is raised. + + """ + i = path.rfind('.') + module, attr = path[:i], path[i+1:] + try: + mod = import_module(module) + except ImportError as e: + raise ImproperlyConfigured('Error loading registration backend %s: "%s"' % (module, e)) + try: + backend_class = getattr(mod, attr) + except AttributeError: + raise ImproperlyConfigured('Module "%s" does not define a registration backend named "%s"' % (module, attr)) + return backend_class() diff --git a/dependencies/django-registration(restore)/registration/backends/default/__init__.py b/dependencies/django-registration(restore)/registration/backends/default/__init__.py new file mode 100644 index 000000000..19192e0d0 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/backends/default/__init__.py @@ -0,0 +1,136 @@ +from django.conf import settings +from django.contrib.sites.shortcuts import get_current_site + +from registration import signals +from registration.forms import RegistrationForm +from registration.models import RegistrationProfile + + +class DefaultBackend(object): + """ + A registration backend which follows a simple workflow: + + 1. User signs up, inactive account is created. + + 2. Email is sent to user with activation link. + + 3. User clicks activation link, account is now active. + + Using this backend requires that + + * ``registration`` be listed in the ``INSTALLED_APPS`` setting + (since this backend makes use of models defined in this + application). + + * The setting ``ACCOUNT_ACTIVATION_DAYS`` be supplied, specifying + (as an integer) the number of days from registration during + which a user may activate their account (after that period + expires, activation will be disallowed). + + * The creation of the templates + ``registration/activation_email_subject.txt`` and + ``registration/activation_email.txt``, which will be used for + the activation email. See the notes for this backends + ``register`` method for details regarding these templates. + + Additionally, registration can be temporarily closed by adding the + setting ``REGISTRATION_OPEN`` and setting it to + ``False``. Omitting this setting, or setting it to ``True``, will + be interpreted as meaning that registration is currently open and + permitted. + + Internally, this is accomplished via storing an activation key in + an instance of ``registration.models.RegistrationProfile``. See + that model and its custom manager for full documentation of its + fields and supported operations. + + """ + def register(self, request, **kwargs): + """ + Given a username, email address and password, register a new + user account, which will initially be inactive. + + Along with the new ``User`` object, a new + ``registration.models.RegistrationProfile`` will be created, + tied to that ``User``, containing the activation key which + will be used for this account. + + An email will be sent to the supplied email address; this + email should contain an activation link. The email will be + rendered using two templates. See the documentation for + ``RegistrationProfile.send_activation_email()`` for + information about these templates and the contexts provided to + them. + + After the ``User`` and ``RegistrationProfile`` are created and + the activation email is sent, the signal + ``registration.signals.user_registered`` will be sent, with + the new ``User`` as the keyword argument ``user`` and the + class of this backend as the sender. + + """ + username, email, password = kwargs['username'], kwargs['email'], kwargs['password1'] + + site = get_current_site(request) + new_user = RegistrationProfile.objects.create_inactive_user(username, email, + password, site) + signals.user_registered.send(sender=self.__class__, + user=new_user, + request=request) + return new_user + + def activate(self, request, activation_key): + """ + Given an an activation key, look up and activate the user + account corresponding to that key (if possible). + + After successful activation, the signal + ``registration.signals.user_activated`` will be sent, with the + newly activated ``User`` as the keyword argument ``user`` and + the class of this backend as the sender. + + """ + activated = RegistrationProfile.objects.activate_user(activation_key) + if activated: + signals.user_activated.send(sender=self.__class__, + user=activated, + request=request) + return activated + + def registration_allowed(self, request): + """ + Indicate whether account registration is currently permitted, + based on the value of the setting ``REGISTRATION_OPEN``. This + is determined as follows: + + * If ``REGISTRATION_OPEN`` is not specified in settings, or is + set to ``True``, registration is permitted. + + * If ``REGISTRATION_OPEN`` is both specified and set to + ``False``, registration is not permitted. + + """ + return getattr(settings, 'REGISTRATION_OPEN', True) + + def get_form_class(self, request): + """ + Return the default form class used for user registration. + + """ + return RegistrationForm + + def post_registration_redirect(self, request, user): + """ + Return the name of the URL to redirect to after successful + user registration. + + """ + return ('registration_complete', (), {}) + + def post_activation_redirect(self, request, user): + """ + Return the name of the URL to redirect to after successful + account activation. + + """ + return ('registration_activation_complete', (), {}) diff --git a/dependencies/django-registration(restore)/registration/backends/default/urls.py b/dependencies/django-registration(restore)/registration/backends/default/urls.py new file mode 100644 index 000000000..504ea0ba8 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/backends/default/urls.py @@ -0,0 +1,51 @@ +""" +URLconf for registration and activation, using django-registration's +default backend. + +If the default behavior of these views is acceptable to you, simply +use a line like this in your root URLconf to set up the default URLs +for registration:: + + (r'^accounts/', include('registration.backends.default.urls')), + +This will also automatically set up the views in +``django.contrib.auth`` at sensible default locations. + +If you'd like to customize the behavior (e.g., by passing extra +arguments to the various views) or split up the URLs, feel free to set +up your own URL patterns for these views instead. + +""" + +from django.conf.urls import * +from django.views.generic.base import TemplateView + +from registration.views import activate +from registration.views import register + +urlpatterns = [url(r'^activate/complete/$', + TemplateView.as_view( + template_name='registration/activation_complete.html'), + name='registration_activation_complete'), + # Activation keys get matched by \w+ instead of the more specific + # [a-fA-F0-9]{40} because a bad activation key should still get to the view; + # that way it can return a sensible "invalid key" message instead of a + # confusing 404. + url(r'^activate/(?P\w+)/$', + activate, + {'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_activate'), + url(r'^register/$', + register, + {'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_register'), + url(r'^register/complete/$', + TemplateView.as_view( + template_name='registration/registration_complete.html'), + name='registration_complete'), + url(r'^register/closed/$', + TemplateView.as_view( + template_name='registration/registration_closed.html'), + name='registration_disallowed'), + url(r'', include('registration.auth_urls')), + ] diff --git a/dependencies/django-registration(restore)/registration/backends/default_with_names/__init__.py b/dependencies/django-registration(restore)/registration/backends/default_with_names/__init__.py new file mode 100644 index 000000000..f6c5b3b1f --- /dev/null +++ b/dependencies/django-registration(restore)/registration/backends/default_with_names/__init__.py @@ -0,0 +1,306 @@ +# coding: utf-8 + +import re + +from django.conf import settings +from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm, SetPasswordForm, PasswordChangeForm +from django.contrib.auth.models import User +from django.contrib.sites.requests import RequestSite +from django.contrib.sites.models import Site +from django.utils.translation import ugettext as _ +from django.utils.translation import get_language_from_request +from django import forms +from django.contrib.auth.tokens import default_token_generator +from users.models import UserProfile +from django.template.loader import render_to_string +from django.utils.http import int_to_base36 +from django.utils import translation + +from registration import signals +from registration.forms import RegistrationForm, RegistrationFormUniqueEmail +from registration.models import RegistrationProfile + +from mail.common import send_mass_mail_html + +from crispy_forms.helper import FormHelper +from crispy_forms.layout import Layout, HTML + +attrs_dict = { 'class': 'required' } + + +class AnytaskLoginForm(AuthenticationForm): + username = forms.CharField(label=_("Username"), max_length=75) + + def __init__(self, *args, **kwargs): + AuthenticationForm.__init__(self, *args, **kwargs) + self.error_messages['invalid_login'] = _(u"Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль.") + self.fields['username'].label = _(u"Логин / E-mail") + + self.helper = FormHelper(self) + self.helper.form_action = '/accounts/login/' + self.helper.label_class = 'col-md-4' + self.helper.field_class = 'col-md-8' + self.helper.layout.append(HTML(u"""
    +
    + """ + _(u'Забыли пароль?') + """ +
    +
    +
    +
    + + +
    +
    """)) + + def clean_username(self): + username = self.cleaned_data.get('username', '') + + try: + user = User.objects.get(username__iexact=username) + return user.username + except User.DoesNotExist: + pass + + try: + user = User.objects.get(email__iexact=username) + return user.username + except User.DoesNotExist: + pass + + return username + +class AnytaskPasswordResetForm(PasswordResetForm): + def __init__(self, *args, **kwargs): + PasswordResetForm.__init__(self, *args, **kwargs) + self.helper = FormHelper(self) + self.helper.label_class = 'col-md-5' + self.helper.field_class = 'col-md-7' + self.helper.layout.append(HTML(u"""
    +
    + +
    +
    """)) + + def save(self, *args, **kwargs): + kwargs['email_template_name'] = 'registration/password_reset_email.txt' + kwargs['html_email_template_name'] = 'registration/password_reset_email.html' + PasswordResetForm.save(self, *args, **kwargs) + + +class AnytaskSetPasswordForm(SetPasswordForm): + def __init__(self, *args, **kwargs): + SetPasswordForm.__init__(self, *args, **kwargs) + self.helper = FormHelper(self) + self.helper.label_class = 'col-md-4' + self.helper.field_class = 'col-md-8' + self.helper.layout.append(HTML(u"""
    +
    + +
    +
    """)) + + +class AnytaskPasswordChangeForm(PasswordChangeForm): + def __init__(self, *args, **kwargs): + PasswordChangeForm.__init__(self, *args, **kwargs) + self.helper = FormHelper(self) + self.helper.label_class = 'col-md-5' + self.helper.field_class = 'col-md-7' + self.helper.layout.append(HTML(u"""
    +
    + +
    +
    """)) + + +class RegistrationFormWithNames(RegistrationForm): + first_name = forms.CharField(widget=forms.TextInput(attrs=attrs_dict)) + last_name = forms.CharField(widget=forms.TextInput(attrs=attrs_dict)) + show_email = forms.BooleanField(required=False, initial=True) + #invite = forms.CharField(widget=forms.TextInput(attrs=attrs_dict), label="Инвайт") + + def __init__(self, *args, **kwargs): + super(RegistrationForm, self).__init__(*args, **kwargs) + self.fields['username'].label = _(u"Логин") + self.fields['first_name'].label = _(u"Имя") + self.fields['last_name'].label = _(u"Фамилия") + self.fields['show_email'].label = _(u"Показывать мой e-mail всем пользователям") + + self.fields.keyOrder = [ + 'username', + 'first_name', + 'last_name', + 'email', + 'show_email', + 'password1', + 'password2', + #'invite', + ] + + +class RegistrationFormWithNamesUniqEmail(RegistrationFormWithNames, RegistrationFormUniqueEmail): + pass + +class BootStrapRegistrationFormWithNames(RegistrationFormWithNamesUniqEmail): + def __init__(self, *args, **kwargs): + RegistrationFormWithNamesUniqEmail.__init__(self, *args, **kwargs) + + self.helper = FormHelper(self) + self.helper.label_class = 'col-md-4' + self.helper.field_class = 'col-md-8' + self.helper.layout.append(HTML(u"""
    +
    + +
    +
    """)) + + + +class DefaultBackend(object): + """ + A registration backend which follows a simple workflow: + + 1. User signs up, inactive account is created. + + 2. Email is sent to user with activation link. + + 3. User clicks activation link, account is now active. + + Using this backend requires that + + * ``registration`` be listed in the ``INSTALLED_APPS`` setting + (since this backend makes use of models defined in this + application). + + * The setting ``ACCOUNT_ACTIVATION_DAYS`` be supplied, specifying + (as an integer) the number of days from registration during + which a user may activate their account (after that period + expires, activation will be disallowed). + + * The creation of the templates + ``registration/activation_email_subject.txt`` and + ``registration/activation_email.txt``, which will be used for + the activation email. See the notes for this backends + ``register`` method for details regarding these templates. + + Additionally, registration can be temporarily closed by adding the + setting ``REGISTRATION_OPEN`` and setting it to + ``False``. Omitting this setting, or setting it to ``True``, will + be interpreted as meaning that registration is currently open and + permitted. + + Internally, this is accomplished via storing an activation key in + an instance of ``registration.models.RegistrationProfile``. See + that model and its custom manager for full documentation of its + fields and supported operations. + + """ + def register(self, request, **kwargs): + """ + Given a username, email address and password, register a new + user account, which will initially be inactive. + + Along with the new ``User`` object, a new + ``registration.models.RegistrationProfile`` will be created, + tied to that ``User``, containing the activation key which + will be used for this account. + + An email will be sent to the supplied email address; this + email should contain an activation link. The email will be + rendered using two templates. See the documentation for + ``RegistrationProfile.send_activation_email()`` for + information about these templates and the contexts provided to + them. + + After the ``User`` and ``RegistrationProfile`` are created and + the activation email is sent, the signal + ``registration.signals.user_registered`` will be sent, with + the new ``User`` as the keyword argument ``user`` and the + class of this backend as the sender. + + """ + username, email, password = kwargs['username'], kwargs['email'], kwargs['password1'] + first_name, last_name, show_email = kwargs['first_name'], kwargs['last_name'], kwargs['show_email'] + #invite = get_object_or_404(Invite, key=invite_key) + + if Site._meta.installed: + site = Site.objects.get_current() + else: + site = RequestSite(request) + new_user = RegistrationProfile.objects.create_inactive_user(username, email, + password, site) + + new_user.first_name = first_name + new_user.last_name = last_name + new_user.save() + + new_user_profile = UserProfile.objects.get(user=new_user) + new_user_profile.show_email = show_email + new_user_profile.language = get_language_from_request(request) + new_user_profile.save() + + #if invite.group: + # invite.group.students.add(new_user) + #invite.invited_user = new_user + #invite.save() + + signals.user_registered.send(sender=self.__class__, + user=new_user, + request=request) + return new_user + + def activate(self, request, activation_key): + """ + Given an an activation key, look up and activate the user + account corresponding to that key (if possible). + + After successful activation, the signal + ``registration.signals.user_activated`` will be sent, with the + newly activated ``User`` as the keyword argument ``user`` and + the class of this backend as the sender. + + """ + activated = RegistrationProfile.objects.activate_user(activation_key) + if activated: + signals.user_activated.send(sender=self.__class__, + user=activated, + request=request) + return activated + + def registration_allowed(self, request): + """ + Indicate whether account registration is currently permitted, + based on the value of the setting ``REGISTRATION_OPEN``. This + is determined as follows: + + * If ``REGISTRATION_OPEN`` is not specified in settings, or is + set to ``True``, registration is permitted. + + * If ``REGISTRATION_OPEN`` is both specified and set to + ``False``, registration is not permitted. + + """ + return getattr(settings, 'REGISTRATION_OPEN', True) + + def get_form_class(self, request): + """ + Return the default form class used for user registration. + + """ + return BootStrapRegistrationFormWithNames + + def post_registration_redirect(self, request, user): + """ + Return the name of the URL to redirect to after successful + user registration. + + """ + return ('registration_complete', (), {}) + + def post_activation_redirect(self, request, user): + """ + Return the name of the URL to redirect to after successful + account activation. + + """ + return ('registration_activation_complete', (), {}) diff --git a/dependencies/django-registration(restore)/registration/backends/default_with_names/urls.py b/dependencies/django-registration(restore)/registration/backends/default_with_names/urls.py new file mode 100644 index 000000000..42cf2c48a --- /dev/null +++ b/dependencies/django-registration(restore)/registration/backends/default_with_names/urls.py @@ -0,0 +1,83 @@ +""" +URLconf for registration and activation, using django-registration's +default backend. + +If the default behavior of these views is acceptable to you, simply +use a line like this in your root URLconf to set up the default URLs +for registration:: + + (r'^accounts/', include('registration.backends.default.urls')), + +This will also automatically set up the views in +``django.contrib.auth`` at sensible default locations. + +If you'd like to customize the behavior (e.g., by passing extra +arguments to the various views) or split up the URLs, feel free to set +up your own URL patterns for these views instead. + +""" + +from django.conf.urls import * +from django.views.generic.base import TemplateView + +from registration.backends.default_with_names import AnytaskLoginForm, \ + AnytaskPasswordResetForm, AnytaskSetPasswordForm, \ + AnytaskPasswordChangeForm +from registration.views import activate +from registration.views import register +from registration.views import ajax_check_username, ajax_check_email + +from django.contrib.auth import views as auth_views + +urlpatterns = [url(r'^activate/complete/$', + TemplateView.as_view( + template_name='registration/activation_complete.html'), + name='registration_activation_complete'), + # Activation keys get matched by \w+ instead of the more specific + # [a-fA-F0-9]{40} because a bad activation key should still get to the view; + # that way it can return a sensible "invalid key" message instead of a + # confusing 404. + url(r'^activate/(?P\w+)/$', + activate, + { + 'backend': 'registration.backends.default_with_names.DefaultBackend'}, + name='registration_activate'), + url(r'^register/$', + register, + { + 'backend': 'registration.backends.default_with_names.DefaultBackend'}, + name='registration_register'), + url(r'^register/complete/$', + TemplateView.as_view( + template_name='registration/registration_complete.html'), + name='registration_complete'), + url(r'^register/closed/$', + TemplateView.as_view( + template_name='registration/registration_closed.html'), + name='registration_disallowed'), + url(r'^register/ajax_check_username/$', + ajax_check_username, + name='registration.views.ajax_check_username'), + url(r'^register/ajax_check_email/$', + ajax_check_email, + name='registration.views.ajax_check_email'), + url(r'^login/$', + auth_views.login, + {'template_name': 'registration/login.html', + 'authentication_form': AnytaskLoginForm}, + name='registration.views.login'), + url(r'^password/reset/$', + auth_views.password_reset, + {'password_reset_form': AnytaskPasswordResetForm}, + name='registration.views.password_reset'), + url( + r'^password/reset/confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', + auth_views.password_reset_confirm, + {'set_password_form': AnytaskSetPasswordForm}, + name='registration.views.password_reset_confirm'), + url(r'^password/change/$', + auth_views.password_change, + {'password_change_form': AnytaskPasswordChangeForm}, + name='registration.views.password_change'), + url(r'', include('registration.auth_urls')), + ] diff --git a/dependencies/django-registration(restore)/registration/backends/simple/__init__.py b/dependencies/django-registration(restore)/registration/backends/simple/__init__.py new file mode 100644 index 000000000..5e8c35be0 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/backends/simple/__init__.py @@ -0,0 +1,64 @@ +from django.conf import settings +from django.contrib.auth import authenticate +from django.contrib.auth import login +from django.contrib.auth.models import User + +from registration import signals +from registration.forms import RegistrationForm + + +class SimpleBackend(object): + """ + A registration backend which implements the simplest possible + workflow: a user supplies a username, email address and password + (the bare minimum for a useful account), and is immediately signed + up and logged in. + + """ + def register(self, request, **kwargs): + """ + Create and immediately log in a new user. + + """ + username, email, password = kwargs['username'], kwargs['email'], kwargs['password1'] + User.objects.create_user(username, email, password) + + # authenticate() always has to be called before login(), and + # will return the user we just created. + new_user = authenticate(username=username, password=password) + login(request, new_user) + signals.user_registered.send(sender=self.__class__, + user=new_user, + request=request) + return new_user + + def activate(self, **kwargs): + raise NotImplementedError + + def registration_allowed(self, request): + """ + Indicate whether account registration is currently permitted, + based on the value of the setting ``REGISTRATION_OPEN``. This + is determined as follows: + + * If ``REGISTRATION_OPEN`` is not specified in settings, or is + set to ``True``, registration is permitted. + + * If ``REGISTRATION_OPEN`` is both specified and set to + ``False``, registration is not permitted. + + """ + return getattr(settings, 'REGISTRATION_OPEN', True) + + def get_form_class(self, request): + return RegistrationForm + + def post_registration_redirect(self, request, user): + """ + After registration, redirect to the user's account page. + + """ + return (user.get_absolute_url(), (), {}) + + def post_activation_redirect(self, request, user): + raise NotImplementedError diff --git a/dependencies/django-registration(restore)/registration/backends/simple/urls.py b/dependencies/django-registration(restore)/registration/backends/simple/urls.py new file mode 100644 index 000000000..21875fba4 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/backends/simple/urls.py @@ -0,0 +1,34 @@ +""" +URLconf for registration and activation, using django-registration's +one-step backend. + +If the default behavior of these views is acceptable to you, simply +use a line like this in your root URLconf to set up the default URLs +for registration:: + + (r'^accounts/', include('registration.backends.simple.urls')), + +This will also automatically set up the views in +``django.contrib.auth`` at sensible default locations. + +If you'd like to customize the behavior (e.g., by passing extra +arguments to the various views) or split up the URLs, feel free to set +up your own URL patterns for these views instead. + +""" + +from django.conf.urls import * +from django.views.generic.base import TemplateView + +from registration.views import register + +urlpatterns = [url(r'^register/$', + register, + {'backend': 'registration.backends.simple.SimpleBackend'}, + name='registration_register'), + url(r'^register/closed/$', + TemplateView.as_view( + template_name='registration/registration_closed.html'), + name='registration_disallowed'), + url(r'', include('registration.auth_urls')), +] diff --git a/dependencies/django-registration(restore)/registration/forms.py b/dependencies/django-registration(restore)/registration/forms.py new file mode 100644 index 000000000..8382a88c0 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/forms.py @@ -0,0 +1,123 @@ +""" +Forms and validation code for user registration. + +""" + + +from django.contrib.auth.models import User +from django import forms +from django.utils.translation import ugettext_lazy as _ + + +# I put this on all required fields, because it's easier to pick up +# on them with CSS or JavaScript if they have a class of "required" +# in the HTML. Your mileage may vary. If/when Django ticket #3515 +# lands in trunk, this will no longer be necessary. +attrs_dict = {'class': 'required'} + + +class RegistrationForm(forms.Form): + """ + Form for registering a new user account. + + Validates that the requested username is not already in use, and + requires the password to be entered twice to catch typos. + + Subclasses should feel free to add any additional validation they + need, but should avoid defining a ``save()`` method -- the actual + saving of collected user data is delegated to the active + registration backend. + + """ + username = forms.RegexField(regex=r'^[\w.@+-]+$', + max_length=30, + widget=forms.TextInput(attrs=attrs_dict), + label=_("Username"), + error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) + email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, + maxlength=75)), + 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), + label=_("Password (again)")) + + def clean_username(self): + """ + Validate that the username is alphanumeric and is not already + in use. + + """ + existing = User.objects.filter(username__iexact=self.cleaned_data['username']) + if existing.exists(): + raise forms.ValidationError(_("A user with that username already exists.")) + else: + return self.cleaned_data['username'] + + def clean(self): + """ + Verifiy that the values entered into the two password fields + match. Note that an error here will end up in + ``non_field_errors()`` because it doesn't apply to a single + field. + + """ + if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data: + if self.cleaned_data['password1'] != self.cleaned_data['password2']: + raise forms.ValidationError(_("The two password fields didn't match.")) + return self.cleaned_data + + +class RegistrationFormTermsOfService(RegistrationForm): + """ + Subclass of ``RegistrationForm`` which adds a required checkbox + for agreeing to a site's Terms of Service. + + """ + tos = forms.BooleanField(widget=forms.CheckboxInput(attrs=attrs_dict), + label=_(u'I have read and agree to the Terms of Service'), + error_messages={'required': _("You must agree to the terms to register")}) + + +class RegistrationFormUniqueEmail(RegistrationForm): + """ + Subclass of ``RegistrationForm`` which enforces uniqueness of + email addresses. + + """ + def clean_email(self): + """ + Validate that the supplied email address is unique for the + site. + + """ + if User.objects.filter(email__iexact=self.cleaned_data['email']): + raise forms.ValidationError(_("This email address is already in use. Please supply a different email address.")) + return self.cleaned_data['email'] + + +class RegistrationFormNoFreeEmail(RegistrationForm): + """ + Subclass of ``RegistrationForm`` which disallows registration with + email addresses from popular free webmail services; moderately + useful for preventing automated spam registrations. + + To change the list of banned domains, subclass this form and + override the attribute ``bad_domains``. + + """ + bad_domains = ['aim.com', 'aol.com', 'email.com', 'gmail.com', + 'googlemail.com', 'hotmail.com', 'hushmail.com', + 'msn.com', 'mail.ru', 'mailinator.com', 'live.com', + 'yahoo.com'] + + def clean_email(self): + """ + Check the supplied email address against a list of known free + webmail domains. + + """ + email_domain = self.cleaned_data['email'].split('@')[1] + if email_domain in self.bad_domains: + raise forms.ValidationError(_("Registration using free email addresses is prohibited. Please supply a different email address.")) + return self.cleaned_data['email'] diff --git a/dependencies/django-registration(restore)/registration/locale/ar/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/ar/LC_MESSAGES/django.po new file mode 100644 index 000000000..dd61869d3 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/ar/LC_MESSAGES/django.po @@ -0,0 +1,81 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "اسم المستخدم" + +#: forms.py:41 +msgid "email address" +msgstr "عنوان البريد الالكتروني" + +#: forms.py:43 +msgid "password" +msgstr "كلمة المرور" + +#: forms.py:45 +msgid "password (again)" +msgstr "تأكيد كلمة المرور" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "يمكن أن يحتوي اسم المستخدم على احرف، ارقام وشرطات سطرية فقط" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "اسم المستخدم مسجل مسبقا. يرجى اختيار اسم اخر." + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "يجب ادخال كلمة المرور مطابقة كل مرة" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "أقر بقراءة والموافقة على شروط الخدمة" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "يجب الموافقة على الشروط للتسجيل" + +#: forms.py:124 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "عنوان البريد الالكتروني مسجل مسبقا. يرجى تزويد عنوان بريد الكتروني مختلف." + +#: forms.py:149 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "يمنع التسجيل باستخدام عناوين بريد الكترونية مجانية. يرجى تزويد عنوان بريد الكتروني مختلف." + +#: models.py:188 +msgid "user" +msgstr "مستخدم" + +#: models.py:189 +msgid "activation key" +msgstr "رمز التفعيل" + +#: models.py:194 +msgid "registration profile" +msgstr "ملف التسجيل الشخصي" + +#: models.py:195 +msgid "registration profiles" +msgstr "ملفات التسجيل الشخصية" diff --git a/dependencies/django-registration(restore)/registration/locale/bg/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/bg/LC_MESSAGES/django.po new file mode 100644 index 000000000..5089ec17d --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/bg/LC_MESSAGES/django.po @@ -0,0 +1,78 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: 2008-03-05 12:37+0200\n" +"Last-Translator: Vladislav \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Bookmarks: -1,-1,-1,-1,10,-1,-1,-1,-1,-1\n" + +#: forms.py:38 +msgid "username" +msgstr "Потребителско име " + +#: forms.py:41 +msgid "email address" +msgstr "Електронна поща" + +#: forms.py:43 +msgid "password" +msgstr "Парола" + +#: forms.py:45 +msgid "password (again)" +msgstr "Парола (проверка)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "Потребителските имена могат да съдържат букви, цифри и подчертавки" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Потребителското име е заето. Моля изберето друго." + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "Грешка при проверка на паролата." + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "Прочел съм и съм съгласен с условията за експлоатация" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "Трябва да сте съгласни с условията за да се регистрирате." + +#: forms.py:124 +msgid "This email address is already in use. Please supply a different email address." +msgstr "Адреса на електронната поща е използван. Моля въведете друг адрес." + +#: forms.py:149 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "Регистрациите с безплатни адреси е забранен. Моля въведете различен адрес за електронна поща" + +#: models.py:188 +msgid "user" +msgstr "Потребител" + +#: models.py:189 +msgid "activation key" +msgstr "Ключ за активация" + +#: models.py:194 +msgid "registration profile" +msgstr "регистрационен профил" + +#: models.py:195 +msgid "registration profiles" +msgstr "регистрационни профили" + diff --git a/dependencies/django-registration(restore)/registration/locale/ca/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/ca/LC_MESSAGES/django.po new file mode 100644 index 000000000..7068194c8 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/ca/LC_MESSAGES/django.po @@ -0,0 +1,97 @@ +# Catalan translation for django-registration. +# Copyright (C) 2007-2010, James Bennet +# This file is distributed under the same license as the django-registration package. +# Carles Barrobés , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-07-17 11:04+0200\n" +"PO-Revision-Date: 2010-09-24 23:21+0100\n" +"Last-Translator: Carles Barrobés i Meix \n" +"Language-Team: Català\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Catalan\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Activar usuaris" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Re-enviar e-mails d'activació" + +#: forms.py:35 +msgid "Username" +msgstr "Nom d'usuari" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Aquest valor ha de contenir només lletres, números i guions baixos" + +#: forms.py:39 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:41 +msgid "Password" +msgstr "Contrasenya" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Contrasenya (de nou)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Ja existeix un usuari amb aquest nom" + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "Els dos camps de contrasenya no coincideixen" + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "He llegit i estic d'acord amb les condicions d'ús" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Heu d'estar d'acord amb les condicions d'ús per registrar-vos" + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Aquesta adreça d'e-mail ja està sent utilitzada. Sisplau, entreu-ne una " +"altra." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Està prohibit registrar-se utilitzant adreces d'e-mail gratuïtes. Sisplau " +"entreu-ne una altra." + +#: models.py:168 +msgid "user" +msgstr "usuari" + +#: models.py:169 +msgid "activation key" +msgstr "clau d'activació" + +#: models.py:174 +msgid "registration profile" +msgstr "perfil de registre" + +#: models.py:175 +msgid "registration profiles" +msgstr "perfils de registre" + +#~ msgid "Email address" +#~ msgstr "Adreça d'e-mail" diff --git a/dependencies/django-registration(restore)/registration/locale/cs/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/cs/LC_MESSAGES/django.po new file mode 100644 index 000000000..439c9cff7 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/cs/LC_MESSAGES/django.po @@ -0,0 +1,94 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , 2011. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-12 14:09-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Implayo s.r.o. \n" +"Language-Team: LANGUAGE \n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Aktivovat uživatele" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Znovu odeslat aktivační e-maily" + +#: forms.py:35 +msgid "username" +msgstr "uživatelské jméno" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Tato hodnota může obsahovat pouze písmena, čísla a podtržítka." + +#: forms.py:39 +msgid "Email address" +msgstr "E-mailová adresa" + +#: forms.py:41 +msgid "Password" +msgstr "Heslo" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Heslo (znovu)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Uživatel s tímto jménem již existuje." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "Zadaná 2 hesla se neshodují." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Přečetl jsem si a souhlasím s podmínkami služby" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Musíte odsouhlasit podmínky služby pro pokračování v registraci." + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Tato e-mailová adresa se již používá. Prosím zadejte jinou e-mailovou " +"adresu." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Používání volných e-mailových adres je zakázáno. Prosím zadejte " +"jinou e-mailovou adresu." + +#: models.py:165 +msgid "user" +msgstr "uživatel" + +#: models.py:166 +msgid "activation key" +msgstr "aktivační klíč" + +#: models.py:171 +msgid "registration profile" +msgstr "registrační profil" + +#: models.py:172 +msgid "registration profiles" +msgstr "registrační profily" diff --git a/dependencies/django-registration(restore)/registration/locale/da/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/da/LC_MESSAGES/django.po new file mode 100644 index 000000000..7bb0ac8f7 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/da/LC_MESSAGES/django.po @@ -0,0 +1,92 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Rune Bromer , 2007-2009. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.8 \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Rune Bromer \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Aktiver brugere" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Gensend aktiveringsemails" + +#: forms.py:35 +msgid "Username" +msgstr "Brugernavn" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "V¾rdien mŒ kun indeholde bogstaver, tal og underscore." + +#: forms.py:39 +msgid "Email address" +msgstr "E-mailadresse" + +#: forms.py:41 +msgid "Password" +msgstr "Password" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Password (gentag)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Der findes allerede en bruger med dette brugernavn." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "De 2 passwordfelter er ikke ens." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "I har l¾st og accepterer betingelserne." + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Du skal acceptere betingelserne for at registere" + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Denne emailadresse er allerede i brug. Benyt venligst en anden. " + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Registrering med gratis emailadresser er ikke muligt. V¾lg venligst en " +"anden emailadresse" + +#: models.py:165 +msgid "user" +msgstr "bruger" + +#: models.py:166 +msgid "activation key" +msgstr "Aktiveringsn¿gle" + +#: models.py:171 +msgid "registration profile" +msgstr "Registreringsprofil" + +#: models.py:172 +msgid "registration profiles" +msgstr "Registreringprofiler" diff --git a/dependencies/django-registration(restore)/registration/locale/de/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/de/LC_MESSAGES/django.po new file mode 100644 index 000000000..b1e44f429 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,93 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Jannis Leidel , 2007-2009. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.8 \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-18 21:32+0200\n" +"PO-Revision-Date: 2007-09-29 16:50+0200\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Deutsch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Benutzer aktivieren" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Aktivierungs-E-Mail erneut senden" + +#: forms.py:35 +msgid "Username" +msgstr "Benutzername" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." + +#: forms.py:39 +msgid "Email address" +msgstr "E-Mail-Adresse" + +#: forms.py:41 +msgid "Password" +msgstr "Passwort" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Passwort (wiederholen)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Dieser Benutzername ist bereits vergeben." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "Die beiden Passwörter sind nicht identisch." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Ich habe die Nutzungsvereinbarung gelesen und stimme ihr zu" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Sie müssen der Nutzungsvereinbarung zustimmen, um sich zu registrieren" + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Diese E-Mail-Adresse wird schon genutzt. Bitte geben Sie eine andere E-Mail-" +"Adresse an." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Die Registrierung mit einer kostenlosen E-Mail-Adresse ist untersagt. Bitte " +"geben Sie eine andere E-Mail-Adresse an." + +#: models.py:165 +msgid "user" +msgstr "Benutzer" + +#: models.py:166 +msgid "activation key" +msgstr "Aktivierungsschlüssel" + +#: models.py:171 +msgid "registration profile" +msgstr "Registrierungsprofil" + +#: models.py:172 +msgid "registration profiles" +msgstr "Registrierungsprofile" diff --git a/dependencies/django-registration(restore)/registration/locale/el/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/el/LC_MESSAGES/django.po new file mode 100644 index 000000000..cd38eb1b4 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/el/LC_MESSAGES/django.po @@ -0,0 +1,84 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Panos Laganakos , 2007. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: 2007-11-14 21:50+0200\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "όνομα χρήστη" + +#: forms.py:41 +msgid "email address" +msgstr "διεύθυνση ηλεκτρονικού ταχυδρομείου" + +#: forms.py:43 +msgid "password" +msgstr "συνθηματικό" + +#: forms.py:45 +msgid "password (again)" +msgstr "συνθηματικό (ξανά)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "Τα ονόματα χρηστών μπορούν να περιλαμβάνουν μόνο γράμματα, αριθμούς και υπογραμμίσεις" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Αυτό το όνομα χρήστη χρησιμοποίειται ήδη. Παρακαλώ διαλέξτε ένα άλλο." + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "Πρέπει να εισάγετε το ίδιο συνθηματικό κάθε φορά" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "Διάβασα και συμφωνώ με τους Όρους της Υπηρεσίας" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "Πρέπει να συμφωνείται με τους όρους για να εγγραφείτε" + +#: forms.py:124 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Η συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου χρησιμοποιείται ήδη. " +"Παρακαλώ δώστε κάποια άλλη." + +#: forms.py:149 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Η εγγραφή μέσω δωρεάν διευθύνσεων ηλεκτρονικού ταχυδρομείου απαγορεύεται. ""Παρακαλώ δώστε κάποια άλλη." + +#: models.py:188 +msgid "user" +msgstr "χρήστης" + +#: models.py:189 +msgid "activation key" +msgstr "κλειδί ενεργοποίησης" + +#: models.py:194 +msgid "registration profile" +msgstr "προφίλ εγγραφής" + +#: models.py:195 +msgid "registration profiles" +msgstr "προφίλ εγγραφών" diff --git a/dependencies/django-registration(restore)/registration/locale/en/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/en/LC_MESSAGES/django.po new file mode 100644 index 000000000..b41ce1766 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-01 16:47+0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "" + +#: forms.py:35 +msgid "Username" +msgstr "" + +#: forms.py:36 +msgid "This value may contain only letters, numbers and @/./+/-/_ characters." +msgstr "" + +#: forms.py:39 +msgid "E-mail" +msgstr "" + +#: forms.py:41 +msgid "Password" +msgstr "" + +#: forms.py:43 +msgid "Password (again)" +msgstr "" + +#: forms.py:53 +msgid "A user with that username already exists." +msgstr "" + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "" + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "" + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" + +#: models.py:176 +msgid "user" +msgstr "" + +#: models.py:177 +msgid "activation key" +msgstr "" + +#: models.py:182 +msgid "registration profile" +msgstr "" + +#: models.py:183 +msgid "registration profiles" +msgstr "" + +#: backends/default_with_names/__init__.py:29 +msgid "Логин / E-mail" +msgstr "Login / E-mail" + +#: backends/default_with_names/__init__.py:37 +msgid "Забыли пароль?" +msgstr "Forgot password?" + +#: backends/default_with_names/__init__.py:42 +msgid "Войти" +msgstr "Log in" + +#: backends/default_with_names/__init__.py:71 +msgid "Сбросить" +msgstr "Reset password" + +#: backends/default_with_names/__init__.py:84 +msgid "Применить" +msgstr "Apply" + +#: backends/default_with_names/__init__.py:97 +msgid "Изменить" +msgstr "Change" + +#: backends/default_with_names/__init__.py:114 +msgid "Логин" +msgstr "Username" + +#: backends/default_with_names/__init__.py:115 +msgid "Имя" +msgstr "Fisrt name" + +#: backends/default_with_names/__init__.py:116 +msgid "Фамилия" +msgstr "Last name" + +#: backends/default_with_names/__init__.py:117 +msgid "Показывать мой e-mail всем пользователям" +msgstr "Show my e-mail" + +#: backends/default_with_names/__init__.py:143 +msgid "Зарегистрироваться" +msgstr "Sign up" + +msgid "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." +msgstr "Please enter a correct username/email and password." diff --git a/dependencies/django-registration(restore)/registration/locale/es/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/es/LC_MESSAGES/django.po new file mode 100644 index 000000000..ba0384fe5 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/es/LC_MESSAGES/django.po @@ -0,0 +1,85 @@ +# Spanish translation for django-registration. +# Copyright (C) 2007, James Bennet +# This file is distributed under the same license as the registration package. +# Ernesto Rico Schmidt , 2008. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.3 \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-03-11 00:19-0400\n" +"PO-Revision-Date: 2008-03-11 00:19-0400\n" +"Last-Translator: Ernesto Rico Schmidt \n" +"Language-Team: Español \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "nombre de usuario" + +#: forms.py:41 +msgid "email address" +msgstr "dirección de coreo electrónico" + +#: forms.py:43 +msgid "password" +msgstr "contraseña" + +#: forms.py:45 +msgid "password (again)" +msgstr "contraseña (otra vez)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "Los nombres de usuarios sólo pueden contener letras, números y guiones bajos" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Este nombre de usuario ya está ocupado. Por favor escoge otro" + +#: forms.py:71 +msgid "You must type the same password each time" +msgstr "Tienes que introducir la misma contraseña cada vez" + +#: forms.py:100 +msgid "I have read and agree to the Terms of Service" +msgstr "He leído y acepto los términos de servicio" + +#: forms.py:109 +msgid "You must agree to the terms to register" +msgstr "Tienes que aceptar los términos para registrarte" + +#: forms.py:128 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"La dirección de correo electrónico ya está siendo usada. Por favor" +"proporciona otra dirección." + +#: forms.py:153 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"El registro usando una dirección de correo electrónico gratis está prohibido." +"Por favor proporciona otra dirección." + +#: models.py:188 +msgid "user" +msgstr "usuario" + +#: models.py:189 +msgid "activation key" +msgstr "clave de activación" + +#: models.py:194 +msgid "registration profile" +msgstr "perfil de registro" + +#: models.py:195 +msgid "registration profiles" +msgstr "perfiles de registro" diff --git a/dependencies/django-registration(restore)/registration/locale/es_AR/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/es_AR/LC_MESSAGES/django.po new file mode 100644 index 000000000..fb746b5b9 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/es_AR/LC_MESSAGES/django.po @@ -0,0 +1,83 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2008 Leonardo Manuel Rocha +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "nombre de usuario" + +#: forms.py:41 +msgid "email address" +msgstr "dirección de e-mail" + +#: forms.py:43 +msgid "password" +msgstr "contraseña" + +#: forms.py:45 +msgid "password (again)" +msgstr "contraseña (nuevamente)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "El nombre de usuario solo puede contener letras, números y guiones bajos" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Ese nombre de usuario ya está asignado. Por favor elija otro." + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "Debe tipear la misma contraseña cada vez" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "He leído y estoy de acuerdo con las Condiciones de Servicio" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "Debe estar de acuerdo con las Condiciones para poder registrarse" + +#: forms.py:124 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Esa dirección de e-mail ya está en uso. Por favor provea otra " +"dirección." + +#: forms.py:149 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "La registración con un e-mail gratuito está prohibida. Por favor " +"de una dirección de e-mail diferente." + +#: models.py:188 +msgid "user" +msgstr "usuario" + +#: models.py:189 +msgid "activation key" +msgstr "clave de activación" + +#: models.py:194 +msgid "registration profile" +msgstr "perfil de registro" + +#: models.py:195 +msgid "registration profiles" +msgstr "perfiles de registro" diff --git a/dependencies/django-registration(restore)/registration/locale/fa/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/fa/LC_MESSAGES/django.po new file mode 100644 index 000000000..5c658cda0 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/fa/LC_MESSAGES/django.po @@ -0,0 +1,80 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Mohsen Mansouryar , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: 2011-11-18 01:11+0330\n" +"Last-Translator: Mohsen Mansouryar \n" +"Language-Team: erixe \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Persian\n" +"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: forms.py:38 +msgid "username" +msgstr "نام کاربری" + +#: forms.py:41 +msgid "email address" +msgstr "پست الکترونیکی" + +#: forms.py:43 +msgid "password" +msgstr "گذرواژه" + +#: forms.py:45 +msgid "password (again)" +msgstr "گذرواژه(تکرار)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "نام های کاربری تنها می توانند شامل حرف، رقم و یا _ باشند." + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "این نام کاربری گرفته شده است. لطفا نام دیگری انتخاب کنید." + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "دو گذرواژه باید مطابق باشند!" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "من شرایط استفاده از این سرویس را مطالعه کرده و می پذیرم." + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "شما باید شرایط عضویت را بپذیرید!" + +#: forms.py:124 +msgid "This email address is already in use. Please supply a different email address." +msgstr "این آدرس استفاده شده است. لطفا آدرس دیگری ارائه دهید." + +#: forms.py:149 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "ثبت نام با استفاده از پست های الکترونیکی رایگان امکان پذیر نمی باشد." + +#: models.py:188 +msgid "user" +msgstr "کاربر" + +#: models.py:189 +msgid "activation key" +msgstr "کد فعالسازی" + +#: models.py:194 +msgid "registration profile" +msgstr "مشخصات ثبت نام" + +#: models.py:195 +msgid "registration profiles" +msgstr "پروفایل های ثبت نام" + diff --git a/dependencies/django-registration(restore)/registration/locale/fr/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/fr/LC_MESSAGES/django.po new file mode 100644 index 000000000..f25ed06dd --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/fr/LC_MESSAGES/django.po @@ -0,0 +1,91 @@ +# django-registration French translation. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the django-registration package. +# Samuel Adam , 2007. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.8 alpha-1 \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-07-01 14:33+0200\n" +"PO-Revision-Date: 2010-07-01 14:30+0200\n" +"Last-Translator: Patrick Samson \n" +"Language-Team: Français \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: .\admin.py:23 +msgid "Activate users" +msgstr "Active les utilisateurs" + +#: .\admin.py:43 +msgid "Re-send activation emails" +msgstr "Envoie à nouveau les courriels d'activation" + +#: .\forms.py:35 +msgid "Username" +msgstr "Nom d'utilisateur" + +#: .\forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Cette valeur ne doit contenir que des lettres, chiffres et tirets bas." + +#: .\forms.py:39 +msgid "Email address" +msgstr "Adresse courriel" + +#: .\forms.py:41 +msgid "Password" +msgstr "Mot de passe" + +#: .\forms.py:43 +msgid "Password (again)" +msgstr "Mot de passe (vérification)" + +#: .\forms.py:55 +msgid "A user with that username already exists." +msgstr "Un utilisateur avec ce nom existe déjà." + +#: .\forms.py:67 +msgid "The two password fields didn't match." +msgstr "Les deux mots de passe ne correspondent pas." + +#: .\forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "J'ai lu et accepté les Conditions Générales d'Utilisation" + +#: .\forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Vous devez accepter les conditions d'utilisation pour vous inscrire" + +#: .\forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Cette adresse courriel est déjà utilisée. Veuillez en indiquer une autre." + +#: .\forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"L'inscription avec adresse courriel de compte gratuit est interdite. " +"Veuillez en indiquer une autre." + +#: .\models.py:165 +msgid "user" +msgstr "utilisateur" + +#: .\models.py:166 +msgid "activation key" +msgstr "clé d'activation" + +#: .\models.py:171 +msgid "registration profile" +msgstr "profil d'inscription" + +#: .\models.py:172 +msgid "registration profiles" +msgstr "profils d'inscription" diff --git a/dependencies/django-registration(restore)/registration/locale/he/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/he/LC_MESSAGES/django.po new file mode 100644 index 000000000..5567e0863 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/he/LC_MESSAGES/django.po @@ -0,0 +1,86 @@ +# translation of registration. +# Copyright (C) 2008 THE registration'S COPYRIGHT HOLDER +# This file is distributed under the same license as the registration package. +# <>, 2008. +# , fuzzy +# <>, 2008. +# +# +msgid "" +msgstr "" +"Project-Id-Version: registration\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-02-10 02:01+0200\n" +"PO-Revision-Date: 2008-02-10 02:05+0200\n" +"Last-Translator: Meir Kriheli \n" +"Language-Team: Hebrew\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit" + +#: forms.py:38 +msgid "username" +msgstr "שם משתמש" + +#: forms.py:41 +msgid "email address" +msgstr "דואר אלקטרוני" + +#: forms.py:43 +msgid "password" +msgstr "סיסמה" + +#: forms.py:45 +msgid "password (again)" +msgstr "סיסמה (שוב)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "שמות משתמש יכולים להכיל רק אותיות, ספרות וקווים תחתונים" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "שם המשתמש תפוס כבר. נא לבחור אחר." + +#: forms.py:64 +msgid "You must type the same password each time" +msgstr "יש להקליד את אותה הסיסמה פעמיים" + +#: forms.py:93 +msgid "I have read and agree to the Terms of Service" +msgstr "קראתי והסכמתי לתנאי השימוש" + +#: forms.py:102 +msgid "You must agree to the terms to register" +msgstr "עליך להסכים לתנאי השימוש" + +#: forms.py:121 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"כתובת הדואר האלקטרוני תפוסה כבר. נא לספק כתובת דואר אחרת." + +#: forms.py:146 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"הרישום בעזרת תיבת דואר אלקטרוני חינמית אסור. נא לספק כתובת אחרת." + +#: models.py:188 +msgid "user" +msgstr "משתמש" + +#: models.py:189 +msgid "activation key" +msgstr "מפתח הפעלה" + +#: models.py:194 +msgid "registration profile" +msgstr "פרופיל רישום" + +#: models.py:195 +msgid "registration profiles" +msgstr "פרופילי רישום" + diff --git a/dependencies/django-registration(restore)/registration/locale/hr/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/hr/LC_MESSAGES/django.po new file mode 100644 index 000000000..1ed7e6c2b --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/hr/LC_MESSAGES/django.po @@ -0,0 +1,86 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.8.1beta\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-12-01 14:09-0500\n" +"PO-Revision-Date: 2010-12-01 15:49+0100\n" +"Last-Translator: Enis Afgan \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Croatian\n" +"X-Poedit-Country: CROATIA\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Aktiviraj korisnike" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Ponovno pošlji aktivacijski email" + +#: forms.py:35 +msgid "username" +msgstr "Korisničko ime" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Ova vrijednost mora sadržavati samo slova, brojeve i podvlake." + +#: forms.py:39 +msgid "Email address" +msgstr "Email adresa" + +#: forms.py:41 +msgid "Password" +msgstr "Lozinka" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Lozinka (ponovno)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Ovo korisničko ime već postoji." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "Oba polja za lozinku nisu ista." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Pročitao sam i slažem se s uvijetima uporabe." + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Morate se složiti sa uvijetima uporabe prije registracije." + +#: forms.py:95 +msgid "This email address is already in use. Please supply a different email address." +msgstr "Ova email adresa je već korištena. Molimo da koristite drugu email adresu." + +#: forms.py:122 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "Registracija gdje se koristi besplati email servis nije dopuštena. Molimo da koristite drugu email adresu." + +#: models.py:165 +msgid "user" +msgstr "Korisnik" + +#: models.py:166 +msgid "activation key" +msgstr "Aktivacijski ključ" + +#: models.py:171 +msgid "registration profile" +msgstr "Registracijski profil" + +#: models.py:172 +msgid "registration profiles" +msgstr "Registracijski profili" \ No newline at end of file diff --git a/dependencies/django-registration(restore)/registration/locale/is/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/is/LC_MESSAGES/django.po new file mode 100644 index 000000000..479e792a9 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/is/LC_MESSAGES/django.po @@ -0,0 +1,74 @@ +# Icelandic translation of django-registration +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the django-registration +# package. +# Björn Kristinsson , 2009. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-22 12:49+0100\n" +"PO-Revision-Date: 2009-01-22 12:49+0100\n" +"Last-Translator: Björn Kristinsson \n" +"Language-Team: Icelandic\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:36 +msgid "username" +msgstr "notandanafn" + +#: forms.py:39 +msgid "email address" +msgstr "netfang" + +#: forms.py:41 +msgid "password" +msgstr "lykilorð" + +#: forms.py:43 +msgid "password (again)" +msgstr "lykilorð (aftur)" + +#: forms.py:55 +msgid "This username is already taken. Please choose another." +msgstr "Þetta notendanafn er þegar á skrá. Vinsamlega reyndu annað." + +#: forms.py:67 +msgid "You must type the same password each time" +msgstr "Lykilorðin verða að vera eins " + +#: forms.py:90 +msgid "I have read and agree to the Terms of Service" +msgstr "Ég hef lesið og samþykki skilmálana" + +#: forms.py:107 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Þetta netfang er þegar á skrá. Vinsamlegast notaðu annað netfang." + +#: forms.py:133 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "Óheimilt er að nota ókeypis netföng. Vinsamlegast notaðu annað netfang." + +#: models.py:218 +msgid "user" +msgstr "notandi" + +#: models.py:219 +msgid "activation key" +msgstr "einkennislykill" + +#: models.py:224 +msgid "registration profile" +msgstr "skráningarprófíll" + +#: models.py:225 +msgid "registration profiles" +msgstr "skráningarprófílar" diff --git a/dependencies/django-registration(restore)/registration/locale/it/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/it/LC_MESSAGES/django.po new file mode 100644 index 000000000..09a3c814b --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/it/LC_MESSAGES/django.po @@ -0,0 +1,89 @@ +# translation of django.po to Italian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Nicola Larosa , 2008. +# Flavio Curella , 2011 +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.8 alpha-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-07-01 14:33+0200\n" +"PO-Revision-Date: 2011-08-04 12:41-0600\n" +"Last-Translator: Flavio Curella \n" +"Language-Team: Italiano \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Italian\n" +"X-Poedit-Country: ITALY\n" + +#: .\admin.py:23 +msgid "Activate users" +msgstr "Attiva utenti" + +#: .\admin.py:43 +msgid "Re-send activation emails" +msgstr "Re-invia email di attivazione" + +#: .\forms.py:35 +msgid "Username" +msgstr "Nome utente" + +#: .\forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Questo valore può contenere solo lettere, numeri e sottolineature." + +#: .\forms.py:39 +msgid "Email address" +msgstr "indirizzo email" + +#: .\forms.py:41 +msgid "Password" +msgstr "Password" + +#: .\forms.py:43 +msgid "Password (again)" +msgstr "Password (di nuovo)" + +#: .\forms.py:55 +msgid "A user with that username already exists." +msgstr "Questo nome utente è già usato." + +#: .\forms.py:67 +msgid "The two password fields didn't match." +msgstr "Le password inserite non coincidono." + +#: .\forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Dichiaro di aver letto e di approvare le Condizioni di Servizio" + +#: .\forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Per registrarsi bisogna approvare le condizioni" + +#: .\forms.py:95 +msgid "This email address is already in use. Please supply a different email address." +msgstr "Questo indirizzo email è già in uso. Inserisci un altro indirizzo email." + +#: .\forms.py:122 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "La registrazione con indirizzi email gratis non è permessa. Inserisci un altro indirizzo email." + +#: .\models.py:165 +msgid "user" +msgstr "utente" + +#: .\models.py:166 +msgid "activation key" +msgstr "chiave di attivazione" + +#: .\models.py:171 +msgid "registration profile" +msgstr "profilo di registrazione" + +#: .\models.py:172 +msgid "registration profiles" +msgstr "profili di registrazione" + diff --git a/dependencies/django-registration(restore)/registration/locale/ja/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/ja/LC_MESSAGES/django.po new file mode 100644 index 000000000..afaaf948b --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/ja/LC_MESSAGES/django.po @@ -0,0 +1,78 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Shinya Okano , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.4 \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: 2008-01-31 10:20+0900\n" +"Last-Translator: Shinya Okano \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "ユーザ名" + +#: forms.py:41 +msgid "email address" +msgstr "メールアドレス" + +#: forms.py:43 +msgid "password" +msgstr "パスワード" + +#: forms.py:45 +msgid "password (again)" +msgstr "パスワード (確認)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "ユーザ名には半角英数とアンダースコアのみが使用できます。" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "このユーザ名は既に使用されています。他のユーザ名を指定してください。" + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "同じパスワードを入力する必要があります。" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "サービス利用規約を読み、同意します。" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "登録するためには規約に同意する必要があります。" + +#: forms.py:124 +msgid "This email address is already in use. Please supply a different email address." +msgstr "このメールアドレスは既に使用されています。他のメールアドレスを指定して下さい。" + +#: forms.py:149 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "自由なメールアドレスを使用した登録は禁止されています。他のメールアドレスを指定してください。" + +#: models.py:188 +msgid "user" +msgstr "ユーザ" + +#: models.py:189 +msgid "activation key" +msgstr "アクティベーションキー" + +#: models.py:194 +msgid "registration profile" +msgstr "登録プロファイル" + +#: models.py:195 +msgid "registration profiles" +msgstr "登録プロファイル" + diff --git a/dependencies/django-registration(restore)/registration/locale/ko/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/ko/LC_MESSAGES/django.po new file mode 100644 index 000000000..d466420d7 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/ko/LC_MESSAGES/django.po @@ -0,0 +1,89 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Young Gyu Park , 2009. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-12 14:09-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Young Gyu Park \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "활동 사용자" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "이 메일 제 전송" + +#: forms.py:35 +msgid "username" +msgstr "사용자 아이디" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "이 곳에는 숫자, _, 영문 글자만 가능합니다." + +#: forms.py:39 +msgid "Email address" +msgstr "이메일 주소" + +#: forms.py:41 +msgid "Password" +msgstr "사용자 패스워드" + +#: forms.py:43 +msgid "Password (again)" +msgstr "패스워드 (재입력)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "이미 같은 아이디로 사용자가 등록되어 있습니다." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "패스워드가 서로 일치하지 않습니다." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "약관을 읽었고 그 내용에 동의합니다." + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "약관에 동의 하셔야만 합니다." + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "이메일이 이미 사용중입니다. 다른 이메일을 등록해 주세요." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "무료 이메일 계정으로 등록하실 수 없습니다. 다른 이메일을 등록해 주세요" + +#: models.py:165 +msgid "user" +msgstr "사용자" + +#: models.py:166 +msgid "activation key" +msgstr "활성화 키" + +#: models.py:171 +msgid "registration profile" +msgstr "등록 프로파일" + +#: models.py:172 +msgid "registration profiles" +msgstr "등록 프로파일" diff --git a/dependencies/django-registration(restore)/registration/locale/nb/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/nb/LC_MESSAGES/django.po new file mode 100644 index 000000000..9682d19a8 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/nb/LC_MESSAGES/django.po @@ -0,0 +1,91 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# jonklo , 2010. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-12-15 21:37+0100\n" +"PO-Revision-Date: 2010-12-15 21:37+0100\n" +"Last-Translator: jonklo \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Aktiver brukere" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Send ny aktiveringsmail" + +#: forms.py:35 +msgid "Username" +msgstr "Brukernavn" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Dette feltet kan bare inneholde bokstaver, nummer og understreker." + +#: forms.py:39 +msgid "Email address" +msgstr "E-postadresse" + +#: forms.py:41 +msgid "Password" +msgstr "Passord" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Passord (gjenta)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Det eksisterer allerede en bruker med dette brukernavnet." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "De to passordfeltene er ikke like." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Jeg har lest og godtar betingelsene" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Du må godta betingelsene for å registrere deg" + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Denne e-postadressen er allerede i bruk. Vennligst oppgi en annen " +"e-postadresse." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "Registrering med gratis e-postadresse er ikke tillatt. Vennligst " +"oppgi en annen e-postadresse." + +#: models.py:168 +msgid "user" +msgstr "bruker" + +#: models.py:169 +msgid "activation key" +msgstr "aktiveringsnøkkel" + +#: models.py:174 +msgid "registration profile" +msgstr "registrasjonsprofil" + +#: models.py:175 +msgid "registration profiles" +msgstr "registrasjonsprofiler" diff --git a/dependencies/django-registration(restore)/registration/locale/nl/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/nl/LC_MESSAGES/django.po new file mode 100644 index 000000000..03cb2e5db --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/nl/LC_MESSAGES/django.po @@ -0,0 +1,77 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: registration\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-08-14 13:25+0200\n" +"PO-Revision-Date: 2008-08-14 13:25+0200\n" +"Last-Translator: Joost Cassee \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: forms.py:38 +msgid "username" +msgstr "gebruikersnaam" + +#: forms.py:41 +msgid "email address" +msgstr "e-mail adres" + +#: forms.py:43 +msgid "password" +msgstr "wachtwoord" + +#: forms.py:45 +msgid "password (again)" +msgstr "wachtwoord (opnieuw)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "Gebruikersnamen kunnen alleen letters, nummer en liggende streepjes bevatten." + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Deze gebruikersnaam is reeds in gebruik. Kiest u alstublieft een andere gebruikersnaam." + +#: forms.py:71 +msgid "You must type the same password each time" +msgstr "U moet twee maal hetzelfde wachtwoord typen." + +#: forms.py:100 +msgid "I have read and agree to the Terms of Service" +msgstr "Ik heb de servicevoorwaarden gelezen en ga akkoord." + +#: forms.py:109 +msgid "You must agree to the terms to register" +msgstr "U moet akkoord gaan met de servicevoorwaarden om u te registreren." + +#: forms.py:125 +msgid "This email address is already in use. Please supply a different email address." +msgstr "Dit e-mail adres is reeds in gebruik. Kiest u alstublieft een ander e-mail adres." + +#: forms.py:151 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "U kunt u niet registreren met een gratis e-mail adres. Kiest u alstublieft een ander e-mail adres." + +#: models.py:191 +msgid "user" +msgstr "gebruiker" + +#: models.py:192 +msgid "activation key" +msgstr "activatiecode" + +#: models.py:197 +msgid "registration profile" +msgstr "registratieprofiel" + +#: models.py:198 +msgid "registration profiles" +msgstr "registratieprofielen" diff --git a/dependencies/django-registration(restore)/registration/locale/pl/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/pl/LC_MESSAGES/django.po new file mode 100644 index 000000000..498fd5b6b --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/pl/LC_MESSAGES/django.po @@ -0,0 +1,84 @@ +# Polish translation for django-registration. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the django-registration package. +# Jarek Zgoda , 2007. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 0.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: 2007-12-15 12:45+0100\n" +"Last-Translator: Jarek Zgoda \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "nazwa użytkownika" + +#: forms.py:41 +msgid "email address" +msgstr "adres email" + +#: forms.py:43 +msgid "password" +msgstr "hasło" + +#: forms.py:45 +msgid "password (again)" +msgstr "hasło (ponownie)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "" +"Nazwa użytkownika może zawierać tylko litery, cyfry i znaki podkreślenia" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Ta nazwa użytkownika jest już zajęta. Wybierz inną." + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "Musisz wpisać to samo hasło w obu polach" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "Przeczytałem regulamin i akceptuję go" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "Musisz zaakceptować regulamin, aby się zarejestrować" + +#: forms.py:124 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Ten adres email jest już używany. Użyj innego adresu email." + +#: forms.py:149 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Nie ma możliwości rejestracji przy użyciu darmowego adresu email. Użyj " +"innego adresu email." + +#: models.py:188 +msgid "user" +msgstr "użytkownik" + +#: models.py:189 +msgid "activation key" +msgstr "klucz aktywacyjny" + +#: models.py:194 +msgid "registration profile" +msgstr "profil rejestracji" + +#: models.py:195 +msgid "registration profiles" +msgstr "profile rejestracji" diff --git a/dependencies/django-registration(restore)/registration/locale/pt/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/pt/LC_MESSAGES/django.po new file mode 100644 index 000000000..074bfa023 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/pt/LC_MESSAGES/django.po @@ -0,0 +1,88 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-26 10:54+0000\n" +"PO-Revision-Date: 2011-01-24 12:20+0000\n" +"Last-Translator: Nuno Mariz \n" +"Language-Team: Nuno Mariz \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Ativar utilizadores" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Reenviar emails de ativação" + +#: forms.py:35 +msgid "Username" +msgstr "Utilizador" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Este valor apenas deverá conter letras, números e underscores." + +#: forms.py:39 +msgid "Email address" +msgstr "Email" + +#: forms.py:41 +msgid "Password" +msgstr "Password" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Password (novamente)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Um utilizador com o mesmo nome já se encontra registado." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "As duas passwords não coincidem." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Eu li e concordo com as Condiçoes de Serviço" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Deverá concordar com as condições para se registar" + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Este email já se encontra registado. Por favor forneça um email diferente." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "O registo com emails gratuitos é proibido. Por favor forneça um email diferente." + +#: models.py:168 +msgid "user" +msgstr "utilizador" + +#: models.py:169 +msgid "activation key" +msgstr "chave de ativação" + +#: models.py:174 +msgid "registration profile" +msgstr "perfil de registo" + +#: models.py:175 +msgid "registration profiles" +msgstr "perfis de registo" diff --git a/dependencies/django-registration(restore)/registration/locale/pt_BR/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/pt_BR/LC_MESSAGES/django.po new file mode 100644 index 000000000..9e8addb6f --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/pt_BR/LC_MESSAGES/django.po @@ -0,0 +1,81 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "usuário" + +#: forms.py:41 +msgid "email address" +msgstr "endereço de email" + +#: forms.py:43 +msgid "password" +msgstr "" + +#: forms.py:45 +msgid "password (again)" +msgstr "senha (novamente)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "Nomes de usuário apenas podem conter letras, números, e underscore" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Este nome de usuário já existe. Por favor, escolha outro." + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "Você deve escrever a mesma senha nos dois campos" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "Eu lí e concordo com os Termos de Uso do serviço" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "Você deve concordar com os termos para registrar-se" + +#: forms.py:124 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Este endereço de email já está em uso. Por favor, informe um endereço de email diferente." + +#: forms.py:149 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "Registrar-se com contas de email gratuitos está proibido. Por favor, informe um endereço de email diferente." + +#: models.py:188 +msgid "user" +msgstr "usuário" + +#: models.py:189 +msgid "activation key" +msgstr "chave de ativação" + +#: models.py:194 +msgid "registration profile" +msgstr "profile de registro" + +#: models.py:195 +msgid "registration profiles" +msgstr "profiles de registro" diff --git a/dependencies/django-registration(restore)/registration/locale/ru/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 000000000..072e146a0 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,92 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-21 20:12+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Активировать учетные записи" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Выслать ключи активации заново" + +#: forms.py:35 +msgid "Username" +msgstr "Имя пользователя" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Это поле может содержать только буквы, цифры и подчеркивания" + +#: forms.py:39 +msgid "Email address" +msgstr "Адрес электронной почты" + +#: forms.py:41 +msgid "Password" +msgstr "Пароль" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Пароль (снова)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Пользователь с таким именем уже существует." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "Введенные пароли не совпадают." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Я прочитал Правила Использования и согласен с ними" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Для регистрации Вы должны согласиться с Правилами" + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Этот адрес электронной почты уже используется. Пожалуйста, введите другой " +"адрес." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Регистрация с использованием свободных почтовых серверов запрещена. " +"Пожалуйста, введите другой адрес электронной почты." + +#: models.py:165 +msgid "user" +msgstr "пользователь" + +#: models.py:166 +msgid "activation key" +msgstr "ключ активации" + +#: models.py:171 +msgid "registration profile" +msgstr "карточка регистрации" + +#: models.py:172 +msgid "registration profiles" +msgstr "карточки регистрации" diff --git a/dependencies/django-registration(restore)/registration/locale/sl/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/sl/LC_MESSAGES/django.po new file mode 100644 index 000000000..0996851c8 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/sl/LC_MESSAGES/django.po @@ -0,0 +1,87 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.8.1beta\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-12 14:09-0500\n" +"PO-Revision-Date: 2011-11-05 21:20+0100\n" +"Last-Translator: Marko Mrdjenovic \n" +"Language-Team: Slovenian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Aktiviraj uporabnike" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Ponovno pošlji aktivacijsko e-pošto" + +#: forms.py:35 +msgid "username" +msgstr "uporabniško ime" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Vrednost lahko vsebuje samo črke, cifre in podčrtaje." + +#: forms.py:39 +msgid "Email address" +msgstr "E-naslov" + +#: forms.py:41 +msgid "Password" +msgstr "Geslo" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Geslo (ponovno)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Uporabnik s tem uporabniškim imenom že obstaja." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "Polji z gesli se ne ujemata." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Strinjam se s pogoji uporabe" + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Za registracijo se morate strinjati s pogoji uporabe" + +#: forms.py:95 +msgid "This email address is already in use. Please supply a different email address." +msgstr "E-naslov je že v uporabi, prosimo vnesite drugega." + +#: forms.py:122 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "Registracija ni mogoča z brezplačnimi e-naslovi. Prosimo vnesite drug e-naslov." + +#: models.py:165 +msgid "user" +msgstr "Uporabnik" + +#: models.py:166 +msgid "activation key" +msgstr "Aktivacijski ključ" + +#: models.py:171 +msgid "registration profile" +msgstr "Registracijski profil" + +#: models.py:172 +msgid "registration profiles" +msgstr "Registracijski profili" + diff --git a/dependencies/django-registration(restore)/registration/locale/sr/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/sr/LC_MESSAGES/django.po new file mode 100644 index 000000000..4fa699c55 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/sr/LC_MESSAGES/django.po @@ -0,0 +1,80 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: django-registration trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-04-05 13:51+0200\n" +"PO-Revision-Date: 2008-04-05 14:00+0100\n" +"Last-Translator: Nebojsa Djordjevic \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Poedit-Language: Serbian\n" +"X-Poedit-Country: YUGOSLAVIA\n" + +#: forms.py:38 +msgid "username" +msgstr "korisničko ime" + +#: forms.py:41 +msgid "email address" +msgstr "email adresa" + +#: forms.py:43 +msgid "password" +msgstr "šifra" + +#: forms.py:45 +msgid "password (again)" +msgstr "šifra (ponovo)" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "Korisničko ime može da se sastoji samo od slova, brojeva i donje crte (\"_\")" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Korisničko ime je već zauzeto. Izaberite drugo." + +#: forms.py:71 +msgid "You must type the same password each time" +msgstr "Unete šifre se ne slažu" + +#: forms.py:100 +msgid "I have read and agree to the Terms of Service" +msgstr "Pročitao sam i slažem se sa uslovima korišćenja" + +#: forms.py:109 +msgid "You must agree to the terms to register" +msgstr "Morate se složiti sa uslovima korišćenja da bi ste se registrovali" + +#: forms.py:128 +msgid "This email address is already in use. Please supply a different email address." +msgstr "Ova e-mail adresa je već u upotrebi. Morate koristiti drugu e-mail adresu." + +#: forms.py:153 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "Registracija korišćenjem besplatnig e-mail adresa je zabranjena. Morate uneti drugu e-mail adresu." + +#: models.py:188 +msgid "user" +msgstr "korisnik" + +#: models.py:189 +msgid "activation key" +msgstr "aktivacioni ključ" + +#: models.py:194 +msgid "registration profile" +msgstr "registracioni profil" + +#: models.py:195 +msgid "registration profiles" +msgstr "registracioni profili" + diff --git a/dependencies/django-registration(restore)/registration/locale/sv/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/sv/LC_MESSAGES/django.po new file mode 100644 index 000000000..dec76e273 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/sv/LC_MESSAGES/django.po @@ -0,0 +1,81 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-03-23 18:59+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Emil Stenström \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: .\forms.py:38 +msgid "username" +msgstr "Användarnamn" + +#: .\forms.py:41 +msgid "email address" +msgstr "E-postadress" + +#: .\forms.py:43 +msgid "password" +msgstr "Lösenord" + +#: .\forms.py:45 +msgid "password (again)" +msgstr "Lösenord (igen)" + +#: .\forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "Användarnamn får bara innehålla bokstäver, siffror och understreck" + +#: .\forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "Det användarnamnet är upptaget. Prova ett annat." + +#: .\forms.py:71 +msgid "You must type the same password each time" +msgstr "Båda lösenord måste vara lika" + +#: .\forms.py:100 +msgid "I have read and agree to the Terms of Service" +msgstr "Jag har läst och accepterar avtalet" + +#: .\forms.py:109 +msgid "You must agree to the terms to register" +msgstr "Du måste acceptera avtalet för att registrera dig" + +#: .\forms.py:128 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Den e-postadressen är upptagen, använd an annan adress." + +#: .\forms.py:153 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "Gratis e-postadresser är inte tillåtna, använd en annan adress." + +#: .\models.py:188 +msgid "user" +msgstr "Användare" + +#: .\models.py:189 +msgid "activation key" +msgstr "Aktiveringsnyckel" + +#: .\models.py:194 +msgid "registration profile" +msgstr "Profil" + +#: .\models.py:195 +msgid "registration profiles" +msgstr "Profiler" diff --git a/dependencies/django-registration(restore)/registration/locale/tr_TR/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/tr_TR/LC_MESSAGES/django.po new file mode 100644 index 000000000..295c524de --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/tr_TR/LC_MESSAGES/django.po @@ -0,0 +1,92 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-11-11 12:48+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: RECEP KIRMIZI \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:23 +msgid "Activate users" +msgstr "Kullanıcıları aktive et" + +#: admin.py:43 +msgid "Re-send activation emails" +msgstr "Aktivasyon e-postalarını yeniden gönder" + +#: forms.py:35 +msgid "Username" +msgstr "Kullanıcı adı" + +#: forms.py:36 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Bu alan sadece harfler, numaralar ve alt çizgiler barındırabilir." + +#: forms.py:39 +msgid "Email address" +msgstr "Eposta adresi" + +#: forms.py:41 +msgid "Password" +msgstr "Parola" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Parola (tekrar)" + +#: forms.py:55 +msgid "A user with that username already exists." +msgstr "Bu kullanıcı adına sahip bir kullanıcı bulunmakta." + +#: forms.py:67 +msgid "The two password fields didn't match." +msgstr "İki parola birbiri ile uyuşmadı." + +#: forms.py:78 +msgid "I have read and agree to the Terms of Service" +msgstr "Anlaşma kurallarını okudum ve kabul ediyorum." + +#: forms.py:79 +msgid "You must agree to the terms to register" +msgstr "Kayıt olmak için kuralları kabul etmelisiniz." + +#: forms.py:95 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Bu eposta adresi kullanımda. Lütfen farklı bir eposta adresi veriniz." + +#: forms.py:122 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Ücretsiz eposta adresleri ile kayıt kabul edilmemektedir. Lütfen farklı bir " +"eposta adresi veriniz." + +#: models.py:168 +msgid "user" +msgstr "kullanıcı" + +#: models.py:169 +msgid "activation key" +msgstr "aktivasyon anahtarı" + +#: models.py:174 +msgid "registration profile" +msgstr "kayıt profili" + +#: models.py:175 +msgid "registration profiles" +msgstr "kayıt profilleri" diff --git a/dependencies/django-registration(restore)/registration/locale/zh_CN/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/zh_CN/LC_MESSAGES/django.po new file mode 100644 index 000000000..7c609c316 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/zh_CN/LC_MESSAGES/django.po @@ -0,0 +1,77 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: 2008-03-20 23:22+0800\n" +"Last-Translator: hutuworm \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "用户名" + +#: forms.py:41 +msgid "email address" +msgstr "Email 地址" + +#: forms.py:43 +msgid "password" +msgstr "密码" + +#: forms.py:45 +msgid "password (again)" +msgstr "密码（重复）" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "用户名只能包含字母、数字和下划线" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "该用户名已被占用，请另选一个。" + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "您必须输入两遍同样的密码" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "我已阅读并同意该服务条款" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "您必须同意注册条款" + +#: forms.py:124 +msgid "This email address is already in use. Please supply a different email address." +msgstr "该 Email 地址已有人使用，请提供一个另外的 Email 地址。" + +#: forms.py:149 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "禁止使用免费 Email 地址注册，请提供一个另外的 Email 地址。" + +#: models.py:188 +msgid "user" +msgstr "用户" + +#: models.py:189 +msgid "activation key" +msgstr "激活密钥" + +#: models.py:194 +msgid "registration profile" +msgstr "注册信息" + +#: models.py:195 +msgid "registration profiles" +msgstr "注册信息" + diff --git a/dependencies/django-registration(restore)/registration/locale/zh_TW/LC_MESSAGES/django.po b/dependencies/django-registration(restore)/registration/locale/zh_TW/LC_MESSAGES/django.po new file mode 100644 index 000000000..7cc090d08 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/locale/zh_TW/LC_MESSAGES/django.po @@ -0,0 +1,77 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"PO-Revision-Date: 2008-03-20 23:22+0800\n" +"Last-Translator: hutuworm \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: forms.py:38 +msgid "username" +msgstr "用戶名" + +#: forms.py:41 +msgid "email address" +msgstr "Email 地址" + +#: forms.py:43 +msgid "password" +msgstr "密碼" + +#: forms.py:45 +msgid "password (again)" +msgstr "密碼（重復）" + +#: forms.py:54 +msgid "Usernames can only contain letters, numbers and underscores" +msgstr "用戶名只能包含字母、數字和下劃線" + +#: forms.py:59 +msgid "This username is already taken. Please choose another." +msgstr "該用戶名已被佔用，請另選一個。" + +#: forms.py:68 +msgid "You must type the same password each time" +msgstr "您必須輸入兩遍同樣的密碼" + +#: forms.py:96 +msgid "I have read and agree to the Terms of Service" +msgstr "我已閱讀並同意該服務條款" + +#: forms.py:105 +msgid "You must agree to the terms to register" +msgstr "您必須同意注冊條款" + +#: forms.py:124 +msgid "This email address is already in use. Please supply a different email address." +msgstr "該 Email 地址已有人使用，請提供一個另外的 Email 地址。" + +#: forms.py:149 +msgid "Registration using free email addresses is prohibited. Please supply a different email address." +msgstr "禁止使用免費 Email 地址注冊，請提供一個另外的 Email 地址。" + +#: models.py:188 +msgid "user" +msgstr "用戶" + +#: models.py:189 +msgid "activation key" +msgstr "激活密鑰" + +#: models.py:194 +msgid "registration profile" +msgstr "注冊信息" + +#: models.py:195 +msgid "registration profiles" +msgstr "注冊信息" + diff --git a/dependencies/django-registration(restore)/registration/management/__init__.py b/dependencies/django-registration(restore)/registration/management/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/dependencies/django-registration(restore)/registration/management/commands/__init__.py b/dependencies/django-registration(restore)/registration/management/commands/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/dependencies/django-registration(restore)/registration/management/commands/cleanupregistration.py b/dependencies/django-registration(restore)/registration/management/commands/cleanupregistration.py new file mode 100644 index 000000000..e8433564b --- /dev/null +++ b/dependencies/django-registration(restore)/registration/management/commands/cleanupregistration.py @@ -0,0 +1,19 @@ +""" +A management command which deletes expired accounts (e.g., +accounts which signed up but never activated) from the database. + +Calls ``RegistrationProfile.objects.delete_expired_users()``, which +contains the actual logic for determining which accounts are deleted. + +""" + +from django.core.management.base import BaseCommand as NoArgsCommand + +from registration.models import RegistrationProfile + + +class Command(NoArgsCommand): + help = "Delete expired user registrations from the database" + + def handle_noargs(self, **options): + RegistrationProfile.objects.delete_expired_users() diff --git a/dependencies/django-registration(restore)/registration/migrations/0001_initial.py b/dependencies/django-registration(restore)/registration/migrations/0001_initial.py new file mode 100644 index 000000000..c3a8b8437 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/migrations/0001_initial.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.8 on 2020-05-11 16:21 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='RegistrationProfile', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('activation_key', models.CharField(max_length=40, verbose_name='activation key')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True, verbose_name='user')), + ], + options={ + 'verbose_name': 'registration profile', + 'verbose_name_plural': 'registration profiles', + }, + ), + ] diff --git a/dependencies/django-registration(restore)/registration/migrations/__init__.py b/dependencies/django-registration(restore)/registration/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/dependencies/django-registration(restore)/registration/models.py b/dependencies/django-registration(restore)/registration/models.py new file mode 100644 index 000000000..8736df1a7 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/models.py @@ -0,0 +1,262 @@ +import datetime +import hashlib +import random +import re + +from django.conf import settings +from django.contrib.auth.models import User +from django.db import models +from django.db import transaction +from django.template.loader import render_to_string +from django.utils.translation import ugettext_lazy as _ + +from django.utils import timezone + + +SHA1_RE = re.compile('^[a-f0-9]{40}$') + + +class RegistrationManager(models.Manager): + """ + Custom manager for the ``RegistrationProfile`` model. + + The methods defined here provide shortcuts for account creation + and activation (including generation and emailing of activation + keys), and for cleaning out expired inactive accounts. + + """ + def activate_user(self, activation_key): + """ + Validate an activation key and activate the corresponding + ``User`` if valid. + + If the key is valid and has not expired, return the ``User`` + after activating. + + If the key is not valid or has expired, return ``False``. + + If the key is valid but the ``User`` is already active, + return ``False``. + + To prevent reactivation of an account which has been + deactivated by site administrators, the activation key is + reset to the string constant ``RegistrationProfile.ACTIVATED`` + after successful activation. + + """ + # Make sure the key we're trying conforms to the pattern of a + # SHA1 hash; if it doesn't, no point trying to look it up in + # the database. + if SHA1_RE.search(activation_key): + try: + profile = self.get(activation_key=activation_key) + except self.model.DoesNotExist: + return False + if not profile.activation_key_expired(): + user = profile.user + user.is_active = True + user.save() + profile.activation_key = self.model.ACTIVATED + profile.save() + return user + return False + + def create_inactive_user(self, username, email, password, + site, send_email=True): + """ + Create a new, inactive ``User``, generate a + ``RegistrationProfile`` and email its activation key to the + ``User``, returning the new ``User``. + + By default, an activation email will be sent to the new + user. To disable this, pass ``send_email=False``. + + """ + new_user = User.objects.create_user(username, email, password) + new_user.is_active = False + new_user.save() + + registration_profile = self.create_profile(new_user) + + if send_email: + registration_profile.send_activation_email(site) + + return new_user + create_inactive_user = transaction.atomic(create_inactive_user) + + def create_profile(self, user): + """ + Create a ``RegistrationProfile`` for a given + ``User``, and return the ``RegistrationProfile``. + + The activation key for the ``RegistrationProfile`` will be a + SHA1 hash, generated from a combination of the ``User``'s + username and a random salt. + + """ + salt = hashlib.sha1(str(random.random()).encode('utf8')).hexdigest()[:5].encode('utf8') + username = user.username + if isinstance(username, str): + username = username.encode('utf-8') + activation_key = hashlib.sha1(salt+username).hexdigest() + return self.create(user=user, + activation_key=activation_key) + + def delete_expired_users(self): + """ + Remove expired instances of ``RegistrationProfile`` and their + associated ``User``s. + + Accounts to be deleted are identified by searching for + instances of ``RegistrationProfile`` with expired activation + keys, and then checking to see if their associated ``User`` + instances have the field ``is_active`` set to ``False``; any + ``User`` who is both inactive and has an expired activation + key will be deleted. + + It is recommended that this method be executed regularly as + part of your routine site maintenance; this application + provides a custom management command which will call this + method, accessible as ``manage.py cleanupregistration``. + + Regularly clearing out accounts which have never been + activated serves two useful purposes: + + 1. It alleviates the ocasional need to reset a + ``RegistrationProfile`` and/or re-send an activation email + when a user does not receive or does not act upon the + initial activation email; since the account will be + deleted, the user will be able to simply re-register and + receive a new activation key. + + 2. It prevents the possibility of a malicious user registering + one or more accounts and never activating them (thus + denying the use of those usernames to anyone else); since + those accounts will be deleted, the usernames will become + available for use again. + + If you have a troublesome ``User`` and wish to disable their + account while keeping it in the database, simply delete the + associated ``RegistrationProfile``; an inactive ``User`` which + does not have an associated ``RegistrationProfile`` will not + be deleted. + + """ + for profile in self.all(): + try: + if profile.activation_key_expired(): + user = profile.user + if not user.is_active: + user.delete() + profile.delete() + except User.DoesNotExist: + profile.delete() + +class RegistrationProfile(models.Model): + """ + A simple profile which stores an activation key for use during + user account registration. + + Generally, you will not want to interact directly with instances + of this model; the provided manager includes methods + for creating and activating new accounts, as well as for cleaning + out accounts which have never been activated. + + While it is possible to use this model as the value of the + ``AUTH_PROFILE_MODULE`` setting, it's not recommended that you do + so. This model's sole purpose is to store data temporarily during + account registration and activation. + + """ + ACTIVATED = u"ALREADY_ACTIVATED" + + user = models.ForeignKey(User, unique=True, verbose_name=_('user')) + activation_key = models.CharField(_('activation key'), max_length=40) + + objects = RegistrationManager() + + class Meta: + verbose_name = _('registration profile') + verbose_name_plural = _('registration profiles') + + def __str__(self): + return u"Registration information for %s" % self.user + + def activation_key_expired(self): + """ + Determine whether this ``RegistrationProfile``'s activation + key has expired, returning a boolean -- ``True`` if the key + has expired. + + Key expiration is determined by a two-step process: + + 1. If the user has already activated, the key will have been + reset to the string constant ``ACTIVATED``. Re-activating + is not permitted, and so this method returns ``True`` in + this case. + + 2. Otherwise, the date the user signed up is incremented by + the number of days specified in the setting + ``ACCOUNT_ACTIVATION_DAYS`` (which should be the number of + days after signup during which a user is allowed to + activate their account); if the result is less than or + equal to the current date, the key has expired and this + method returns ``True``. + + """ + expiration_date = datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS) + return self.activation_key == self.ACTIVATED or \ + (self.user.date_joined + expiration_date <= timezone.now()) + activation_key_expired.boolean = True + + def send_activation_email(self, site): + """ + Send an activation email to the user associated with this + ``RegistrationProfile``. + + The activation email will make use of two templates: + + ``registration/activation_email_subject.txt`` + This template will be used for the subject line of the + email. Because it is used as the subject line of an email, + this template's output **must** be only a single line of + text; output longer than one line will be forcibly joined + into only a single line. + + ``registration/activation_email.txt`` + This template will be used for the body of the email. + + These templates will each receive the following context + variables: + + ``activation_key`` + The activation key for the new account. + + ``expiration_days`` + The number of days remaining during which the account may + be activated. + + ``site`` + An object representing the site on which the user + registered; depending on whether ``django.contrib.sites`` + is installed, this may be an instance of either + ``django.contrib.sites.models.Site`` (if the sites + application is installed) or + ``django.contrib.sites.models.RequestSite`` (if + not). Consult the documentation for the Django sites + framework for details regarding these objects' interfaces. + + """ + ctx_dict = {'activation_key': self.activation_key, + 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, + 'site': site} + subject = render_to_string('registration/activation_email_subject.txt', + ctx_dict) + # Email subject *must not* contain newlines + subject = ''.join(subject.splitlines()) + + message = render_to_string('registration/activation_email.txt', + ctx_dict) + + self.user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) + diff --git a/dependencies/django-registration(restore)/registration/signals.py b/dependencies/django-registration(restore)/registration/signals.py new file mode 100644 index 000000000..343e3a555 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/signals.py @@ -0,0 +1,8 @@ +from django.dispatch import Signal + + +# A new user has registered. +user_registered = Signal(providing_args=["user", "request"]) + +# A user has activated his or her account. +user_activated = Signal(providing_args=["user", "request"]) diff --git a/dependencies/django-registration(restore)/registration/tests/__init__.py b/dependencies/django-registration(restore)/registration/tests/__init__.py new file mode 100644 index 000000000..92a36285a --- /dev/null +++ b/dependencies/django-registration(restore)/registration/tests/__init__.py @@ -0,0 +1,8 @@ +from django.test import TestCase + +import registration + +from registration.tests.backends import * +from registration.tests.forms import * +from registration.tests.models import * +from registration.tests.views import * diff --git a/dependencies/django-registration/registration/tests/backends.py b/dependencies/django-registration(restore)/registration/tests/backends.py similarity index 100% rename from dependencies/django-registration/registration/tests/backends.py rename to dependencies/django-registration(restore)/registration/tests/backends.py diff --git a/dependencies/django-registration(restore)/registration/tests/forms.py b/dependencies/django-registration(restore)/registration/tests/forms.py new file mode 100644 index 000000000..15e84105e --- /dev/null +++ b/dependencies/django-registration(restore)/registration/tests/forms.py @@ -0,0 +1,121 @@ +from django.contrib.auth.models import User +from django.test import TestCase + +from registration import forms + +from django.utils import translation + +class RegistrationFormTests(TestCase): + """ + Test the default registration forms. + + """ + def test_registration_form(self): + """ + Test that ``RegistrationForm`` enforces username constraints + and matching passwords. + + """ + # Create a user so we can verify that duplicate usernames aren't + # permitted. + User.objects.create_user('alice', 'alice@example.com', 'secret') + + invalid_data_dicts = [ + # Non-alphanumeric username. + {'data': {'username': 'foo/bar', + 'email': 'foo@example.com', + 'password1': 'foo', + 'password2': 'foo'}, + 'error': ('username', [u"This value may contain only letters, numbers and @/./+/-/_ characters."])}, + # Already-existing username. + {'data': {'username': 'alice', + 'email': 'alice@example.com', + 'password1': 'secret', + 'password2': 'secret'}, + 'error': ('username', [u"A user with that username already exists."])}, + # Mismatched passwords. + {'data': {'username': 'foo', + 'email': 'foo@example.com', + 'password1': 'foo', + 'password2': 'bar'}, + 'error': ('__all__', [u"The two password fields didn't match."])}, + ] + + for invalid_dict in invalid_data_dicts: + with translation.override('en'): + form = forms.RegistrationForm(data=invalid_dict['data']) + self.failIf(form.is_valid()) + self.assertEqual(form.errors[invalid_dict['error'][0]], + invalid_dict['error'][1]) + + form = forms.RegistrationForm(data={'username': 'foo', + 'email': 'foo@example.com', + 'password1': 'foo', + 'password2': 'foo'}) + self.failUnless(form.is_valid()) + + def test_registration_form_tos(self): + """ + Test that ``RegistrationFormTermsOfService`` requires + agreement to the terms of service. + + """ + form = forms.RegistrationFormTermsOfService(data={'username': 'foo', + 'email': 'foo@example.com', + 'password1': 'foo', + 'password2': 'foo'}) + self.failIf(form.is_valid()) + self.assertEqual(form.errors['tos'], + [u"You must agree to the terms to register"]) + + form = forms.RegistrationFormTermsOfService(data={'username': 'foo', + 'email': 'foo@example.com', + 'password1': 'foo', + 'password2': 'foo', + 'tos': 'on'}) + self.failUnless(form.is_valid()) + + def test_registration_form_unique_email(self): + """ + Test that ``RegistrationFormUniqueEmail`` validates uniqueness + of email addresses. + + """ + # Create a user so we can verify that duplicate addresses + # aren't permitted. + User.objects.create_user('alice', 'alice@example.com', 'secret') + + form = forms.RegistrationFormUniqueEmail(data={'username': 'foo', + 'email': 'alice@example.com', + 'password1': 'foo', + 'password2': 'foo'}) + self.failIf(form.is_valid()) + self.assertEqual(form.errors['email'], + [u"This email address is already in use. Please supply a different email address."]) + + form = forms.RegistrationFormUniqueEmail(data={'username': 'foo', + 'email': 'foo@example.com', + 'password1': 'foo', + 'password2': 'foo'}) + self.failUnless(form.is_valid()) + + def test_registration_form_no_free_email(self): + """ + Test that ``RegistrationFormNoFreeEmail`` disallows + registration with free email addresses. + + """ + base_data = {'username': 'foo', + 'password1': 'foo', + 'password2': 'foo'} + for domain in forms.RegistrationFormNoFreeEmail.bad_domains: + invalid_data = base_data.copy() + invalid_data['email'] = u"foo@%s" % domain + form = forms.RegistrationFormNoFreeEmail(data=invalid_data) + self.failIf(form.is_valid()) + self.assertEqual(form.errors['email'], + [u"Registration using free email addresses is prohibited. Please supply a different email address."]) + + base_data['email'] = 'foo@example.com' + form = forms.RegistrationFormNoFreeEmail(data=base_data) + self.failUnless(form.is_valid()) diff --git a/dependencies/django-registration(restore)/registration/tests/models.py b/dependencies/django-registration(restore)/registration/tests/models.py new file mode 100644 index 000000000..1ca291b32 --- /dev/null +++ b/dependencies/django-registration(restore)/registration/tests/models.py @@ -0,0 +1,225 @@ +import datetime +import re + +from django.conf import settings +from django.contrib.auth.models import User +from django.contrib.sites.models import Site +from django.core import mail +from django.core import management +from django.test import TestCase +from hashlib import sha1 as sha_constructor + +from registration.models import RegistrationProfile + + +class RegistrationModelTests(TestCase): + """ + Test the model and manager used in the default backend. + + """ + user_info = {'username': 'alice', + 'password': 'swordfish', + 'email': 'alice@example.com'} + + def setUp(self): + self.old_activation = getattr(settings, 'ACCOUNT_ACTIVATION_DAYS', None) + settings.ACCOUNT_ACTIVATION_DAYS = 7 + + def tearDown(self): + settings.ACCOUNT_ACTIVATION_DAYS = self.old_activation + + def test_profile_creation(self): + """ + Creating a registration profile for a user populates the + profile with the correct user and a SHA1 hash to use as + activation key. + + """ + new_user = User.objects.create_user(**self.user_info) + profile = RegistrationProfile.objects.create_profile(new_user) + + self.assertEqual(RegistrationProfile.objects.count(), 1) + self.assertEqual(profile.user.id, new_user.id) + self.failUnless(re.match('^[a-f0-9]{40}$', profile.activation_key)) + self.assertEqual(str(profile), + "Registration information for alice") + + def test_activation_email(self): + """ + ``RegistrationProfile.send_activation_email`` sends an + email. + + """ + new_user = User.objects.create_user(**self.user_info) + profile = RegistrationProfile.objects.create_profile(new_user) + profile.send_activation_email(Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].to, [self.user_info['email']]) + + def test_user_creation(self): + """ + Creating a new user populates the correct data, and sets the + user's account inactive. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + self.assertEqual(new_user.username, 'alice') + self.assertEqual(new_user.email, 'alice@example.com') + self.failUnless(new_user.check_password('swordfish')) + self.failIf(new_user.is_active) + + def test_user_creation_email(self): + """ + By default, creating a new user sends an activation email. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + self.assertEqual(len(mail.outbox), 1) + + def test_user_creation_no_email(self): + """ + Passing ``send_email=False`` when creating a new user will not + send an activation email. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + send_email=False, + **self.user_info) + self.assertEqual(len(mail.outbox), 0) + + def test_unexpired_account(self): + """ + ``RegistrationProfile.activation_key_expired()`` is ``False`` + within the activation window. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + profile = RegistrationProfile.objects.get(user=new_user) + self.failIf(profile.activation_key_expired()) + + def test_expired_account(self): + """ + ``RegistrationProfile.activation_key_expired()`` is ``True`` + outside the activation window. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + new_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user.save() + profile = RegistrationProfile.objects.get(user=new_user) + self.failUnless(profile.activation_key_expired()) + + def test_valid_activation(self): + """ + Activating a user within the permitted window makes the + account active, and resets the activation key. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + profile = RegistrationProfile.objects.get(user=new_user) + activated = RegistrationProfile.objects.activate_user(profile.activation_key) + + self.failUnless(isinstance(activated, User)) + self.assertEqual(activated.id, new_user.id) + self.failUnless(activated.is_active) + + profile = RegistrationProfile.objects.get(user=new_user) + self.assertEqual(profile.activation_key, RegistrationProfile.ACTIVATED) + + def test_expired_activation(self): + """ + Attempting to activate outside the permitted window does not + activate the account. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + new_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user.save() + + profile = RegistrationProfile.objects.get(user=new_user) + activated = RegistrationProfile.objects.activate_user(profile.activation_key) + + self.failIf(isinstance(activated, User)) + self.failIf(activated) + + new_user = User.objects.get(username='alice') + self.failIf(new_user.is_active) + + profile = RegistrationProfile.objects.get(user=new_user) + self.assertNotEqual(profile.activation_key, RegistrationProfile.ACTIVATED) + + def test_activation_invalid_key(self): + """ + Attempting to activate with a key which is not a SHA1 hash + fails. + + """ + self.failIf(RegistrationProfile.objects.activate_user('foo')) + + def test_activation_already_activated(self): + """ + Attempting to re-activate an already-activated account fails. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + profile = RegistrationProfile.objects.get(user=new_user) + RegistrationProfile.objects.activate_user(profile.activation_key) + + profile = RegistrationProfile.objects.get(user=new_user) + self.failIf(RegistrationProfile.objects.activate_user(profile.activation_key)) + + def test_activation_nonexistent_key(self): + """ + Attempting to activate with a non-existent key (i.e., one not + associated with any account) fails. + + """ + # Due to the way activation keys are constructed during + # registration, this will never be a valid key. + invalid_key = sha_constructor(b'foo').hexdigest() + self.failIf(RegistrationProfile.objects.activate_user(invalid_key)) + + def test_expired_user_deletion(self): + """ + ``RegistrationProfile.objects.delete_expired_users()`` only + deletes inactive users whose activation window has expired. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + expired_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + username='bob', + password='secret', + email='bob@example.com') + expired_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + expired_user.save() + + RegistrationProfile.objects.delete_expired_users() + self.assertEqual(RegistrationProfile.objects.count(), 1) + self.assertRaises(User.DoesNotExist, User.objects.get, username='bob') + + def test_management_command(self): + """ + The ``cleanupregistration`` management command properly + deletes expired accounts. + + """ + new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + **self.user_info) + expired_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), + username='bob', + password='secret', + email='bob@example.com') + expired_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + expired_user.save() + + management.call_command('cleanupregistration') + self.assertEqual(RegistrationProfile.objects.count(), 1) + self.assertRaises(User.DoesNotExist, User.objects.get, username='bob') diff --git a/dependencies/django-registration(restore)/registration/tests/urls.py b/dependencies/django-registration(restore)/registration/tests/urls.py new file mode 100644 index 000000000..c834e1a2d --- /dev/null +++ b/dependencies/django-registration(restore)/registration/tests/urls.py @@ -0,0 +1,88 @@ +""" +URLs used in the unit tests for django-registration. + +You should not attempt to use these URLs in any sort of real or +development environment; instead, use +``registration/backends/default/urls.py``. This URLconf includes those +URLs, and also adds several additional URLs which serve no purpose +other than to test that optional keyword arguments are properly +handled. + +""" + +from django.conf.urls import * +from django.views.generic.base import TemplateView + +from registration.views import activate +from registration.views import register + + +urlpatterns = [ + # Test the 'activate' view with custom template + # name. + url(r'^activate-with-template-name/(?P\w+)/$', + activate, + {'template_name': 'registration/test_template_name.html', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_activate_template_name'), + # Test the 'activate' view with + # extra_context_argument. + url(r'^activate-extra-context/(?P\w+)/$', + activate, + {'extra_context': {'foo': 'bar', 'callable': lambda: 'called'}, + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_activate_extra_context'), + # Test the 'activate' view with success_url argument. + url(r'^activate-with-success-url/(?P\w+)/$', + activate, + {'success_url': 'registration_test_custom_success_url', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_activate_success_url'), + # Test the 'register' view with custom template + # name. + url(r'^register-with-template-name/$', + register, + {'template_name': 'registration/test_template_name.html', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_template_name'), + # Test the'register' view with extra_context + # argument. + url(r'^register-extra-context/$', + register, + {'extra_context': {'foo': 'bar', 'callable': lambda: 'called'}, + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_extra_context'), + # Test the 'register' view with custom URL for + # closed registration. + url(r'^register-with-disallowed-url/$', + register, + {'disallowed_url': 'registration_test_custom_disallowed', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_disallowed_url'), + # Set up a pattern which will correspond to the + # custom 'disallowed_url' above. + url(r'^custom-disallowed/$', + TemplateView.as_view(template_name='registration/registration_closed.html'), + name='registration_test_custom_disallowed'), + # Test the 'register' view with custom redirect + # on successful registration. + url(r'^register-with-success_url/$', + register, + {'success_url': 'registration_test_custom_success_url', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_success_url' + ), + # Pattern for custom redirect set above. + url(r'^custom-success/$', + TemplateView.as_view(template_name='registration/test_template_name.html'), + name='registration_test_custom_success_url'), + (r'', include('registration.backends.default.urls')), + (r'', include('registration.backends.default_with_names.urls')), + (r'', include('search.urls')), + (r'', include('blog.urls')), + (r'', include('mail.urls')), + url(r'^admission/', include('admission.urls')), + url(r'^shad2017/register', 'admission.views.register'), + url(r'^shad2017/activate/(?P\w+)/', 'admission.views.activate'), + url(r'^shad2017/decline/(?P\w+)/', 'admission.views.decline'), + ] diff --git a/dependencies/django-registration/registration/tests/views.py b/dependencies/django-registration(restore)/registration/tests/views.py similarity index 100% rename from dependencies/django-registration/registration/tests/views.py rename to dependencies/django-registration(restore)/registration/tests/views.py diff --git a/dependencies/django-registration/registration/urls.py b/dependencies/django-registration(restore)/registration/urls.py similarity index 100% rename from dependencies/django-registration/registration/urls.py rename to dependencies/django-registration(restore)/registration/urls.py diff --git a/dependencies/django-registration(restore)/registration/views.py b/dependencies/django-registration(restore)/registration/views.py new file mode 100644 index 000000000..84df576be --- /dev/null +++ b/dependencies/django-registration(restore)/registration/views.py @@ -0,0 +1,229 @@ +""" +Views which allow users to create and activate accounts. + +""" + + +from django.shortcuts import redirect +from django.shortcuts import render +from django.template import RequestContext +from django.http import HttpResponse + +from registration.backends import get_backend + +from django.contrib.auth.models import User + + +def activate(request, backend, + template_name='registration/activate.html', + success_url=None, extra_context=None, **kwargs): + """ + Activate a user's account. + + The actual activation of the account will be delegated to the + backend specified by the ``backend`` keyword argument (see below); + the backend's ``activate()`` method will be called, passing any + keyword arguments captured from the URL, and will be assumed to + return a ``User`` if activation was successful, or a value which + evaluates to ``False`` in boolean context if not. + + Upon successful activation, the backend's + ``post_activation_redirect()`` method will be called, passing the + ``HttpRequest`` and the activated ``User`` to determine the URL to + redirect the user to. To override this, pass the argument + ``success_url`` (see below). + + On unsuccessful activation, will render the template + ``registration/activate.html`` to display an error message; to + override thise, pass the argument ``template_name`` (see below). + + **Arguments** + + ``backend`` + The dotted Python import path to the backend class to + use. Required. + + ``extra_context`` + A dictionary of variables to add to the template context. Any + callable object in this dictionary will be called to produce + the end result which appears in the context. Optional. + + ``success_url`` + The name of a URL pattern to redirect to on successful + acivation. This is optional; if not specified, this will be + obtained by calling the backend's + ``post_activation_redirect()`` method. + + ``template_name`` + A custom template to use. This is optional; if not specified, + this will default to ``registration/activate.html``. + + ``\*\*kwargs`` + Any keyword arguments captured from the URL, such as an + activation key, which will be passed to the backend's + ``activate()`` method. + + **Context:** + + The context will be populated from the keyword arguments captured + in the URL, and any extra variables supplied in the + ``extra_context`` argument (see above). + + **Template:** + + registration/activate.html or ``template_name`` keyword argument. + + """ + backend = get_backend(backend) + account = backend.activate(request, **kwargs) + + if account: + if success_url is None: + to, args, kwargs = backend.post_activation_redirect(request, account) + return redirect(to, *args, **kwargs) + else: + return redirect(success_url) + + if extra_context is None: + extra_context = {} + context = RequestContext(request) + for key, value in extra_context.items(): + context[key] = callable(value) and value() or value + + if not kwargs: + kwargs = {} + kwargs['context_instance'] = context + return render(request, template_name, + kwargs, + context) + + +def register(request, backend, success_url=None, form_class=None, + disallowed_url='registration_disallowed', + template_name='registration/registration_form.html', + extra_context=None): + """ + Allow a new user to register an account. + + The actual registration of the account will be delegated to the + backend specified by the ``backend`` keyword argument (see below); + it will be used as follows: + + 1. The backend's ``registration_allowed()`` method will be called, + passing the ``HttpRequest``, to determine whether registration + of an account is to be allowed; if not, a redirect is issued to + the view corresponding to the named URL pattern + ``registration_disallowed``. To override this, see the list of + optional arguments for this view (below). + + 2. The form to use for account registration will be obtained by + calling the backend's ``get_form_class()`` method, passing the + ``HttpRequest``. To override this, see the list of optional + arguments for this view (below). + + 3. If valid, the form's ``cleaned_data`` will be passed (as + keyword arguments, and along with the ``HttpRequest``) to the + backend's ``register()`` method, which should return the new + ``User`` object. + + 4. Upon successful registration, the backend's + ``post_registration_redirect()`` method will be called, passing + the ``HttpRequest`` and the new ``User``, to determine the URL + to redirect the user to. To override this, see the list of + optional arguments for this view (below). + + **Required arguments** + + None. + + **Optional arguments** + + ``backend`` + The dotted Python import path to the backend class to use. + + ``disallowed_url`` + URL to redirect to if registration is not permitted for the + current ``HttpRequest``. Must be a value which can legally be + passed to ``django.shortcuts.redirect``. If not supplied, this + will be whatever URL corresponds to the named URL pattern + ``registration_disallowed``. + + ``form_class`` + The form class to use for registration. If not supplied, this + will be retrieved from the registration backend. + + ``extra_context`` + A dictionary of variables to add to the template context. Any + callable object in this dictionary will be called to produce + the end result which appears in the context. + + ``success_url`` + URL to redirect to after successful registration. Must be a + value which can legally be passed to + ``django.shortcuts.redirect``. If not supplied, this will be + retrieved from the registration backend. + + ``template_name`` + A custom template to use. If not supplied, this will default + to ``registration/registration_form.html``. + + **Context:** + + ``form`` + The registration form. + + Any extra variables supplied in the ``extra_context`` argument + (see above). + + **Template:** + + registration/registration_form.html or ``template_name`` keyword + argument. + + """ + backend = get_backend(backend) + if not backend.registration_allowed(request): + return redirect(disallowed_url) + if form_class is None: + form_class = backend.get_form_class(request) + + if request.method == 'POST': + form = form_class(data=request.POST, files=request.FILES) + if form.is_valid(): + new_user = backend.register(request, **form.cleaned_data) + if success_url is None: + to, args, kwargs = backend.post_registration_redirect(request, new_user) + return redirect(to, *args, **kwargs) + else: + return redirect(success_url) + else: + form = form_class() + + if extra_context is None: + extra_context = {} + context = RequestContext(request) + for key, value in extra_context.items(): + context[key] = callable(value) and value() or value + + return render(request, template_name, + {'form': form}, + context) + + +def ajax_check_username(request): + response = 'false' + if request.is_ajax() and request.method == 'GET' and request.GET['username']: + existing = User.objects.filter(username__iexact=request.GET['username']) + if not existing.exists(): + response = 'true' + + return HttpResponse(response) + + +def ajax_check_email(request): + response = 'false' + if request.is_ajax() and request.method == 'GET' and request.GET['email']: + if not User.objects.filter(email__iexact=request.GET['email']): + response = 'true' + + return HttpResponse(response) \ No newline at end of file diff --git a/dependencies/django-registration(restore)/setup.py b/dependencies/django-registration(restore)/setup.py new file mode 100644 index 000000000..0f0fa37a4 --- /dev/null +++ b/dependencies/django-registration(restore)/setup.py @@ -0,0 +1,48 @@ +from distutils.core import setup +import os + +from registration import get_version + + +# Compile the list of packages available, because distutils doesn't have +# an easy way to do this. +packages, data_files = [], [] +root_dir = os.path.dirname(__file__) +if root_dir: + os.chdir(root_dir) + +for dirpath, dirnames, filenames in os.walk('registration'): + # Ignore dirnames that start with '.' + for i, dirname in enumerate(dirnames): + if dirname.startswith('.'): del dirnames[i] + if '__init__.py' in filenames: + pkg = dirpath.replace(os.path.sep, '.') + if os.path.altsep: + pkg = pkg.replace(os.path.altsep, '.') + packages.append(pkg) + elif filenames: + prefix = dirpath[13:] # Strip "registration/" or "registration\" + for f in filenames: + data_files.append(os.path.join(prefix, f)) + + +setup(name='django-registration', + version=get_version().replace(' ', '-'), + description='An extensible user-registration application for Django', + author='James Bennett', + author_email='james@b-list.org', + url='http://www.bitbucket.org/ubernostrum/django-registration/wiki/', + download_url='http://www.bitbucket.org/ubernostrum/django-registration/get/v0.8.gz', + package_dir={'registration': 'registration'}, + packages=packages, + package_data={'registration': data_files}, + classifiers=['Development Status :: 4 - Beta', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Software Development :: Libraries :: Python Modules', + 'Topic :: Utilities'], + ) diff --git a/dependencies/django-registration/.coveragerc b/dependencies/django-registration/.coveragerc new file mode 100644 index 000000000..dbb613541 --- /dev/null +++ b/dependencies/django-registration/.coveragerc @@ -0,0 +1,16 @@ +[run] +branch = True +omit = + */migrations/* + */south_migrations/* + +source = registration + +[report] +exclude_lines = + # Have to re-enable the standard pragma + pragma: no cover + + # Don't complain if tests don't hit defensive assertion code: + raise NotImplementedError +show_missing = 1 diff --git a/dependencies/django-registration/.gitignore b/dependencies/django-registration/.gitignore new file mode 100644 index 000000000..25d5d4dc2 --- /dev/null +++ b/dependencies/django-registration/.gitignore @@ -0,0 +1,63 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg +include/ +.eggs/ + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Rope +.ropeproject + +# Django stuff: +*.log +*.pot + +dr.sqlite3 + +# Sphinx documentation +docs/_build/ + +# Pycharm +.idea + +# PIP +pip-selfcheck.json diff --git a/dependencies/django-registration/.travis.yml b/dependencies/django-registration/.travis.yml new file mode 100644 index 000000000..8515fa0ee --- /dev/null +++ b/dependencies/django-registration/.travis.yml @@ -0,0 +1,20 @@ +dist: bionic +language: python +python: + - 2.7 + - 3.5 + - 3.6 + - 3.7 + - 3.8 + +install: + pip install -r test-requirements.txt + +before_script: + - rm -rf build + +script: + - make lint && tox + +after_success: + - coveralls diff --git a/dependencies/django-registration/AUTHORS b/dependencies/django-registration/AUTHORS index 14b438b63..3aa65920b 100644 --- a/dependencies/django-registration/AUTHORS +++ b/dependencies/django-registration/AUTHORS @@ -1,4 +1,9 @@ -The primary author of django-registration is James Bennett +The authors of django-registration (redux) can be found at + + +------------------------------------------------- + +The original author of django-registration was James Bennett , who may be found online at . @@ -33,4 +38,6 @@ Others who have contributed to the application: * Nuno Mariz (Portuguese translation) * Patrick Samson (French translation) * Recep Kirmizi (Turkish translation) -* Mohsen Mansouryar (Persian translation) \ No newline at end of file +* Mohsen Mansouryar (Persian translation) +* Jeffrey Long (Testing templates) +* Ilya Baryshev (Test app / config) diff --git a/dependencies/django-registration/CHANGELOG b/dependencies/django-registration/CHANGELOG index 81a6daad1..a7a56a682 100644 --- a/dependencies/django-registration/CHANGELOG +++ b/dependencies/django-registration/CHANGELOG @@ -1,6 +1,288 @@ -============================= -django-registration changelog -============================= +=================================== +django-registration-redux changelog +=================================== + +Version 2.9, TBD +---------------- + + +Version 2.8, 7 May, 2020 +---------------- +* Feature: Greek translations - `#381 +_` + +Version 2.7, 4 January, 2020 +---------------- +* Feature: Django 3.0 support - `#373 +_` +* Feature: Use SHA256 instead of SHA1 for `activation_key` - `#362 +_` +* Bugfix: Changed path reference from 'login' to 'auth_login'. - +`#335 _` + +Version 2.6, 10 April, 2019 +---------------- +* Bugfix: Pass `user` instance instead of `user.get_username()` to template +context. - +`#350 _` +* Feature: Add testing for Django 2.2 and Python 3.7 (no code changes +required). - `#352 +_` +* Bugfix: Send emails on commit `#355 +_` + +Version 2.5, 27 October, 2018 +---------------- +* Feature: Add support for Django 2.1. - +`#337 _` +* Bugfix: Don't delete if user.is_active=True in cleanupregistration. - +`#342 _` + +Version 2.4, 11 April, 2018 +---------------- +* Bugfix: Updates Spanish translation messages. - +`#333 _` + +Version 2.3, 10 April, 2018 +---------------- +* Bugfix: Updates Spanish translation messages. - +`#330 _` + +Version 2.2, 08 February, 2018 +---------------- +* Bugfix: Updates Russian translation messages. - +`#321 _` + +Version 2.1, 17 December, 2018 +---------------- +* Bugfix: Fix formatting issues in documentation. +`#319 _` +* Bugfix: Use ``get_username()`` instead of directly accessing the username to +support subclasses of ``AbstractBaseUser`` +`#318 _` + +Version 2.0, 05 December, 2017 +---------------- +* BACKWARDS-INCOMPATIBLE CHANGE: Remove support for Django < 1.11. +* BACKWARDS-INCOMPATIBLE CHANGE: Remove `registration/urls.py` in favor of +`registration/backends/default/urls.py` +* Feature: Add compatibility for Django 2.0. + +Version 1.9, 16 November, 2017 +---------------- +* Bugfix: Fix ``SupervisedRegistrationProfile`` so expiration depends on +profiles that have completed the entire process or have exceeded the +``ACCOUNT_ACTIVATION_DAYS`` - +`#310 _` +* Bugfix: Prevent resending an activation email if multiple +``RegistrationProfile`` objects exist for the given email address. - +`#311 _` +* Bugfix: Add logging to ``RegistrationProfile.delete_expired_users``, use +``profile.activated`` instead of ``user.is_active``. - +`#308 _` +* BACKWARDS-INCOMPATIBLE CHANGE: Change of return signature of +``RegistrationProfileManager.activate_user``. A tuple containing the User +instance and a boolean of whether or not said user was activated is now +returned. - +`#309 `_. +* Bugfix: Updates `pt_BR` translation messages. - +`#305 _` +* Bugfix: Update all translation strings with `django-admin makemessages --all`. - +`#304 _` +* Feature: Configure from email address from ``Site`` object. - +`#294 _` + +Version 1.8, 03 October, 2017 +---------------- +* Bugfix: Add `outlook.com` to the list of free email providers. - +`#287 _` +* Documentation: Add possible settings for activation emails. - +`#283 _` +* Feature: Added `REGISTRATION_ADMINS` setting to support different admins +(than those in `ADMINS`) in charge of registration. Falls back to `ADMINS` in +case this is not set. - +`#279 _` +* Documentation: Added documentation regarding admin approval registration. - +`#279 _` +* Redirect logged in users away from the registration page if authenticated. - +`#262 _` +* Document how to send password reset email with HTML content. - +`#276 _` + +Version 1.7, 18 July, 2017 +---------------- +* Fix security issue of leaking password reset token through the Referer +header. - `#268 _` +* Fix migration issue when using multiple databases - `#264 _` +* Improve German translation - `#259 _` +* Fix bug in templates if password reset is unsuccessful - `#269 +_` + +Version 1.6, 25 April, 2017 +---------------- + +* Feature: Make search for email case insensitive when resending activation +email. + `#250 `_. +* Feature: Add ``RegistrationFormUsernameLowercase`` to force all usernames to +lowercase. + `#251 `_. + +Version 1.5, 08 April, 2017 +---------------- + +* BACKWARDS-INCOMPATIBLE CHANGE: Remove support for Django 1.7. +* BACKWARDS-INCOMPATIBLE CHANGE: Change signature of +``RegistrationProfileManager.activate_user``. +``site`` is now a required positional argument. + `#244 `_. +* Feature: Added workflow to resend activation email. See + `#161 `_. +* Enhancement: Separate logic between account creation and activation. + See: `#171 `_. +* Bugfix: Add page title to `activate.html` +* Feature: Added a 3-step registration flow requiring manual admin approval. + See: `#184 `_. +* Enhancement: Using a more cryptographically secure method for generating +activation keys. + See: `#213 `_. +* Bugfix: Add redirection setting for simple backend after successful +registration. + See: `#239 `_. +* Bugfix: Use dict instead of `RequestContext` when sending activation email. +- + See: `#194 `_. + +Version 1.4, 21 February, 2016 +------------------------------ + +* BACKWARDS-INCOMPATIBLE CHANGE: Remove unnecessary `_RequestPassingFormView`. + See `#56 `_. + +* Compatibility: Added support for Django 1.10 + +* Bugfix: Pass request object into `resend_activation_mail` so the email + template can render the site URL with the correct schema (HTTP, HTTPS). + +* Bugfix: Ensure `register` method has consistent arguments. + See `#153 `_. + +* Enhancement: Add invoke tasks, requirements.txt file, and make wrapper to + help developers get setup. + See `#154 `_. + +Version 1.3, 12 January, 2016 +----------------------------- + +* Add support for Django 1.9. django-registration supports Django 1.7 and newer. + +* Feature: Added `resend_activation_mail` method to `RegistrationManager`. + +* Feature: Added support for additional registration forms; + `RegistrationFormTOSAndUniqueEmail` and `RegistrationFormTOSAndNoFreeEmail`. + See `#113 `_. + +* Bugfix: Properly extend the base registration template. + +* Enhancement: Re-enable Python 3.3 support. + +* Enhancement: Distinguish between account activation failure and attempted + reactivation. See `#72 `_. + +* Bugfix: Install an unzipped package in order to support running migrations. + See `#104 `_. + +* Feature: Added Thai, Hungarian, and Russian localizations. + +* Feature: Added support for specifying template paths for activation email. + + +Version 1.2, 11 May, 2015 +------------------------- + +* BACKWARDS-INCOMPATIBLE CHANGE: When overriding the + `registration/activation_email.txt` template, you must also now override the + `registration/activation_email.html` template or set the setting + (`REGISTRATION_EMAIL_HTML`) to `False`. + +* BACKWARDS-INCOMPATIBLE CHANGE: An initial migration for Django > 1.7 has been + provided. South users will need to configure a null migration with + (`SOUTH_MIGRATION_MODULES`). + +* BACKWARDS-INCOMPATIBLE CHANGE: A `base.html` template is now assumed to + exist. + +* Feature: Added support for disabling HTML emails using the setting option + `REGISTRATION_EMAIL_HTML`. + +* Feature: Added settings' options that allows to exlude the default auth urls + (`INCLUDE_AUTH_URLS`) and register url (`INCLUDE_REGISTER_URL`). + +* Feature: Added support to dynamically import any chosen registration form + using the settings option `REGISTRATION_FORM`. + +* Enhancement: Make `RegistrationForm` a subclass of Django's + `UserCreationForm` + +* Enhancement: Use registration form `save` method to create user instance, + whenever form is a subclass of Django's `ModelForm`. + + + +Version 1.1, 19 September, 2014 +------------------------------- + +This represents the first release of `django-registration-redux`. +It is based off the defunct v1.0 `django-registration` abandoned by James Bennett. + +* Compatibility: Added support for Python 3.x. + +* Compatibility: Added support for Django 1.6, 1.7. + +* Feature: Added support for mime/multipart HTML / Text registration + emails. + +* Feature: Added `REGISTRATION_EMAIL_SUBJECT_PREFIX` config. + +* Feature: Added support for `REGISTRATION_AUTO_LOGIN` config. + +* Feature: Added support for `SEND_ACTIVATION_EMAIL` config. + +* Bugfix: Signal "user_activated" was being sent twice. + +* Bugfix: Fixed broken tests. + +The change log below is from the versions maintained +by James Bennett. + + +Version 1.0, 17 June 2013 +------------------------- + +(Taken from release-notes.rst in this release) + +* The 1.0 release of django-registration represents a complete + rewrite of the previous codebase. For information on upgrading, + consult :ref:`the upgrade guide `. + +* The largest overall change is that in place of the monolithic backend + classes and function-based views found in django-registration 0.8, in + 1.0 all views are class-based. A "backend" now consists of, + typically, one or two subclasses of :ref:`the built-in base views + `. + +* Implementing these as class-based views allows for far simpler + configuration and customization, without the overhead involved in + supporting large numbers of optional keyword arguments to + function-based views, or the need to provide a separate class-based + infrastructure for implementing the logic of registration. + +* Notably, this implementation is also completely backwards-compatible + for users of django-registration 0.8 who simply used the recommended + default URLConf for one of the supplied backends; those URLConfs exist + in the same locations, and have been rewritten to point to the + appropriate class-based views with the appropriate options. + Version 0.8, 24 March 2012: --------------------------- @@ -236,4 +518,4 @@ http://django-registration.googlecode.com/files/registration-0.1.tar.gz * First packaged version using distutils. -* Added docs/ directory and overview. +* Added docs/ directory and overview. diff --git a/dependencies/django-registration/LICENSE b/dependencies/django-registration/LICENSE index d3587f388..e0d66d13c 100644 --- a/dependencies/django-registration/LICENSE +++ b/dependencies/django-registration/LICENSE @@ -1,4 +1,6 @@ -Copyright (c) 2007-2012, James Bennett +Copyright (c) 2007-2013, James Bennett +Copyright (c) 2014-2017, Andrew Cutler, Stephen DiCato, Joshua Blum, and others +(see AUTHORS) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/dependencies/django-registration/MANIFEST.in b/dependencies/django-registration/MANIFEST.in index 2ee0377c0..dd3e5c7f5 100644 --- a/dependencies/django-registration/MANIFEST.in +++ b/dependencies/django-registration/MANIFEST.in @@ -2,7 +2,9 @@ include CHANGELOG include INSTALL include LICENSE include MANIFEST.in -include README +include README.rst include AUTHORS recursive-include docs * +prune docs/_build recursive-include registration/locale * +recursive-include registration/templates * diff --git a/dependencies/django-registration/Makefile b/dependencies/django-registration/Makefile new file mode 100644 index 000000000..a75756db4 --- /dev/null +++ b/dependencies/django-registration/Makefile @@ -0,0 +1,37 @@ +.PHONY: installdeps\ + build\ + test\ + lint\ + clean \ + release + +installdeps: + pip install -U -r requirements.txt + +build: + invoke build $(ARGS) + +test: + invoke test + +lint: + invoke lint + +clean: + invoke clean $(ARGS) + +release: clean lint test + ifeq ($(TAG_NAME),) + $(error Usage: make release TAG_NAME=) + endif + # NOTE(joshblum): First you should update the changelog and bump the + # version in setup.py + git clean -dxf + git tag $(TAG_NAME) + git push --tags + # Create the wheels for Python2 and Python3. + python setup.py sdist bdist_wheel --universal + # To check whether the README formats properly. + twine check dist/* + # Upload to pypi. + twine upload dist/* diff --git a/dependencies/django-registration/README.rst b/dependencies/django-registration/README.rst new file mode 100644 index 000000000..8def36239 --- /dev/null +++ b/dependencies/django-registration/README.rst @@ -0,0 +1,110 @@ +.. -*-restructuredtext-*- + +:Description: Django-registration provides user registration functionality for Django websites. +:maintainers: Macropin_, DiCato_, and joshblum_ +:contributors: `list of contributors `_ + +.. _Macropin: https://github.com/macropin +.. _DiCato: https://github.com/dicato +.. _joshblum: https://github.com/joshblum + +.. image:: https://travis-ci.org/macropin/django-registration.svg?branch=master + :target: https://travis-ci.org/macropin/django-registration + +.. image:: https://coveralls.io/repos/macropin/django-registration/badge.svg?branch=master + :target: https://coveralls.io/r/macropin/django-registration/ + +.. image:: https://badge.fury.io/py/django-registration-redux.svg + :target: https://pypi.python.org/pypi/django-registration-redux/ + +.. image:: https://readthedocs.org/projects/django-registration-redux/badge/?version=latest + :target: http://django-registration-redux.readthedocs.org/en/latest/?badge=latest + :alt: Documentation Status + +.. image:: https://img.shields.io/pypi/pyversions/django-registration-redux.svg + :target: https://pypi.python.org/pypi/django-registration-redux + +If you have issues with the "django-registration-redux" package then please `raise them here`_. + +This is a fairly simple user-registration application for Django, designed to +make allowing user signups as painless as possible. It requires a functional +installation of Django 1.11 or newer, but has no other dependencies. + + +Installation +------------ + +Install, upgrade and uninstall django-registration-redux with these commands:: + + pip install django-registration-redux + pip install --upgrade django-registration-redux + pip uninstall django-registration-redux + +To install it manually, run the following command inside this source directory:: + + python setup.py install + + +Or if you'd prefer you can simply place the included ``registration`` +directory somewhere on your Python path, or symlink to it from +somewhere on your Python path; this is useful if you're working from a +Git checkout. + +Note that this application requires Python 2.7/3.5 or later, and a +functional installation of Django 1.11 or newer. + +If you are running on Django <=1.11, you can install a previous version of +`django-registration-redux`, which supports older versions of Django. See the +`CHANGELOG`_ for support details. Older versions will receive minor bug fixes as +needed, but are no longer actively developed:: + + pip install django-registration-redux==1.10 + + +Getting started with development +-------------------------------- + +To get started with development, first install the required packages:: + + make installdeps + +For convenience a ``Makefile`` is included which wraps the Python `invoke +`_ library. Once you work on a patch, you can test +the functionality by running:: + + make test + +Or equivalently:: + + invoke test + +Command line arguments can be passed to the ``invoke`` script through the +``Makefile`` via the ``ARGS`` parameter. For example:: + + make build ARGS=--docs + +Or equivalently:: + + invoke build --docs + +Alternatives +------------ + +`djangopackages.com `_ +has a comprehensive comparison of Django packages used for user registration +and authentication. + +For example, `django-allauth `_ +is an alternative to django-registration-redux that provides user registration +in addition to social authentication and email address management. + +License +------- + +Django-registration-redux is licensed under `BSD License`. + + + +.. _`available online`: https://django-registration-redux.readthedocs.org/ +.. _`raise them here`: https://github.com/macropin/django-registration/issues +.. _`CHANGELOG`: https://github.com/macropin/django-registration/blob/master/CHANGELOG diff --git a/dependencies/django-registration/docs/admin-approval-backend.rst b/dependencies/django-registration/docs/admin-approval-backend.rst new file mode 100644 index 000000000..ad6a78877 --- /dev/null +++ b/dependencies/django-registration/docs/admin-approval-backend.rst @@ -0,0 +1,42 @@ +.. _admin-approval-backend: +.. module:: registration.backends.admin_approval + +The admin approval backend +========================== + +As an alternative to :ref:`the default backend `, and +an example of writing alternate workflows, |project| bundles +an approval-needed registration system in +``registration.backend.admin_approval``. This backend's workflow is similar to +the default with one extra step of approval from an admin. Specifically the +steps are the following: + +1. A user signs up by filling out a registration form. + +2. The user confirms the account by following the link sent to the email + address supplied during registration. + +3. An admin receives an email with a link that will approve the user + registration. + +4. When the admin approves the request, the user receives an email informing + them that they can now login. + + +Configuration +------------- + +To make use of this backend, simply include the URLConf +``registration.backends.admin_approval.urls`` at whatever location you choose +in your URL hierarchy. + +This backend makes use of the same settings documented in +:ref:`the default backend ` plus the following settings: + +``REGISTRATION_ADMINS`` + A list with the same structure as the ``ADMINS`` Django setting containing + names and emails. Approval emails will be sent to the emails defined here. + If this setting is not set (or is empty), emails defined in ``ADMINS`` + will be used. Optionally, this can be defined as a string with the path + of a callable that returns a list of the same structure as the + ``ADMINS`` setting. diff --git a/dependencies/django-registration/docs/conf.py b/dependencies/django-registration/docs/conf.py index 068994bd5..1732b64ce 100644 --- a/dependencies/django-registration/docs/conf.py +++ b/dependencies/django-registration/docs/conf.py @@ -11,7 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import os +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -37,17 +38,17 @@ master_doc = 'index' # General information about the project. -project = u'django-registration' -copyright = u'2007-2012, James Bennett' +project = u'django-registration-redux' +copyright = u'2007-2013, James Bennett. 2014-2017, Andrew Cutler and others.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.8' +version = '2.8' # The full version, including alpha/beta/rc tags. -release = '0.8' +release = '2.8' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -120,7 +121,7 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +#html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. @@ -158,7 +159,7 @@ #html_file_suffix = '' # Output file base name for HTML help builder. -htmlhelp_basename = 'django-registrationdoc' +htmlhelp_basename = 'django-registration-reduxdoc' # -- Options for LaTeX output -------------------------------------------------- @@ -172,7 +173,7 @@ # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'django-registration.tex', u'django-registration Documentation', + ('index', 'django-registration-redux.tex', u'django-registration-redux Documentation', u'James Bennett', 'manual'), ] @@ -192,3 +193,6 @@ # If false, no module index is generated. #latex_use_modindex = True + + +rst_epilog = '.. |project| replace:: %s' % project diff --git a/dependencies/django-registration/docs/default-backend.rst b/dependencies/django-registration/docs/default-backend.rst index a557a64ad..a63667790 100644 --- a/dependencies/django-registration/docs/default-backend.rst +++ b/dependencies/django-registration/docs/default-backend.rst @@ -4,9 +4,8 @@ The default backend =================== -A default :ref:`registration backend ` is bundled with -django-registration, as the class -``registration.backends.default.DefaultBackend``, and implements a +A default registration backend is bundled with |project|, +as the module ``registration.backends.default``, and implements a simple two-step workflow in which a new user first registers, then confirms and activates the new account by following a link sent to the email address supplied during registration. @@ -15,6 +14,10 @@ email address supplied during registration. Default behavior and configuration ---------------------------------- +To make use of this backend, simply include the URLConf +``registration.backends.default.urls`` at whatever location you choose +in your URL hierarchy. + This backend makes use of the following settings: ``ACCOUNT_ACTIVATION_DAYS`` @@ -29,21 +32,53 @@ This backend makes use of the following settings: is optional, and a default of ``True`` will be assumed if it is not supplied. +``INCLUDE_AUTH_URLS`` + A boolean (either ``True`` or ``False``) indicating whether auth urls + (mapped to ``django.contrib.auth.views``) should be included in the + ``urlpatterns`` of the application backend. + +``INCLUDE_REGISTER_URL`` + A boolean (either ``True`` or ``False``) indicating whether the view + for registering accounts should be included in the ``urlpatterns`` + of the application backend. + +``REGISTRATION_FORM`` + A string dotted path to the desired registration form. + +``ACTIVATION_EMAIL_SUBJECT`` + A string slashed path to the desired template for the activation email subject. + +``ACTIVATION_EMAIL_BODY`` + A string slashed path to the desired template for the activation email body. + +``ACTIVATION_EMAIL_HTML`` + A string slashed path tot the desired template for the activation email html. + By default, this backend uses :class:`registration.forms.RegistrationForm` as its form class for user registration; this can be overridden by passing the keyword argument ``form_class`` to the :func:`~registration.views.register` view. +Two views are provided: +``registration.backends.default.views.RegistrationView`` and +``registration.backends.default.views.ActivationView``. These views +subclass |project|'s base +:class:`~registration.views.RegistrationView` and +:class:`~registration.views.ActivationView`, respectively, and +implement the two-step registration/activation process. + Upon successful registration -- not activation -- the default redirect is to the URL pattern named ``registration_complete``; this can be -overridden by passing the keyword argument ``success_url`` to the -:func:`~registration.views.register` view. +overridden in subclasses by changing +:attr:`~registration.views.RegistrationView.success_url` or +implementing +:meth:`~registration.views.RegistrationView.get_success_url()` Upon successful activation, the default redirect is to the URL pattern -named ``registration_activation_complete``; this can be overridden by -passing the keyword argument ``success_url`` to the -:func:`~registration.views.activate` view. +named ``registration_activation_complete``; this can be overridden in +subclasses by implementing +:meth:`~registration.views.ActivationView.get_success_url()`. How account data is stored for activation @@ -80,16 +115,15 @@ the database, using the following model: .. attribute:: activation_key - A 40-character ``CharField``, storing the activation key for the - account. Initially, the activation key is the hexdigest of a - SHA1 hash; after activation, this is reset to :attr:`ACTIVATED`. - - Additionally, one class attribute exists: + A 64-character ``CharField``, storing the activation key for the + account. The activation key is the hexdigest of a SHA256 hash. - .. attribute:: ACTIVATED + .. attribute:: activated - A constant string used as the value of :attr:`activation_key` - for accounts which have been activated. + A ``BooleanField``, storing whether or not the the User has activated + their account. Storing this independent from ``self.user.is_active`` + allows accounts to be deactivated and prevent being reactivated without + authorization. And the following methods: @@ -99,7 +133,7 @@ the database, using the following model: and returns a boolean (``True`` if expired, ``False`` otherwise). Uses the following algorithm: - 1. If :attr:`activation_key` is :attr:`ACTIVATED`, the account + 1. If :attr:`activated` is ``True``, the account has already been activated and so the key is considered to have expired. @@ -111,7 +145,7 @@ the database, using the following model: :rtype: bool - .. method:: send_activation_email(site) + .. method:: send_activation_email(site[, request]) Sends an activation email to the address of the account. @@ -140,6 +174,14 @@ the database, using the following model: `_ for details regarding these objects' interfaces. + ``request`` + Django's ``HttpRequest`` object for better flexibility. + When provided, it will also provide all the data via + installed template context processors which can provide + even more flexibility by using many Django's provided + and custom template context processors to provide more + variables to the template. + Because email subjects must be a single line of text, the rendered output of ``registration/activation_email_subject.txt`` will be forcibly condensed to a single line. @@ -148,6 +190,12 @@ the database, using the following model: was registered. :type site: ``django.contrib.sites.models.Site`` or ``django.contrib.sites.models.RequestSite`` + :param request: Optional Django's ``HttpRequest`` object + from view which if supplied will be passed to the template + via ``RequestContext``. As a consequence, all installed + ``TEMPLATE_CONTEXT_PROCESSORS`` will be used to populate + context. + :type request: ``django.http.request.HttpRequest`` :rtype: ``None`` @@ -160,23 +208,24 @@ Additionally, :class:`RegistrationProfile` has a custom manager This manager provides several convenience methods for creating and working with instances of :class:`RegistrationProfile`: - .. method:: activate_user(activation_key) + .. method:: activate_user(activation_key, site) Validates ``activation_key`` and, if valid, activates the associated account by setting its ``is_active`` field to ``True``. To prevent re-activation of accounts, the - :attr:`~RegistrationProfile.activation_key` of the + :attr:`~RegistrationProfile.activated` of the :class:`RegistrationProfile` for the account will be set to - :attr:`RegistrationProfile.ACTIVATED` after successful - activation. + ``True`` after successful activation. - Returns the ``User`` instance representing the account if - activation is successful, ``False`` otherwise. + Returns a tuple of (``User``, ``activated``) representing the account if + activation is successful and whether the ``User`` was activated or not. :param activation_key: The activation key to use for the activation. - :type activation_key: string, a 40-character SHA1 hexdigest - :rtype: ``User`` or bool + :type activation_key: string, a 64-character SHA256 hexdigest + :type site: ``django.contrib.sites.models.Site`` or + ``django.contrib.sites.models.RequestSite`` + :rtype: (``User``, ``bool) .. method:: delete_expired_users @@ -199,18 +248,16 @@ Additionally, :class:`RegistrationProfile` has a custom manager :rtype: ``None`` - .. method:: create_inactive_user(username, email, password, site[, send_email]) + .. method:: create_inactive_user(site, [new_user=None, send_email=True, request=None, **user_info]) Creates a new, inactive user account and an associated instance of :class:`RegistrationProfile`, sends the activation email and returns the new ``User`` object representing the account. - :param username: The username to use for the new account. - :type username: string - :param email: The email address to use for the new account. - :type email: string - :param password: The password to use for the new account. - :type password: string + :param new_user: The user instance. + :type new_user: ``django.contrib.auth.models.AbstractBaseUser``` + :param user_info: The fields to use for the new account. + :type user_info: dict :param site: An object representing the site on which the account is being registered. :type site: ``django.contrib.sites.models.Site`` or @@ -221,6 +268,12 @@ Additionally, :class:`RegistrationProfile` has a custom manager ``False``, no email will be sent (but the account will still be inactive) :type send_email: bool + :param request: If ``send_email`` parameter is ``True`` + and if ``request`` is supplied, it will be passed to the + email templates for better flexibility. + Please take a look at the sample email templates + for better explanation how it can be used. + :type request: ``django.http.request.HttpRequest`` :rtype: ``User`` .. method:: create_profile(user) @@ -229,7 +282,7 @@ Additionally, :class:`RegistrationProfile` has a custom manager the account represented by ``user``. The ``RegistrationProfile`` created by this method will have its - :attr:`~RegistrationProfile.activation_key` set to a SHA1 hash + :attr:`~RegistrationProfile.activation_key` set to a SHA256 hash generated from a combination of the account's username and a random salt. diff --git a/dependencies/django-registration/docs/faq.rst b/dependencies/django-registration/docs/faq.rst index cd03cd5d5..4e63c8262 100644 --- a/dependencies/django-registration/docs/faq.rst +++ b/dependencies/django-registration/docs/faq.rst @@ -4,22 +4,22 @@ Frequently-asked questions ========================== The following are miscellaneous common questions and answers related -to installing/using django-registration, culled from bug reports, +to installing/using |project|, culled from bug reports, emails and other sources. General ------- -**What license is django-registration under?** - django-registration is offered under a three-clause BSD-style +**What license is django-registration-redux under?** + |project| is offered under a three-clause BSD-style license; this is `an OSI-approved open-source license `_, and allows - you a large degree of freedom in modifiying and redistributing the + you a large degree of freedom in modifying and redistributing the code. For the full terms, see the file ``LICENSE`` which came with - your copy of django-registration; if you did not receive a copy of - this file, you can view it online at - . + your copy of |project|; if you did not receive a copy of + this file, you can `view it online + `_. **Why are the forms and models for the default backend not in the default backend?** The model and manager used by :ref:`the default backend @@ -29,7 +29,7 @@ General ``registration.backends.default``, but there are several reasons why that's not such a good idea: - 1. Older versions of django-registration made use of the model and + 1. Older versions of |project| made use of the model and form classes, and moving them would create an unnecessary backwards incompatibility: ``import`` statements would need to be changed, and some database updates would be needed to @@ -57,77 +57,39 @@ General Installation and setup ---------------------- -**How do I install django-registration?** +**How do I install django-registration-redux?** Full instructions are available in :ref:`the quick start guide `. -**Do I need to put a copy of django-registration in every project I use it in?** +**Do I need to put a copy of django-registration-redux in every project I use it in?** No; putting applications in your project directory is a very bad habit, and you should stop doing it. If you followed the - instructions mentioned above, django-registration was installed + instructions mentioned above, |project| was installed into a location that's on your Python import path, so you'll only ever need to add ``registration`` to your ``INSTALLED_APPS`` setting (in any project, or in any number of projects), and it will work. -**Does django-registration come with any sample templates I can use right away?** - No, for two reasons: - - 1. Providing default templates with an application is generally - hard to impossible, because different sites can have such - wildly different design and template structure. Any attempt to - provide templates which would work with all the possibilities - would probably end up working with none of them. - - 2. A number of things in django-registration depend on the - specific :ref:`registration backend ` you use, - including the variables which end up in template - contexts. Since django-registration has no way of knowing in - advance what backend you're going to be using, it also has no - way of knowing what your templates will need to look like. - - Fortunately, however, django-registration has good documentation - which explains what context variables will be available to - templates, and so it should be easy for anyone who knows Django's - template system to create templates which integrate with their own - site. - Configuration ------------- **Do I need to rewrite the views to change the way they behave?** - No. There are several ways you can customize behavior without - making any changes whatsoever: - - * Pass custom arguments -- e.g., to specify forms, template names, - etc. -- to :ref:`the registration views `. - - * Use the :ref:`signals ` sent by the views to add custom - behavior. - - * Write a custom :ref:`registration backend ` which - implements the behavior you need, and have the views use your - backend. - - If none of these are sufficient, your best option is likely to - simply write your own views; however, it is hoped that the level - of customization exposed by these options will be sufficient for - nearly all user-registration workflows. - -**How do I pass custom arguments to the views?** - Part 3 of the official Django tutorial, when it `introduces - generic views - `_, - covers the necessary mechanism: simply provide a dictionary of - keyword arguments in your URLconf. - -**Does that mean I should rewrite django-registration's default URLconf?** - No; if you'd like to pass custom arguments to the registration - views, simply write and include your own URLconf instead of - including the default one provided with django-registration. + Not always. Any behavior controlled by an attribute on a + class-based view can be changed by passing a different value for + that attribute in the URLConf. See `Django's class-based view + documentation + `_ + for examples of this. + + For more complex or fine-grained control, you will likely want to + subclass :class:`~registration.views.RegistrationView` or + :class:`~registration.views.ActivationView`, or both, add your + custom logic to your subclasses, and then create a URLConf which + makes use of your subclasses. + **I don't want to write my own URLconf because I don't want to write patterns for all the auth views!** - You're in luck, then; django-registration provides a URLconf which + You're in luck, then; |project| provides a URLconf which *only* contains the patterns for the auth views, and which you can include in your own URLconf anywhere you'd like; it lives at ``registration.auth_urls``. @@ -142,18 +104,18 @@ Troubleshooting **I've got functions listening for the registration/activation signals, but they're not getting called!** - The most common cause of this is placing django-registration in a + The most common cause of this is placing |project| in a sub-directory that's on your Python import path, rather than installing it directly onto the import path as normal. Importing - from django-registration in that case can cause various issues, + from |project| in that case can cause various issues, including incorrectly connecting signal handlers. For example, if - you were to place django-registration inside a directory named + you were to place |project| inside a directory named ``django_apps``, and refer to it in that manner, you would end up with a situation where your code does this:: from django_apps.registration.signals import user_registered - But django-registration will be doing:: + But |project| will be doing:: from registration.signals import user_registered @@ -163,21 +125,24 @@ Troubleshooting when the signal is sent using the second import. To avoid this problem, follow the standard practice of installing - django-registration directly on your import path and always + |project| directly on your import path and always referring to it by its own module name: ``registration`` (and in general, it is always a good idea to follow normal Python practices for installing and using Django applications). +**I want to use custom templates, but django keeps using the admin templates instead of mine!** + + To fix this, make sure that in the ``INSTALLED_APPS`` of your + ``settings.py`` the entry for the ``registration`` app is placed + above ``django.contrib.admin``. Tips and tricks --------------- **How do I log a user in immediately after registration or activation?** - You can most likely do this simply by writing a function which - listens for the appropriate :ref:`signal `; your function - should set the ``backend`` attribute of the user to the correct - authentication backend, and then call - ``django.contrib.auth.login()`` to log the user in. + Take a look at the implementation of :ref:`the simple backend + `, which logs a user in immediately after + registration. **How do I re-send an activation email?** Assuming you're using :ref:`the default backend @@ -192,4 +157,29 @@ Tips and tricks In the default backend, a custom admin action is provided for this. In the admin for the ``RegistrationProfile`` model, click the checkbox for the user(s) you'd like to activate, then select - the "Activate users" action. \ No newline at end of file + the "Activate users" action. + +**How do I send an email with html content?** + By default, the email content will only be plain text. To allow HTML + content to be sent, you should add a url pattern before including + ``django-registration``'s urls (i.e ``registration.backends.default.urls``). + For example, if your email template is ``registration/password_reset_email.html``, + your ``urls.py`` could look like:: + + from django.conf.urls import url, include + from django.contrib.auth import views as auth_views + from django.urls import reverse_lazy + + url(r'^password/reset/$', + auth_views.PasswordResetView.as_view( + success_url=reverse_lazy('auth_password_reset_done'), + html_email_template_name='registration/password_reset_email.html' + ), name='auth_password_reset'), + + # other url patterns + + # last the default registration backends + url(r'', include('registration.backends.default.urls')), + + We provide default HTML templates in the + ``registration/templates/registration`` directory. diff --git a/dependencies/django-registration/docs/forms.rst b/dependencies/django-registration/docs/forms.rst index ce5ca419f..e53596bd5 100644 --- a/dependencies/django-registration/docs/forms.rst +++ b/dependencies/django-registration/docs/forms.rst @@ -4,10 +4,10 @@ Forms for user registration =========================== -Several form classes are provided with django-registration, covering +Several form classes are provided with |project|, covering common cases for gathering account information and implementing common constraints for user registration. These forms were designed with -django-registration's :ref:`default backend ` in +|project|'s :ref:`default backend ` in mind, but may also be useful in other situations. @@ -34,17 +34,13 @@ mind, but may also be useful in other situations. ``password2`` The password to use for the new account. This represented as a password input (``input type="password"`` in the rendered HTML). + Password mismatches are recorded as errors of ``password2``. The constraints on usernames and email addresses match those enforced by Django's default authentication backend for instances of ``django.contrib.auth.models.User``. The repeated entry of the password serves to catch typos. - Because it does not apply to any single field of the form, the - validation error for mismatched passwords is attached to the form - itself, and so must be accessed via the form's - ``non_field_errors()`` method. - .. class:: RegistrationFormTermsOfService @@ -96,5 +92,34 @@ mind, but may also be useful in other situations. * ``yahoo.com`` + * ``outlook.com`` + To change this, subclass this form and set the class attribute ``bad_domains`` to a list of domains you wish to disallow. + + +Multiple Form Inheritance +------------------------- + +Multiple :class:`RegistrationForm` subclasses can be inherited into one class. +For instance, if your project requires a terms of service and a unique email +upon registration, those subclasses can be inherited into a single class. That +would look like this:: + + # myapp/forms.py + class CustomForm(RegistrationFormTermsOfService, RegistrationFormUniqueEmail): + pass + +NOTE: If inheriting both :class:`RegistrationFormNoFreeEmail` and +:class:`RegistrationFormUniqueEmail`. :class:`RegistrationFormNoFreeEmail` +must be inherited first, like this:: + + # myapp/forms.py + class CustomForm(RegistrationFormNoFreeEmail, RegistrationFormUniqueEmail): + pass + +You can also add any customization to the form, to add additional fields for +example. Once you have built your form you must update the +``REGISTRATION_FORM`` reflect the string dotted path to the form you wish +to use. For our example in ``settings.py`` you would change +``REGISTRATION_FORM = 'myapp.forms.CustomForm'``. diff --git a/dependencies/django-registration/docs/index.rst b/dependencies/django-registration/docs/index.rst index 35c6b361e..8d8e55726 100644 --- a/dependencies/django-registration/docs/index.rst +++ b/dependencies/django-registration/docs/index.rst @@ -1,31 +1,38 @@ -.. django-registration documentation master file, created by +.. django-registration-redux documentation master file, created by sphinx-quickstart on Mon Jun 22 02:57:42 2009. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -django-registration 0.8 documentation -===================================== +|project| |version| documentation +================================= -This documentation covers the 0.8 release of django-registration, a -simple but extensible application providing user registration -functionality for `Django `_-powered -websites. +This documentation covers the |version| release of +|project|, a simple but extensible application providing +user registration functionality for `Django +`_ powered websites. -Although nearly all aspects of the registration process are -customizable, the default setup of django-registration attempts to -cover the most common use case: two-phase registration, consisting of -initial signup followed by a confirmation email which contains -instructions for activating the new account. +Although nearly all aspects of the registration process are customizable, +out-of-the-box support is provided for the following use cases: + +* One-phase registration, where a user signs up and is immediately + active and logged in. + +* Two-phase registration, consisting of initial signup followed by a + confirmation email with instructions for activating the new account. + +* Three-phase registration, where a user signs up, confirms their account via + email, and then an admin approves the account allowing the user to login. To get up and running quickly, consult the :ref:`quick-start guide `, which describes all the necessary steps to install -django-registration and configure it for the default workflow. For +|project| and configure it for the default workflow. For more detailed information, including how to customize the registration process (and support for alternate registration systems), read through the documentation listed below. -If you are upgrading from a previous release, please read the -:ref:`upgrade guide ` for information on what's changed. +If you are upgrading from a previous release, please read the `CHANGELOG +`_ for +information on what's changed. Contents: @@ -35,9 +42,9 @@ Contents: quickstart release-notes upgrade - backend-api default-backend simple-backend + admin-approval-backend forms views signals @@ -47,9 +54,5 @@ Contents: * `Django's authentication documentation `_; Django's - authentication system is used by django-registration's default + authentication system is used by |project|'s default configuration. - - * `django-profiles - `_, an - application which provides simple user-profile management. diff --git a/dependencies/django-registration/docs/quickstart.rst b/dependencies/django-registration/docs/quickstart.rst index b04ba4941..0bffaff9f 100644 --- a/dependencies/django-registration/docs/quickstart.rst +++ b/dependencies/django-registration/docs/quickstart.rst @@ -3,26 +3,26 @@ Quick start guide ================= -Before installing django-registration, you'll need to have a copy of +Before installing |project|, you'll need to have a copy of `Django `_ already installed. For the -|version| release, Django 1.1 or newer is required. +|version| release, Django 1.11 or newer is required. For further information, consult the `Django download page `_, which offers convenient packaged downloads and installation instructions. -Installing django-registration ------------------------------- +Installing |project| +-------------------- -There are several ways to install django-registration: +There are several ways to install |project|: * Automatically, via a package manager. * Manually, by downloading a copy of the release package and installing it yourself. -* Manually, by performing a Mercurial checkout of the latest code. +* Manually, by performing a Git checkout of the latest code. It is also highly recommended that you learn to use `virtualenv `_ for development and @@ -39,30 +39,17 @@ Automatic installation via a package manager ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Several automatic package-installation tools are available for Python; -the most popular are `easy_install -`_ and `pip -`_. Either can be used to install -django-registration. - -Using ``easy_install``, type:: - - easy_install -Z django-registration - -Note that the ``-Z`` flag is required, to tell ``easy_install`` not to -create a zipped package; zipped packages prevent certain features of -Django from working properly. +the recommended one is `pip `_. Using ``pip``, type:: - pip install django-registration + pip install django-registration-redux It is also possible that your operating system distributor provides a -packaged version of django-registration (for example, `Debian -GNU/Linux `_ provides a package, installable via -``apt-get-install python-django-registration``). Consult your +packaged version of |project|. Consult your operating system's package list for details, but be aware that third-party distributions may be providing older versions of -django-registration, and so you should consult the documentation which +|project|, and so you should consult the documentation which comes with your operating system's package. @@ -70,16 +57,16 @@ Manual installation from a downloaded package ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If you prefer not to use an automated package installer, you can -download a copy of django-registration and install it manually. The -latest release package can be downloaded from `django-registration's -listing on the Python Package Index -`_. +download a copy of |project| and install it manually. The +latest release package can be downloaded from |project|'s +`listing on the Python Package Index +`_. Once you've downloaded the package, unpack it (on most operating systems, simply double-click; alternately, type ``tar zxvf -django-registration-0.8.tar.gz`` at a command line on Linux, Mac OS X +django-registration-redux-x.x.tar.gz`` at a command line on Linux, Mac OS X or other Unix-like systems). This will create the directory -``django-registration-0.8``, which contains the ``setup.py`` +``django-registration-redux-x.x``, which contains the ``setup.py`` installation script. From a command line in that directory, type:: python setup.py install @@ -88,36 +75,36 @@ Note that on some systems you may need to execute this with administrative privileges (e.g., ``sudo python setup.py install``). -Manual installation from a Mercurial checkout -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Manual installation from a Git checkout +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If you'd like to try out the latest in-development code, you can -obtain it from the django-registration repository, which is hosted at -`Bitbucket `_ and uses `Mercurial -`_ for version control. To +obtain it from the |project| repository, which is hosted at +`Github `_ and uses `Git +`_ for version control. To obtain the latest code and documentation, you'll need to have -Mercurial installed, at which point you can type:: +Git installed, at which point you can type:: - hg clone http://bitbucket.org/ubernostrum/django-registration/ + git clone https://github.com/macropin/django-registration.git You can also obtain a copy of a particular release of -django-registration by specifying the ``-r`` argument to ``hg clone``; +|project| by specifying the ``-b`` argument to ``git clone``; each release is given a tag of the form ``vX.Y``, where "X.Y" is the -release number. So, for example, to check out a copy of the 0.8 +release number. So, for example, to check out a copy of the |version| release, type:: - hg clone -r v0.8 http://bitbucket.org/ubernostrum/django-registration/ + git clone -b v1.0 https://github.com/macropin/django-registration.git -In either case, this will create a copy of the django-registration -Mercurial repository on your computer; you can then add the -``django-registration`` directory inside the checkout your Python +In either case, this will create a copy of the |project| +Git repository on your computer; you can then add the +``django-registration-redux`` directory inside the checkout your Python import path, or use the ``setup.py`` script to install as a package. Basic configuration and use --------------------------- -Once installed, you can add django-registration to any Django-based +Once installed, you can add |project| to any Django-based project you're developing. The default setup will enable user registration with the following workflow: @@ -142,8 +129,8 @@ email-sending documentation `_ for details). -Required settings -~~~~~~~~~~~~~~~~~ +Settings +~~~~~~~~ Begin by adding ``registration`` to the ``INSTALLED_APPS`` setting of your project, and specifying one additional setting: @@ -152,22 +139,52 @@ your project, and specifying one additional setting: This is the number of days users will have to activate their accounts after registering. If a user does not activate within that period, the account will remain permanently inactive and may - be deleted by maintenance scripts provided in django-registration. + be deleted by maintenance scripts provided in |project|. + +``REGISTRATION_DEFAULT_FROM_EMAIL`` + Optional. If set, emails sent through the registration app will use this + string. Falls back to using Django's built-in ``DEFAULT_FROM_EMAIL`` + setting. + +``REGISTRATION_EMAIL_HTML`` + Optional. If this is `False`, registration emails will be send in plain + text. If this is `True`, emails will be sent as HTML. Defaults to `True`. + +``REGISTRATION_AUTO_LOGIN`` + Optional. If this is `True`, your users will automatically log in when they + click on the activation link in their email. Defaults to `False`. + +``ACCOUNT_AUTHENTICATED_REGISTRATION_REDIRECTS`` + Optional. If this is `True`, your users will automatically be + redirected to ``LOGIN_REDIRECT_URL`` when trying to access the + ``RegistrationView``. Defaults to `True`. + +``REGISTRATION_USE_SITE_EMAIL`` + Optional. If this is `True`, the ``Site`` object will determine the domain + that emails are sent. The ``REGISTRATION_SITE_USER_EMAIL`` setting must be + set if this is `True`. Defaults to `False`. + +``REGISTRATION_SITE_USER_EMAIL`` + Required if ``REGISTRATION_USE_SITE_EMAIL`` is set. Determines the user + that emails are sent by. For example, if this is set to ``admin`` emails + will be sent from ``admin@``. For example, you might have something like the following in your Django settings file:: - INSTALLED_APPS = ( - 'django.contrib.auth', + INSTALLED_APPS = [ 'django.contrib.sites', - 'registration', + 'registration', #should be immediately above 'django.contrib.admin' + 'django.contrib.admin', # ...other installed applications... - ) - + ] + ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value. + REGISTRATION_AUTO_LOGIN = True # Automatically log the user in. -Once you've done this, run ``manage.py syncdb`` to install the model -used by the default setup. +Once you've done this, run ``python manage.py migrate`` to install the model +used by the default setup. Note, in order for the templates to properly work, +the ``registration`` app **must** appear above ``django.contrib.admin``. Setting up URLs @@ -175,7 +192,7 @@ Setting up URLs The :ref:`default backend ` includes a Django ``URLconf`` which sets up URL patterns for :ref:`the views in -django-registration `, as well as several useful views in +django-registration-redux `, as well as several useful views in ``django.contrib.auth`` (e.g., login, logout, password change/reset). This ``URLconf`` can be found at ``registration.backends.default.urls``, and so can simply be included @@ -183,23 +200,38 @@ in your project's root URL configuration. For example, to place the URLs under the prefix ``/accounts/``, you could add the following to your project's root ``URLconf``:: - (r'^accounts/', include('registration.backends.default.urls')), + url(r'^accounts/', include('registration.backends.default.urls')), Users would then be able to register by visiting the URL ``/accounts/register/``, login (once activated) at ``/accounts/login/``, etc. - -Required templates -~~~~~~~~~~~~~~~~~~ - -In the default setup, you will need to create several templates -required by django-registration, and possibly additional templates -required by views in ``django.contrib.auth``. The templates requires -by django-registration are as follows; note that, with the exception -of the templates used for account activation emails, all of these are -rendered using a ``RequestContext`` and so will also receive any -additional variables provided by `context processors +Another ``URLConf`` is also provided -- at ``registration.auth_urls`` +-- which just handles the Django auth views, should you want to put +those at a different location. + + +Templates +~~~~~~~~~ + +The templates in |project| assume you have a ``base.html`` template in your +project's template directory. This base template should include a ``title``, +``meta``, and ``content`` block. The ``title`` block should allow customization +of the ```` tag. The ``meta`` block should appear within the ``<head>`` +tag to allow for custom ``<meta`` tags for security reasons. The ``content`` +block should be within the ``<body>`` tag. Other than that, every template +needed is included. You can extend and customize the included templates as +needed. To customize the templates, create a ``registration`` folder where the +`template loader is configured to find templates +<https://docs.djangoproject.com/en/dev/topics/templates/#configuration>`_. Copy +the existing templates from the installed package or for your `version on +Github <https://github.com/macropin/django-registration/releases>`_ and modify +them as necessary. Some of the templates you'll probably want to customize are +covered here: + +Note that, with the exception of the templates used for account activation +emails, all of these are rendered using a ``RequestContext`` and so will also +receive any additional variables provided by `context processors <http://docs.djangoproject.com/en/dev/ref/templates/api/#id1>`_. **registration/registration_form.html** @@ -259,7 +291,11 @@ being used. This template has the following context: **registration/activation_email.txt** -Used to generate the body of the activation email. Should display a +**IMPORTANT**: If you override this template, you must also override the HTML +version (below), or disable HTML emails by adding +``REGISTRATION_EMAIL_HTML = False`` to your settings.py. + +Used to generate the text body of the activation email. Should display a link the user can click to activate the account. This template has the following context: @@ -280,15 +316,113 @@ following context: <http://docs.djangoproject.com/en/dev/ref/contrib/sites/>`_ for details regarding these objects' interfaces. -Note that the templates used to generate the account activation email -use the extension ``.txt``, not ``.html``. Due to widespread antipathy -toward and interoperability problems with HTML email, -django-registration defaults to plain-text email, and so these -templates should simply output plain text rather than HTML. - -To make use of the views from ``django.contrib.auth`` (which are set -up for you by the default URLconf mentioned above), you will also need -to create the templates required by those views. Consult `the -documentation for Django's authentication system -<http://docs.djangoproject.com/en/dev/topics/auth/#django.contrib.auth.views.login>`_ -for details regarding these templates. +``user`` + The new user account + +**registration/activation_email.html** + +This template is used to generate the html body of the activation email. +Should display the same content as the text version of the activation email. + +The context available is the same as the text version of the template. + + +**registration/admin_approve_email_subject.txt** + +Used to generate the subject line of the approval email sent to the admin. +Because the subject line of an email must be a single line of text, any output +from this template will be forcibly condensed to a single line before +being used. This template has the following context: + +``site`` + An object representing the site on which the user registered; + depending on whether ``django.contrib.sites`` is installed, this + may be an instance of either ``django.contrib.sites.models.Site`` + (if the sites application is installed) or + ``django.contrib.sites.models.RequestSite`` (if not). Consult `the + documentation for the Django sites framework + <http://docs.djangoproject.com/en/dev/ref/contrib/sites/>`_ for + details regarding these objects' interfaces. + +**registration/admin_approve_email.txt** + +**IMPORTANT**: If you override this template, you must also override the HTML +version (below), or disable HTML emails by adding +``REGISTRATION_EMAIL_HTML = False`` to your settings.py. + +Used to generate the text body of the approval email sent to the admin. +Should display a link the user can click to activate the account. +This template has the following context: + +``user`` + The username of the user that requests approval for the new account. + +``site`` + An object representing the site on which the user registered; + depending on whether ``django.contrib.sites`` is installed, this + may be an instance of either ``django.contrib.sites.models.Site`` + (if the sites application is installed) or + ``django.contrib.sites.models.RequestSite`` (if not). Consult `the + documentation for the Django sites framework + <http://docs.djangoproject.com/en/dev/ref/contrib/sites/>`_ for + details regarding these objects' interfaces. + +**registration/admin_approve_email.html** + +This template is used to generate the html body of the approval email sent to +the admin. +Should display the same content as the text version of the approval email. + +The context available is the same as the text version of the template. + +**registration/admin_approve_complete.html** + +Used after successful account approval. This template has no context +variables of its own, and should simply inform the admin that the user +account is now approved. + +**registration/admin_approve_complete_email_subject.txt** + +Used to generate the subject line of the admin approval complete email. Because +the subject line of an email must be a single line of text, any output +from this template will be forcibly condensed to a single line before +being used. This template has the following context: + +``site`` + An object representing the site on which the user registered; + depending on whether ``django.contrib.sites`` is installed, this + may be an instance of either ``django.contrib.sites.models.Site`` + (if the sites application is installed) or + ``django.contrib.sites.requests.RequestSite`` (if not). Consult `the + documentation for the Django sites framework + <http://docs.djangoproject.com/en/dev/ref/contrib/sites/>`_ for + details regarding these objects' interfaces. + +**registration/admin_approve_complete_email.txt** + +**IMPORTANT**: If you override this template, you must also override the HTML +version (below), or disable HTML emails by adding +``REGISTRATION_EMAIL_HTML = False`` to your settings.py. + +Used after successful account activation. +This template has the following context: + +``site`` + An object representing the site on which the user registered; + depending on whether ``django.contrib.sites`` is installed, this + may be an instance of either ``django.contrib.sites.models.Site`` + (if the sites application is installed) or + ``django.contrib.sites.requests.RequestSite`` (if not). Consult `the + documentation for the Django sites framework + <http://docs.djangoproject.com/en/dev/ref/contrib/sites/>`_ for + details regarding these objects' interfaces. + + +**registration/admin_approve_complete_email.html** + +This template is used to generate the html body of the approval complete email +sent to the user. +Should display the same content as the text version of the approval complete +email. + +The context available is the same as the text version of the template. diff --git a/dependencies/django-registration/docs/release-notes.rst b/dependencies/django-registration/docs/release-notes.rst index 261725d11..d85206e57 100644 --- a/dependencies/django-registration/docs/release-notes.rst +++ b/dependencies/django-registration/docs/release-notes.rst @@ -3,67 +3,5 @@ Release notes ============= -The |version| release of django-registration represents a complete -rewrite of the previous codebase, and as such introduces a number of -new features and greatly enhances the flexibility and customizability -of django-registration. This document summarizes those features; for a -list of changes which impact existing installations, consult :ref:`the -upgrade guide <upgrade>`. - - -The backend system ------------------- - -The largest overall change consists of factoring out the logic of user -registration into pluggable/swappable backend classes. The -:ref:`registration views <views>` now accept a (required) argument, -``backend``, which indicates the backend class to use, and that class -has full control over the registration (and, if needed, activation) -process, including: - -* Determining whether registration will be allowed at all, on a - per-request basis. - -* Specifying a form class to use for account registration. - -* Implementing the actual process of account creation. - -* Determining whether a separate activation step is needed, and if so - what it will entail. - -* Specifying actions to take (e.g., redirects, automatic login, etc.) - following successful registration or activation. - -For full details, see the documentation for :ref:`the backend API -<backend-api>`. - -The workflow used by previous releases of django-registration -(two-step registration/activation) has been implemented using this -system, and is shipped as :ref:`the default backend <default-backend>` -in django-registration |version|. - - -Other new features ------------------- - -An alternate :ref:`one-step registration system <simple-backend>` is -provided, for use by sites which do not require a two-step -registration/activation system. - -During the registration and (optional) activation process, -:ref:`custom signals <signals>` are now sent, allowing easy injection -of custom processing into the registration workflow without needing to -write a full backend. - -The default backend now supplies several `custom admin actions -<http://docs.djangoproject.com/en/dev/ref/contrib/admin/actions/>`_ to -make the process of administering a site with django-registration -simpler. - -The :func:`~registration.views.activate` view now supplies any -captured keyword arguments from the URL (in the case of the default -backend, this is the activation key) to its template in case of -unsuccessful activation; this greatly simplifies the process of -determining why activation failed and displaying appropriate error -messages. - +The |version| release of |project| supports Python 2.7, 3.4, 3.5, 3.6, 3.7 and +Django 1.11, 2.0, 2.1, and 2.2. diff --git a/dependencies/django-registration/docs/signals.rst b/dependencies/django-registration/docs/signals.rst index a66fd5672..968525629 100644 --- a/dependencies/django-registration/docs/signals.rst +++ b/dependencies/django-registration/docs/signals.rst @@ -2,11 +2,11 @@ .. module:: registration.signals -Custom signals used by django-registration -========================================== +Custom signals used by |project| +================================ -Much of django-registration's customizability comes through the -ability to write and use :ref:`registration backends <backend-api>` +Much of |project|'s customizability comes through the +ability to write and use registration backends implementing different workflows for user registration. However, there are many cases where only a small bit of additional logic needs to be injected into the registration process, and writing a custom backend diff --git a/dependencies/django-registration/docs/simple-backend.rst b/dependencies/django-registration/docs/simple-backend.rst index 03efa87e9..3d9d95995 100644 --- a/dependencies/django-registration/docs/simple-backend.rst +++ b/dependencies/django-registration/docs/simple-backend.rst @@ -5,8 +5,8 @@ The "simple" (one-step) backend =============================== As an alternative to :ref:`the default backend <default-backend>`, and -an example of writing :ref:`registration backends <backend-api>`, -django-registration bundles a one-step registration system in +an example of writing alternate workflows, |project| bundles +a one-step registration system in ``registration.backend.simple``. This backend's workflow is deliberately as simple as possible: @@ -25,9 +25,9 @@ To use this backend, simply include the URLconf ``registration.backends.simple.urls`` somewhere in your site's own URL configuration. For example:: - (r'^accounts/', include('registration.backends.simple.urls')), + url(r'^accounts/', include('registration.backends.simple.urls')), -No additional settings are required, but one optional setting is +No additional settings are required, but two optional settings are supported: ``REGISTRATION_OPEN`` @@ -35,27 +35,14 @@ supported: registration of new accounts is currently permitted. A default of ``True`` will be assumed if this setting is not supplied. -Upon successful registration, the default redirect is to the URL -specified by the ``get_absolute_url()`` method of the newly-created -``User`` object; by default, this will be ``/users/<username>/``, -although it can be overridden in either of two ways: - -1. Specify a custom URL pattern for the - :func:`~registration.views.register` view, passing the keyword - argument ``success_url``. - -2. Override the default ``get_absolute_url()`` of the ``User`` model - in your Django configuration, as covered in `Django's settings - documentation - <http://docs.djangoproject.com/en/dev/ref/settings/#absolute-url-overrides>`_. +``SIMPLE_BACKEND_REDIRECT_URL`` + Redirection url after successful registration. + Default value is ``/`` The default form class used for account registration will be :class:`registration.forms.RegistrationForm`, although this can be -overridden by supplying a custom URL pattern for the ``register()`` -view and passing the keyword argument ``form_class``. - -Note that because this backend does not use an activation step, -attempting to use the :func:`~registration.views.activate` view with -this backend or calling the backend's ``activate()`` or -``post_activation_redirect()`` methods will raise -``NotImplementedError``. +overridden by supplying a custom URL pattern for the registration view +and passing the keyword argument ``form_class``, or by subclassing +``registration.backends.simple.views.RegistrationView`` and either +overriding ``form_class`` or implementing +:meth:`~registration.views.RegistrationView.get_form_class()`. diff --git a/dependencies/django-registration/docs/upgrade.rst b/dependencies/django-registration/docs/upgrade.rst index 3cd7a4ebe..8b52a1ac1 100644 --- a/dependencies/django-registration/docs/upgrade.rst +++ b/dependencies/django-registration/docs/upgrade.rst @@ -3,116 +3,139 @@ Upgrade guide ============= -The |version| release of django-registration represents a complete -rewrite of the previous codebase, and introduces several new features -which greatly enhance the customizability and extensibility of -django-registration. Whenever possible, changes were made in ways -which preserve backwards compatibility with previous releases, but -some changes to existing installations will still be required in order -to upgrade to |version|. This document provides a summary of those -changes, and of the new features available in the |version| release. - +The |version| release of |project| is not compatible with the legacy +django-registration (previously maintained by James Bennett). Major backwards +incompatible changes will be recorded here, but for a full list of changes +between versions you should refer to the `CHANGELOG +<https://github.com/macropin/django-registration/blob/master/CHANGELOG>`_. Django version requirement -------------------------- -As of |version|, django-registration requires Django 1.3 or newer; -older Django releases may work, but are officially unsupported. +As of |version|, |project| requires Django 1.11 or newer; +older Django releases may work, but are officially unsupported. Additionally, +|project| officially supports Python 2.7, 3.5, 3.6, 3.7 and 3.8. Backwards-incompatible changes ------------------------------ -If you're upgrading from an older release of django-registration, and -if you were using the default setup (i.e., the included default -URLconf and no custom URL patterns or custom arguments to views), most -things will continue to work as normal (although you will need to -create one new template; see the section on views below). However, the -old default URLconf has been deprecated and will be removed in version -1.0 of django-registration, so it is recommended that you begin -migrating now. To do so, change any use of ``registration.urls`` to -``registration.backends.default.urls``. For example, if you had the -following in your root URLconf:: - - (r'^accounts/', include('registration.urls')), - -you should change it to:: - - (r'^accounts/', include('registration.backends.default.urls')), - -The older include will continue to work until django-registration 1.0; -in |version| it raises a ``PendingDeprecationWarning`` (which is -ignored by default in Python), in 0.9 it will raise -``DeprecationWarning`` (which will begin printing warning messages on -import) and in 1.0 it will be removed entirely. - - -Changes to registration views -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -:ref:`The views used to handle user registration <views>` have changed -significantly as of django-registration |version|. Both views now -require the keyword argument ``backend``, which specifies the -:ref:`registration backend <backend-api>` to use, and so any URL -pattern for these views must supply that argument. The URLconf -provided with :ref:`the default backend <default-backend>` properly -passes this argument. - -The ``profile_callback`` argument of the -:func:`~registration.views.register` view has been removed; the -functionality it provided can now be implemented easily via a custom -backend, or by connecting listeners to :ref:`the signals sent during -the registration process <signals>`. - -The :func:`~registration.views.activate` view now issues a redirect -upon successful activation; in the default backend this is to the URL -pattern named ``registration_activation_complete``; in the default -setup, this will redirect to a view which renders the template -``registration/activation_complete.html``, and so this template should -be present when using the default backend and default -configuration. Other backends can specify the location to redirect to -through their ``post_activation_redirect()`` method, and this can be -overridden on a case-by-case basis by passing the (new) keyword -argument ``success_url`` to the ``activate()`` view. On unsuccessful -activation, the ``activate()`` view still displays the same template, -but its context has changed: the context will simply consist of any -keyword arguments captured in the URL and passed to the view. - - -Changes to registration forms -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Previously, the form used to collect data during registration was -expected to implement a ``save()`` method which would create the new -user account. This is no longer the case; creating the account is -handled by the backend, and so any custom logic should be moved into a -custom backend, or by connecting listeners to :ref:`the signals sent -during the registration process <signals>`. - - -Changes to the :class:`~registration.models.RegistrationProfile` model -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The -:meth:`~registration.models.RegistrationManager.create_inactive_user` -method of :class:`~registration.models.RegistrationManager` now has an -additional required argument: ``site``. This allows -django-registration to easily be used regardless of whether -``django.contrib.sites`` is installed, since a ``RequestSite`` object -can be passed in place of a regular ``Site`` object. - -The :data:`~registration.signals.user_registered` signal is no longer -sent by ``create_inactive_user()``, and the -:data:`~registration.signals.user_activated` signal is no longer sent -by :meth:`~registration.models.RegistrationManager.activate_user`; -these signals are now sent by the backend after these methods have -been called. Note that :ref:`these signals <signals>` were added after -the django-registration 0.7 release but before the refactoring which -introduced :ref:`the backend API <backend-api>`, so only installations -which were tracking the in-development codebase will have made use of -them. - -The sending of activation emails has been factored out of -``create_inactive_user()``, and now exists as the method -:meth:`~registration.models.RegistrationProfile.send_activation_email` -on instances of ``RegistrationProfile``. +Version 2.8 +``````````` + +- None + +Version 2.7 +``````````` + +- None + +Version 2.6 +``````````` + +- None + +Version 2.5 +``````````` + +- None + +Version 2.4 +``````````` + +- None + +Version 2.3 +``````````` + +- None + + +Version 2.2 +``````````` + +- None + + +Version 2.1 +``````````` + +- None + + +Version 2.0 +``````````` + +- Removed support for Django < 1.11. +- Removed `registration/urls.py` in favor of + `registration/backends/default/urls.py` + + +Version 1.9 +``````````` +- Change of return signature of + ``RegistrationProfileManager.activate_user``. A tuple containing the + User instance and a boolean of whether or not said user was activated + is now returned. + + +Version 1.8 +``````````` + +- None + +Version 1.7 +``````````` + +- None + +Version 1.6 +``````````` + +- None + +Version 1.5 +``````````` + +- Support for Django 1.7 is removed, and Django 1.8 or newer is required. +- Change signature of ``RegistrationProfileManager.activate_user``. + ``site`` is now a required positional argument. + See `#244 <https://github.com/macropin/django-registration/pull/244>`_. + +Version 1.4 +``````````` + +- Remove unnecessary `_RequestPassingFormView`. + See `#56 <https://github.com/macropin/django-registration/pull/56>`_. Please + ensure that you update any subclassed views to reference ``self.request`` + instead of accepting ``request`` as an argument. + +Version 1.3 +``````````` +- Django 1.7 or newer is required. Please ensure you upgrade your Django + version before upgrading. + +Version 1.2 +``````````` +- **Native migration support breaks South compatibility**: An initial native + migration for Django > 1.7 has been provided. South users will need to + configure a null migration with (`SOUTH_MIGRATION_MODULES`) in + `settings.py` as shown below: + + :: + + SOUTH_MIGRATION_MODULES = { + 'registration': 'registration.south_migrations', + +- **register method in RegistrationView has different parameters**: The + parameters of the`register` method in RegistrationView have changed. + +Version 1.1 +``````````` + +- **base.html template required**: A `base.html` template is now assumed to + exist. Please ensure that your project provides one for |project| to inherit + from. +- **HTML email templates**: |project| now uses HTML email templates. If you + previously customized text email templates, you need to do the same with + the new HTML templates. diff --git a/dependencies/django-registration/docs/views.rst b/dependencies/django-registration/docs/views.rst index faca64437..5f9474640 100644 --- a/dependencies/django-registration/docs/views.rst +++ b/dependencies/django-registration/docs/views.rst @@ -4,119 +4,132 @@ Registration views ================== -In order to allow users to register using whatever workflow is -implemented by the :ref:`registration backend <backend-api>` in use, -django-registration provides two views. Both are designed to allow -easy configurability without writing or rewriting view code. - -.. function:: activate(request, backend[, template_name[, success_url[, extra_context[, **kwargs]]]]) - - Activate a user's account, for workflows which require a separate - activation step. - - The actual activation of the account will be delegated to the - backend specified by the ``backend`` keyword argument; the - backend's ``activate()`` method will be called, passing the - ``HttpRequest`` and any keyword arguments captured from the URL, - and will be assumed to return a ``User`` if activation was - successful, or a value which evaluates to ``False`` in boolean - context if not. - - Upon successful activation, the backend's - ``post_activation_redirect()`` method will be called, passing the - ``HttpRequest`` and the activated ``User`` to determine the URL to - redirect the user to. To override this, pass the argument - ``success_url`` (see below). - - On unsuccessful activation, will render the template - ``registration/activate.html`` to display an error message; to - override thise, pass the argument ``template_name`` (see below). - - **Context** - - The context will be populated from the keyword arguments captured - in the URL. This view uses ``RequestContext``, so variables - populated by context processors will also be present in the - context. - - :param backend: The dotted Python path to the backend class to use. - :type backend: string - :param extra_context: Optionally, variables to add to the template - context. Any callable object in this dictionary will be called - to produce the final result which appears in the context. - :type extra_context: dict - :param template_name: Optional. A custom template name to use. If - not specified, this will default to - ``registration/activate.html``. - :type template_name: string - :param **kwargs: Any keyword arguments captured from the URL, such - as an activation key, which will be passed to the backend's - ``activate()`` method. - - -.. function:: register(request, backend[, success_url[, form_class[, disallowed_url[, template_name[, extra_context]]]]]) - - Allow a new user to register an account. - - The actual registration of the account will be delegated to the - backend specified by the ``backend`` keyword argument. The backend - is used as follows: - - 1. The backend's ``registration_allowed()`` method will be called, - passing the ``HttpRequest``, to determine whether registration - of an account is to be allowed; if not, a redirect is issued to - a page indicating that registration is not permitted. - - 2. The form to use for account registration will be obtained by - calling the backend's ``get_form_class()`` method, passing the - ``HttpRequest``. To override this, pass the keyword argument - ``form_class``. - - 3. If valid, the form's ``cleaned_data`` will be passed (as keyword - arguments, and along with the ``HttpRequest``) to the backend's - ``register()`` method, which should return a ``User`` object - representing the new account. - - 4. Upon successful registration, the backend's - ``post_registration_redirect()`` method will be called, passing - the ``HttpRequest`` and the new ``User``, to determine the URL - to redirect to. To override this, pass the keyword argument - ``success_url``. - - **Context** - - ``form`` - The form instance being used to collect registration data. - - This view uses ``RequestContext``, so variables populated by - context processors will also be present in the context. - - :param backend: The dotted Python path to the backend class to use. - :type backend: string - :param disallowed_url: The URL to redirect to if registration is - not permitted (e.g., if registration is closed). This should be - a string suitable for passing as the ``to`` argument to - `Django's "redirect" shortcut - <http://docs.djangoproject.com/en/dev/topics/http/shortcuts/#redirect>`_. If - not specified, this will default to ``registration_disallowed``. - :type disallowed_url: string - :param extra_context: Optionally, variables to add to the template - context. Any callable object in this dictionary will be called - to produce the final result which appears in the context. - :type extra_context: dict - :param form_class: The form class to use for registration; this - should be some subclass of ``django.forms.Form``. If not - specified, the backend's ``get_form_class()`` method will be - called to obtain the form class. - :type form_class: subclass of ``django.forms.Form`` - :param success_url: The URL to redirect to after successful - registration. This should be a string suitable for passing as - the ``to`` argument to `Django's "redirect" shortcut - <http://docs.djangoproject.com/en/dev/topics/http/shortcuts/#redirect>`_. If - not specified, the backend's ``post_registration_redirect()`` - method will be called to obtain the URL. - :type success_url: string - :param template_name: Optional. A custom template name to use. If - not specified, this will default to +In order to allow the utmost flexibility in customizing and supporting +different workflows, |project| makes use of Django's support +for `class-based views +<https://docs.djangoproject.com/en/dev/topics/class-based-views/>`_. Included +in |project| are two base classes which can be subclassed to +implement whatever workflow is required. + +.. class:: RegistrationView + + A subclass of Django's `FormView + <https://docs.djangoproject.com/en/dev/ref/class-based-views/generic-editing/#formview>`_, + which provides the infrastructure for supporting user registration. + + Useful places to override or customize on a ``RegistrationView`` + subclass are: + + .. attribute:: disallowed_url + + The URL to redirect to when registration is disallowed. Should + be a string, `the name of a URL pattern + <https://docs.djangoproject.com/en/dev/topics/http/urls/#naming-url-patterns>`_. Default + value is ``registration_disallowed``. + + .. attribute:: form_class + + The form class to use for user registration. Can be overridden + on a per-request basis (see below). Should be the actual class + object; by default, this class is + :class:`registration.forms.RegistrationForm`. + + .. attribute:: success_url + + The URL to redirect to after successful registration. Should be + a string, the name of a URL pattern, or a 3-tuple of arguments + suitable for passing to Django's `redirect shortcut + <https://docs.djangoproject.com/en/dev/topics/http/shortcuts/#redirect>`_. Can + be overridden on a per-request basis (see below). Default value + is ``None``, so that per-request customization is used instead. + + .. attribute:: template_name + + The template to use for user registration. Should be a + string. Default value is ``registration/registration_form.html``. - :type template_name: string + + .. method:: get_form_class() + + Select a form class to use on a per-request basis. If not + overridden, will use :attr:`~form_class`. Should be the actual + class object. + + .. method:: get_success_url(user) + + Return a URL to redirect to after successful registration, on a + per-request or per-user basis. If not overridden, will use + :attr:`~success_url`. Should be a string, the name of a URL + pattern, or a 3-tuple of arguments suitable for passing to + Django's ``redirect`` shortcut. + + .. method:: registration_allowed() + + Should return a boolean indicating whether user registration is + allowed, either in general or for this specific request. + + .. method:: register(form) + + Actually perform the business of registering a new user. Receives the + registration ``form``. Should return the new user who was just + registered. + + +.. class:: ActivationView + + A subclass of Django's `TemplateView + <https://docs.djangoproject.com/en/dev/ref/class-based-views/base/#templateview>`_ + which provides support for a separate account-activation step, in + workflows which require that. + + Useful places to override or customize on an ``ActivationView`` + subclass are: + + .. attribute:: template_name + + The template to use for user activation. Should be a + string. Default value is ``registration/activate.html``. + + .. method:: activate(*args, **kwargs) + + Actually perform the business of activating a user account. Receives any + positional or keyword arguments passed to the view. Should return the + activated user account if activation is successful, or any value + which evaluates ``False`` in boolean context if activation is + unsuccessful. + + .. method:: get_success_url(user) + + Return a URL to redirect to after successful registration, on a + per-request or per-user basis. If not overridden, will use + :attr:`~success_url`. Should be a string, the name of a URL + pattern, or a 3-tuple of arguments suitable for passing to + Django's ``redirect`` shortcut. + +.. class:: ResendActivationView + + A subclass of Django's FormView` + <https://docs.djangoproject.com/en/1.11/ref/class-based-views/generic-editing/#formview>`_ + which provides support for resending an activation email to a user. + + Useful places to override or customize on an ``ResendActivationView`` + subclass are: + + .. attribute:: template_name + + The template to use for user activation. Should be a + string. Default value is ``registration/resend_activation_form.html``. + + .. method:: resend_activation(self, form) + + Given an email, look up user by email and resend activation key + if user is not already activated or previous activation key has + not expired. Note that if multiple users exist with the given + email, no emails will be sent. Returns True if activation key + was successfully sent, False otherwise. + + + .. method:: render_form_submitted_template(self, form) + + Renders resend activation complete template with the submitted + email. diff --git a/dependencies/django-registration/manage.py b/dependencies/django-registration/manage.py new file mode 100644 index 000000000..ddf21237b --- /dev/null +++ b/dependencies/django-registration/manage.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_app.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/dependencies/django-registration/registration/__init__.py b/dependencies/django-registration/registration/__init__.py index a5fec6d4f..c4c2fc562 100644 --- a/dependencies/django-registration/registration/__init__.py +++ b/dependencies/django-registration/registration/__init__.py @@ -1,30 +1,22 @@ -VERSION = (0, 8, 0, 'final', 0) +VERSION = (2, 8, 0, 'final', 0) -def get_version(version=None): - """Derives a PEP386-compliant version number from VERSION.""" - if version is None: - version = VERSION - assert len(version) == 5 - assert version[3] in ('alpha', 'beta', 'rc', 'final') + +def get_version(): + "Returns a PEP 386-compliant version number from VERSION." + assert len(VERSION) == 5 + assert VERSION[3] in ('alpha', 'beta', 'rc', 'final') # Now build the two parts of the version number: # main = X.Y[.Z] # sub = .devN - for pre-alpha releases # | {a|b|c}N - for alpha, beta and rc releases - parts = 2 if version[2] == 0 else 3 - main = '.'.join(str(x) for x in version[:parts]) + parts = 2 if VERSION[2] == 0 else 3 + main = '.'.join(str(x) for x in VERSION[:parts]) sub = '' - if version[3] == 'alpha' and version[4] == 0: - # At the toplevel, this would cause an import loop. - from django.utils.version import get_svn_revision - svn_revision = get_svn_revision()[4:] - if svn_revision != 'unknown': - sub = '.dev%s' % svn_revision - - elif version[3] != 'final': + if VERSION[3] != 'final': mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'} - sub = mapping[version[3]] + str(version[4]) + sub = mapping[VERSION[3]] + str(VERSION[4]) - return main + sub + return str(main + sub) diff --git a/dependencies/django-registration/registration/admin.py b/dependencies/django-registration/registration/admin.py index 032455394..1db87060c 100644 --- a/dependencies/django-registration/registration/admin.py +++ b/dependencies/django-registration/registration/admin.py @@ -1,25 +1,28 @@ from django.contrib import admin -from django.contrib.sites.requests import RequestSite -from django.contrib.sites.models import Site -from django.utils.translation import ugettext_lazy as _ +from django.contrib.sites.shortcuts import get_current_site -from registration.models import RegistrationProfile +from .models import RegistrationProfile +from .users import UsernameField +from .utils import _ class RegistrationAdmin(admin.ModelAdmin): actions = ['activate_users', 'resend_activation_email'] list_display = ('user', 'activation_key_expired') raw_id_fields = ['user'] - search_fields = ('user__username', 'user__first_name', 'user__last_name') + search_fields = ('user__{0}'.format(UsernameField()), + 'user__first_name', 'user__last_name') def activate_users(self, request, queryset): """ - Activates the selected users, if they are not alrady + Activates the selected users, if they are not already activated. - + """ + + site = get_current_site(request) for profile in queryset: - RegistrationProfile.objects.activate_user(profile.activation_key) + RegistrationProfile.objects.activate_user(profile.activation_key, site) activate_users.short_description = _("Activate users") def resend_activation_email(self, request, queryset): @@ -30,16 +33,14 @@ def resend_activation_email(self, request, queryset): who are eligible to activate; emails will not be sent to users whose activation keys have expired or who have already activated. - + """ - if Site._meta.installed: - site = Site.objects.get_current() - else: - site = RequestSite(request) + site = get_current_site(request) for profile in queryset: - if not profile.activation_key_expired(): - profile.send_activation_email(site) + user = profile.user + RegistrationProfile.objects.resend_activation_mail(user.email, site, request) + resend_activation_email.short_description = _("Re-send activation emails") diff --git a/dependencies/django-registration/registration/auth_urls.py b/dependencies/django-registration/registration/auth_urls.py index 4fddea10a..934aa5543 100644 --- a/dependencies/django-registration/registration/auth_urls.py +++ b/dependencies/django-registration/registration/auth_urls.py @@ -22,36 +22,38 @@ consult a specific backend's documentation for details. """ - -from django.conf.urls import * - -import django.contrib.auth.views as auth_views - -urlpatterns = [url(r'^login/$', - auth_views.login, - {'template_name': 'registration/login.html'}, - name='django.contrib.auth.views.login'), - url(r'^logout/$', - auth_views.logout, - {'template_name': 'registration/logout.html'}, - name='django.contrib.auth.views.logout'), - url(r'^password/change/$', - auth_views.password_change, - name='django.contrib.auth.views.password_change'), - url(r'^password/change/done/$', - auth_views.password_change_done, - name='django.contrib.auth.views.password_change_done'), - url(r'^password/reset/$', - auth_views.password_reset, - name='django.contrib.auth.views.password_reset'), - url( - r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', - auth_views.password_reset_confirm, - name='django.contrib.auth.views.password_reset_confirm'), - url(r'^password/reset/complete/$', - auth_views.password_reset_complete, - name='django.contrib.auth.views.password_reset_complete'), - url(r'^password/reset/done/$', - auth_views.password_reset_done, - name='django.contrib.auth.views.password_reset_done'), - ] +from django.conf.urls import url +from django.contrib.auth import views as auth_views +from django.urls import reverse_lazy + +urlpatterns = [ + # url(r'^login/$', + # auth_views.LoginView.as_view( + # template_name='registration/login.html'), + # name='auth_login'), + url(r'^logout/$', + auth_views.LogoutView.as_view( + template_name='registration/logout.html'), + name='auth_logout'), + # url(r'^password/change/$', + # auth_views.PasswordChangeView.as_view( + # success_url=reverse_lazy('auth_password_change_done')), + # name='auth_password_change'), + url(r'^password/change/done/$', + auth_views.PasswordChangeDoneView.as_view(), + name='auth_password_change_done'), + # url(r'^password/reset/$', + # auth_views.PasswordResetView.as_view( + # success_url=reverse_lazy('auth_password_reset_done')), + # name='auth_password_reset'), + url(r'^password/reset/complete/$', + auth_views.PasswordResetCompleteView.as_view(), + name='auth_password_reset_complete'), + url(r'^password/reset/done/$', + auth_views.PasswordResetDoneView.as_view(), + name='auth_password_reset_done'), + # url(r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', + # auth_views.PasswordResetConfirmView.as_view( + # success_url=reverse_lazy('auth_password_reset_complete')), + # name='auth_password_reset_confirm'), +] diff --git a/dependencies/django-registration/registration/backends/__init__.py b/dependencies/django-registration/registration/backends/__init__.py index 01a4c6847..e69de29bb 100644 --- a/dependencies/django-registration/registration/backends/__init__.py +++ b/dependencies/django-registration/registration/backends/__init__.py @@ -1,32 +0,0 @@ -from django.core.exceptions import ImproperlyConfigured - - -# Python 2.7 has an importlib with import_module; for older Pythons, -# Django's bundled copy provides it. -try: # pragma: no cover - from importlib import import_module # pragma: no cover -except ImportError: # pragma: no cover - from importlib import import_module # pragma: no cover - -def get_backend(path): - """ - Return an instance of a registration backend, given the dotted - Python import path (as a string) to the backend class. - - If the backend cannot be located (e.g., because no such module - exists, or because the module does not contain a class of the - appropriate name), ``django.core.exceptions.ImproperlyConfigured`` - is raised. - - """ - i = path.rfind('.') - module, attr = path[:i], path[i+1:] - try: - mod = import_module(module) - except ImportError as e: - raise ImproperlyConfigured('Error loading registration backend %s: "%s"' % (module, e)) - try: - backend_class = getattr(mod, attr) - except AttributeError: - raise ImproperlyConfigured('Module "%s" does not define a registration backend named "%s"' % (module, attr)) - return backend_class() diff --git a/dependencies/django-registration/registration/backends/admin_approval/__init__.py b/dependencies/django-registration/registration/backends/admin_approval/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/dependencies/django-registration/registration/backends/admin_approval/urls.py b/dependencies/django-registration/registration/backends/admin_approval/urls.py new file mode 100644 index 000000000..811cdc702 --- /dev/null +++ b/dependencies/django-registration/registration/backends/admin_approval/urls.py @@ -0,0 +1,77 @@ +""" +URLconf for registration and activation, using django-registration's +admin approval backend. + +If the default behavior of these views is acceptable to you, simply +use a line like this in your root URLconf to set up the default URLs +for registration:: + + (r'^accounts/', include('registration.backends.admin_approval.urls')), + +This will also automatically set up the views in +``django.contrib.auth`` at sensible default locations. + +If you'd like to customize registration behavior, feel free to set up +your own URL patterns for these views instead. + +""" + + +from django.conf import settings +from django.conf.urls import include +from django.conf.urls import url +from django.contrib.auth.decorators import permission_required +from django.views.generic.base import TemplateView + +from .views import ActivationView +from .views import ApprovalView +from .views import RegistrationView + +from registration.backends.admin_approval.views import ResendActivationView + +urlpatterns = [ + url(r'^activate/resend/$', + ResendActivationView.as_view(), + name='registration_resend_activation'), + url(r'^activate/complete/$', + TemplateView.as_view( + template_name='registration/activation_complete_admin_pending.html' + ), + name='registration_activation_complete'), + # Activation keys get matched by \w+ instead of the more specific + # [a-fA-F0-9]{40} because a bad activation key should still get to the view; + # that way it can return a sensible "invalid key" message instead of a + # confusing 404. + + url(r'^activate/(?P<activation_key>\w+)/$', + ActivationView.as_view(), + name='registration_activate'), + url(r'^approve/complete/$', + TemplateView.as_view( + template_name='registration/admin_approve_complete.html'), + name='registration_approve_complete'), + url(r'^approve/(?P<profile_id>[0-9]+)/$', + permission_required('is_superuser')(ApprovalView.as_view()), + name='registration_admin_approve'), + url(r'^register/complete/$', + TemplateView.as_view( + template_name='registration/registration_complete.html'), + name='registration_complete'), + url(r'^register/closed/$', + TemplateView.as_view( + template_name='registration/registration_closed.html'), + name='registration_disallowed'), +] + + +if getattr(settings, 'INCLUDE_REGISTER_URL', True): + urlpatterns += [ + url(r'^register/$', + RegistrationView.as_view(), + name='registration_register'), + ] + +if getattr(settings, 'INCLUDE_AUTH_URLS', True): + urlpatterns += [ + url(r'', include('registration.auth_urls')), + ] diff --git a/dependencies/django-registration/registration/backends/admin_approval/views.py b/dependencies/django-registration/registration/backends/admin_approval/views.py new file mode 100644 index 000000000..7539e44fd --- /dev/null +++ b/dependencies/django-registration/registration/backends/admin_approval/views.py @@ -0,0 +1,72 @@ +from django.contrib.sites.shortcuts import get_current_site + +from ... import signals +from ...models import SupervisedRegistrationProfile +from ...views import ApprovalView as BaseApprovalView +from ..default.views import ActivationView as BaseActivationView +from ..default.views import RegistrationView as BaseRegistrationView +from ..default.views import ResendActivationView as BaseResendActivationView + + +class RegistrationView(BaseRegistrationView): + + """ + Follows the exact logic of + ``registration.backends.default.views.RegistrationView`` but uses + ``SupervisedRegistrationProfile`` instead of ``RegistrationProfile`` + + """ + + registration_profile = SupervisedRegistrationProfile + + +class ActivationView(BaseActivationView): + + """ + Follows the exact logic of + ``registration.backends.default.views.ActivationView`` but uses + ``SupervisedRegistrationProfile`` instead of ``RegistrationProfile`` + + """ + + registration_profile = SupervisedRegistrationProfile + + +class ResendActivationView(BaseResendActivationView): + + """ + Follows the exact logic of + ``registration.backends.default.views.ResendActivationView`` but uses + ``SupervisedRegistrationProfile`` instead of ``RegistrationProfile`` + + """ + + registration_profile = SupervisedRegistrationProfile + + +class ApprovalView(BaseApprovalView): + def approve(self, *args, **kwargs): + """ + Given a user id, look up and approve the user account + corresponding to that key (if possible). + + After successful approval, the signal + ``registration.signals.user_approved`` will be sent, with the + newly approved ``User`` as the keyword argument ``user`` and + the class of this backend as the sender. + + """ + user_id = kwargs.get('profile_id', '') + approved_user = ( + SupervisedRegistrationProfile.objects.admin_approve_user( + user_id, get_current_site(self.request))) + if approved_user: + signals.user_approved.send( + sender=self.__class__, + user=approved_user, + request=self.request + ) + return approved_user + + def get_success_url(self, user): + return ('registration_approve_complete', (), {}) diff --git a/dependencies/django-registration/registration/backends/default/__init__.py b/dependencies/django-registration/registration/backends/default/__init__.py index 19192e0d0..e69de29bb 100644 --- a/dependencies/django-registration/registration/backends/default/__init__.py +++ b/dependencies/django-registration/registration/backends/default/__init__.py @@ -1,136 +0,0 @@ -from django.conf import settings -from django.contrib.sites.shortcuts import get_current_site - -from registration import signals -from registration.forms import RegistrationForm -from registration.models import RegistrationProfile - - -class DefaultBackend(object): - """ - A registration backend which follows a simple workflow: - - 1. User signs up, inactive account is created. - - 2. Email is sent to user with activation link. - - 3. User clicks activation link, account is now active. - - Using this backend requires that - - * ``registration`` be listed in the ``INSTALLED_APPS`` setting - (since this backend makes use of models defined in this - application). - - * The setting ``ACCOUNT_ACTIVATION_DAYS`` be supplied, specifying - (as an integer) the number of days from registration during - which a user may activate their account (after that period - expires, activation will be disallowed). - - * The creation of the templates - ``registration/activation_email_subject.txt`` and - ``registration/activation_email.txt``, which will be used for - the activation email. See the notes for this backends - ``register`` method for details regarding these templates. - - Additionally, registration can be temporarily closed by adding the - setting ``REGISTRATION_OPEN`` and setting it to - ``False``. Omitting this setting, or setting it to ``True``, will - be interpreted as meaning that registration is currently open and - permitted. - - Internally, this is accomplished via storing an activation key in - an instance of ``registration.models.RegistrationProfile``. See - that model and its custom manager for full documentation of its - fields and supported operations. - - """ - def register(self, request, **kwargs): - """ - Given a username, email address and password, register a new - user account, which will initially be inactive. - - Along with the new ``User`` object, a new - ``registration.models.RegistrationProfile`` will be created, - tied to that ``User``, containing the activation key which - will be used for this account. - - An email will be sent to the supplied email address; this - email should contain an activation link. The email will be - rendered using two templates. See the documentation for - ``RegistrationProfile.send_activation_email()`` for - information about these templates and the contexts provided to - them. - - After the ``User`` and ``RegistrationProfile`` are created and - the activation email is sent, the signal - ``registration.signals.user_registered`` will be sent, with - the new ``User`` as the keyword argument ``user`` and the - class of this backend as the sender. - - """ - username, email, password = kwargs['username'], kwargs['email'], kwargs['password1'] - - site = get_current_site(request) - new_user = RegistrationProfile.objects.create_inactive_user(username, email, - password, site) - signals.user_registered.send(sender=self.__class__, - user=new_user, - request=request) - return new_user - - def activate(self, request, activation_key): - """ - Given an an activation key, look up and activate the user - account corresponding to that key (if possible). - - After successful activation, the signal - ``registration.signals.user_activated`` will be sent, with the - newly activated ``User`` as the keyword argument ``user`` and - the class of this backend as the sender. - - """ - activated = RegistrationProfile.objects.activate_user(activation_key) - if activated: - signals.user_activated.send(sender=self.__class__, - user=activated, - request=request) - return activated - - def registration_allowed(self, request): - """ - Indicate whether account registration is currently permitted, - based on the value of the setting ``REGISTRATION_OPEN``. This - is determined as follows: - - * If ``REGISTRATION_OPEN`` is not specified in settings, or is - set to ``True``, registration is permitted. - - * If ``REGISTRATION_OPEN`` is both specified and set to - ``False``, registration is not permitted. - - """ - return getattr(settings, 'REGISTRATION_OPEN', True) - - def get_form_class(self, request): - """ - Return the default form class used for user registration. - - """ - return RegistrationForm - - def post_registration_redirect(self, request, user): - """ - Return the name of the URL to redirect to after successful - user registration. - - """ - return ('registration_complete', (), {}) - - def post_activation_redirect(self, request, user): - """ - Return the name of the URL to redirect to after successful - account activation. - - """ - return ('registration_activation_complete', (), {}) diff --git a/dependencies/django-registration/registration/backends/default/urls.py b/dependencies/django-registration/registration/backends/default/urls.py index 504ea0ba8..71449f4f3 100644 --- a/dependencies/django-registration/registration/backends/default/urls.py +++ b/dependencies/django-registration/registration/backends/default/urls.py @@ -11,41 +11,51 @@ This will also automatically set up the views in ``django.contrib.auth`` at sensible default locations. -If you'd like to customize the behavior (e.g., by passing extra -arguments to the various views) or split up the URLs, feel free to set -up your own URL patterns for these views instead. +If you'd like to customize registration behavior, feel free to set up +your own URL patterns for these views instead. """ -from django.conf.urls import * + +from django.conf import settings +from django.conf.urls import include +from django.conf.urls import url from django.views.generic.base import TemplateView -from registration.views import activate -from registration.views import register - -urlpatterns = [url(r'^activate/complete/$', - TemplateView.as_view( - template_name='registration/activation_complete.html'), - name='registration_activation_complete'), - # Activation keys get matched by \w+ instead of the more specific - # [a-fA-F0-9]{40} because a bad activation key should still get to the view; - # that way it can return a sensible "invalid key" message instead of a - # confusing 404. - url(r'^activate/(?P<activation_key>\w+)/$', - activate, - {'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_activate'), - url(r'^register/$', - register, - {'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_register'), - url(r'^register/complete/$', - TemplateView.as_view( - template_name='registration/registration_complete.html'), - name='registration_complete'), - url(r'^register/closed/$', - TemplateView.as_view( - template_name='registration/registration_closed.html'), - name='registration_disallowed'), - url(r'', include('registration.auth_urls')), - ] +from .views import ActivationView +from .views import RegistrationView +from .views import ResendActivationView + +urlpatterns = [ + url(r'^activate/complete/$', + TemplateView.as_view(template_name='registration/activation_complete.html'), + name='registration_activation_complete'), + url(r'^activate/resend/$', + ResendActivationView.as_view(), + name='registration_resend_activation'), + # Activation keys get matched by \w+ instead of the more specific + # [a-fA-F0-9]{40} because a bad activation key should still get to the view; + # that way it can return a sensible "invalid key" message instead of a + # confusing 404. + url(r'^activate/(?P<activation_key>\w+)/$', + ActivationView.as_view(), + name='registration_activate'), + url(r'^register/complete/$', + TemplateView.as_view(template_name='registration/registration_complete.html'), + name='registration_complete'), + url(r'^register/closed/$', + TemplateView.as_view(template_name='registration/registration_closed.html'), + name='registration_disallowed'), +] + +if getattr(settings, 'INCLUDE_REGISTER_URL', True): + urlpatterns += [ + url(r'^register/$', + RegistrationView.as_view(), + name='registration_register'), + ] + +if getattr(settings, 'INCLUDE_AUTH_URLS', True): + urlpatterns += [ + url(r'', include('registration.auth_urls')), + ] diff --git a/dependencies/django-registration/registration/backends/default/views.py b/dependencies/django-registration/registration/backends/default/views.py new file mode 100644 index 000000000..195a683a6 --- /dev/null +++ b/dependencies/django-registration/registration/backends/default/views.py @@ -0,0 +1,180 @@ +from django.conf import settings +from django.contrib.sites.shortcuts import get_current_site +from django.shortcuts import render + +from ... import signals +from ...models import RegistrationProfile +from ...users import UserModel +from ...views import ActivationView as BaseActivationView +from ...views import RegistrationView as BaseRegistrationView +from ...views import ResendActivationView as BaseResendActivationView + + +class RegistrationView(BaseRegistrationView): + """ + A registration backend which follows a simple workflow: + + 1. User signs up, inactive account is created. + + 2. Email is sent to user with activation link. + + 3. User clicks activation link, account is now active. + + Using this backend requires that + + * ``registration`` be listed in the ``INSTALLED_APPS`` setting + (since this backend makes use of models defined in this + application). + + * The setting ``ACCOUNT_ACTIVATION_DAYS`` be supplied, specifying + (as an integer) the number of days from registration during + which a user may activate their account (after that period + expires, activation will be disallowed). + + * The creation of the templates + ``registration/activation_email_subject.txt`` and + ``registration/activation_email.txt``, which will be used for + the activation email. See the notes for this backends + ``register`` method for details regarding these templates. + + When subclassing this view, you can set the ``SEND_ACTIVATION_EMAIL`` + class variable to False to skip sending the new user a confirmation + email or set ``SEND_ACTIVATION_EMAIL`` to ``False``. Doing so implies + that you will have to activate the user manually from the admin site or + send an activation by some other method. For example, by listening for + the ``user_registered`` signal. + + Additionally, registration can be temporarily closed by adding the + setting ``REGISTRATION_OPEN`` and setting it to + ``False``. Omitting this setting, or setting it to ``True``, will + be interpreted as meaning that registration is currently open and + permitted. + + Internally, this is accomplished via storing an activation key in + an instance of ``registration.models.RegistrationProfile``. See + that model and its custom manager for full documentation of its + fields and supported operations. + + """ + SEND_ACTIVATION_EMAIL = getattr(settings, 'SEND_ACTIVATION_EMAIL', True) + success_url = 'registration_complete' + + registration_profile = RegistrationProfile + + def register(self, form): + """ + Given a username, email address and password, register a new + user account, which will initially be inactive. + + Along with the new ``User`` object, a new + ``registration.models.RegistrationProfile`` will be created, + tied to that ``User``, containing the activation key which + will be used for this account. + + An email will be sent to the supplied email address; this + email should contain an activation link. The email will be + rendered using two templates. See the documentation for + ``RegistrationProfile.send_activation_email()`` for + information about these templates and the contexts provided to + them. + + After the ``User`` and ``RegistrationProfile`` are created and + the activation email is sent, the signal + ``registration.signals.user_registered`` will be sent, with + the new ``User`` as the keyword argument ``user`` and the + class of this backend as the sender. + + """ + site = get_current_site(self.request) + + if hasattr(form, 'save'): + new_user_instance = form.save(commit=False) + else: + new_user_instance = (UserModel().objects + .create_user(**form.cleaned_data)) + + new_user = self.registration_profile.objects.create_inactive_user( + new_user=new_user_instance, + site=site, + send_email=self.SEND_ACTIVATION_EMAIL, + request=self.request, + ) + signals.user_registered.send(sender=self.__class__, + user=new_user, + request=self.request) + return new_user + + def registration_allowed(self): + """ + Indicate whether account registration is currently permitted, + based on the value of the setting ``REGISTRATION_OPEN``. This + is determined as follows: + + * If ``REGISTRATION_OPEN`` is not specified in settings, or is + set to ``True``, registration is permitted. + + * If ``REGISTRATION_OPEN`` is both specified and set to + ``False``, registration is not permitted. + + """ + return getattr(settings, 'REGISTRATION_OPEN', True) + + +class ActivationView(BaseActivationView): + + registration_profile = RegistrationProfile + + def activate(self, *args, **kwargs): + """ + Given an an activation key, look up and activate the user + account corresponding to that key (if possible). + + After successful activation, the signal + ``registration.signals.user_activated`` will be sent, with the + newly activated ``User`` as the keyword argument ``user`` and + the class of this backend as the sender. + + """ + activation_key = kwargs.get('activation_key', '') + site = get_current_site(self.request) + user, activated = self.registration_profile.objects.activate_user( + activation_key, site) + if activated: + signals.user_activated.send(sender=self.__class__, + user=user, + request=self.request) + return user + + def get_success_url(self, user): + return ('registration_activation_complete', (), {}) + + +class ResendActivationView(BaseResendActivationView): + + registration_profile = RegistrationProfile + + def resend_activation(self, form): + """ + Given an email, look up user by email and resend activation key + if user is not already activated or previous activation key has + not expired. Note that if multiple users exist with the given + email, no emails will be sent. + + Returns True if activation key was successfully sent, False otherwise. + + """ + site = get_current_site(self.request) + email = form.cleaned_data['email'] + return self.registration_profile.objects.resend_activation_mail( + email, site, self.request) + + def render_form_submitted_template(self, form): + """ + Renders resend activation complete template with the submitted email. + + """ + email = form.cleaned_data['email'] + context = {'email': email} + return render(self.request, + 'registration/resend_activation_complete.html', + context) diff --git a/dependencies/django-registration/registration/backends/default_with_names/__init__.py b/dependencies/django-registration/registration/backends/default_with_names/__init__.py index f6c5b3b1f..35a0abb02 100644 --- a/dependencies/django-registration/registration/backends/default_with_names/__init__.py +++ b/dependencies/django-registration/registration/backends/default_with_names/__init__.py @@ -33,7 +33,7 @@ class AnytaskLoginForm(AuthenticationForm): def __init__(self, *args, **kwargs): AuthenticationForm.__init__(self, *args, **kwargs) - self.error_messages['invalid_login'] = _(u"Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль.") + self.error_messages['invalid_login'] = "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." self.fields['username'].label = _(u"Логин / E-mail") self.helper = FormHelper(self) @@ -42,7 +42,7 @@ def __init__(self, *args, **kwargs): self.helper.field_class = 'col-md-8' self.helper.layout.append(HTML(u"""<div class="form-group row" style="margin-bottom: 16px;margin-top: -16px;"> <div class="col-md-offset-4 col-md-8"> - <a href="{% url "django.contrib.auth.views.password_reset" %}"><small class="text-muted">""" + _(u'Забыли пароль?') + """</small></a> + <a href="{% url "auth_password_reset" %}"><small class="text-muted">""" + _(u'Забыли пароль?') + """</small></a> </div> </div> <div class="form-group row"> diff --git a/dependencies/django-registration/registration/backends/default_with_names/urls.py b/dependencies/django-registration/registration/backends/default_with_names/urls.py index 42cf2c48a..8ca4ffc7f 100644 --- a/dependencies/django-registration/registration/backends/default_with_names/urls.py +++ b/dependencies/django-registration/registration/backends/default_with_names/urls.py @@ -1,20 +1,15 @@ """ URLconf for registration and activation, using django-registration's default backend. - If the default behavior of these views is acceptable to you, simply use a line like this in your root URLconf to set up the default URLs for registration:: - (r'^accounts/', include('registration.backends.default.urls')), - This will also automatically set up the views in ``django.contrib.auth`` at sensible default locations. - If you'd like to customize the behavior (e.g., by passing extra arguments to the various views) or split up the URLs, feel free to set up your own URL patterns for these views instead. - """ from django.conf.urls import * @@ -23,9 +18,10 @@ from registration.backends.default_with_names import AnytaskLoginForm, \ AnytaskPasswordResetForm, AnytaskSetPasswordForm, \ AnytaskPasswordChangeForm -from registration.views import activate -from registration.views import register -from registration.views import ajax_check_username, ajax_check_email +from .views import ActivationView +from .views import RegistrationView +from .views import ajax_check_username, ajax_check_email +from django.urls import reverse_lazy from django.contrib.auth import views as auth_views @@ -38,12 +34,12 @@ # that way it can return a sensible "invalid key" message instead of a # confusing 404. url(r'^activate/(?P<activation_key>\w+)/$', - activate, + ActivationView.as_view(), { 'backend': 'registration.backends.default_with_names.DefaultBackend'}, name='registration_activate'), url(r'^register/$', - register, + RegistrationView.as_view(), { 'backend': 'registration.backends.default_with_names.DefaultBackend'}, name='registration_register'), @@ -62,22 +58,22 @@ ajax_check_email, name='registration.views.ajax_check_email'), url(r'^login/$', - auth_views.login, - {'template_name': 'registration/login.html', - 'authentication_form': AnytaskLoginForm}, - name='registration.views.login'), - url(r'^password/reset/$', - auth_views.password_reset, - {'password_reset_form': AnytaskPasswordResetForm}, - name='registration.views.password_reset'), - url( - r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', - auth_views.password_reset_confirm, - {'set_password_form': AnytaskSetPasswordForm}, - name='registration.views.password_reset_confirm'), + auth_views.LoginView.as_view(template_name='registration/login.html', + extra_context={'form': AnytaskLoginForm}), + name='auth_login'), + url(r'^password/reset/$', auth_views.PasswordResetView.as_view( + success_url=reverse_lazy('auth_password_reset_done'), + extra_context={'password_reset_form': AnytaskPasswordResetForm}), + name='auth_password_reset'), + url(r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', + auth_views.PasswordResetConfirmView.as_view( + success_url=reverse_lazy('auth_password_reset_complete'), + extra_context={'set_password_form': AnytaskSetPasswordForm}), + name='auth_password_reset_confirm'), url(r'^password/change/$', - auth_views.password_change, - {'password_change_form': AnytaskPasswordChangeForm}, - name='registration.views.password_change'), + auth_views.PasswordChangeView.as_view( + success_url=reverse_lazy('auth_password_change_done'), + extra_context={'password_change_form': AnytaskPasswordChangeForm}), + name='auth_password_change'), url(r'', include('registration.auth_urls')), - ] +] diff --git a/dependencies/django-registration/registration/backends/default_with_names/views.py b/dependencies/django-registration/registration/backends/default_with_names/views.py new file mode 100644 index 000000000..0fee5fad4 --- /dev/null +++ b/dependencies/django-registration/registration/backends/default_with_names/views.py @@ -0,0 +1,202 @@ +from django.conf import settings +from django.contrib.sites.shortcuts import get_current_site +from django.shortcuts import render + +from ... import signals +from ...models import RegistrationProfile +from ...users import UserModel +from ...views import ActivationView as BaseActivationView +from ...views import RegistrationView as BaseRegistrationView +from ...views import ResendActivationView as BaseResendActivationView + +from django.contrib.auth.models import User +from django.http import HttpResponse + + +class RegistrationView(BaseRegistrationView): + """ + A registration backend which follows a simple workflow: + + 1. User signs up, inactive account is created. + + 2. Email is sent to user with activation link. + + 3. User clicks activation link, account is now active. + + Using this backend requires that + + * ``registration`` be listed in the ``INSTALLED_APPS`` setting + (since this backend makes use of models defined in this + application). + + * The setting ``ACCOUNT_ACTIVATION_DAYS`` be supplied, specifying + (as an integer) the number of days from registration during + which a user may activate their account (after that period + expires, activation will be disallowed). + + * The creation of the templates + ``registration/activation_email_subject.txt`` and + ``registration/activation_email.txt``, which will be used for + the activation email. See the notes for this backends + ``register`` method for details regarding these templates. + + When subclassing this view, you can set the ``SEND_ACTIVATION_EMAIL`` + class variable to False to skip sending the new user a confirmation + email or set ``SEND_ACTIVATION_EMAIL`` to ``False``. Doing so implies + that you will have to activate the user manually from the admin site or + send an activation by some other method. For example, by listening for + the ``user_registered`` signal. + + Additionally, registration can be temporarily closed by adding the + setting ``REGISTRATION_OPEN`` and setting it to + ``False``. Omitting this setting, or setting it to ``True``, will + be interpreted as meaning that registration is currently open and + permitted. + + Internally, this is accomplished via storing an activation key in + an instance of ``registration.models.RegistrationProfile``. See + that model and its custom manager for full documentation of its + fields and supported operations. + + """ + SEND_ACTIVATION_EMAIL = getattr(settings, 'SEND_ACTIVATION_EMAIL', True) + success_url = 'registration_complete' + + registration_profile = RegistrationProfile + + def register(self, form): + """ + Given a username, email address and password, register a new + user account, which will initially be inactive. + + Along with the new ``User`` object, a new + ``registration.models.RegistrationProfile`` will be created, + tied to that ``User``, containing the activation key which + will be used for this account. + + An email will be sent to the supplied email address; this + email should contain an activation link. The email will be + rendered using two templates. See the documentation for + ``RegistrationProfile.send_activation_email()`` for + information about these templates and the contexts provided to + them. + + After the ``User`` and ``RegistrationProfile`` are created and + the activation email is sent, the signal + ``registration.signals.user_registered`` will be sent, with + the new ``User`` as the keyword argument ``user`` and the + class of this backend as the sender. + + """ + site = get_current_site(self.request) + + if hasattr(form, 'save'): + new_user_instance = form.save(commit=False) + else: + new_user_instance = (UserModel().objects + .create_user(**form.cleaned_data)) + + new_user = self.registration_profile.objects.create_inactive_user( + new_user=new_user_instance, + site=site, + send_email=self.SEND_ACTIVATION_EMAIL, + request=self.request, + ) + signals.user_registered.send(sender=self.__class__, + user=new_user, + request=self.request) + return new_user + + def registration_allowed(self): + """ + Indicate whether account registration is currently permitted, + based on the value of the setting ``REGISTRATION_OPEN``. This + is determined as follows: + + * If ``REGISTRATION_OPEN`` is not specified in settings, or is + set to ``True``, registration is permitted. + + * If ``REGISTRATION_OPEN`` is both specified and set to + ``False``, registration is not permitted. + + """ + return getattr(settings, 'REGISTRATION_OPEN', True) + + +class ActivationView(BaseActivationView): + + registration_profile = RegistrationProfile + + def activate(self, *args, **kwargs): + """ + Given an an activation key, look up and activate the user + account corresponding to that key (if possible). + + After successful activation, the signal + ``registration.signals.user_activated`` will be sent, with the + newly activated ``User`` as the keyword argument ``user`` and + the class of this backend as the sender. + + """ + activation_key = kwargs.get('activation_key', '') + site = get_current_site(self.request) + user, activated = self.registration_profile.objects.activate_user( + activation_key, site) + if activated: + signals.user_activated.send(sender=self.__class__, + user=user, + request=self.request) + return user + + def get_success_url(self, user): + return ('registration_activation_complete', (), {}) + + +class ResendActivationView(BaseResendActivationView): + + registration_profile = RegistrationProfile + + def resend_activation(self, form): + """ + Given an email, look up user by email and resend activation key + if user is not already activated or previous activation key has + not expired. Note that if multiple users exist with the given + email, no emails will be sent. + + Returns True if activation key was successfully sent, False otherwise. + + """ + site = get_current_site(self.request) + email = form.cleaned_data['email'] + return self.registration_profile.objects.resend_activation_mail( + email, site, self.request) + + def render_form_submitted_template(self, form): + """ + Renders resend activation complete template with the submitted email. + + """ + email = form.cleaned_data['email'] + context = {'email': email} + return render(self.request, + 'registration/resend_activation_complete.html', + context) + + +def ajax_check_username(request): + response = 'false' + if request.is_ajax() and request.method == 'GET' and request.GET['username']: + existing = User.objects.filter(username__iexact=request.GET['username']) + if not existing.exists(): + response = 'true' + + return HttpResponse(response) + + +def ajax_check_email(request): + response = 'false' + if request.is_ajax() and request.method == 'GET' and request.GET['email']: + if not User.objects.filter(email__iexact=request.GET['email']): + response = 'true' + + return HttpResponse(response) diff --git a/dependencies/django-registration/registration/backends/simple/__init__.py b/dependencies/django-registration/registration/backends/simple/__init__.py index 5e8c35be0..e69de29bb 100644 --- a/dependencies/django-registration/registration/backends/simple/__init__.py +++ b/dependencies/django-registration/registration/backends/simple/__init__.py @@ -1,64 +0,0 @@ -from django.conf import settings -from django.contrib.auth import authenticate -from django.contrib.auth import login -from django.contrib.auth.models import User - -from registration import signals -from registration.forms import RegistrationForm - - -class SimpleBackend(object): - """ - A registration backend which implements the simplest possible - workflow: a user supplies a username, email address and password - (the bare minimum for a useful account), and is immediately signed - up and logged in. - - """ - def register(self, request, **kwargs): - """ - Create and immediately log in a new user. - - """ - username, email, password = kwargs['username'], kwargs['email'], kwargs['password1'] - User.objects.create_user(username, email, password) - - # authenticate() always has to be called before login(), and - # will return the user we just created. - new_user = authenticate(username=username, password=password) - login(request, new_user) - signals.user_registered.send(sender=self.__class__, - user=new_user, - request=request) - return new_user - - def activate(self, **kwargs): - raise NotImplementedError - - def registration_allowed(self, request): - """ - Indicate whether account registration is currently permitted, - based on the value of the setting ``REGISTRATION_OPEN``. This - is determined as follows: - - * If ``REGISTRATION_OPEN`` is not specified in settings, or is - set to ``True``, registration is permitted. - - * If ``REGISTRATION_OPEN`` is both specified and set to - ``False``, registration is not permitted. - - """ - return getattr(settings, 'REGISTRATION_OPEN', True) - - def get_form_class(self, request): - return RegistrationForm - - def post_registration_redirect(self, request, user): - """ - After registration, redirect to the user's account page. - - """ - return (user.get_absolute_url(), (), {}) - - def post_activation_redirect(self, request, user): - raise NotImplementedError diff --git a/dependencies/django-registration/registration/backends/simple/urls.py b/dependencies/django-registration/registration/backends/simple/urls.py index 21875fba4..6a3aa0297 100644 --- a/dependencies/django-registration/registration/backends/simple/urls.py +++ b/dependencies/django-registration/registration/backends/simple/urls.py @@ -11,24 +11,35 @@ This will also automatically set up the views in ``django.contrib.auth`` at sensible default locations. -If you'd like to customize the behavior (e.g., by passing extra -arguments to the various views) or split up the URLs, feel free to set -up your own URL patterns for these views instead. +If you'd like to customize registration behavior, feel free to set up +your own URL patterns for these views instead. """ -from django.conf.urls import * + +from django.conf import settings +from django.conf.urls import include +from django.conf.urls import url from django.views.generic.base import TemplateView -from registration.views import register - -urlpatterns = [url(r'^register/$', - register, - {'backend': 'registration.backends.simple.SimpleBackend'}, - name='registration_register'), - url(r'^register/closed/$', - TemplateView.as_view( - template_name='registration/registration_closed.html'), - name='registration_disallowed'), - url(r'', include('registration.auth_urls')), +from .views import RegistrationView + +urlpatterns = [ + url(r'^register/closed/$', + TemplateView.as_view(template_name='registration/registration_closed.html'), + name='registration_disallowed'), ] + +if getattr(settings, 'INCLUDE_REGISTER_URL', True): + urlpatterns += [ + url(r'^register/$', + RegistrationView.as_view( + success_url=getattr(settings, 'SIMPLE_BACKEND_REDIRECT_URL', '/'), + ), + name='registration_register'), + ] + +if getattr(settings, 'INCLUDE_AUTH_URLS', True): + urlpatterns += [ + url(r'', include('registration.auth_urls')), + ] diff --git a/dependencies/django-registration/registration/backends/simple/views.py b/dependencies/django-registration/registration/backends/simple/views.py new file mode 100644 index 000000000..ba5a14249 --- /dev/null +++ b/dependencies/django-registration/registration/backends/simple/views.py @@ -0,0 +1,46 @@ +from django.conf import settings +from django.contrib.auth import authenticate +from django.contrib.auth import login + +from ... import signals +from ...views import RegistrationView as BaseRegistrationView + + +class RegistrationView(BaseRegistrationView): + """ + A registration backend which implements the simplest possible + workflow: a user supplies a username, email address and password + (the bare minimum for a useful account), and is immediately signed + up and logged in). + + """ + success_url = 'registration_complete' + + def register(self, form): + new_user = form.save() + username_field = getattr(new_user, 'USERNAME_FIELD', 'username') + new_user = authenticate( + username=getattr(new_user, username_field), + password=form.cleaned_data['password1'] + ) + + login(self.request, new_user) + signals.user_registered.send(sender=self.__class__, + user=new_user, + request=self.request) + return new_user + + def registration_allowed(self): + """ + Indicate whether account registration is currently permitted, + based on the value of the setting ``REGISTRATION_OPEN``. This + is determined as follows: + + * If ``REGISTRATION_OPEN`` is not specified in settings, or is + set to ``True``, registration is permitted. + + * If ``REGISTRATION_OPEN`` is both specified and set to + ``False``, registration is not permitted. + + """ + return getattr(settings, 'REGISTRATION_OPEN', True) diff --git a/dependencies/django-registration/registration/forms.py b/dependencies/django-registration/registration/forms.py index 8382a88c0..3385a3b8f 100644 --- a/dependencies/django-registration/registration/forms.py +++ b/dependencies/django-registration/registration/forms.py @@ -1,81 +1,67 @@ """ Forms and validation code for user registration. -""" +Note that all of these forms assume Django's bundle default ``User`` +model; since it's not possible for a form to anticipate in advance the +needs of custom user models, you will need to write your own forms if +you're using a custom model. +""" +from __future__ import unicode_literals -from django.contrib.auth.models import User from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.contrib.auth.forms import UserCreationForm +from .users import UserModel +from .users import UsernameField +from .utils import _ -# I put this on all required fields, because it's easier to pick up -# on them with CSS or JavaScript if they have a class of "required" -# in the HTML. Your mileage may vary. If/when Django ticket #3515 -# lands in trunk, this will no longer be necessary. -attrs_dict = {'class': 'required'} +User = UserModel() -class RegistrationForm(forms.Form): +class RegistrationForm(UserCreationForm): """ Form for registering a new user account. - + Validates that the requested username is not already in use, and requires the password to be entered twice to catch typos. - + Subclasses should feel free to add any additional validation they need, but should avoid defining a ``save()`` method -- the actual saving of collected user data is delegated to the active registration backend. - + + """ + required_css_class = 'required' + email = forms.EmailField(label=_("E-mail")) + + class Meta: + model = User + fields = (UsernameField(), "email") + + +class RegistrationFormUsernameLowercase(RegistrationForm): + """ + A subclass of :class:`RegistrationForm` which enforces unique case insensitive + usernames, make all usernames to lower case. + """ - username = forms.RegexField(regex=r'^[\w.@+-]+$', - max_length=30, - widget=forms.TextInput(attrs=attrs_dict), - label=_("Username"), - error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) - email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, - maxlength=75)), - 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), - label=_("Password (again)")) - def clean_username(self): - """ - Validate that the username is alphanumeric and is not already - in use. - - """ - existing = User.objects.filter(username__iexact=self.cleaned_data['username']) - if existing.exists(): - raise forms.ValidationError(_("A user with that username already exists.")) - else: - return self.cleaned_data['username'] + username = self.cleaned_data.get('username', '').lower() + if User.objects.filter(**{UsernameField(): username}).exists(): + raise forms.ValidationError(_('A user with that username already exists.')) - def clean(self): - """ - Verifiy that the values entered into the two password fields - match. Note that an error here will end up in - ``non_field_errors()`` because it doesn't apply to a single - field. - - """ - if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data: - if self.cleaned_data['password1'] != self.cleaned_data['password2']: - raise forms.ValidationError(_("The two password fields didn't match.")) - return self.cleaned_data + return username class RegistrationFormTermsOfService(RegistrationForm): """ Subclass of ``RegistrationForm`` which adds a required checkbox for agreeing to a site's Terms of Service. - + """ - tos = forms.BooleanField(widget=forms.CheckboxInput(attrs=attrs_dict), - label=_(u'I have read and agree to the Terms of Service'), + tos = forms.BooleanField(widget=forms.CheckboxInput, + label=_('I have read and agree to the Terms of Service'), error_messages={'required': _("You must agree to the terms to register")}) @@ -83,13 +69,13 @@ class RegistrationFormUniqueEmail(RegistrationForm): """ Subclass of ``RegistrationForm`` which enforces uniqueness of email addresses. - + """ def clean_email(self): """ Validate that the supplied email address is unique for the site. - + """ if User.objects.filter(email__iexact=self.cleaned_data['email']): raise forms.ValidationError(_("This email address is already in use. Please supply a different email address.")) @@ -101,23 +87,28 @@ class RegistrationFormNoFreeEmail(RegistrationForm): Subclass of ``RegistrationForm`` which disallows registration with email addresses from popular free webmail services; moderately useful for preventing automated spam registrations. - + To change the list of banned domains, subclass this form and override the attribute ``bad_domains``. - + """ bad_domains = ['aim.com', 'aol.com', 'email.com', 'gmail.com', 'googlemail.com', 'hotmail.com', 'hushmail.com', 'msn.com', 'mail.ru', 'mailinator.com', 'live.com', - 'yahoo.com'] - + 'yahoo.com', 'outlook.com'] + def clean_email(self): """ Check the supplied email address against a list of known free webmail domains. - + """ email_domain = self.cleaned_data['email'].split('@')[1] if email_domain in self.bad_domains: raise forms.ValidationError(_("Registration using free email addresses is prohibited. Please supply a different email address.")) return self.cleaned_data['email'] + + +class ResendActivationForm(forms.Form): + required_css_class = 'required' + email = forms.EmailField(label=_("E-mail")) diff --git a/dependencies/django-registration/registration/locale/ar/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/ar/LC_MESSAGES/django.po index dd61869d3..0b2f3b117 100644 --- a/dependencies/django-registration/registration/locale/ar/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/ar/LC_MESSAGES/django.po @@ -8,74 +8,438 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "اسم المستخدم" - -#: forms.py:41 -msgid "email address" -msgstr "عنوان البريد الالكتروني" - -#: forms.py:43 -msgid "password" -msgstr "كلمة المرور" - -#: forms.py:45 -msgid "password (again)" -msgstr "تأكيد كلمة المرور" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "يمكن أن يحتوي اسم المستخدم على احرف، ارقام وشرطات سطرية فقط" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "رمز التفعيل" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "اسم المستخدم مسجل مسبقا. يرجى اختيار اسم اخر." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "يجب ادخال كلمة المرور مطابقة كل مرة" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "أقر بقراءة والموافقة على شروط الخدمة" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "يجب الموافقة على الشروط للتسجيل" -#: forms.py:124 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "عنوان البريد الالكتروني مسجل مسبقا. يرجى تزويد عنوان بريد الكتروني مختلف." +msgstr "" +"عنوان البريد الالكتروني مسجل مسبقا. يرجى تزويد عنوان بريد الكتروني مختلف." -#: forms.py:149 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." -msgstr "يمنع التسجيل باستخدام عناوين بريد الكترونية مجانية. يرجى تزويد عنوان بريد الكتروني مختلف." +msgstr "" +"يمنع التسجيل باستخدام عناوين بريد الكترونية مجانية. يرجى تزويد عنوان بريد " +"الكتروني مختلف." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "مستخدم" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "رمز التفعيل" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "ملف التسجيل الشخصي" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "ملفات التسجيل الشخصية" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "رمز التفعيل" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "رمز التفعيل" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "ملف التسجيل الشخصي" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "رمز التفعيل" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "تأكيد كلمة المرور" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "كلمة المرور" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "كلمة المرور" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "كلمة المرور" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "كلمة المرور" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "ملف التسجيل الشخصي" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "رمز التفعيل" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "اسم المستخدم" + +#~ msgid "email address" +#~ msgstr "عنوان البريد الالكتروني" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "يمكن أن يحتوي اسم المستخدم على احرف، ارقام وشرطات سطرية فقط" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "اسم المستخدم مسجل مسبقا. يرجى اختيار اسم اخر." + +#~ msgid "You must type the same password each time" +#~ msgstr "يجب ادخال كلمة المرور مطابقة كل مرة" diff --git a/dependencies/django-registration/registration/locale/bg/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/bg/LC_MESSAGES/django.po index 5089ec17d..94f420d3c 100644 --- a/dependencies/django-registration/registration/locale/bg/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/bg/LC_MESSAGES/django.po @@ -7,72 +7,438 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2008-03-05 12:37+0200\n" "Last-Translator: Vladislav <vladislav.mitov@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,10,-1,-1,-1,-1,-1\n" -#: forms.py:38 -msgid "username" -msgstr "Потребителско име " - -#: forms.py:41 -msgid "email address" -msgstr "Електронна поща" - -#: forms.py:43 -msgid "password" -msgstr "Парола" - -#: forms.py:45 -msgid "password (again)" -msgstr "Парола (проверка)" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "Потребителските имена могат да съдържат букви, цифри и подчертавки" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "Ключ за активация" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Потребителското име е заето. Моля изберето друго." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "Грешка при проверка на паролата." +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Прочел съм и съм съгласен с условията за експлоатация" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Трябва да сте съгласни с условията за да се регистрирате." -#: forms.py:124 -msgid "This email address is already in use. Please supply a different email address." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." msgstr "Адреса на електронната поща е използван. Моля въведете друг адрес." -#: forms.py:149 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." -msgstr "Регистрациите с безплатни адреси е забранен. Моля въведете различен адрес за електронна поща" +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Регистрациите с безплатни адреси е забранен. Моля въведете различен адрес за " +"електронна поща" -#: models.py:188 +#: models.py:274 msgid "user" msgstr "Потребител" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "Ключ за активация" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "регистрационен профил" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "регистрационни профили" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "Ключ за активация" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "Ключ за активация" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "регистрационен профил" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "Ключ за активация" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "Парола (проверка)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "Парола" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "Парола" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "Парола" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "Парола" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "регистрационен профил" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "Ключ за активация" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "Потребителско име " + +#~ msgid "email address" +#~ msgstr "Електронна поща" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "Потребителските имена могат да съдържат букви, цифри и подчертавки" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Потребителското име е заето. Моля изберето друго." + +#~ msgid "You must type the same password each time" +#~ msgstr "Грешка при проверка на паролата." diff --git a/dependencies/django-registration/registration/locale/ca/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/ca/LC_MESSAGES/django.po index 7068194c8..2f5f33f4f 100644 --- a/dependencies/django-registration/registration/locale/ca/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/ca/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-17 11:04+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2010-09-24 23:21+0100\n" "Last-Translator: Carles Barrobés i Meix <carles@barrobes.com>\n" "Language-Team: Català\n" @@ -17,51 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Catalan\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Activar usuaris" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Re-enviar e-mails d'activació" -#: forms.py:35 -msgid "Username" -msgstr "Nom d'usuari" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Aquest valor ha de contenir només lletres, números i guions baixos" - -#: forms.py:39 +#: forms.py:36 forms.py:114 msgid "E-mail" msgstr "E-mail" -#: forms.py:41 -msgid "Password" -msgstr "Contrasenya" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Contrasenya (de nou)" - -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Ja existeix un usuari amb aquest nom" -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "Els dos camps de contrasenya no coincideixen" - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "He llegit i estic d'acord amb les condicions d'ús" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Heu d'estar d'acord amb les condicions d'ús per registrar-vos" -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." @@ -69,7 +49,7 @@ msgstr "" "Aquesta adreça d'e-mail ja està sent utilitzada. Sisplau, entreu-ne una " "altra." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." @@ -77,21 +57,387 @@ msgstr "" "Està prohibit registrar-se utilitzant adreces d'e-mail gratuïtes. Sisplau " "entreu-ne una altra." -#: models.py:168 +#: models.py:274 msgid "user" msgstr "usuari" -#: models.py:169 +#: models.py:276 msgid "activation key" msgstr "clau d'activació" -#: models.py:174 +#: models.py:282 msgid "registration profile" msgstr "perfil de registre" -#: models.py:175 +#: models.py:283 msgid "registration profiles" msgstr "perfils de registre" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "clau d'activació" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Re-enviar e-mails d'activació" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "perfil de registre" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "clau d'activació" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Contrasenya (de nou)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Contrasenya" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Contrasenya" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Contrasenya" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Contrasenya" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "perfil de registre" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Re-enviar e-mails d'activació" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Re-enviar e-mails d'activació" + +#~ msgid "Username" +#~ msgstr "Nom d'usuari" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Aquest valor ha de contenir només lletres, números i guions baixos" + +#~ msgid "The two password fields didn't match." +#~ msgstr "Els dos camps de contrasenya no coincideixen" + #~ msgid "Email address" #~ msgstr "Adreça d'e-mail" diff --git a/dependencies/django-registration/registration/locale/cs/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/cs/LC_MESSAGES/django.po index 439c9cff7..bf2df518e 100644 --- a/dependencies/django-registration/registration/locale/cs/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/cs/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-12 14:09-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Implayo s.r.o. <michal.pilar@implayo.cz>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,78 +17,426 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Aktivovat uživatele" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Znovu odeslat aktivační e-maily" -#: forms.py:35 -msgid "username" -msgstr "uživatelské jméno" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Tato hodnota může obsahovat pouze písmena, čísla a podtržítka." - -#: forms.py:39 -msgid "Email address" -msgstr "E-mailová adresa" - -#: forms.py:41 -msgid "Password" -msgstr "Heslo" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Heslo (znovu)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Uživatel s tímto jménem již existuje." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "Zadaná 2 hesla se neshodují." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Přečetl jsem si a souhlasím s podmínkami služby" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Musíte odsouhlasit podmínky služby pro pokračování v registraci." -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "" -"Tato e-mailová adresa se již používá. Prosím zadejte jinou e-mailovou " -"adresu." +"Tato e-mailová adresa se již používá. Prosím zadejte jinou e-mailovou adresu." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." msgstr "" -"Používání volných e-mailových adres je zakázáno. Prosím zadejte " -"jinou e-mailovou adresu." +"Používání volných e-mailových adres je zakázáno. Prosím zadejte jinou e-" +"mailovou adresu." -#: models.py:165 +#: models.py:274 msgid "user" msgstr "uživatel" -#: models.py:166 +#: models.py:276 msgid "activation key" msgstr "aktivační klíč" -#: models.py:171 +#: models.py:282 msgid "registration profile" msgstr "registrační profil" -#: models.py:172 +#: models.py:283 msgid "registration profiles" msgstr "registrační profily" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "aktivační klíč" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Znovu odeslat aktivační e-maily" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "registrační profil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "aktivační klíč" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Heslo (znovu)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Heslo" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Heslo" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Heslo" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Heslo" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "registrační profil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Znovu odeslat aktivační e-maily" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Znovu odeslat aktivační e-maily" + +#~ msgid "username" +#~ msgstr "uživatelské jméno" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Tato hodnota může obsahovat pouze písmena, čísla a podtržítka." + +#~ msgid "Email address" +#~ msgstr "E-mailová adresa" + +#~ msgid "The two password fields didn't match." +#~ msgstr "Zadaná 2 hesla se neshodují." diff --git a/dependencies/django-registration/registration/locale/da/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/da/LC_MESSAGES/django.po index 7bb0ac8f7..ce56b083c 100644 --- a/dependencies/django-registration/registration/locale/da/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/da/LC_MESSAGES/django.po @@ -8,85 +8,434 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.8 \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" +"PO-Revision-Date: \n" "Last-Translator: Rune Bromer <rb@konstellation.dk>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Aktiver brugere" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Gensend aktiveringsemails" -#: forms.py:35 -msgid "Username" -msgstr "Brugernavn" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "V¾rdien mŒ kun indeholde bogstaver, tal og underscore." - -#: forms.py:39 -msgid "Email address" -msgstr "E-mailadresse" - -#: forms.py:41 -msgid "Password" -msgstr "Password" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Password (gentag)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Der findes allerede en bruger med dette brugernavn." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "De 2 passwordfelter er ikke ens." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "I har l¾st og accepterer betingelserne." -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Du skal acceptere betingelserne for at registere" -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "" -"Denne emailadresse er allerede i brug. Benyt venligst en anden. " +msgstr "Denne emailadresse er allerede i brug. Benyt venligst en anden. " -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." msgstr "" -"Registrering med gratis emailadresser er ikke muligt. V¾lg venligst en " -"anden emailadresse" +"Registrering med gratis emailadresser er ikke muligt. V¾lg venligst en anden " +"emailadresse" -#: models.py:165 +#: models.py:274 msgid "user" msgstr "bruger" -#: models.py:166 +#: models.py:276 msgid "activation key" msgstr "Aktiveringsn¿gle" -#: models.py:171 +#: models.py:282 msgid "registration profile" msgstr "Registreringsprofil" -#: models.py:172 +#: models.py:283 msgid "registration profiles" msgstr "Registreringprofiler" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "Aktiveringsn¿gle" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Gensend aktiveringsemails" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "Registreringsprofil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "Aktiveringsn¿gle" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Password (gentag)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Password" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Password" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Password" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Password" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "Registreringsprofil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Gensend aktiveringsemails" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Gensend aktiveringsemails" + +#~ msgid "Username" +#~ msgstr "Brugernavn" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "V¾rdien mŒ kun indeholde bogstaver, tal og underscore." + +#~ msgid "Email address" +#~ msgstr "E-mailadresse" + +#~ msgid "The two password fields didn't match." +#~ msgstr "De 2 passwordfelter er ikke ens." diff --git a/dependencies/django-registration/registration/locale/de/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/de/LC_MESSAGES/django.po index b1e44f429..c8e7bbd9e 100644 --- a/dependencies/django-registration/registration/locale/de/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/de/LC_MESSAGES/django.po @@ -8,59 +8,40 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.8 \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-18 21:32+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2007-09-29 16:50+0200\n" -"Last-Translator: Jannis Leidel <jannis@leidel.info>\n" +"Last-Translator: Michael Schmid <gutermichi@googlemail.com>\n" "Language-Team: Deutsch <de@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Benutzer aktivieren" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Aktivierungs-E-Mail erneut senden" -#: forms.py:35 -msgid "Username" -msgstr "Benutzername" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." - -#: forms.py:39 -msgid "Email address" -msgstr "E-Mail-Adresse" - -#: forms.py:41 -msgid "Password" -msgstr "Passwort" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Passwort (wiederholen)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Dieser Benutzername ist bereits vergeben." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "Die beiden Passwörter sind nicht identisch." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Ich habe die Nutzungsvereinbarung gelesen und stimme ihr zu" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Sie müssen der Nutzungsvereinbarung zustimmen, um sich zu registrieren" -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." @@ -68,7 +49,7 @@ msgstr "" "Diese E-Mail-Adresse wird schon genutzt. Bitte geben Sie eine andere E-Mail-" "Adresse an." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." @@ -76,18 +57,473 @@ msgstr "" "Die Registrierung mit einer kostenlosen E-Mail-Adresse ist untersagt. Bitte " "geben Sie eine andere E-Mail-Adresse an." -#: models.py:165 +#: models.py:274 msgid "user" msgstr "Benutzer" -#: models.py:166 +#: models.py:276 msgid "activation key" msgstr "Aktivierungsschlüssel" -#: models.py:171 +#: models.py:282 msgid "registration profile" msgstr "Registrierungsprofil" -#: models.py:172 +#: models.py:283 msgid "registration profiles" msgstr "Registrierungsprofile" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "Aktivierungsschlüssel" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Aktivierungs-E-Mail erneut senden" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "Account aktiviert" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "Ihr Account ist nun aktiviert." + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "Sie können sich jetzt einloggen." + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" +"Sobald ein Administrator Ihren Account aktiviert hat können Sie sich " +"einloggen." + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "Registrierungsprofil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" Sie (oder jemand der vorgibt Sie zu sein) möchte einen Account auf\n" +" %(site_name)s registrieren. Falls Sie es nicht waren, ignorieren Sie " +"diese E-Mail\n" +" und Ihre Adresse wird aus unserem System gelöscht.\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" Um diesen Account zu aktivieren klicken Sie bitte auf den folgenden Link " +"innerhalb der nächsten next\n" +" %(expiration_days)s Tage:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" Mit freundlichen Grüßen,,\n" +" %(site_name)s Management\n" +" " + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +"Sie (oder jemand der vorgibt Sie zu sein) möchten einen Account auf\n" +"%(site_name)s registrieren. Falls es nicht Sie waren, ignorieren Sie bitte " +"diese E-Mail\n" +"und Ihre Adresse wird aus unserem System gelöscht.\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +"Um diesen Account zu aktivieren klicken Sie bitte auf den folgenden Link " +"innerhalb der nächsten\n" +"%(expiration_days)s Tage:\n" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +"Mit freundlichen Grüßen,\n" +"%(site_name)s Management\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "Aktivierungsschlüssel" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "Genehmigung fehlgeschlagen" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "Account Genehmigung fehlgeschlagen." + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "Account genehmigt" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "Der Account des Nutzers ist jetzt genehmigt." + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "Admin Genehmigung" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" +"\n" +" Ihr Account ist nun genehmigt. Sie können sich \n" +" " + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "einloggen" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" +"\n" +"Ihr Account ist nun genehmigt. Sie können sich über den folgenden Link " +"einloggen\n" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" +"\n" +" Der folgende Nutzer (%(user)s) möchte einen Account auf\n" +" %(site_name)s erstellen.\n" +" " + +#: templates/registration/admin_approve_email.html:17 +#, fuzzy +#| msgid "" +#| "\n" +#| " To approve this, please \n" +#| " " +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" +"\n" +" Um dies zu bestätigen, bitte \n" +" " + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "Hier klicken" + +#: templates/registration/admin_approve_email.txt:2 +#, fuzzy, python-format +#| msgid "" +#| "\n" +#| "The following user (%(user)s) has asked to register an account at\n" +#| "%(site_name)s. \n" +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" +"\n" +"Der folgende Nutzer (%(user)s) möchte einen Account auf\n" +"%(site_name)s erstellen. \n" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +"Zur Bestätigung bitte auf den folgenden Link klicken.\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "Account wartet auf Genehmigung" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +#, fuzzy +#| msgid "Log In" +msgid "Log in" +msgstr "Login" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "Passwort vergessen?" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "Zurücksetzen" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "Noch kein Mitglied?" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "Registrieren" + +#: templates/registration/logout.html:4 +#, fuzzy +#| msgid "Logged in" +msgid "Logged out" +msgstr "Eingeloggt" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "Erfolgreich ausgeloggt" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Passwort (wiederholen)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "Passwort erfolgreich geändert!" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Passwort ändern" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "Passwort-Zurücksetzung komplett" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "Ihr Passwort wurde zurückgesetzt!" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "Sie können sich jetzt <a href=\"%(login_url)s\">einloggen</a>" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "Bestätige Passwort-Zurücksetzung" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "Neues Passwort unten eingeben um Passwort zurückzusetzen" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Passwort ändern" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password reset" +msgstr "Passwort (wiederholen)" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" Wir haben Ihnen eine E-Mail mit einem Link zum Zurücksetzen des " +"Passworts geschickt.Bitte prüfen Sie Ihre E-Mail und klicken Sie auf den " +"Link um Fortzusetzen.\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "Grüße" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"Sie erhalten diese E-Mail, weil Sie (oder jemand der angibt Sie zu sein)\n" +"die Zurücksetzung des Passwort auf %(domain)s angefragt hat. Falls Sie\n" +"das Passwort nicht zurücksetzen wollen ignorieren Sie bitte diese " +"Nachricht.\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"Um Ihr Passwort zurückzusetzen klicken Sie bitte auf den folgenden Link oder " +"kopieren Sie ihn und fügen ihn\n" +"in Ihrem Browser ein:\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "Ihr Nutzername, für den Fall, dass Sie ihn vergessen haben:" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "Beste Grüße" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "Management" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Passwort ändern" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" Passwort vergessen? E-Mail im nachfolgenden Formular angeben und wir " +"senden Ihnen eine Anleitung um ein Neues zu erstellen.\n" +" " + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "Registrierungsprofil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" +"Entschuldigung, die Registrierung ist derzeit geschlossen. Schauen Sie " +"später nochmal vorbei." + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Aktivierungs-E-Mail erneut senden" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" +"Bitte überprüfen Sie Ihre E-Mail um den Registrierungs-Prozess abzuschließen." + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "Für einen Account registrieren" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "Absenden" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "Account Aktivierung erneut gesendet" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" +"\n" +" Wir haben Ihnen eine E-Mail an %(email)s mit weiteren Instruktionen " +"gesendet.\n" +" " + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Aktivierungs-E-Mail erneut senden" + +#~ msgid "Username" +#~ msgstr "Benutzername" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "" +#~ "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." + +#~ msgid "Email address" +#~ msgstr "E-Mail-Adresse" + +#~ msgid "The two password fields didn't match." +#~ msgstr "Die beiden Passwörter sind nicht identisch." diff --git a/dependencies/django-registration/registration/locale/el/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/el/LC_MESSAGES/django.po index cd38eb1b4..f01a3fd0a 100644 --- a/dependencies/django-registration/registration/locale/el/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/el/LC_MESSAGES/django.po @@ -8,77 +8,461 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2007-11-14 21:50+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "όνομα χρήστη" +#: admin.py:26 +msgid "Activate users" +msgstr "Ενεργοποίηση χρηστών" -#: forms.py:41 -msgid "email address" -msgstr "διεύθυνση ηλεκτρονικού ταχυδρομείου" +#: admin.py:44 +msgid "Re-send activation emails" +msgstr "Να σταλεί ξανά το κλειδί ενεργοποίησης" -#: forms.py:43 -msgid "password" -msgstr "συνθηματικό" - -#: forms.py:45 -msgid "password (again)" -msgstr "συνθηματικό (ξανά)" - -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "Τα ονόματα χρηστών μπορούν να περιλαμβάνουν μόνο γράμματα, αριθμούς και υπογραμμίσεις" - -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Αυτό το όνομα χρήστη χρησιμοποίειται ήδη. Παρακαλώ διαλέξτε ένα άλλο." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "Πρέπει να εισάγετε το ίδιο συνθηματικό κάθε φορά" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "Υπάρχει ήδη χρήστης με αυτό το όνομα." -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" -msgstr "Διάβασα και συμφωνώ με τους Όρους της Υπηρεσίας" +msgstr "Διάβασα τους όρους χρήσης και συμφωνώ." -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" -msgstr "Πρέπει να συμφωνείται με τους όρους για να εγγραφείτε" +msgstr "Πρέπει να συμφωνήσετε με τους όρους για να εγγραφείτε" -#: forms.py:124 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "" -"Η συγκεκριμένη διεύθυνση ηλεκτρονικού ταχυδρομείου χρησιμοποιείται ήδη. " -"Παρακαλώ δώστε κάποια άλλη." +"Αυτή η διεύθυνση email χρησιμοποιείται ήδη. " +"Προσδιορίστε άλλη." -#: forms.py:149 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." msgstr "" -"Η εγγραφή μέσω δωρεάν διευθύνσεων ηλεκτρονικού ταχυδρομείου απαγορεύεται. ""Παρακαλώ δώστε κάποια άλλη." +"Η εγγραφή με δωρεάν διευθύνσεις email απαγορεύεται. " +"Προσδιορίστε άλλη διεύθυνση." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "χρήστης" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "κλειδί ενεργοποίησης" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "προφίλ εγγραφής" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "προφίλ εγγραφών" + +#: templates/registration/activate.html:4 +msgid "Activation Failure" +msgstr "Αποτυχία ενεργοποίησης" + +#: templates/registration/activate.html:7 +msgid "Account activation failed." +msgstr "Η ενεργοποίηση του λογαριασμού απέτυχε." + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "Λογαριασμός ενεργοποιημένος" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "Ο λογαριασμός σας ενεργοποιήθηκε." + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "Μπορείτε να πραγματοποιήσετε είσοδο στο σύστημα." + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" +"Θα μπορέσετε να πραγματοποιήσετε είσοδο στο σύστημα μόλις ένας " +"διαχειριστής ενεργοποιήσει το λογαριασμό σας." + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +msgid "registration" +msgstr "εγγραφή" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" Κάποιος ζήτησε να δημιουργηθεί λογαριασμός για σας στο %(site_name)s.\n" +" Αν δεν ήσασταν εσείς, αγνοήστε αυτό το email και η διεύθυνσή σας θα\n" +" διαγραφεί από τα αρχεία μας.\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" Για να ενεργοποιηθεί ο λογαριασμός, ακολουθήστε τον παρακάτω σύνδεσμο\n" +" πριν περάσουν %(expiration_days)s μέρες:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" Με εκτίμηση,\n" +" Η διαχείριση του %(site_name)s\n" +" " + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +"Κάποιος ζήτησε να δημιουργηθεί λογαριασμός για σας στο %(site_name)s.\n" +"Αν δεν ήσασταν εσείς, αγνοήστε αυτό το email και η διεύθυνσή σας θα\n" +"διαγραφεί από τα αρχεία μας.\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +"Για να ενεργοποιηθεί ο λογαριασμός, ακολουθήστε τον παρακάτω σύνδεσμο\n" +"πριν περάσουν %(expiration_days)s μέρες:\n" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +"Με εκτίμηση,\n" +"Η διαχείριση του %(site_name)s\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +msgid "Account activation on" +msgstr "Ενεργοποίηση λογαριασμού στο" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "Αποτυχία έγκρισης" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "Η έγκριση του λογαριασμού απέτυχε." + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "Λογαριασμός εγκρίθηκε" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "Ο λογαριασμός του χρήστη εγκρίθηκε." + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "— έγκριση διαχειριστή" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" +"\n" +" Ο λογαριασμός σας έχει εγκριθεί. Μπορείτε να \n" +" " + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "πραγματοποιήσετε είσοδο." + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" +"\n" +"Ο λογαριασμός σας εγκρίθηκε. Μπορείτε τώρα να πραγματοποιήσετε είσοδο\n" +"με τον παρακάτω σύνδεσμο\n" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" +"\n" +" Ο παρακάτω χρήστης (%(user)s) ζήτησε να καταχωρήσει λογαριασμό στο\n" +" %(site_name)s.\n" +" " + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" +"\n" +" Για να εγκρίνετε, παρακαλώ\n" +" " + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "κλικ εδώ" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" +"\n" +"Ο παρακάτω χρήστης (%(user)s) ζήτησε να καταχωρήσει λογαριασμό στο\n" +"%(site_name)s.\n" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +"Για να εγκρίνετε, παρακαλώ ακολουθήστε τον παρακάτω σύνδεσμο.\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "Έγκριση λογαριασμού στο" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "Είσοδος" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "Ξεχάσατε το συνθηματικό;" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "Επαναφορά" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "Δεν έχετε λογαριασμό;" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "Εγγραφή" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "Αποσυνδεθήκατε" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "Αποσυνδεθήκατε επιτυχώς" + +#: templates/registration/password_change_done.html:4 +msgid "Password changed" +msgstr "Το συνθηματικό άλλαξε" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "Το συνθηματικό άλλαξε επιτυχώς" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +msgid "Change password" +msgstr "Αλλαγή συνθηματικού" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "Ολοκλήρωση επαναφοράς συνθηματικού" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "Το νέο συνθηματικό σας είναι έτοιμο." + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "Μπορείτε τώρα να <a href=\"%(login_url)s\">πραγματοποιήσετε είσοδο</a>" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "Επιβεβαίωση ορισμού νέου συνθηματικού" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "Προσδιορίστε νέο συνθηματικό:" + +#: templates/registration/password_reset_confirm.html:18 +msgid "Set password" +msgstr "Ορισμός συνθηματικού" + +#: templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Επαναφορά συνθηματικού" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" Σας στείλαμε email με σύνδεσμο για ορισμό νέου συνθηματικού.\n" +" Ελέγξτε το email σας και ακολουθήστε το σύνδεσμο.\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "Γεια σας" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"Λαμβάνετε αυτό το email γιατί ζητήσατε να οριστεί νέο συνθηματικό\n" +"στον ιστότοπο %(domain)s. Αν δεν θέλετε να ορίσετε νέο συνθηματικό,\n" +"αγνοήστε αυτό το μήνυμα.\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"Για να ορίσετε νέο συνθηματικό, ακολουθήστε τον παρακάτω σύνδεσμο\n" +"ή αντιγράψτε τον στον περιηγητή σας:\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "Το όνομα χρήστη σας, σε περίπτωση που το ξεχάσατε:" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "Χαιρετισμούς" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "— Η διαχείριση" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +msgid "Reset password" +msgstr "Επαναφορά συνθηματικού" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" Ξεχάσατε το συνθηματικό; Προσδιορίστε το email σας και θα σας στείλουμε " +"οδηγίες για να ορίσετε νέο.\n" +" " + +#: templates/registration/registration_closed.html:4 +msgid "Registration is closed" +msgstr "Δεν γίνονται εγγραφές" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "Δεν επιτρέπονται εγγραφές επί του παρόντος. Δοκιμάστε αργότερα." + +#: templates/registration/registration_complete.html:4 +msgid "Activation email sent" +msgstr "Εστάλη το email για ενεργοποίηση" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "Ελέγξτε το email σας για να ολοκληρώσετε τη διαδικασία εγγραφής." + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "Εγγραφή" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "Υποβολή" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "Το email ενεργοποίησης εστάλη εκ νέου" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" +"\n" +" Στείλαμε email με οδηγίες στο %(email)s.\n" +" " + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "Εκ νέου αποστολή του email ενεργοποίησης" diff --git a/dependencies/django-registration/registration/locale/en/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/en/LC_MESSAGES/django.po index b41ce1766..3f2e286a0 100644 --- a/dependencies/django-registration/registration/locale/en/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-01 16:47+0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,121 +17,387 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "" -#: forms.py:35 -msgid "Username" -msgstr "" - -#: forms.py:36 -msgid "This value may contain only letters, numbers and @/./+/-/_ characters." -msgstr "" - -#: forms.py:39 +#: forms.py:36 forms.py:114 msgid "E-mail" msgstr "" -#: forms.py:41 -msgid "Password" -msgstr "" - -#: forms.py:43 -msgid "Password (again)" -msgstr "" - -#: forms.py:53 +#: forms.py:52 msgid "A user with that username already exists." msgstr "" -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "" - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "" -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "" -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." msgstr "" -#: models.py:176 +#: models.py:274 msgid "user" msgstr "" -#: models.py:177 +#: models.py:276 msgid "activation key" msgstr "" -#: models.py:182 +#: models.py:282 msgid "registration profile" msgstr "" -#: models.py:183 +#: models.py:283 msgid "registration profiles" msgstr "" -#: backends/default_with_names/__init__.py:29 -msgid "Логин / E-mail" -msgstr "Login / E-mail" +#: templates/registration/activate.html:4 +msgid "Activation Failure" +msgstr "" + +#: templates/registration/activate.html:7 +msgid "Account activation failed." +msgstr "" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" -#: backends/default_with_names/__init__.py:37 -msgid "Забыли пароль?" -msgstr "Forgot password?" +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" -#: backends/default_with_names/__init__.py:42 -msgid "Войти" -msgstr "Log in" +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +msgid "registration" +msgstr "" -#: backends/default_with_names/__init__.py:71 -msgid "Сбросить" -msgstr "Reset password" +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" -#: backends/default_with_names/__init__.py:84 -msgid "Применить" -msgstr "Apply" +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" -#: backends/default_with_names/__init__.py:97 -msgid "Изменить" -msgstr "Change" +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" -#: backends/default_with_names/__init__.py:114 -msgid "Логин" -msgstr "Username" +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" -#: backends/default_with_names/__init__.py:115 -msgid "Имя" -msgstr "Fisrt name" +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" -#: backends/default_with_names/__init__.py:116 -msgid "Фамилия" -msgstr "Last name" +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +msgid "Account activation on" +msgstr "" -#: backends/default_with_names/__init__.py:117 -msgid "Показывать мой e-mail всем пользователям" -msgstr "Show my e-mail" +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" -#: backends/default_with_names/__init__.py:143 -msgid "Зарегистрироваться" -msgstr "Sign up" +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" -msgid "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." -msgstr "Please enter a correct username/email and password." +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +msgid "Password changed" +msgstr "" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +msgid "Change password" +msgstr "" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +msgid "Set password" +msgstr "" + +#: templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +msgid "Reset password" +msgstr "" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +msgid "Registration is closed" +msgstr "" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +msgid "Activation email sent" +msgstr "" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" diff --git a/dependencies/django-registration/registration/locale/es/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/es/LC_MESSAGES/django.po index ba0384fe5..4a3ba23b6 100644 --- a/dependencies/django-registration/registration/locale/es/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/es/LC_MESSAGES/django.po @@ -8,78 +8,486 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.3 \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-11 00:19-0400\n" -"PO-Revision-Date: 2008-03-11 00:19-0400\n" -"Last-Translator: Ernesto Rico Schmidt <e.rico.schmidt@gmail.com>\n" -"Language-Team: Español <de@li.org>\n" +"POT-Creation-Date: 2018-04-10 22:33-0400\n" +"PO-Revision-Date: 2018-04-11 08:50+0200\n" +"Last-Translator: Jose Antonio Martin <jantoniomartin@gmail.com>\n" +"Language-Team: Español <es@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "nombre de usuario" +#: admin.py:26 +msgid "Activate users" +msgstr "Activar usuarios" -#: forms.py:41 -msgid "email address" -msgstr "dirección de coreo electrónico" +#: admin.py:44 +msgid "Re-send activation emails" +msgstr "Reenviar correos de activación" -#: forms.py:43 -msgid "password" -msgstr "contraseña" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "Correo Electrónico" -#: forms.py:45 -msgid "password (again)" -msgstr "contraseña (otra vez)" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "Ya existe un usuario con ese nombre de usuario." -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "Los nombres de usuarios sólo pueden contener letras, números y guiones bajos" - -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Este nombre de usuario ya está ocupado. Por favor escoge otro" - -#: forms.py:71 -msgid "You must type the same password each time" -msgstr "Tienes que introducir la misma contraseña cada vez" - -#: forms.py:100 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" -msgstr "He leído y acepto los términos de servicio" +msgstr "He leído y acepto los Términos de Servicio" -#: forms.py:109 +#: forms.py:65 msgid "You must agree to the terms to register" -msgstr "Tienes que aceptar los términos para registrarte" +msgstr "Debe aceptar los términos para registrarse" -#: forms.py:128 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "" -"La dirección de correo electrónico ya está siendo usada. Por favor" -"proporciona otra dirección." +"La dirección de correo electrónico ya está siendo usada. Por favor " +"proporcione otra dirección." -#: forms.py:153 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." msgstr "" -"El registro usando una dirección de correo electrónico gratis está prohibido." -"Por favor proporciona otra dirección." +"El registro usando una dirección de correo electrónico gratuita está " +"prohibido. Por favor proporcione otra dirección." -#: models.py:188 +#: models.py:304 msgid "user" msgstr "usuario" -#: models.py:189 +#: models.py:306 msgid "activation key" msgstr "clave de activación" -#: models.py:194 +#: models.py:312 msgid "registration profile" msgstr "perfil de registro" -#: models.py:195 +#: models.py:313 msgid "registration profiles" msgstr "perfiles de registro" + +#: templates/registration/activate.html:4 +msgid "Activation Failure" +msgstr "Fallo de activación" + +#: templates/registration/activate.html:7 +msgid "Account activation failed." +msgstr "La activación de la cuenta ha fallado." + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "Cuenta Activada" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "Tu cuenta está activada." + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "Puedes acceder." + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "Podrás acceder después de que un administrador active tu cuenta." + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +msgid "registration" +msgstr "registro" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" Usted (o alguien que se hace pasar por usted) ha solicitado dar de alta " +"una cuenta en\n" +" %(site_name)s. Si no ha sido usted, por favor, ignore este email\n" +" y su dirección será eliminada de nuestros registros.\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" Para activar esta cuenta, por favor pulse el siguiente enlace durante " +"los próximos\n" +" %(expiration_days)s días:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" Atentamente,\n" +" los administradores de %(site_name)s\n" +" " + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +"Usted (o alguien que se hace pasar por usted) ha solicitado dar de alta una " +"cuenta en\n" +"%(site_name)s. Si no ha sido usted, por favor ignore este correo " +"electrónico\n" +"y su dirección será borrada de nuestros registros.\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +"Para activar esta cuenta, por favor pulse el siguiente enlace durante los " +"próximos\n" +"%(expiration_days)s días:\n" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +"Atentamente,\n" +"los administradores de %(site_name)s\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +msgid "Account activation on" +msgstr "Activación de cuenta en" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "Fallo de aprobación" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "La aprobación de la cuenta falló." + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "Cuenta Aprobada" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "La cuenta del usuario ha sido aprobada." + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "aprobación de administrador" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" +"\n" +" Su cuenta ha sido aprobada. Puede \n" +" " + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "iniciar sesión." + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" +"\n" +"Su cuenta ha sido aprobada. Puede acceder usando el siguiente enlace\n" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" +"\n" +" El siguiente usuario (%(user)s) ha solicitado dar de alta una cuenta en\n" +" %(site_name)s.\n" +" " + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" +"\n" +" Para aprobarla, por favor\n" +" " + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "pulse aquí" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" +"\n" +"El siguiente usuario (%(user)s) ha solicitado dar de alta una cuenta en\n" +"%(site_name)s.\n" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +"Para aprobarla, por favor pulse el siguiente enlace.\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "Aprobación de la cuenta en" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "Iniciar sesión" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "¿Olvidó su contraseña?" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "Restablézcala" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "¿Aún no es miembro?" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "Regístrese" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "Desconectado" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "Se desconectó con éxito" + +#: templates/registration/password_change_done.html:4 +msgid "Password changed" +msgstr "Contraseña cambiada" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "¡Se cambió la contraseña con éxito!" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +msgid "Change password" +msgstr "Cambiar contraseña" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "Reinicio de contraseña completado" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "¡Su contraseña ha sido restablecida!" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "Ahora puede <a href=\"%(login_url)s\">iniciar sesión</a>" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "Confirmar restablecimiento de contraseña" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "Introduzca su nueva contraseña para restablecerla:" + +#: templates/registration/password_reset_confirm.html:18 +msgid "Set password" +msgstr "Configurar contraseña" + +#: templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Reinicio de contraseña" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" Le hemos enviado un email con un enlace para restablecer su contraseña. " +"Por favor compruebe\n" +" su correo electrónico y pulse el enlace para continuar.\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "Saludos" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"Está recibiendo este email porque usted (o alguien que se hace pasar por " +"usted)\n" +"solicitó que su contraseña fuera restablecida en %(domain)s. Si usted no " +"desea\n" +"restablecer su contraseña, por favor ignore este mensaje.\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"Para restablecer su contraseña, por favor pulse el siguiente enlace, o " +"cópielo y péguelo en su navegador:\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "Su usuario, por si lo hubiera olvidado:" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "Saludos cordiales" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "Administración" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +msgid "Reset password" +msgstr "Restablecer contraseña" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" ¿Olvidó su contraseña? Introduzca su email en el siguiente formulario y " +"le enviaremos instrucciones para restablecerla.\n" +" " + +#: templates/registration/registration_closed.html:4 +msgid "Registration is closed" +msgstr "El registro está cerrado" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" +"Lo sentimos, pero el registro está cerrado en este momento. Inténtelo más " +"tarde." + +#: templates/registration/registration_complete.html:4 +msgid "Activation email sent" +msgstr "Email de activación enviado" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" +"Por favor revise su correo electrónico para completar el proceso de registro." + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "Registre una cuenta" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "Enviar" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "Activación de Cuenta Reenviada" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" +"\n" +" Le hemos enviado un email a %(email)s con más instrucciones.\n" +" " + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "Reenviar Email de Activación" + +#~ msgid "username" +#~ msgstr "nombre de usuario" + +#~ msgid "email address" +#~ msgstr "dirección de coreo electrónico" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "" +#~ "Los nombres de usuarios sólo pueden contener letras, números y guiones " +#~ "bajos" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Este nombre de usuario ya está ocupado. Por favor escoge otro" + +#~ msgid "You must type the same password each time" +#~ msgstr "Tienes que introducir la misma contraseña cada vez" diff --git a/dependencies/django-registration/registration/locale/es_AR/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/es_AR/LC_MESSAGES/django.po index fb746b5b9..c97ead506 100644 --- a/dependencies/django-registration/registration/locale/es_AR/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/es_AR/LC_MESSAGES/django.po @@ -8,76 +8,439 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "nombre de usuario" - -#: forms.py:41 -msgid "email address" -msgstr "dirección de e-mail" - -#: forms.py:43 -msgid "password" -msgstr "contraseña" - -#: forms.py:45 -msgid "password (again)" -msgstr "contraseña (nuevamente)" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "El nombre de usuario solo puede contener letras, números y guiones bajos" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "clave de activación" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Ese nombre de usuario ya está asignado. Por favor elija otro." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "Debe tipear la misma contraseña cada vez" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "He leído y estoy de acuerdo con las Condiciones de Servicio" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Debe estar de acuerdo con las Condiciones para poder registrarse" -#: forms.py:124 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "Esa dirección de e-mail ya está en uso. Por favor provea otra " -"dirección." +msgstr "" +"Esa dirección de e-mail ya está en uso. Por favor provea otra dirección." -#: forms.py:149 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." -msgstr "La registración con un e-mail gratuito está prohibida. Por favor " -"de una dirección de e-mail diferente." +msgstr "" +"La registración con un e-mail gratuito está prohibida. Por favor de una " +"dirección de e-mail diferente." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "usuario" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "clave de activación" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "perfil de registro" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "perfiles de registro" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "clave de activación" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "clave de activación" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "perfil de registro" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "clave de activación" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "contraseña (nuevamente)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "contraseña" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "contraseña" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "contraseña" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "contraseña" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "perfil de registro" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "clave de activación" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "nombre de usuario" + +#~ msgid "email address" +#~ msgstr "dirección de e-mail" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "" +#~ "El nombre de usuario solo puede contener letras, números y guiones bajos" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Ese nombre de usuario ya está asignado. Por favor elija otro." + +#~ msgid "You must type the same password each time" +#~ msgstr "Debe tipear la misma contraseña cada vez" diff --git a/dependencies/django-registration/registration/locale/fa/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/fa/LC_MESSAGES/django.po index 5c658cda0..6380a00f0 100644 --- a/dependencies/django-registration/registration/locale/fa/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/fa/LC_MESSAGES/django.po @@ -7,74 +7,438 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2011-11-18 01:11+0330\n" "Last-Translator: Mohsen Mansouryar <mohsen.brian@gmail.com>\n" "Language-Team: erixe <mohsen.brian@gmail.com>\n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Persian\n" "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" "X-Poedit-SourceCharset: utf-8\n" -#: forms.py:38 -msgid "username" -msgstr "نام کاربری" - -#: forms.py:41 -msgid "email address" -msgstr "پست الکترونیکی" - -#: forms.py:43 -msgid "password" -msgstr "گذرواژه" - -#: forms.py:45 -msgid "password (again)" -msgstr "گذرواژه(تکرار)" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "نام های کاربری تنها می توانند شامل حرف، رقم و یا _ باشند." +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "کد فعالسازی" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "این نام کاربری گرفته شده است. لطفا نام دیگری انتخاب کنید." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "دو گذرواژه باید مطابق باشند!" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "من شرایط استفاده از این سرویس را مطالعه کرده و می پذیرم." -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "شما باید شرایط عضویت را بپذیرید!" -#: forms.py:124 -msgid "This email address is already in use. Please supply a different email address." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." msgstr "این آدرس استفاده شده است. لطفا آدرس دیگری ارائه دهید." -#: forms.py:149 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." msgstr "ثبت نام با استفاده از پست های الکترونیکی رایگان امکان پذیر نمی باشد." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "کاربر" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "کد فعالسازی" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "مشخصات ثبت نام" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "پروفایل های ثبت نام" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "کد فعالسازی" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "کد فعالسازی" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "مشخصات ثبت نام" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "کد فعالسازی" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "گذرواژه(تکرار)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "گذرواژه" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "گذرواژه" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "گذرواژه" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "گذرواژه" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "مشخصات ثبت نام" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "کد فعالسازی" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "نام کاربری" + +#~ msgid "email address" +#~ msgstr "پست الکترونیکی" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "نام های کاربری تنها می توانند شامل حرف، رقم و یا _ باشند." + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "این نام کاربری گرفته شده است. لطفا نام دیگری انتخاب کنید." + +#~ msgid "You must type the same password each time" +#~ msgstr "دو گذرواژه باید مطابق باشند!" diff --git a/dependencies/django-registration/registration/locale/fr/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/fr/LC_MESSAGES/django.po index f25ed06dd..119d1a6ae 100644 --- a/dependencies/django-registration/registration/locale/fr/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/fr/LC_MESSAGES/django.po @@ -8,65 +8,49 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.8 alpha-1 \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-01 14:33+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2010-07-01 14:30+0200\n" -"Last-Translator: Patrick Samson <maxcom@laposte.net>\n" +"Last-Translator: Jean-Marc Porcherot <jmarc.porcherot@free.fr>\n" "Language-Team: Français <fr@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: .\admin.py:23 +#: admin.py:26 msgid "Activate users" -msgstr "Active les utilisateurs" +msgstr "Activer les utilisateurs" -#: .\admin.py:43 +#: admin.py:44 +#, fuzzy +#| msgid "Activation email sent" msgid "Re-send activation emails" -msgstr "Envoie à nouveau les courriels d'activation" - -#: .\forms.py:35 -msgid "Username" -msgstr "Nom d'utilisateur" - -#: .\forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Cette valeur ne doit contenir que des lettres, chiffres et tirets bas." +msgstr "Le mail d'activation a été envoyé" -#: .\forms.py:39 -msgid "Email address" -msgstr "Adresse courriel" - -#: .\forms.py:41 -msgid "Password" -msgstr "Mot de passe" - -#: .\forms.py:43 -msgid "Password (again)" -msgstr "Mot de passe (vérification)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: .\forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." -msgstr "Un utilisateur avec ce nom existe déjà." +msgstr "Ce nom d'utilisateur est déjà utilisé." -#: .\forms.py:67 -msgid "The two password fields didn't match." -msgstr "Les deux mots de passe ne correspondent pas." - -#: .\forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "J'ai lu et accepté les Conditions Générales d'Utilisation" -#: .\forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Vous devez accepter les conditions d'utilisation pour vous inscrire" -#: .\forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "Cette adresse courriel est déjà utilisée. Veuillez en indiquer une autre." +msgstr "" +"Cette adresse courriel est déjà utilisée. Veuillez en indiquer une autre." -#: .\forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." @@ -74,18 +58,473 @@ msgstr "" "L'inscription avec adresse courriel de compte gratuit est interdite. " "Veuillez en indiquer une autre." -#: .\models.py:165 +#: models.py:274 msgid "user" msgstr "utilisateur" -#: .\models.py:166 +#: models.py:276 +#, fuzzy +#| msgid "Account activation on" msgid "activation key" -msgstr "clé d'activation" +msgstr "Activation du compte sur" -#: .\models.py:171 +#: models.py:282 +#, fuzzy +#| msgid "registration profiles" msgid "registration profile" -msgstr "profil d'inscription" +msgstr "profils d'inscription" -#: .\models.py:172 +#: models.py:283 msgid "registration profiles" msgstr "profils d'inscription" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "Activation email sent" +msgid "Activation Failure" +msgstr "Le mail d'activation a été envoyé" + +#: templates/registration/activate.html:7 +msgid "Account activation failed." +msgstr "Erreur lors de l'activation du compte" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "Compte activé" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "Votre compte est activé" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "Vous pouvez vous connecter." + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +msgid "registration" +msgstr "profil d'inscription" + +#: templates/registration/activation_email.html:11 +#, fuzzy, python-format +#| msgid "" +#| "\n" +#| " You (or someone pretending to be you) have asked to register an " +#| "account at\n" +#| " %(site.name)s. If this wasn't you, please ignore this email\n" +#| " and your address will be removed from our records.\n" +#| " " +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" Vous (ou quelqu'un se faisant passer pour vous) a demandé à créer un " +"compte sur le site\n" +" %(site.name)s. Si ce n'étais pas vous, veuillez ignorer cet email\n" +" et votre adresse sera retirée de notre base.\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" Pour activer votre compte, cliquez sur ce lien avant\n" +" %(expiration_days)s jours:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, fuzzy, python-format +#| msgid "" +#| "\n" +#| " Sincerely,\n" +#| " %(site.name)s Management\n" +#| " " +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" Cordialement,\n" +" " + +#: templates/registration/activation_email.txt:2 +#, fuzzy, python-format +#| msgid "" +#| "\n" +#| "You (or someone pretending to be you) have asked to register an account " +#| "at\n" +#| "%(site.name)s. If this wasn't you, please ignore this email\n" +#| "and your address will be removed from our records.\n" +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +" Vous (ou quelqu'un se faisant passer pour vous) a demandé à créer un " +"compte sur le site\n" +" %(site.name)s. Si ce n'étais pas vous, veuillez ignorer cet email\n" +" et votre adresse sera retirée de notre base.\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +" Pour activer votre compte, cliquez sur ce lien avant\n" +" %(expiration_days)s jours:\n" + +#: templates/registration/activation_email.txt:14 +#, fuzzy, python-format +#| msgid "" +#| "\n" +#| "Sincerely,\n" +#| "%(site.name)s Management\n" +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +" Cordialement,\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +msgid "Account activation on" +msgstr "Activation du compte sur" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +#, fuzzy +#| msgid "Account activation failed." +msgid "Account Approval failed." +msgstr "Erreur lors de l'activation du compte" + +#: templates/registration/admin_approve_complete.html:4 +#, fuzzy +#| msgid "Account Activated" +msgid "Account Approved" +msgstr "Compte activé" + +#: templates/registration/admin_approve_complete.html:8 +#, fuzzy +#| msgid "Your account is now activated." +msgid "The user's account is now approved." +msgstr "Votre compte est activé" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +#, fuzzy +#| msgid "Your account is now activated." +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "Votre compte est activé" + +#: templates/registration/admin_approve_complete_email.html:14 +#, fuzzy +#| msgid "log in" +msgid "log in." +msgstr "vous connecter" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +#, fuzzy +#| msgid "" +#| "\n" +#| "To activate this account, please click the following link within the " +#| "next\n" +#| "%(expiration_days)s days:\n" +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +" Pour activer votre compte, cliquez sur ce lien avant\n" +" %(expiration_days)s jours:\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +#, fuzzy +#| msgid "Account activation on" +msgid "Account approval on" +msgstr "Activation du compte sur" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "Se connecter" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "Mot de passe oublié ?" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "Le renouveler" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "Vous n'êtes pas membre ?" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "Vous enregistrer" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "Déconnecté" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "Déconnecté avec succès" + +#: templates/registration/password_change_done.html:4 +msgid "Password changed" +msgstr "Mot de passe changé" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "Mot de passe changé avec succès" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +msgid "Change password" +msgstr "Mot de passe" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "Changement du mot de passe effectué" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "Votre mot de passe a été changé" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "Confirmer le renouvellement du mot de passe" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "Saisissez votre nouveau mot de passe" + +#: templates/registration/password_reset_confirm.html:18 +msgid "Set password" +msgstr "Modifiez votre mot de passe" + +#: templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Mot de passe modifié" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" Un lien vous a été envoyé pour le changement de votre mot de passe. " +"Veuillez consulter\n" +" votre boîte mail et cliquer sur le lien pour continuer.\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "Cher" + +#: templates/registration/password_reset_email.html:5 +#, fuzzy, python-format +#| msgid "" +#| "\n" +#| "You are receiving this email because you (or someone pretending to be " +#| "you)\n" +#| "requested that your password be reset on the %(domain)s site. If you do " +#| "not \n" +#| "wish to reset your password, please ignore this message.\n" +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"Vous recevez ce courriel parce que vous (ou quelqu'un se faisant passer pour " +"vous)\n" +"avez demandé à renouveler votre mot de passe sur le site %(domain)s. \n" +"Si vous ne souhaitez pas renouveler votre mot de passe, veuillez ignorer ce " +"message.\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"Pour renouveler votre mot de passe, veuillez cliquer sur le lien ci-" +"dessous,\n" +"ou le copier/coller dans la barre d'adresse de votre navigateur :\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "Rappel de votre nom d'utilisateur, si vous l'avez oublié :" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "Cordialement" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +msgid "Reset password" +msgstr "Renouveler le mot de passe" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" Mot de passe oublié ? Saisissez votre adresse mail ci-dessous afin que " +"nous vous envoyions les instructions pour que vous puissiez le renouveler.\n" +" " + +#: templates/registration/registration_closed.html:4 +msgid "Registration is closed" +msgstr "L'inscription est indisponible" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" +"Désolé, l'inscription est indisponible pour le moment. Veuillez réessayer " +"plus tard" + +#: templates/registration/registration_complete.html:4 +msgid "Activation email sent" +msgstr "Le mail d'activation a été envoyé" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" +"Veuillez consulter votre boîte mail pour terminer le processus " +"d'enregistrement" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "Créer un compte" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "Envoyer" + +#: templates/registration/resend_activation_complete.html:4 +#, fuzzy +#| msgid "Account activation on" +msgid "Account Activation Resent" +msgstr "Activation du compte sur" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Activation email sent" +msgid "Resend Activation Email" +msgstr "Le mail d'activation a été envoyé" + +#~ msgid "You may now" +#~ msgstr "Vous pouvez maintenant" + +#~ msgid "Username" +#~ msgstr "Nom d'utilisateur" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "" +#~ "Cette valeur ne doit contenir que des lettres, chiffres et tirets bas." + +#~ msgid "Email address" +#~ msgstr "Adresse courriel" + +#~ msgid "The two password fields didn't match." +#~ msgstr "Les deux mots de passe ne correspondent pas." diff --git a/dependencies/django-registration/registration/locale/he/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/he/LC_MESSAGES/django.po index 5567e0863..fde04609b 100644 --- a/dependencies/django-registration/registration/locale/he/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/he/LC_MESSAGES/django.po @@ -4,83 +4,441 @@ # <>, 2008. # , fuzzy # <>, 2008. -# -# +# +# msgid "" msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-10 02:01+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2008-02-10 02:05+0200\n" "Last-Translator: Meir Kriheli <meir@mksoft.co.il>\n" "Language-Team: Hebrew\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "שם משתמש" - -#: forms.py:41 -msgid "email address" -msgstr "דואר אלקטרוני" - -#: forms.py:43 -msgid "password" -msgstr "סיסמה" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:45 -msgid "password (again)" -msgstr "סיסמה (שוב)" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "מפתח הפעלה" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "שמות משתמש יכולים להכיל רק אותיות, ספרות וקווים תחתונים" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "שם המשתמש תפוס כבר. נא לבחור אחר." +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" #: forms.py:64 -msgid "You must type the same password each time" -msgstr "יש להקליד את אותה הסיסמה פעמיים" - -#: forms.py:93 msgid "I have read and agree to the Terms of Service" msgstr "קראתי והסכמתי לתנאי השימוש" -#: forms.py:102 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "עליך להסכים לתנאי השימוש" -#: forms.py:121 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "" -"כתובת הדואר האלקטרוני תפוסה כבר. נא לספק כתובת דואר אחרת." +msgstr "כתובת הדואר האלקטרוני תפוסה כבר. נא לספק כתובת דואר אחרת." -#: forms.py:146 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." -msgstr "" -"הרישום בעזרת תיבת דואר אלקטרוני חינמית אסור. נא לספק כתובת אחרת." +msgstr "הרישום בעזרת תיבת דואר אלקטרוני חינמית אסור. נא לספק כתובת אחרת." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "משתמש" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "מפתח הפעלה" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "פרופיל רישום" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "פרופילי רישום" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "מפתח הפעלה" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "מפתח הפעלה" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "פרופיל רישום" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "מפתח הפעלה" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "סיסמה (שוב)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "סיסמה" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "סיסמה" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "סיסמה" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "סיסמה" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "פרופיל רישום" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "מפתח הפעלה" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "שם משתמש" + +#~ msgid "email address" +#~ msgstr "דואר אלקטרוני" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "שמות משתמש יכולים להכיל רק אותיות, ספרות וקווים תחתונים" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "שם המשתמש תפוס כבר. נא לבחור אחר." + +#~ msgid "You must type the same password each time" +#~ msgstr "יש להקליד את אותה הסיסמה פעמיים" diff --git a/dependencies/django-registration/registration/locale/hr/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/hr/LC_MESSAGES/django.po index 1ed7e6c2b..aa495287c 100644 --- a/dependencies/django-registration/registration/locale/hr/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/hr/LC_MESSAGES/django.po @@ -7,80 +7,437 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.1beta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-01 14:09-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2010-12-01 15:49+0100\n" "Last-Translator: Enis Afgan <afgane@gmail.com>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Croatian\n" "X-Poedit-Country: CROATIA\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Aktiviraj korisnike" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Ponovno pošlji aktivacijski email" -#: forms.py:35 -msgid "username" -msgstr "Korisničko ime" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Ova vrijednost mora sadržavati samo slova, brojeve i podvlake." - -#: forms.py:39 -msgid "Email address" -msgstr "Email adresa" - -#: forms.py:41 -msgid "Password" -msgstr "Lozinka" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Lozinka (ponovno)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Ovo korisničko ime već postoji." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "Oba polja za lozinku nisu ista." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Pročitao sam i slažem se s uvijetima uporabe." -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Morate se složiti sa uvijetima uporabe prije registracije." -#: forms.py:95 -msgid "This email address is already in use. Please supply a different email address." -msgstr "Ova email adresa je već korištena. Molimo da koristite drugu email adresu." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Ova email adresa je već korištena. Molimo da koristite drugu email adresu." -#: forms.py:122 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." -msgstr "Registracija gdje se koristi besplati email servis nije dopuštena. Molimo da koristite drugu email adresu." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Registracija gdje se koristi besplati email servis nije dopuštena. Molimo da " +"koristite drugu email adresu." -#: models.py:165 +#: models.py:274 msgid "user" msgstr "Korisnik" -#: models.py:166 +#: models.py:276 msgid "activation key" msgstr "Aktivacijski ključ" -#: models.py:171 +#: models.py:282 msgid "registration profile" msgstr "Registracijski profil" -#: models.py:172 +#: models.py:283 msgid "registration profiles" -msgstr "Registracijski profili" \ No newline at end of file +msgstr "Registracijski profili" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "Aktivacijski ključ" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Ponovno pošlji aktivacijski email" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "Registracijski profil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "Aktivacijski ključ" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Lozinka (ponovno)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Lozinka" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Lozinka" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Lozinka" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Lozinka" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "Registracijski profil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Ponovno pošlji aktivacijski email" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Ponovno pošlji aktivacijski email" + +#~ msgid "username" +#~ msgstr "Korisničko ime" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Ova vrijednost mora sadržavati samo slova, brojeve i podvlake." + +#~ msgid "Email address" +#~ msgstr "Email adresa" + +#~ msgid "The two password fields didn't match." +#~ msgstr "Oba polja za lozinku nisu ista." diff --git a/dependencies/django-registration/registration/locale/hu/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/hu/LC_MESSAGES/django.po new file mode 100644 index 000000000..4c4b28381 --- /dev/null +++ b/dependencies/django-registration/registration/locale/hu/LC_MESSAGES/django.po @@ -0,0 +1,478 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Gergely Bódi <vendelin@gmail.com>, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: django-register-redux 1.3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" +"Language-Team: Hungarian <hu@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: admin.py:26 +msgid "Activate users" +msgstr "Felhasználók aktiválása" + +#: admin.py:44 +msgid "Re-send activation emails" +msgstr "Aktiváló emailek újraküldése" + +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "E-mail" + +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" + +#: forms.py:64 +msgid "I have read and agree to the Terms of Service" +msgstr "Elolvastam és elfogadom a felhasználási feltételeket" + +#: forms.py:65 +msgid "You must agree to the terms to register" +msgstr "El kell fogadnod a feltételeket a regisztráláshoz" + +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "Ez az email cím már foglalt. Kérlek adj meg egy másikat." + +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "Ingyenes email címről regisztrálni tilos. Kérlek adj meg egy másikat." + +#: models.py:274 +msgid "user" +msgstr "felhasználó" + +#: models.py:276 +msgid "activation key" +msgstr "aktiválási kulcs" + +#: models.py:282 +msgid "registration profile" +msgstr "regisztrációs profil" + +#: models.py:283 +msgid "registration profiles" +msgstr "regisztrációs profilok" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "Activation email sent" +msgid "Activation Failure" +msgstr "Aktiváló email elküldve" + +#: templates/registration/activate.html:7 +msgid "Account activation failed." +msgstr "Fiók aktiválása sikertelen." + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "Fiók aktiválva" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "A fiókod aktiválásra került." + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "Mostantól bejelentkezhetsz." + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +msgid "registration" +msgstr "regisztráció" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" Te (vagy valaki a nevedben) kérte egy fiók regisztrálását erre az " +"oldalra\n" +" %(site_name)s. Ha nem te voltál, hagyd ezt figyelmen kívül,\n" +" és a címed törölve lesz az adatbázisból.\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" Az aktiváláshoz kattints az alábbi linkre\n" +" %(expiration_days)s napon belül:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" Üdvözlettel,\n" +" %(site_name)s Ügyfélszolgálat\n" +" " + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +"Te (vagy valaki a nevedben) kérte egy fiók regisztrálását erre az oldalra:\n" +"%(site_name)s. Ha nem te voltál, hagyd ezt figyelmen kívül, \n" +"és a címed törölve lesz az adatbázisból.\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +"Az aktiváláshoz kattints az alábbi linkre\n" +"%(expiration_days)s napon belül:\n" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +"Üdvözlettel,\n" +"%(site_name)s Ügyfélszolgálat\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +msgid "Account activation on" +msgstr "Fiók aktiválása a következőre:" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +#, fuzzy +#| msgid "Account activation failed." +msgid "Account Approval failed." +msgstr "Fiók aktiválása sikertelen." + +#: templates/registration/admin_approve_complete.html:4 +#, fuzzy +#| msgid "Account Activated" +msgid "Account Approved" +msgstr "Fiók aktiválva" + +#: templates/registration/admin_approve_complete.html:8 +#, fuzzy +#| msgid "Your account is now activated." +msgid "The user's account is now approved." +msgstr "A fiókod aktiválásra került." + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +#, fuzzy +#| msgid "Your account is now activated." +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "A fiókod aktiválásra került." + +#: templates/registration/admin_approve_complete_email.html:14 +#, fuzzy +#| msgid "log in" +msgid "log in." +msgstr "bejelentkezhetsz" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +#, fuzzy +#| msgid "" +#| "\n" +#| "To activate this account, please click the following link within the " +#| "next\n" +#| "%(expiration_days)s days:\n" +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +"Az aktiváláshoz kattints az alábbi linkre\n" +"%(expiration_days)s napon belül:\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +#, fuzzy +#| msgid "Account activation on" +msgid "Account approval on" +msgstr "Fiók aktiválása a következőre:" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "Bejelentkezés" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "Elfelejtetted a jelszavad?" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "Visszaállítás" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "Még nem vagy tag?" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "Regisztráció" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "Kijelentkezés" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "Sikeresen kijelentkeztél" + +#: templates/registration/password_change_done.html:4 +msgid "Password changed" +msgstr "Megváltozott jelszó" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "A jelszavad sikeresen megváltozott!" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +msgid "Change password" +msgstr "Jelszó megváltoztatása" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "Jelszó megáltoztatva" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "A jelszavad sikeresen megváltoztatásra került!" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "Jelszó visszaállítás megerősítése" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "Írd ide az új jelszavad:" + +#: templates/registration/password_reset_confirm.html:18 +msgid "Set password" +msgstr "Jelszó beállítása" + +#: templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Jelszó megváltoztatva" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" Hamarosan kapsz egy levelet a jelszavad megváltozásáról. Nézd meg\n" +" a leveleid közt, és kattints a linkre a folytatáshoz.\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "Kedves" + +#: templates/registration/password_reset_email.html:5 +#, fuzzy, python-format +#| msgid "" +#| "\n" +#| "You are receiving this email because you (or someone pretending to be " +#| "you)\n" +#| "requested that your password be reset on the %(domain)s site. If you do " +#| "not \n" +#| "wish to reset your password, please ignore this message.\n" +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"Azért kaptad ezt a levelet, mert te (vagy valaki a nevedben)\n" +"jelszó visszaállítást kért a %(domain)s oldalon. Ha nem te akartad\n" +"visszaállítani a jelszavad, hagyd ezt figyelmen kívül, kérlek.\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"A jelszavad visszaállításához kérlek kattints az alábbi linkre, vagy másold " +"ki\n" +"a böngésződbe:\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "A felhasználóneved, arra az esetre, ha elfelejtetted volna:" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "Minden jót" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "Ügyfélszolgálat" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +msgid "Reset password" +msgstr "Jelszó visszaállítás" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" Elfelejtetted a jelszavad? Írd ide az email címed, és küldünk egy " +"levelet további instrukciókkal a megújításához.\n" +" " + +#: templates/registration/registration_closed.html:4 +msgid "Registration is closed" +msgstr "Regisztráció letiltva" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "Sajnálom, a regisztráció jelenleg le van tiltva. Gyere vissza később" + +#: templates/registration/registration_complete.html:4 +msgid "Activation email sent" +msgstr "Aktiváló email elküldve" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "Kérlek nézd meg a leveleid a regisztráció befejezéséhez." + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "Fiók regisztrálása" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "Küldés" + +#: templates/registration/resend_activation_complete.html:4 +#, fuzzy +#| msgid "Account activation on" +msgid "Account Activation Resent" +msgstr "Fiók aktiválása a következőre:" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Aktiváló emailek újraküldése" + +#~ msgid "You may now" +#~ msgstr "Most már" diff --git a/dependencies/django-registration/registration/locale/is/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/is/LC_MESSAGES/django.po index 479e792a9..2fddd67a6 100644 --- a/dependencies/django-registration/registration/locale/is/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/is/LC_MESSAGES/django.po @@ -9,66 +9,433 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-22 12:49+0100\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2009-01-22 12:49+0100\n" "Last-Translator: Björn Kristinsson <bjornkri@gmail.com>\n" "Language-Team: Icelandic\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:36 -msgid "username" -msgstr "notandanafn" - -#: forms.py:39 -msgid "email address" -msgstr "netfang" - -#: forms.py:41 -msgid "password" -msgstr "lykilorð" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:43 -msgid "password (again)" -msgstr "lykilorð (aftur)" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "einkennislykill" -#: forms.py:55 -msgid "This username is already taken. Please choose another." -msgstr "Þetta notendanafn er þegar á skrá. Vinsamlega reyndu annað." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:67 -msgid "You must type the same password each time" -msgstr "Lykilorðin verða að vera eins " +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:90 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Ég hef lesið og samþykki skilmálana" -#: forms.py:107 +#: forms.py:65 +msgid "You must agree to the terms to register" +msgstr "" + +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "Þetta netfang er þegar á skrá. Vinsamlegast notaðu annað netfang." -#: forms.py:133 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." -msgstr "Óheimilt er að nota ókeypis netföng. Vinsamlegast notaðu annað netfang." +msgstr "" +"Óheimilt er að nota ókeypis netföng. Vinsamlegast notaðu annað netfang." -#: models.py:218 +#: models.py:274 msgid "user" msgstr "notandi" -#: models.py:219 +#: models.py:276 msgid "activation key" msgstr "einkennislykill" -#: models.py:224 +#: models.py:282 msgid "registration profile" msgstr "skráningarprófíll" -#: models.py:225 +#: models.py:283 msgid "registration profiles" msgstr "skráningarprófílar" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "einkennislykill" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "einkennislykill" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "skráningarprófíll" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "einkennislykill" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "lykilorð (aftur)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "lykilorð" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "lykilorð" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "lykilorð" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "lykilorð" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "skráningarprófíll" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "einkennislykill" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "notandanafn" + +#~ msgid "email address" +#~ msgstr "netfang" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Þetta notendanafn er þegar á skrá. Vinsamlega reyndu annað." + +#~ msgid "You must type the same password each time" +#~ msgstr "Lykilorðin verða að vera eins " diff --git a/dependencies/django-registration/registration/locale/it/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/it/LC_MESSAGES/django.po index 09a3c814b..8fd4662b5 100644 --- a/dependencies/django-registration/registration/locale/it/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/it/LC_MESSAGES/django.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.8 alpha-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-01 14:33+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2011-08-04 12:41-0600\n" "Last-Translator: Flavio Curella <flavio.curella@gmail.com>\n" "Language-Team: Italiano <it@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,71 +20,426 @@ msgstr "" "X-Poedit-Language: Italian\n" "X-Poedit-Country: ITALY\n" -#: .\admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Attiva utenti" -#: .\admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Re-invia email di attivazione" -#: .\forms.py:35 -msgid "Username" -msgstr "Nome utente" - -#: .\forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Questo valore può contenere solo lettere, numeri e sottolineature." - -#: .\forms.py:39 -msgid "Email address" -msgstr "indirizzo email" - -#: .\forms.py:41 -msgid "Password" -msgstr "Password" - -#: .\forms.py:43 -msgid "Password (again)" -msgstr "Password (di nuovo)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: .\forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Questo nome utente è già usato." -#: .\forms.py:67 -msgid "The two password fields didn't match." -msgstr "Le password inserite non coincidono." - -#: .\forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Dichiaro di aver letto e di approvare le Condizioni di Servizio" -#: .\forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Per registrarsi bisogna approvare le condizioni" -#: .\forms.py:95 -msgid "This email address is already in use. Please supply a different email address." -msgstr "Questo indirizzo email è già in uso. Inserisci un altro indirizzo email." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Questo indirizzo email è già in uso. Inserisci un altro indirizzo email." -#: .\forms.py:122 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." -msgstr "La registrazione con indirizzi email gratis non è permessa. Inserisci un altro indirizzo email." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"La registrazione con indirizzi email gratis non è permessa. Inserisci un " +"altro indirizzo email." -#: .\models.py:165 +#: models.py:274 msgid "user" msgstr "utente" -#: .\models.py:166 +#: models.py:276 msgid "activation key" msgstr "chiave di attivazione" -#: .\models.py:171 +#: models.py:282 msgid "registration profile" msgstr "profilo di registrazione" -#: .\models.py:172 +#: models.py:283 msgid "registration profiles" msgstr "profili di registrazione" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "chiave di attivazione" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Re-invia email di attivazione" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "profilo di registrazione" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "chiave di attivazione" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Password (di nuovo)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Password" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Password" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Password" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Password" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "profilo di registrazione" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Re-invia email di attivazione" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Re-invia email di attivazione" + +#~ msgid "Username" +#~ msgstr "Nome utente" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Questo valore può contenere solo lettere, numeri e sottolineature." + +#~ msgid "Email address" +#~ msgstr "indirizzo email" + +#~ msgid "The two password fields didn't match." +#~ msgstr "Le password inserite non coincidono." diff --git a/dependencies/django-registration/registration/locale/ja/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/ja/LC_MESSAGES/django.po index afaaf948b..612195985 100644 --- a/dependencies/django-registration/registration/locale/ja/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/ja/LC_MESSAGES/django.po @@ -8,71 +8,440 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.4 \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2008-01-31 10:20+0900\n" "Last-Translator: Shinya Okano <xxshss@yahoo.co.jp>\n" "Language-Team: Japanese <LL@li.org>\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "ユーザ名" - -#: forms.py:41 -msgid "email address" -msgstr "メールアドレス" - -#: forms.py:43 -msgid "password" -msgstr "パスワード" - -#: forms.py:45 -msgid "password (again)" -msgstr "パスワード (確認)" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "ユーザ名には半角英数とアンダースコアのみが使用できます。" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "アクティベーションキー" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "このユーザ名は既に使用されています。他のユーザ名を指定してください。" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "同じパスワードを入力する必要があります。" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "サービス利用規約を読み、同意します。" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "登録するためには規約に同意する必要があります。" -#: forms.py:124 -msgid "This email address is already in use. Please supply a different email address." -msgstr "このメールアドレスは既に使用されています。他のメールアドレスを指定して下さい。" +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"このメールアドレスは既に使用されています。他のメールアドレスを指定して下さ" +"い。" -#: forms.py:149 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." -msgstr "自由なメールアドレスを使用した登録は禁止されています。他のメールアドレスを指定してください。" +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"自由なメールアドレスを使用した登録は禁止されています。他のメールアドレスを指" +"定してください。" -#: models.py:188 +#: models.py:274 msgid "user" msgstr "ユーザ" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "アクティベーションキー" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "登録プロファイル" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "登録プロファイル" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "アクティベーションキー" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "アクティベーションキー" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "登録プロファイル" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "アクティベーションキー" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "パスワード (確認)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "パスワード" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "パスワード" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "パスワード" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "パスワード" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "登録プロファイル" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "アクティベーションキー" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "ユーザ名" + +#~ msgid "email address" +#~ msgstr "メールアドレス" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "ユーザ名には半角英数とアンダースコアのみが使用できます。" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "" +#~ "このユーザ名は既に使用されています。他のユーザ名を指定してください。" + +#~ msgid "You must type the same password each time" +#~ msgstr "同じパスワードを入力する必要があります。" diff --git a/dependencies/django-registration/registration/locale/ko/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/ko/LC_MESSAGES/django.po index d466420d7..f573508c5 100644 --- a/dependencies/django-registration/registration/locale/ko/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/ko/LC_MESSAGES/django.po @@ -8,82 +8,432 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-12 14:09-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Young Gyu Park <ygpark2@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" -msgstr "활동 사용자" +msgstr "사용자 활성화" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" -msgstr "이 메일 제 전송" +msgstr "이 메일 재 전송" -#: forms.py:35 -msgid "username" -msgstr "사용자 아이디" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "이 곳에는 숫자, _, 영문 글자만 가능합니다." - -#: forms.py:39 -msgid "Email address" -msgstr "이메일 주소" - -#: forms.py:41 -msgid "Password" -msgstr "사용자 패스워드" - -#: forms.py:43 -msgid "Password (again)" -msgstr "패스워드 (재입력)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "이미 같은 아이디로 사용자가 등록되어 있습니다." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "패스워드가 서로 일치하지 않습니다." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "약관을 읽었고 그 내용에 동의합니다." -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "약관에 동의 하셔야만 합니다." -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "이메일이 이미 사용중입니다. 다른 이메일을 등록해 주세요." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." msgstr "무료 이메일 계정으로 등록하실 수 없습니다. 다른 이메일을 등록해 주세요" -#: models.py:165 +#: models.py:274 msgid "user" msgstr "사용자" -#: models.py:166 +#: models.py:276 msgid "activation key" msgstr "활성화 키" -#: models.py:171 +#: models.py:282 msgid "registration profile" msgstr "등록 프로파일" -#: models.py:172 +#: models.py:283 msgid "registration profiles" msgstr "등록 프로파일" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "활성화 키" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "이 메일 재 전송" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "등록 프로파일" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "활성화 키" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "비밀번호 (재입력)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "사용자 비밀번호" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "사용자 비밀번호" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "사용자 비밀번호" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "사용자 비밀번호" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "등록 프로파일" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "이 메일 재 전송" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "이 메일 재 전송" + +#~ msgid "username" +#~ msgstr "사용자 아이디" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "이 곳에는 숫자, _, 영문 글자만 가능합니다." + +#~ msgid "Email address" +#~ msgstr "이메일 주소" + +#~ msgid "The two password fields didn't match." +#~ msgstr "비밀번호가 서로 일치하지 않습니다." diff --git a/dependencies/django-registration/registration/locale/nb/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/nb/LC_MESSAGES/django.po index 9682d19a8..048314fb9 100644 --- a/dependencies/django-registration/registration/locale/nb/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/nb/LC_MESSAGES/django.po @@ -8,84 +8,436 @@ msgid "" msgstr "" "Project-Id-Version: django-registration 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-15 21:37+0100\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2010-12-15 21:37+0100\n" "Last-Translator: jonklo <jon at funkbit dot no>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Aktiver brukere" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Send ny aktiveringsmail" -#: forms.py:35 -msgid "Username" -msgstr "Brukernavn" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Dette feltet kan bare inneholde bokstaver, nummer og understreker." - -#: forms.py:39 -msgid "Email address" -msgstr "E-postadresse" - -#: forms.py:41 -msgid "Password" -msgstr "Passord" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Passord (gjenta)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Det eksisterer allerede en bruker med dette brukernavnet." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "De to passordfeltene er ikke like." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Jeg har lest og godtar betingelsene" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Du må godta betingelsene for å registrere deg" -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "Denne e-postadressen er allerede i bruk. Vennligst oppgi en annen " -"e-postadresse." +msgstr "" +"Denne e-postadressen er allerede i bruk. Vennligst oppgi en annen e-" +"postadresse." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." -msgstr "Registrering med gratis e-postadresse er ikke tillatt. Vennligst " -"oppgi en annen e-postadresse." +msgstr "" +"Registrering med gratis e-postadresse er ikke tillatt. Vennligst oppgi en " +"annen e-postadresse." -#: models.py:168 +#: models.py:274 msgid "user" msgstr "bruker" -#: models.py:169 +#: models.py:276 msgid "activation key" msgstr "aktiveringsnøkkel" -#: models.py:174 +#: models.py:282 msgid "registration profile" msgstr "registrasjonsprofil" -#: models.py:175 +#: models.py:283 msgid "registration profiles" msgstr "registrasjonsprofiler" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "aktiveringsnøkkel" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Send ny aktiveringsmail" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "registrasjonsprofil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "aktiveringsnøkkel" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Passord (gjenta)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Passord" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Passord" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Passord" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Passord" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "registrasjonsprofil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Send ny aktiveringsmail" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Send ny aktiveringsmail" + +#~ msgid "Username" +#~ msgstr "Brukernavn" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Dette feltet kan bare inneholde bokstaver, nummer og understreker." + +#~ msgid "Email address" +#~ msgstr "E-postadresse" + +#~ msgid "The two password fields didn't match." +#~ msgstr "De to passordfeltene er ikke like." diff --git a/dependencies/django-registration/registration/locale/nl/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/nl/LC_MESSAGES/django.po index 03cb2e5db..a860391da 100644 --- a/dependencies/django-registration/registration/locale/nl/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/nl/LC_MESSAGES/django.po @@ -2,76 +2,449 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-14 13:25+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2008-08-14 13:25+0200\n" "Last-Translator: Joost Cassee <joost@cassee.net>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: forms.py:38 -msgid "username" -msgstr "gebruikersnaam" - -#: forms.py:41 -msgid "email address" -msgstr "e-mail adres" - -#: forms.py:43 -msgid "password" -msgstr "wachtwoord" - -#: forms.py:45 -msgid "password (again)" -msgstr "wachtwoord (opnieuw)" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "Gebruikersnamen kunnen alleen letters, nummer en liggende streepjes bevatten." +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "activatiecode" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Deze gebruikersnaam is reeds in gebruik. Kiest u alstublieft een andere gebruikersnaam." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:71 -msgid "You must type the same password each time" -msgstr "U moet twee maal hetzelfde wachtwoord typen." +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:100 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Ik heb de servicevoorwaarden gelezen en ga akkoord." -#: forms.py:109 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "U moet akkoord gaan met de servicevoorwaarden om u te registreren." -#: forms.py:125 -msgid "This email address is already in use. Please supply a different email address." -msgstr "Dit e-mail adres is reeds in gebruik. Kiest u alstublieft een ander e-mail adres." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Dit e-mail adres is reeds in gebruik. Kiest u alstublieft een ander e-mail " +"adres." -#: forms.py:151 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." -msgstr "U kunt u niet registreren met een gratis e-mail adres. Kiest u alstublieft een ander e-mail adres." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"U kunt u niet registreren met een gratis e-mail adres. Kiest u alstublieft " +"een ander e-mail adres." -#: models.py:191 +#: models.py:274 msgid "user" msgstr "gebruiker" -#: models.py:192 +#: models.py:276 msgid "activation key" msgstr "activatiecode" -#: models.py:197 +#: models.py:282 msgid "registration profile" msgstr "registratieprofiel" -#: models.py:198 +#: models.py:283 msgid "registration profiles" msgstr "registratieprofielen" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "activatiecode" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "activatiecode" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "registratieprofiel" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "activatiecode" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "wachtwoord (opnieuw)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "wachtwoord" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "wachtwoord" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "wachtwoord" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "wachtwoord" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "registratieprofiel" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "activatiecode" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "gebruikersnaam" + +#~ msgid "email address" +#~ msgstr "e-mail adres" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "" +#~ "Gebruikersnamen kunnen alleen letters, nummer en liggende streepjes " +#~ "bevatten." + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "" +#~ "Deze gebruikersnaam is reeds in gebruik. Kiest u alstublieft een andere " +#~ "gebruikersnaam." + +#~ msgid "You must type the same password each time" +#~ msgstr "U moet twee maal hetzelfde wachtwoord typen." diff --git a/dependencies/django-registration/registration/locale/pl/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/pl/LC_MESSAGES/django.po index 498fd5b6b..9598e9c66 100644 --- a/dependencies/django-registration/registration/locale/pl/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/pl/LC_MESSAGES/django.po @@ -8,58 +8,48 @@ msgid "" msgstr "" "Project-Id-Version: 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2007-12-15 12:45+0100\n" "Last-Translator: Jarek Zgoda <jarek.zgoda@gmail.com>\n" "Language-Team: Polish <LL@li.org>\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "nazwa użytkownika" - -#: forms.py:41 -msgid "email address" -msgstr "adres email" - -#: forms.py:43 -msgid "password" -msgstr "hasło" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:45 -msgid "password (again)" -msgstr "hasło (ponownie)" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "klucz aktywacyjny" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" +#: forms.py:36 forms.py:114 +msgid "E-mail" msgstr "" -"Nazwa użytkownika może zawierać tylko litery, cyfry i znaki podkreślenia" - -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Ta nazwa użytkownika jest już zajęta. Wybierz inną." -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "Musisz wpisać to samo hasło w obu polach" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Przeczytałem regulamin i akceptuję go" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Musisz zaakceptować regulamin, aby się zarejestrować" -#: forms.py:124 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "Ten adres email jest już używany. Użyj innego adresu email." -#: forms.py:149 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." @@ -67,18 +57,389 @@ msgstr "" "Nie ma możliwości rejestracji przy użyciu darmowego adresu email. Użyj " "innego adresu email." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "użytkownik" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "klucz aktywacyjny" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "profil rejestracji" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "profile rejestracji" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "klucz aktywacyjny" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "klucz aktywacyjny" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "profil rejestracji" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "klucz aktywacyjny" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "hasło (ponownie)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "hasło" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "hasło" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "hasło" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "hasło" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "profil rejestracji" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "klucz aktywacyjny" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "nazwa użytkownika" + +#~ msgid "email address" +#~ msgstr "adres email" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "" +#~ "Nazwa użytkownika może zawierać tylko litery, cyfry i znaki podkreślenia" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Ta nazwa użytkownika jest już zajęta. Wybierz inną." + +#~ msgid "You must type the same password each time" +#~ msgstr "Musisz wpisać to samo hasło w obu polach" diff --git a/dependencies/django-registration/registration/locale/pt/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/pt/LC_MESSAGES/django.po index 074bfa023..e86466841 100644 --- a/dependencies/django-registration/registration/locale/pt/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/pt/LC_MESSAGES/django.po @@ -7,82 +7,435 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-26 10:54+0000\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2011-01-24 12:20+0000\n" "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n" "Language-Team: Nuno Mariz <nmariz@gmail.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Ativar utilizadores" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Reenviar emails de ativação" -#: forms.py:35 -msgid "Username" -msgstr "Utilizador" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Este valor apenas deverá conter letras, números e underscores." - -#: forms.py:39 -msgid "Email address" -msgstr "Email" - -#: forms.py:41 -msgid "Password" -msgstr "Password" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Password (novamente)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Um utilizador com o mesmo nome já se encontra registado." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "As duas passwords não coincidem." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Eu li e concordo com as Condiçoes de Serviço" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Deverá concordar com as condições para se registar" -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "Este email já se encontra registado. Por favor forneça um email diferente." +msgstr "" +"Este email já se encontra registado. Por favor forneça um email diferente." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." -msgstr "O registo com emails gratuitos é proibido. Por favor forneça um email diferente." +msgstr "" +"O registo com emails gratuitos é proibido. Por favor forneça um email " +"diferente." -#: models.py:168 +#: models.py:274 msgid "user" msgstr "utilizador" -#: models.py:169 +#: models.py:276 msgid "activation key" msgstr "chave de ativação" -#: models.py:174 +#: models.py:282 msgid "registration profile" msgstr "perfil de registo" -#: models.py:175 +#: models.py:283 msgid "registration profiles" msgstr "perfis de registo" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "chave de ativação" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Reenviar emails de ativação" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "perfil de registo" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "chave de ativação" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Password (novamente)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Password" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Password" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Password" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Password" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "perfil de registo" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Reenviar emails de ativação" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Reenviar emails de ativação" + +#~ msgid "Username" +#~ msgstr "Utilizador" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Este valor apenas deverá conter letras, números e underscores." + +#~ msgid "Email address" +#~ msgstr "Email" + +#~ msgid "The two password fields didn't match." +#~ msgstr "As duas passwords não coincidem." diff --git a/dependencies/django-registration/registration/locale/pt_BR/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/pt_BR/LC_MESSAGES/django.po index 9e8addb6f..49547c63c 100644 --- a/dependencies/django-registration/registration/locale/pt_BR/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/pt_BR/LC_MESSAGES/django.po @@ -3,79 +3,477 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" +"PO-Revision-Date: 2015-07-09 19:32-0300\n" +"Last-Translator: Paulo R <proberto.macedo@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "usuário" - -#: forms.py:41 -msgid "email address" -msgstr "endereço de email" - -#: forms.py:43 -msgid "password" -msgstr "" +#: admin.py:26 +msgid "Activate users" +msgstr "Ativar usuários" -#: forms.py:45 -msgid "password (again)" -msgstr "senha (novamente)" +#: admin.py:44 +msgid "Re-send activation emails" +msgstr "Reenviar emails de ativação" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "Nomes de usuário apenas podem conter letras, números, e underscore" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "Email" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Este nome de usuário já existe. Por favor, escolha outro." +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "Já existe um usuário com este nome de usuário." -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "Você deve escrever a mesma senha nos dois campos" - -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Eu lí e concordo com os Termos de Uso do serviço" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Você deve concordar com os termos para registrar-se" -#: forms.py:124 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." -msgstr "Este endereço de email já está em uso. Por favor, informe um endereço de email diferente." +msgstr "" +"Este endereço de email já está em uso. Por favor, informe um endereço de " +"email diferente." -#: forms.py:149 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." -msgstr "Registrar-se com contas de email gratuitos está proibido. Por favor, informe um endereço de email diferente." +msgstr "" +"Registrar-se com contas de email gratuitos está proibido. Por favor, informe " +"um endereço de email diferente." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "usuário" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "chave de ativação" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "profile de registro" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "profiles de registro" + +#: templates/registration/activate.html:4 +msgid "Activation Failure" +msgstr "Falha na Ativação" + +#: templates/registration/activate.html:7 +msgid "Account activation failed." +msgstr "A ativação da conta falhou." + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "Conta Ativada" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "Sua conta agora está ativada" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "Você pode entrar." + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "Assim que um administrador do site ativar a sua conta você poderá " +"entrar." + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +msgid "registration" +msgstr "registro" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" Você (ou alguém fingindo ser você) pediu para registrar uma conta em\n" +" %(site_name)s. Se não foi você, por favor ignore este email\n" +" e o seu endereço será removido dos nossos registros.\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" Para ativar esta conta, por favor clique no seguinte link dentro dos " +"próximos\n" +" %(expiration_days)s dias:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" Atenciosamente,\n" +" Equipe do %(site_name)s\n" +" " + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +"Você (ou alguém fingindo ser você) pediu para registrar uma conta em\n" +"%(site_name)s. Se não foi você, por favor ignore este email\n" +"e o seu endereço será removido dos nossos registros.\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +"Para ativar esta conta, por favor clique no seguinte link dentro dos próximos\n" +"%(expiration_days)s dias:\n" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +"Atenciosamente,\n" +"Equipe do %(site_name)s\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +msgid "Account activation on" +msgstr "Ativação da conta em" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "Falha na Aprovação" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "Aprovação da Conta falhou." + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "Conta Aprovada" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "A conta do usuário agora está ativa." + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "aprovação do administrador" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" +"\n" +" Sua conta agora está aprovada. Você pode \n" +" " + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "entrar." + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" +"\n" +"Sua conta agora está aprovada. Você pode entrar usando o seguinte link\n" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" +"\n" +" Para aprovar isto, por favor\n" +" " + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "clique aqui" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" +"\n" +"O seguinte usuário (%(user)s) pediu para registrar uma conta em\n" +"%(site_name)s.\n" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +"Para aprovar isto, por favor clique no seguinte link.\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "Aprovação da conta em" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "Entrar" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "Esqueceu sua senha?" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "Restaure" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "Não é um membro?" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "Registrar" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "Saiu" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "Saiu com sucesso" + +#: templates/registration/password_change_done.html:4 +msgid "Password changed" +msgstr "Senha alterada" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "Senha alterada com sucesso" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +msgid "Change password" +msgstr "Alterar senha" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "Restauração de senha completa" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "Sua senha foi restaurada!" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "Agora você pode <a href=\"%(login_url)s\">entrar</a>" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "Confirmar restauração de senha" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "Digite a sua nova senha abaixo para restaurar a sua senha:" + +#: templates/registration/password_reset_confirm.html:18 +msgid "Set password" +msgstr "Definir senha" + +#: templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Restauração de senha" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" Nós te enviamos um email com um link para restaurar a sua senha. Por fafor " +"confira\n" +" o seu email e clique no link para continuar.\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "Saudações" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"Você está recebendo este email por que você (ou alguém fingindo ser você)\n" +"pediu que a seua senha fosse resutarada no site do %(domain)s. Se você não \n" +"deseha restaurar a sua senha, por favor ignora esta mensagem.\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"Para restaurar a sua senha, por favor clique no link a seguir, ou copie e " +"cole\n" +"no seu navegador:\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "Seu nome de usuário, caso você esqueceu:" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "Cumprimentos" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "Gerência" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +msgid "Reset password" +msgstr "Restaurar senha" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" Esqueceu sua senha? Digite seu email no formulário abaixo e nós enviaremos " +"instruções para criar uma nova.\n" +" " + +#: templates/registration/registration_closed.html:4 +msgid "Registration is closed" +msgstr "Registro está fechado" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "Desculpe, mas o registro está fechando neste momento. Volte depois." + +#: templates/registration/registration_complete.html:4 +msgid "Activation email sent" +msgstr "E-mail de ativação enviado" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "Por favor verifique seu email para completar o processo de registro.ww" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "Registrar uma conta" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "Submeter" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "Ativação de Conta Reenviada" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" +"\n" +" Nós enviamos um email para %(email)s com mais instruções.\n" +" " + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "Reenviar Email de Ativação" + +#~ msgid "username" +#~ msgstr "usuário" + +#~ msgid "email address" +#~ msgstr "endereço de email" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "Nomes de usuário apenas podem conter letras, números, e underscore" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Este nome de usuário já existe. Por favor, escolha outro." + +#~ msgid "You must type the same password each time" +#~ msgstr "Você deve escrever a mesma senha nos dois campos" diff --git a/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po index 072e146a0..438695708 100644 --- a/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po @@ -1,65 +1,48 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# Andrew Grigorev <andrew@ei-grad.ru>, 2015. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-21 20:12+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"POT-Creation-Date: 2018-02-08 18:01+0300\n" +"PO-Revision-Date: 2015-09-09 00:39+0300\n" +"Last-Translator: Rostislav Grigorev <hjcnbckfd@gmail.com>\n" +"Language-Team: Russian <>\n" +"Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Lokalize 2.0\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Активировать учетные записи" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Выслать ключи активации заново" -#: forms.py:35 -msgid "Username" -msgstr "Имя пользователя" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "E-mail" -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Это поле может содержать только буквы, цифры и подчеркивания" - -#: forms.py:39 -msgid "Email address" -msgstr "Адрес электронной почты" - -#: forms.py:41 -msgid "Password" -msgstr "Пароль" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Пароль (снова)" - -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Пользователь с таким именем уже существует." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "Введенные пароли не совпадают." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Я прочитал Правила Использования и согласен с ними" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Для регистрации Вы должны согласиться с Правилами" -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." @@ -67,7 +50,7 @@ msgstr "" "Этот адрес электронной почты уже используется. Пожалуйста, введите другой " "адрес." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." @@ -75,18 +58,412 @@ msgstr "" "Регистрация с использованием свободных почтовых серверов запрещена. " "Пожалуйста, введите другой адрес электронной почты." -#: models.py:165 +#: models.py:304 msgid "user" msgstr "пользователь" -#: models.py:166 +#: models.py:306 msgid "activation key" msgstr "ключ активации" -#: models.py:171 +#: models.py:312 msgid "registration profile" msgstr "карточка регистрации" -#: models.py:172 +#: models.py:313 msgid "registration profiles" msgstr "карточки регистрации" + +#: templates/registration/activate.html:4 +msgid "Activation Failure" +msgstr "Ошибка активации" + +#: templates/registration/activate.html:7 +msgid "Account activation failed." +msgstr "Активация аккаунта не удалась." + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "Учетная запись активирована" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "Ваша учетная запись теперь активирована." + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "Вы можете войти." + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" +"Как только администратор сайта активирует вашу учетную запись, вы сможете " +"войти в систему." + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +msgid "registration" +msgstr "регистрация" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" Вы (или кто-то выдающий себя за вас) оставили заявку на регистрацию\n" +" учетной записи на %(site_name)s. Если это были не вы, то проигнорируйте " +"это сообщение, и ваш почтовый адрес будет удален из наших записей.\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" Чтобы активировать эту учетную запись, перейдите по следующей ссылке в " +"течение %(expiration_days)s дней:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" С уважением,<br>\n" +" Команда %(site_name)s\n" +" " + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +"Вы (или кто-то выдающий себя за вас) оставили заявку на регистрацию\n" +"учетной записи на %(site_name)s. Если это были не вы, то проигнорируйте\n" +"это сообщение, и ваш почтовый адрес будет удален из наших записей.\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +"Чтобы активировать эту учетную запись, перейдите по следующей ссылке\n" +"в течение %(expiration_days)s дней:\n" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +"С уважением,\n" +"Команда %(site_name)s\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +msgid "Account activation on" +msgstr "Активация учетной записи на" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "Ошибка подтверждения" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "Подтвердить аккаунт не удалось." + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "Учетная запись подтверждена" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "Ваша учетная запись теперь одобрена." + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "одобрено администратором" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" +"\n" +" Ваша учетная запись теперь одобрена. Вы можете \n" +" " + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "войти" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" +"\n" +"Ваша учетная запись одобрена. Вы можете войти в систему, используя следующую " +"ссылку\n" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" +"\n" +" Пользователь (%(user)s) желает зарегистрировать учетную запись на\n" +" %(site_name)s.\n" +" " + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" +"\n" +" Чтобы это подтвердить, пожалуйста,\n" +" " + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "нажмите здесь" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" +"\n" +"Пользователь (%(user)s) желает зарегистрировать учетную запись на\n" +"%(site_name)s.\n" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +"Чтобы это подтвердить, пожалуйста, перейдите по следующей ссылке.\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "Подтверждение учетной записи на" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "Войти" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "Забыли свой пароль?" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "Сбросьте его" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "Нет учетной записи?" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "Зарегистрироваться" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "Выход" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "Вы успешно вышли из своей учетной записи" + +#: templates/registration/password_change_done.html:4 +msgid "Password changed" +msgstr "Пароль изменен" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "Пароль успешно изменен!" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +msgid "Change password" +msgstr "Изменить пароль" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "Сброс пароля завершен" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "Ваш пароль был сброшен!" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "Теперь вы можете <a href=\"%(login_url)s\">войти</a>" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "Подтверждение сброса пароля" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "Введите ваш новый пароль:" + +#: templates/registration/password_reset_confirm.html:18 +msgid "Set password" +msgstr "Установить пароль" + +#: templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Сброс пароля" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" Вам было отправлено письмо со ссылкой на сброс пароля. Проверьте\n" +" вашу почту и перейдите по указанной ссылке для продолжения.\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "Привет" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"Вы получили это письмо потому что вы (или кто-то выдающий себя за вас)\n" +"запросил сброс пароля на сайте %(domain)s. Если вы не хотите сбрасывать\n" +"свой пароль, пожалуйста, проигнорируйте это сообщение.\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"Чтобы сбросить пароль, перейдите по следующей ссылке:\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "Ваше имя пользователя, на случай если вы его забыли:" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "С уважением," + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr " " + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +msgid "Reset password" +msgstr "Сбросить пароль" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" Забыли свой пароль? Введите свой адрес электронной почты и мы отправим " +"вам инструкции по установке нового пароля.\n" +" " + +#: templates/registration/registration_closed.html:4 +msgid "Registration is closed" +msgstr "Регистрация закрыта" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "Извините, но регистрация в данный момент закрыта. Попробуйте позже." + +#: templates/registration/registration_complete.html:4 +msgid "Activation email sent" +msgstr "Письмо активации отправлено" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "Проверьте свою электронную почту для завершения процесса регистрации." + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "Регистрация учетной записи" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "Отправить" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "Активация учетной записи" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" +"\n" +" Мы отправили электронное письмо с дальнейшими инструкциями на адрес " +"%(email)s.\n" +" " + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "Повторное письмо активации" diff --git a/dependencies/django-registration/registration/locale/sl/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/sl/LC_MESSAGES/django.po index 0996851c8..e2462a8dd 100644 --- a/dependencies/django-registration/registration/locale/sl/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/sl/LC_MESSAGES/django.po @@ -7,81 +7,436 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.1beta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-12 14:09-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2011-11-05 21:20+0100\n" "Last-Translator: Marko Mrdjenovic <m@mmm.si>\n" "Language-Team: Slovenian <domen@dev.si>\n" +"Language: sl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Aktiviraj uporabnike" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Ponovno pošlji aktivacijsko e-pošto" -#: forms.py:35 -msgid "username" -msgstr "uporabniško ime" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Vrednost lahko vsebuje samo črke, cifre in podčrtaje." - -#: forms.py:39 -msgid "Email address" -msgstr "E-naslov" - -#: forms.py:41 -msgid "Password" -msgstr "Geslo" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Geslo (ponovno)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Uporabnik s tem uporabniškim imenom že obstaja." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "Polji z gesli se ne ujemata." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Strinjam se s pogoji uporabe" -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Za registracijo se morate strinjati s pogoji uporabe" -#: forms.py:95 -msgid "This email address is already in use. Please supply a different email address." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." msgstr "E-naslov je že v uporabi, prosimo vnesite drugega." -#: forms.py:122 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." -msgstr "Registracija ni mogoča z brezplačnimi e-naslovi. Prosimo vnesite drug e-naslov." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Registracija ni mogoča z brezplačnimi e-naslovi. Prosimo vnesite drug e-" +"naslov." -#: models.py:165 +#: models.py:274 msgid "user" msgstr "Uporabnik" -#: models.py:166 +#: models.py:276 msgid "activation key" msgstr "Aktivacijski ključ" -#: models.py:171 +#: models.py:282 msgid "registration profile" msgstr "Registracijski profil" -#: models.py:172 +#: models.py:283 msgid "registration profiles" msgstr "Registracijski profili" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "Aktivacijski ključ" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Ponovno pošlji aktivacijsko e-pošto" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "Registracijski profil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "Aktivacijski ključ" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Geslo (ponovno)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Geslo" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Geslo" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Geslo" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Geslo" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "Registracijski profil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Ponovno pošlji aktivacijsko e-pošto" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Ponovno pošlji aktivacijsko e-pošto" + +#~ msgid "username" +#~ msgstr "uporabniško ime" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Vrednost lahko vsebuje samo črke, cifre in podčrtaje." + +#~ msgid "Email address" +#~ msgstr "E-naslov" + +#~ msgid "The two password fields didn't match." +#~ msgstr "Polji z gesli se ne ujemata." diff --git a/dependencies/django-registration/registration/locale/sr/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/sr/LC_MESSAGES/django.po index 4fa699c55..461a1c5fe 100644 --- a/dependencies/django-registration/registration/locale/sr/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/sr/LC_MESSAGES/django.po @@ -7,74 +7,444 @@ msgid "" msgstr "" "Project-Id-Version: django-registration trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-05 13:51+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2008-04-05 14:00+0100\n" "Last-Translator: Nebojsa Djordjevic <djnesh@gmail.com>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-Language: Serbian\n" "X-Poedit-Country: YUGOSLAVIA\n" -#: forms.py:38 -msgid "username" -msgstr "korisničko ime" - -#: forms.py:41 -msgid "email address" -msgstr "email adresa" - -#: forms.py:43 -msgid "password" -msgstr "šifra" - -#: forms.py:45 -msgid "password (again)" -msgstr "šifra (ponovo)" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "Korisničko ime može da se sastoji samo od slova, brojeva i donje crte (\"_\")" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "aktivacioni ključ" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Korisničko ime je već zauzeto. Izaberite drugo." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:71 -msgid "You must type the same password each time" -msgstr "Unete šifre se ne slažu" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:100 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Pročitao sam i slažem se sa uslovima korišćenja" -#: forms.py:109 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Morate se složiti sa uslovima korišćenja da bi ste se registrovali" -#: forms.py:128 -msgid "This email address is already in use. Please supply a different email address." -msgstr "Ova e-mail adresa je već u upotrebi. Morate koristiti drugu e-mail adresu." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "" +"Ova e-mail adresa je već u upotrebi. Morate koristiti drugu e-mail adresu." -#: forms.py:153 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." -msgstr "Registracija korišćenjem besplatnig e-mail adresa je zabranjena. Morate uneti drugu e-mail adresu." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "" +"Registracija korišćenjem besplatnig e-mail adresa je zabranjena. Morate " +"uneti drugu e-mail adresu." -#: models.py:188 +#: models.py:274 msgid "user" msgstr "korisnik" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "aktivacioni ključ" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "registracioni profil" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "registracioni profili" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "aktivacioni ključ" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "aktivacioni ključ" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "registracioni profil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "aktivacioni ključ" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "šifra (ponovo)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "šifra" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "šifra" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "šifra" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "šifra" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "registracioni profil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "aktivacioni ključ" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "korisničko ime" + +#~ msgid "email address" +#~ msgstr "email adresa" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "" +#~ "Korisničko ime može da se sastoji samo od slova, brojeva i donje crte (\"_" +#~ "\")" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Korisničko ime je već zauzeto. Izaberite drugo." + +#~ msgid "You must type the same password each time" +#~ msgstr "Unete šifre se ne slažu" diff --git a/dependencies/django-registration/registration/locale/sv/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/sv/LC_MESSAGES/django.po index dec76e273..9b9623941 100644 --- a/dependencies/django-registration/registration/locale/sv/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/sv/LC_MESSAGES/django.po @@ -8,74 +8,435 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-23 18:59+0100\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emil Stenström <em@kth.se>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: .\forms.py:38 -msgid "username" -msgstr "Användarnamn" - -#: .\forms.py:41 -msgid "email address" -msgstr "E-postadress" - -#: .\forms.py:43 -msgid "password" -msgstr "Lösenord" - -#: .\forms.py:45 -msgid "password (again)" -msgstr "Lösenord (igen)" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: .\forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "Användarnamn får bara innehålla bokstäver, siffror och understreck" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "Aktiveringsnyckel" -#: .\forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "Det användarnamnet är upptaget. Prova ett annat." +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: .\forms.py:71 -msgid "You must type the same password each time" -msgstr "Båda lösenord måste vara lika" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: .\forms.py:100 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Jag har läst och accepterar avtalet" -#: .\forms.py:109 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Du måste acceptera avtalet för att registrera dig" -#: .\forms.py:128 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "Den e-postadressen är upptagen, använd an annan adress." -#: .\forms.py:153 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." msgstr "Gratis e-postadresser är inte tillåtna, använd en annan adress." -#: .\models.py:188 +#: models.py:274 msgid "user" msgstr "Användare" -#: .\models.py:189 +#: models.py:276 msgid "activation key" msgstr "Aktiveringsnyckel" -#: .\models.py:194 +#: models.py:282 msgid "registration profile" msgstr "Profil" -#: .\models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "Profiler" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "Aktiveringsnyckel" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "Aktiveringsnyckel" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "Profil" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "Aktiveringsnyckel" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "Lösenord (igen)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "Lösenord" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "Lösenord" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "Lösenord" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "Lösenord" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "Profil" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "Aktiveringsnyckel" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "Användarnamn" + +#~ msgid "email address" +#~ msgstr "E-postadress" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "Användarnamn får bara innehålla bokstäver, siffror och understreck" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "Det användarnamnet är upptaget. Prova ett annat." + +#~ msgid "You must type the same password each time" +#~ msgstr "Båda lösenord måste vara lika" diff --git a/dependencies/django-registration/registration/locale/th/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/th/LC_MESSAGES/django.po new file mode 100644 index 000000000..17f7ff184 --- /dev/null +++ b/dependencies/django-registration/registration/locale/th/LC_MESSAGES/django.po @@ -0,0 +1,503 @@ +# Thai translation for django-registration. +# This file is distributed under the same license as the registration package. +# Phondanai Khanti <phondanai@gmail.com>, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: django-registration 0.3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" +"PO-Revision-Date: 2015-11-05 15:37+0700\n" +"Last-Translator: Phondanai Khanti<phondanai@gmail.com>\n" +"Language-Team: \n" +"Language: th\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.1\n" + +#: admin.py:26 +msgid "Activate users" +msgstr "เปิดใช้งานผู้ใช้" + +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "คีย์สำหรับเปิดใช้งาน" + +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "อีเมล" + +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "ชื่อผู้ใช้นี้ได้ถูกใช้ไปแล้ว" + +#: forms.py:64 +msgid "I have read and agree to the Terms of Service" +msgstr "ฉันได้อ่านและเห็นด้วยกับข้อตกลงในการให้บริการ" + +#: forms.py:65 +msgid "You must agree to the terms to register" +msgstr "คุณต้องยอมรับข้อตกลงในการลงทะเบียน" + +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." +msgstr "ที่อยู่อีเมลได้ถูกใช้งานไปแล้ว โปรดป้อนที่อยู่อีเมลอื่น" + +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." +msgstr "การลงทะเบียนด้วยบริการฟรีอีเมลถูกระงับ โปรเลือกอีเมลอื่น" + +#: models.py:274 +msgid "user" +msgstr "ผู้ใช้" + +#: models.py:276 +msgid "activation key" +msgstr "คีย์สำหรับเปิดใช้งาน" + +#: models.py:282 +msgid "registration profile" +msgstr "โปรไฟล์การลงทะเบียน" + +#: models.py:283 +msgid "registration profiles" +msgstr "โปรไฟล์การลงทะเบียน" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "คีย์สำหรับเปิดใช้งาน" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "คีย์สำหรับเปิดใช้งาน" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "บัญชีผู้ใช้ได้เปิดใช้งานแล้ว" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "บัญชีผู้ใช้ของคุณได้เปิดใช้งานแล้ว" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "คุณสามารถเข้าสู่ระบบได้แล้ว" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "คุณจะสามารถเข้าสู่ระบบได้ ก็ต่อเมื่อผู้ดูแลระบบได้เปิดใช้บัญชีของคุณ" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "การลงทะเบียน" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" +"\n" +" คุณ (หรือบุคคลอื่น ที่แสดงตัวว่าเป็นคุณ) ได้ทำการสมัครสมาชิก" +"ที่\n" +" %(site_name)s ถ้าหากไม่ใช่คุณที่สมัคร โปรดเพิกเฉยต่ออีเมลฉบับนี้\n" +" และที่อยู่อีเมลของคุณจะถูกลบออกจากระบบของเราโดยอัตโนมัติ\n" +" " + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" +"\n" +" ในการเปิดใช้บัญชี กรุณาคลิกลิงค์ด้านล่าง" +"ภายใน\n" +" %(expiration_days)s วัน:\n" +" " + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" +"\n" +" ด้วยความนับถือ\n" +" จากผู้ดูแล %(site_name)s\n" +" " + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" +"\n" +"คุณ (หรือบุคคลอื่น ที่แสดงตัวว่าเป็นคุณ) ได้ทำการสมัครสมาชิกที่\n" +"%(site_name)s ถ้าหากไม่ใช่คุณที่สมัคร โปรดเพิกเฉยต่ออีเมลฉบับนี้\n" +"และที่อยู่อีเมลของคุณจะถูกลบออกจากระบบของเราโดยอัตโนมัติ\n" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" +"\n" +"ในการเปิดใช้บัญชี กรุณาคลิกลิงค์ด้านล่างภายใน\n" +"%(expiration_days)s วัน:\n" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" +"\n" +"ด้วยความนับถือ\n" +"จากผู้ดูแล %(site_name)s\n" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "บัญชีได้เปิดใช้งานมื่อ" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "การอนุมัติเกิดข้อผิดพลาด" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "การอนุมัติบัญชีผู้ใช้เกิดข้อผิดพลาด" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "บัญชีได้ถูกอนุมัติแล้ว" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "บัญชีผู้ใช้ได้ถูกอนุมัติแล้ว" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "อนุมัติโดยผู้ดูแลระบบ" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" +"\n" +" บัญชีของคุณได้ถูกอนุมัติแล้ว คุณสามารถ\n" +" " + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "เข้าสู่ระบบ" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" +"\n" +"บัญชีของคุณได้ถูกอนุมัติแล้ว คุณสามารถเข้าสู่ระบบโดยใช้ลิงค์ด้านล่างนี้\n" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" +"\n" +" ผู้ใช้ (%(user)s) ได้ทำการลงทะเบียนบัญชี ที่\n" +" %(site_name)s\n" +" " + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" +"\n" +" หากต้องการอนุมัติ กรุณา\n" +" " + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "คลิก ที่นี่" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" +"\n" +"ผู้ใช้ (%(user)s) ได้ทำการลงทะเบียนบัญชี ที่\n" +"%(site_name)s\n" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" +"\n" +"หากต้องการอนุมัติ กรุณาคลิกลิงค์ด้านล่างนี้\n" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "การอนุมัติบัญชี ที่" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "เข้าสู่ระบบ" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "ลืมรหัสผ่าน?" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "รีเซ็ต" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "ยังไม่ได้เป็นสมาชิก?" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "ลงทะเบียน" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "ออกจากระบบ" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "ออกจากระบบสำเร็จแล้ว" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "รหัสผ่าน (อีกครั้ง)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "รหัสผ่านได้ถูกเปลี่ยนแล้ว!" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "เปลี่ยนรหัสผ่าน" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "รีเซ็ตรหัสผ่านสำเร็จ" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "รหัสผ่านของคุณได้ถูกรีเซ็ตแล้ว!" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "คุณอาจจะ <a href=\"%(login_url)s\">เข้าสู่ระบบ</a>" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "ยืนยันการรีเซ็ตรหัสผ่าน" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "ตั้งรหัสผ่านใหม่ด้านล่าง เพื่อทำการรีเซ็ตรหัสผ่าน:" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "ตั้งรหัสผ่าน" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "รีเซ็ตรหัสผ่าน" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" +"\n" +" เราได้ทำการส่งอีเมลไปหาคุณ พร้อมกับลิงค์เพื่อทำการรีเซ็ตรหัสผ่าน กรุณา " +"ตรวจสอบ\n" +" อีเมลของคุณ และ คลิกลิงค์ที่ดำเนินการต่อ\n" +" " + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "สวัสดี" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" +"\n" +"คุณได้รับอีเมลฉบับนี้ เพราะ คุณ (หรือบุคคลอื่นที่อาจจะเป็นคุณ)\n" +"ได้ทำการร้องขอการรีเซ็ตรหัสผ่านบนเว็บ %(domain) sหากคณไม่ต้องการรีเซ็ต\n" +"รหัสผ่านของคุณ โปรดเพิกเฉยต่อข้อความนี้\n" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" +"\n" +"ในการรีเซ็ตรหัสผ่าน โปรดคลิกลิงค์ด้านล่างหรือคัดลอก " +"ลิงค์\n" +"แล้วนำไปเปิดที่โปรแกรมท่องเว็บของคุณ:\n" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "ชื่อผู้ใช้ ในกรณีที่คุณลืม:" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "ด้วยความเคารพ" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "การจัดการ" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "รีเซ็ตรหัสผ่าน" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" +"\n" +" ลืมรหัสผ่าน? ป้อนอีเมลของคุณในฟอร์มด้านล่างนี้ ทางเราจะส่ง " +"วิธีการรีเซ็ตให้กับคุณ\n" +" " + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "โปรไฟล์การลงทะเบียน" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "ขออภัย แต่การลงทะเบียนได้ปิดชั่วคราว โปรดกลับมาอีกครั้ง" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "อีเมลสำหรับการเปิดใช้บัญชีได้ถูกส่งไปแล้ว" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "โปรดตรวจสอบอีเมลของคุณเพื่อ ดำเนินการเปิดใช้บัญชีของคุณ" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "ลงทะเบียนบัญชีใหม่" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "ตกลง" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "ส่งอีเมลการเปิดใช้บัญชีอีกครั้ง" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" +"\n" +" เราได้ส่งอีเมล ไปยัง %(email)s พร้อมกับกระบวนการ\n" +" " + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "ส่งอีเมลการเปิดใช้บัญชีอีกครั้ง" + +#~ msgid "username" +#~ msgstr "ชื่อผู้ใช้" + +#~ msgid "email address" +#~ msgstr "ที่อยู่อีเมล" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "ชื่อผู้ใช้สามารถมีเฉพาะตัวอักษรตัวเลขและขีดล่างเท่านั้น" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "ชื่อผู้ใช้นี้ถูกใช้แล้ว กรุณาเลือกชื่อผู้ใช้อื่น" + +#~ msgid "You must type the same password each time" +#~ msgstr "คุณต้องพิมพ์รหัสผ่านเดียวกัน" diff --git a/dependencies/django-registration/registration/locale/tr_TR/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/tr_TR/LC_MESSAGES/django.po index 295c524de..6c5460b1e 100644 --- a/dependencies/django-registration/registration/locale/tr_TR/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/tr_TR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-11 12:48+0200\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: RECEP KIRMIZI <rkirmizi@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,57 +17,37 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:23 +#: admin.py:26 msgid "Activate users" msgstr "Kullanıcıları aktive et" -#: admin.py:43 +#: admin.py:44 msgid "Re-send activation emails" msgstr "Aktivasyon e-postalarını yeniden gönder" -#: forms.py:35 -msgid "Username" -msgstr "Kullanıcı adı" - -#: forms.py:36 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Bu alan sadece harfler, numaralar ve alt çizgiler barındırabilir." - -#: forms.py:39 -msgid "Email address" -msgstr "Eposta adresi" - -#: forms.py:41 -msgid "Password" -msgstr "Parola" - -#: forms.py:43 -msgid "Password (again)" -msgstr "Parola (tekrar)" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:55 +#: forms.py:52 msgid "A user with that username already exists." msgstr "Bu kullanıcı adına sahip bir kullanıcı bulunmakta." -#: forms.py:67 -msgid "The two password fields didn't match." -msgstr "İki parola birbiri ile uyuşmadı." - -#: forms.py:78 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "Anlaşma kurallarını okudum ve kabul ediyorum." -#: forms.py:79 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "Kayıt olmak için kuralları kabul etmelisiniz." -#: forms.py:95 +#: forms.py:81 msgid "" "This email address is already in use. Please supply a different email " "address." msgstr "Bu eposta adresi kullanımda. Lütfen farklı bir eposta adresi veriniz." -#: forms.py:122 +#: forms.py:108 msgid "" "Registration using free email addresses is prohibited. Please supply a " "different email address." @@ -75,18 +55,387 @@ msgstr "" "Ücretsiz eposta adresleri ile kayıt kabul edilmemektedir. Lütfen farklı bir " "eposta adresi veriniz." -#: models.py:168 +#: models.py:274 msgid "user" msgstr "kullanıcı" -#: models.py:169 +#: models.py:276 msgid "activation key" msgstr "aktivasyon anahtarı" -#: models.py:174 +#: models.py:282 msgid "registration profile" msgstr "kayıt profili" -#: models.py:175 +#: models.py:283 msgid "registration profiles" msgstr "kayıt profilleri" + +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "aktivasyon anahtarı" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Account activation failed." +msgstr "Aktivasyon e-postalarını yeniden gönder" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "kayıt profili" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "aktivasyon anahtarı" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "Password (again)" +msgid "Password changed" +msgstr "Parola (tekrar)" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "Password" +msgid "Change password" +msgstr "Parola" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "Password" +msgid "Set password" +msgstr "Parola" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "Password" +msgid "Password reset" +msgstr "Parola" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "Password" +msgid "Reset password" +msgstr "Parola" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "kayıt profili" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Activation email sent" +msgstr "Aktivasyon e-postalarını yeniden gönder" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +#, fuzzy +#| msgid "Re-send activation emails" +msgid "Resend Activation Email" +msgstr "Aktivasyon e-postalarını yeniden gönder" + +#~ msgid "Username" +#~ msgstr "Kullanıcı adı" + +#~ msgid "This value must contain only letters, numbers and underscores." +#~ msgstr "Bu alan sadece harfler, numaralar ve alt çizgiler barındırabilir." + +#~ msgid "Email address" +#~ msgstr "Eposta adresi" + +#~ msgid "The two password fields didn't match." +#~ msgstr "İki parola birbiri ile uyuşmadı." diff --git a/dependencies/django-registration/registration/locale/zh_CN/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/zh_CN/LC_MESSAGES/django.po index 7c609c316..5127cd12f 100644 --- a/dependencies/django-registration/registration/locale/zh_CN/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/zh_CN/LC_MESSAGES/django.po @@ -7,71 +7,435 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2008-03-20 23:22+0800\n" "Last-Translator: hutuworm <hutuworm@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "用户名" - -#: forms.py:41 -msgid "email address" -msgstr "Email 地址" - -#: forms.py:43 -msgid "password" -msgstr "密码" - -#: forms.py:45 -msgid "password (again)" -msgstr "密码（重复）" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "用户名只能包含字母、数字和下划线" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "激活密钥" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "该用户名已被占用，请另选一个。" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "您必须输入两遍同样的密码" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "我已阅读并同意该服务条款" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "您必须同意注册条款" -#: forms.py:124 -msgid "This email address is already in use. Please supply a different email address." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." msgstr "该 Email 地址已有人使用，请提供一个另外的 Email 地址。" -#: forms.py:149 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." msgstr "禁止使用免费 Email 地址注册，请提供一个另外的 Email 地址。" -#: models.py:188 +#: models.py:274 msgid "user" msgstr "用户" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "激活密钥" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "注册信息" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "注册信息" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "激活密钥" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "激活密钥" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "注册信息" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "激活密钥" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "密码（重复）" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "密码" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "密码" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "密码" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "密码" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "注册信息" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "激活密钥" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "用户名" + +#~ msgid "email address" +#~ msgstr "Email 地址" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "用户名只能包含字母、数字和下划线" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "该用户名已被占用，请另选一个。" + +#~ msgid "You must type the same password each time" +#~ msgstr "您必须输入两遍同样的密码" diff --git a/dependencies/django-registration/registration/locale/zh_TW/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/zh_TW/LC_MESSAGES/django.po index 7cc090d08..30b84fc99 100644 --- a/dependencies/django-registration/registration/locale/zh_TW/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/zh_TW/LC_MESSAGES/django.po @@ -7,71 +7,435 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 19:30-0500\n" +"POT-Creation-Date: 2017-10-17 11:22-0400\n" "PO-Revision-Date: 2008-03-20 23:22+0800\n" "Last-Translator: hutuworm <hutuworm@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: forms.py:38 -msgid "username" -msgstr "用戶名" - -#: forms.py:41 -msgid "email address" -msgstr "Email 地址" - -#: forms.py:43 -msgid "password" -msgstr "密碼" - -#: forms.py:45 -msgid "password (again)" -msgstr "密碼（重復）" +#: admin.py:26 +msgid "Activate users" +msgstr "" -#: forms.py:54 -msgid "Usernames can only contain letters, numbers and underscores" -msgstr "用戶名只能包含字母、數字和下劃線" +#: admin.py:44 +#, fuzzy +#| msgid "activation key" +msgid "Re-send activation emails" +msgstr "激活密鑰" -#: forms.py:59 -msgid "This username is already taken. Please choose another." -msgstr "該用戶名已被佔用，請另選一個。" +#: forms.py:36 forms.py:114 +msgid "E-mail" +msgstr "" -#: forms.py:68 -msgid "You must type the same password each time" -msgstr "您必須輸入兩遍同樣的密碼" +#: forms.py:52 +msgid "A user with that username already exists." +msgstr "" -#: forms.py:96 +#: forms.py:64 msgid "I have read and agree to the Terms of Service" msgstr "我已閱讀並同意該服務條款" -#: forms.py:105 +#: forms.py:65 msgid "You must agree to the terms to register" msgstr "您必須同意注冊條款" -#: forms.py:124 -msgid "This email address is already in use. Please supply a different email address." +#: forms.py:81 +msgid "" +"This email address is already in use. Please supply a different email " +"address." msgstr "該 Email 地址已有人使用，請提供一個另外的 Email 地址。" -#: forms.py:149 -msgid "Registration using free email addresses is prohibited. Please supply a different email address." +#: forms.py:108 +msgid "" +"Registration using free email addresses is prohibited. Please supply a " +"different email address." msgstr "禁止使用免費 Email 地址注冊，請提供一個另外的 Email 地址。" -#: models.py:188 +#: models.py:274 msgid "user" msgstr "用戶" -#: models.py:189 +#: models.py:276 msgid "activation key" msgstr "激活密鑰" -#: models.py:194 +#: models.py:282 msgid "registration profile" msgstr "注冊信息" -#: models.py:195 +#: models.py:283 msgid "registration profiles" msgstr "注冊信息" +#: templates/registration/activate.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation Failure" +msgstr "激活密鑰" + +#: templates/registration/activate.html:7 +#, fuzzy +#| msgid "activation key" +msgid "Account activation failed." +msgstr "激活密鑰" + +#: templates/registration/activation_complete.html:4 +#: templates/registration/activation_complete_admin_pending.html:4 +msgid "Account Activated" +msgstr "" + +#: templates/registration/activation_complete.html:8 +#: templates/registration/activation_complete_admin_pending.html:8 +msgid "Your account is now activated." +msgstr "" + +#: templates/registration/activation_complete.html:10 +msgid "You can log in." +msgstr "" + +#: templates/registration/activation_complete_admin_pending.html:10 +msgid "Once a site administrator activates your account you can login." +msgstr "" + +#: templates/registration/activation_email.html:6 +#: templates/registration/admin_approve_email.html:6 +#, fuzzy +#| msgid "registration profile" +msgid "registration" +msgstr "注冊信息" + +#: templates/registration/activation_email.html:11 +#, python-format +msgid "" +"\n" +" You (or someone pretending to be you) have asked to register an account " +"at\n" +" %(site_name)s. If this wasn't you, please ignore this email\n" +" and your address will be removed from our records.\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:18 +#, python-format +msgid "" +"\n" +" To activate this account, please click the following link within the " +"next\n" +" %(expiration_days)s days:\n" +" " +msgstr "" + +#: templates/registration/activation_email.html:30 +#: templates/registration/admin_approve_email.html:23 +#, python-format +msgid "" +"\n" +" Sincerely,\n" +" %(site_name)s Management\n" +" " +msgstr "" + +#: templates/registration/activation_email.txt:2 +#, python-format +msgid "" +"\n" +"You (or someone pretending to be you) have asked to register an account at\n" +"%(site_name)s. If this wasn't you, please ignore this email\n" +"and your address will be removed from our records.\n" +msgstr "" + +#: templates/registration/activation_email.txt:7 +#, python-format +msgid "" +"\n" +"To activate this account, please click the following link within the next\n" +"%(expiration_days)s days:\n" +msgstr "" + +#: templates/registration/activation_email.txt:14 +#, python-format +msgid "" +"\n" +"Sincerely,\n" +"%(site_name)s Management\n" +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +#: templates/registration/admin_approve_complete_email_subject.txt:1 +#, fuzzy +#| msgid "activation key" +msgid "Account activation on" +msgstr "激活密鑰" + +#: templates/registration/admin_approve.html:4 +msgid "Approval Failure" +msgstr "" + +#: templates/registration/admin_approve.html:7 +msgid "Account Approval failed." +msgstr "" + +#: templates/registration/admin_approve_complete.html:4 +msgid "Account Approved" +msgstr "" + +#: templates/registration/admin_approve_complete.html:8 +msgid "The user's account is now approved." +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:6 +msgid "admin approval" +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:11 +msgid "" +"\n" +" Your account is now approved. You can \n" +" " +msgstr "" + +#: templates/registration/admin_approve_complete_email.html:14 +msgid "log in." +msgstr "" + +#: templates/registration/admin_approve_complete_email.txt:2 +msgid "" +"\n" +"Your account is now approved. You can log in using the following link\n" +msgstr "" + +#: templates/registration/admin_approve_email.html:11 +#, python-format +msgid "" +"\n" +" The following user (%(user)s) has asked to register an account at\n" +" %(site_name)s.\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:17 +msgid "" +"\n" +" To approve this, please\n" +" " +msgstr "" + +#: templates/registration/admin_approve_email.html:20 +msgid "click here" +msgstr "" + +#: templates/registration/admin_approve_email.txt:2 +#, python-format +msgid "" +"\n" +"The following user (%(user)s) has asked to register an account at\n" +"%(site_name)s.\n" +msgstr "" + +#: templates/registration/admin_approve_email.txt:6 +msgid "" +"\n" +"To approve this, please click the following link.\n" +msgstr "" + +#: templates/registration/admin_approve_email_subject.txt:1 +msgid "Account approval on" +msgstr "" + +#: templates/registration/login.html:4 templates/registration/login.html:10 +msgid "Log in" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Forgot your password?" +msgstr "" + +#: templates/registration/login.html:14 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Not a member?" +msgstr "" + +#: templates/registration/login.html:15 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:4 +msgid "Logged out" +msgstr "" + +#: templates/registration/logout.html:7 +msgid "Successfully logged out" +msgstr "" + +#: templates/registration/password_change_done.html:4 +#, fuzzy +#| msgid "password (again)" +msgid "Password changed" +msgstr "密碼（重復）" + +#: templates/registration/password_change_done.html:7 +msgid "Password successfully changed!" +msgstr "" + +#: templates/registration/password_change_form.html:4 +#: templates/registration/password_change_form.html:10 +#, fuzzy +#| msgid "password" +msgid "Change password" +msgstr "密碼" + +#: templates/registration/password_reset_complete.html:4 +msgid "Password reset complete" +msgstr "" + +#: templates/registration/password_reset_complete.html:8 +msgid "Your password has been reset!" +msgstr "" + +#: templates/registration/password_reset_complete.html:9 +#, python-format +msgid "You may now <a href=\"%(login_url)s\">log in</a>" +msgstr "" + +#: templates/registration/password_reset_confirm.html:10 +msgid "Confirm password reset" +msgstr "" + +#: templates/registration/password_reset_confirm.html:14 +msgid "Enter your new password below to reset your password:" +msgstr "" + +#: templates/registration/password_reset_confirm.html:18 +#, fuzzy +#| msgid "password" +msgid "Set password" +msgstr "密碼" + +#: templates/registration/password_reset_done.html:4 +#, fuzzy +#| msgid "password" +msgid "Password reset" +msgstr "密碼" + +#: templates/registration/password_reset_done.html:8 +msgid "" +"\n" +" We have sent you an email with a link to reset your password. Please " +"check\n" +" your email and click the link to continue.\n" +" " +msgstr "" + +#: templates/registration/password_reset_email.html:3 +msgid "Greetings" +msgstr "" + +#: templates/registration/password_reset_email.html:5 +#, python-format +msgid "" +"\n" +"You are receiving this email because you (or someone pretending to be you)\n" +"requested that your password be reset on the %(domain)s site. If you do not\n" +"wish to reset your password, please ignore this message.\n" +msgstr "" + +#: templates/registration/password_reset_email.html:11 +msgid "" +"\n" +"To reset your password, please click the following link, or copy and paste " +"it\n" +"into your web browser:\n" +msgstr "" + +#: templates/registration/password_reset_email.html:20 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: templates/registration/password_reset_email.html:23 +msgid "Best regards" +msgstr "" + +#: templates/registration/password_reset_email.html:24 +msgid "Management" +msgstr "" + +#: templates/registration/password_reset_form.html:4 +#: templates/registration/password_reset_form.html:15 +#, fuzzy +#| msgid "password" +msgid "Reset password" +msgstr "密碼" + +#: templates/registration/password_reset_form.html:8 +msgid "" +"\n" +" Forgot your password? Enter your email in the form below and we'll send " +"you instructions for creating a new one.\n" +" " +msgstr "" + +#: templates/registration/registration_closed.html:4 +#, fuzzy +#| msgid "registration profile" +msgid "Registration is closed" +msgstr "注冊信息" + +#: templates/registration/registration_closed.html:7 +msgid "Sorry, but registration is closed at this moment. Come back later." +msgstr "" + +#: templates/registration/registration_complete.html:4 +#, fuzzy +#| msgid "activation key" +msgid "Activation email sent" +msgstr "激活密鑰" + +#: templates/registration/registration_complete.html:7 +msgid "Please check your email to complete the registration process." +msgstr "" + +#: templates/registration/registration_form.html:4 +msgid "Register for an account" +msgstr "" + +#: templates/registration/registration_form.html:10 +#: templates/registration/resend_activation_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/resend_activation_complete.html:4 +msgid "Account Activation Resent" +msgstr "" + +#: templates/registration/resend_activation_complete.html:8 +#, python-format +msgid "" +"\n" +" We have sent an email to %(email)s with further instructions.\n" +" " +msgstr "" + +#: templates/registration/resend_activation_form.html:4 +msgid "Resend Activation Email" +msgstr "" + +#~ msgid "username" +#~ msgstr "用戶名" + +#~ msgid "email address" +#~ msgstr "Email 地址" + +#~ msgid "Usernames can only contain letters, numbers and underscores" +#~ msgstr "用戶名只能包含字母、數字和下劃線" + +#~ msgid "This username is already taken. Please choose another." +#~ msgstr "該用戶名已被佔用，請另選一個。" + +#~ msgid "You must type the same password each time" +#~ msgstr "您必須輸入兩遍同樣的密碼" diff --git a/dependencies/django-registration/registration/management/commands/cleanupregistration.py b/dependencies/django-registration/registration/management/commands/cleanupregistration.py index e8433564b..a1881ed11 100644 --- a/dependencies/django-registration/registration/management/commands/cleanupregistration.py +++ b/dependencies/django-registration/registration/management/commands/cleanupregistration.py @@ -7,13 +7,15 @@ """ -from django.core.management.base import BaseCommand as NoArgsCommand +from django.core.management.base import BaseCommand -from registration.models import RegistrationProfile +from ...models import RegistrationProfile -class Command(NoArgsCommand): +class Command(BaseCommand): help = "Delete expired user registrations from the database" - def handle_noargs(self, **options): + def handle(self, *args, **options): + self.stdout.write('Running cleanupregistration.') RegistrationProfile.objects.delete_expired_users() + self.stdout.write('cleanupregistration completed.') diff --git a/dependencies/django-registration/registration/migrations/0001_initial.py b/dependencies/django-registration/registration/migrations/0001_initial.py index c3a8b8437..5016400b0 100644 --- a/dependencies/django-registration/registration/migrations/0001_initial.py +++ b/dependencies/django-registration/registration/migrations/0001_initial.py @@ -1,16 +1,13 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.8 on 2020-05-11 16:21 from __future__ import unicode_literals from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion +from django.db import migrations +from django.db import models class Migration(migrations.Migration): - initial = True - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -19,13 +16,14 @@ class Migration(migrations.Migration): migrations.CreateModel( name='RegistrationProfile', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('activation_key', models.CharField(max_length=40, verbose_name='activation key')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True, verbose_name='user')), + ('id', models.AutoField(serialize=False, verbose_name='ID', primary_key=True, auto_created=True)), + ('activation_key', models.CharField(verbose_name='activation key', max_length=40)), + ('user', models.OneToOneField(on_delete=models.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), ], options={ 'verbose_name': 'registration profile', 'verbose_name_plural': 'registration profiles', }, + bases=(models.Model,), ), ] diff --git a/dependencies/django-registration/registration/migrations/0002_registrationprofile_activated.py b/dependencies/django-registration/registration/migrations/0002_registrationprofile_activated.py new file mode 100644 index 000000000..9550878ae --- /dev/null +++ b/dependencies/django-registration/registration/migrations/0002_registrationprofile_activated.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations +from django.db import models + + +class Migration(migrations.Migration): + + dependencies = [ + ('registration', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='registrationprofile', + name='activated', + field=models.BooleanField(default=False), + ), + ] diff --git a/dependencies/django-registration/registration/migrations/0003_migrate_activatedstatus.py b/dependencies/django-registration/registration/migrations/0003_migrate_activatedstatus.py new file mode 100644 index 000000000..038956a70 --- /dev/null +++ b/dependencies/django-registration/registration/migrations/0003_migrate_activatedstatus.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations +from django.db import models + + +def migrate_activated_status(apps, schema_editor): + # We can't directly import the RegistrationProfile model + # as it may be a different version than this migration expects. + RegistrationProfile = apps.get_model('registration', 'RegistrationProfile') + # Filter the queryset to only fetch already activated profiles. + # Note, we don't use the string constant `ACTIVATED` because we are using + # the actual model, not necessarily the Python class which has said attribute. + db_alias = schema_editor.connection.alias + for rp in RegistrationProfile.objects.using(db_alias).filter(activation_key='ALREADY_ACTIVATED').iterator(): + # Note, it's impossible to get the original activation key, so just + # leave the ALREADY_ACTIVATED string. + rp.activated = True + rp.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('registration', '0002_registrationprofile_activated'), + ] + + operations = [ + migrations.RunPython(migrate_activated_status) + ] diff --git a/dependencies/django-registration/registration/migrations/0004_supervisedregistrationprofile.py b/dependencies/django-registration/registration/migrations/0004_supervisedregistrationprofile.py new file mode 100644 index 000000000..f4a6348b2 --- /dev/null +++ b/dependencies/django-registration/registration/migrations/0004_supervisedregistrationprofile.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations +from django.db import models + + +class Migration(migrations.Migration): + + dependencies = [ + ('registration', '0003_migrate_activatedstatus'), + ] + + operations = [ + migrations.CreateModel( + name='SupervisedRegistrationProfile', + fields=[ + ('registrationprofile_ptr', models.OneToOneField( + parent_link=True, + auto_created=True, + on_delete=models.CASCADE, + primary_key=True, + serialize=False, + to='registration.RegistrationProfile') + ), + ], + bases=('registration.registrationprofile',), + ), + ] diff --git a/dependencies/django-registration/registration/migrations/0005_activation_key_sha256.py b/dependencies/django-registration/registration/migrations/0005_activation_key_sha256.py new file mode 100644 index 000000000..ccbac266b --- /dev/null +++ b/dependencies/django-registration/registration/migrations/0005_activation_key_sha256.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations +from django.db import models + + +class Migration(migrations.Migration): + + dependencies = [ + ('registration', '0004_supervisedregistrationprofile'), + ] + + operations = [ + migrations.AlterField( + model_name='registrationprofile', + name='activation_key', + field=models.CharField(max_length=64, verbose_name='activation key'), + ), + ] diff --git a/dependencies/django-registration/registration/models.py b/dependencies/django-registration/registration/models.py index 8736df1a7..3b0689232 100644 --- a/dependencies/django-registration/registration/models.py +++ b/dependencies/django-registration/registration/models.py @@ -1,68 +1,178 @@ +from __future__ import unicode_literals + import datetime import hashlib -import random +import logging import re +import string +import warnings +from django import VERSION as DJANGO_VERSION +from django.apps import apps from django.conf import settings -from django.contrib.auth.models import User +from django.core.exceptions import ImproperlyConfigured +from django.core.exceptions import MultipleObjectsReturned +from django.core.exceptions import ObjectDoesNotExist +from django.core.mail import EmailMultiAlternatives from django.db import models from django.db import transaction +from django.template import TemplateDoesNotExist from django.template.loader import render_to_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.crypto import get_random_string +from django.utils.module_loading import import_string +from django.utils.timezone import now as datetime_now + +from .users import UserModel +from .users import UserModelString +from .utils import _ + +# Compatibility decorator removed in Django 3 +if DJANGO_VERSION[0] < 3: + from django.utils.encoding import python_2_unicode_compatible +else: + def python_2_unicode_compatible(c): + return c + + +logger = logging.getLogger(__name__) + +# Adding some backwards compatibility for SHA1 +# The 40 probably should be removed later on +SHA256_RE = re.compile('^[a-f0-9]{40,64}$') + + +def get_from_email(site=None): + """ + Return the email address by which mail is sent. + If the `REGISTRATION_USE_SITE_EMAIL` setting is set, the `Site` object will + provide the domain and the REGISTRATION_SITE_USER_EMAIL will provide the + username. Otherwise the `REGISTRATION_DEFAULT_FROM_EMAIL` or + `DEFAULT_FROM_EMAIL` settings are used. + """ + if getattr(settings, 'REGISTRATION_USE_SITE_EMAIL', False): + user_email = getattr(settings, 'REGISTRATION_SITE_USER_EMAIL', None) + if not user_email: + raise ImproperlyConfigured(( + 'REGISTRATION_SITE_USER_EMAIL must be set when using ' + 'REGISTRATION_USE_SITE_EMAIL.')) + Site = apps.get_model('sites', 'Site') + site = site or Site.objects.get_current() + from_email = '{}@{}'.format(user_email, site.domain) + else: + from_email = getattr(settings, 'REGISTRATION_DEFAULT_FROM_EMAIL', + settings.DEFAULT_FROM_EMAIL) + return from_email + -from django.utils import timezone +def send_email(addresses_to, ctx_dict, subject_template, body_template, + body_html_template): + """ + Function that sends an email + """ + + prefix = getattr(settings, 'REGISTRATION_EMAIL_SUBJECT_PREFIX', '') + subject = prefix + render_to_string(subject_template, ctx_dict) + # Email subject *must not* contain newlines + subject = ''.join(subject.splitlines()) + from_email = get_from_email(ctx_dict.get('site')) + message_txt = render_to_string(body_template, + ctx_dict) + + email_message = EmailMultiAlternatives(subject, message_txt, + from_email, addresses_to) + if getattr(settings, 'REGISTRATION_EMAIL_HTML', True): + try: + message_html = render_to_string( + body_html_template, ctx_dict) + except TemplateDoesNotExist: + pass + else: + email_message.attach_alternative(message_html, 'text/html') -SHA1_RE = re.compile('^[a-f0-9]{40}$') + email_message.send() class RegistrationManager(models.Manager): """ Custom manager for the ``RegistrationProfile`` model. - + The methods defined here provide shortcuts for account creation and activation (including generation and emailing of activation keys), and for cleaning out expired inactive accounts. - + """ - def activate_user(self, activation_key): + + def _activate(self, profile, site, get_profile): + """ + Activate the ``RegistrationProfile`` given as argument. + User is able to login, as ``is_active`` is set to ``True`` """ - Validate an activation key and activate the corresponding - ``User`` if valid. - - If the key is valid and has not expired, return the ``User`` - after activating. - - If the key is not valid or has expired, return ``False``. - + user = profile.user + user.is_active = True + profile.activated = True + + with transaction.atomic(): + user.save() + profile.save() + if get_profile: + return profile + else: + return user + + def activate_user(self, activation_key, site, get_profile=False): + """ + Validate an activation key and activate the corresponding ``User`` if + valid, returns a tuple of (``User``, ``activated``). The activated flag + indicates if the user was newly activated or an error occurred. + + If the key is valid and has not expired, return the (``User``, + ``True``) after activating. + + If the key is not valid or has expired, return (``User`` or ``False``, + ``False``). + If the key is valid but the ``User`` is already active, - return ``False``. - + return (``User``, ``False``). + + If the key is valid but the ``User`` is inactive, return (``User``, + ``False``). + To prevent reactivation of an account which has been - deactivated by site administrators, the activation key is - reset to the string constant ``RegistrationProfile.ACTIVATED`` - after successful activation. + deactivated by site administrators, ``RegistrationProfile.activated`` + is set to ``True`` after successful activation. """ # Make sure the key we're trying conforms to the pattern of a - # SHA1 hash; if it doesn't, no point trying to look it up in + # SHA256 hash; if it doesn't, no point trying to look it up in # the database. - if SHA1_RE.search(activation_key): + # The or statement is used + if SHA256_RE.search(activation_key): try: profile = self.get(activation_key=activation_key) except self.model.DoesNotExist: - return False + # This is an actual activation failure as the activation + # key does not exist. It is *not* the scenario where an + # already activated User reuses an activation key. + return (False, False) + + if profile.activated: + # The User has already activated and is trying to activate + # again. If the User is active, return the User. Else, + # return False as the User has been deactivated by a site + # administrator. + if profile.user.is_active: + return (profile.user, False) + else: + return (profile.user, False) + if not profile.activation_key_expired(): - user = profile.user - user.is_active = True - user.save() - profile.activation_key = self.model.ACTIVATED - profile.save() - return user - return False - - def create_inactive_user(self, username, email, password, - site, send_email=True): + return (self._activate(profile, site, get_profile), True) + + return (False, False) + + def create_inactive_user(self, site, new_user=None, send_email=True, + request=None, profile_info={}, **user_info): """ Create a new, inactive ``User``, generate a ``RegistrationProfile`` and email its activation key to the @@ -70,130 +180,185 @@ def create_inactive_user(self, username, email, password, By default, an activation email will be sent to the new user. To disable this, pass ``send_email=False``. - + Additionally, if email is sent and ``request`` is supplied, + it will be passed to the email template. + """ - new_user = User.objects.create_user(username, email, password) + if new_user is None: + password = user_info.pop('password') + new_user = UserModel()(**user_info) + new_user.set_password(password) new_user.is_active = False - new_user.save() - registration_profile = self.create_profile(new_user) + # Since we calculate the RegistrationProfile expiration from this date, + # we want to ensure that it is current + new_user.date_joined = datetime_now() + + with transaction.atomic(): + new_user.save() + registration_profile = self.create_profile( + new_user, **profile_info) - if send_email: - registration_profile.send_activation_email(site) + # send email only if desired and transaction succeeds + if send_email: + transaction.on_commit( + lambda: registration_profile.send_activation_email( + site, request) + ) return new_user - create_inactive_user = transaction.atomic(create_inactive_user) - def create_profile(self, user): + def create_profile(self, user, **profile_info): """ Create a ``RegistrationProfile`` for a given ``User``, and return the ``RegistrationProfile``. - + The activation key for the ``RegistrationProfile`` will be a - SHA1 hash, generated from a combination of the ``User``'s - username and a random salt. - + SHA256 hash, generated from a secure random string. + + """ + profile = self.model(user=user, **profile_info) + + if 'activation_key' not in profile_info: + profile.create_new_activation_key(save=False) + + profile.save() + + return profile + + def resend_activation_mail(self, email, site, request=None): + """ + Resets activation key for the user and resends activation email. """ - salt = hashlib.sha1(str(random.random()).encode('utf8')).hexdigest()[:5].encode('utf8') - username = user.username - if isinstance(username, str): - username = username.encode('utf-8') - activation_key = hashlib.sha1(salt+username).hexdigest() - return self.create(user=user, - activation_key=activation_key) - + try: + profile = self.get(user__email__iexact=email) + except ObjectDoesNotExist: + return False + except MultipleObjectsReturned: + return False + + if profile.activated or profile.activation_key_expired(): + return False + + profile.create_new_activation_key() + profile.send_activation_email(site, request) + + return True + def delete_expired_users(self): """ Remove expired instances of ``RegistrationProfile`` and their associated ``User``s. - - Accounts to be deleted are identified by searching for - instances of ``RegistrationProfile`` with expired activation - keys, and then checking to see if their associated ``User`` - instances have the field ``is_active`` set to ``False``; any - ``User`` who is both inactive and has an expired activation - key will be deleted. - + + Accounts to be deleted are identified by searching for instances of + ``RegistrationProfile`` with expired activation keys and an + ``activated`` field that is set to ``False``. If these conditions are + met both the ``RegistrationProfile`` and the ``User`` objects will be + deleted. + It is recommended that this method be executed regularly as part of your routine site maintenance; this application provides a custom management command which will call this method, accessible as ``manage.py cleanupregistration``. - + Regularly clearing out accounts which have never been activated serves two useful purposes: - - 1. It alleviates the ocasional need to reset a + + 1. It alleviates the occasional need to reset a ``RegistrationProfile`` and/or re-send an activation email when a user does not receive or does not act upon the initial activation email; since the account will be deleted, the user will be able to simply re-register and receive a new activation key. - + 2. It prevents the possibility of a malicious user registering one or more accounts and never activating them (thus denying the use of those usernames to anyone else); since those accounts will be deleted, the usernames will become available for use again. - + If you have a troublesome ``User`` and wish to disable their account while keeping it in the database, simply delete the associated ``RegistrationProfile``; an inactive ``User`` which does not have an associated ``RegistrationProfile`` will not be deleted. - + """ - for profile in self.all(): + profiles = self.filter( + models.Q(user__is_active=False) | models.Q(user=None), + activated=False, + ) + for profile in profiles: try: if profile.activation_key_expired(): user = profile.user - if not user.is_active: - user.delete() - profile.delete() - except User.DoesNotExist: + logger.warning('Deleting expired Registration profile {} and user {}.'.format(profile, user)) + profile.delete() + user.delete() + except UserModel().DoesNotExist: + logger.warning('Deleting expired Registration profile'.format(profile)) profile.delete() + +@python_2_unicode_compatible class RegistrationProfile(models.Model): """ A simple profile which stores an activation key for use during user account registration. - + Generally, you will not want to interact directly with instances of this model; the provided manager includes methods for creating and activating new accounts, as well as for cleaning out accounts which have never been activated. - + While it is possible to use this model as the value of the ``AUTH_PROFILE_MODULE`` setting, it's not recommended that you do so. This model's sole purpose is to store data temporarily during account registration and activation. - + """ - ACTIVATED = u"ALREADY_ACTIVATED" - - user = models.ForeignKey(User, unique=True, verbose_name=_('user')) - activation_key = models.CharField(_('activation key'), max_length=40) - + user = models.OneToOneField( + UserModelString(), + on_delete=models.CASCADE, + verbose_name=_('user'), + ) + activation_key = models.CharField(_('activation key'), max_length=64) + activated = models.BooleanField(default=False) + objects = RegistrationManager() - + class Meta: verbose_name = _('registration profile') verbose_name_plural = _('registration profiles') - + def __str__(self): - return u"Registration information for %s" % self.user - + return "Registration information for %s" % self.user + + def create_new_activation_key(self, save=True): + """ + Create a new activation key for the user + """ + random_string = get_random_string( + length=32, allowed_chars=string.printable) + self.activation_key = hashlib.sha256( + random_string.encode('utf-8')).hexdigest() + + if save: + self.save() + + return self.activation_key + def activation_key_expired(self): """ Determine whether this ``RegistrationProfile``'s activation key has expired, returning a boolean -- ``True`` if the key has expired. - + Key expiration is determined by a two-step process: - - 1. If the user has already activated, the key will have been - reset to the string constant ``ACTIVATED``. Re-activating - is not permitted, and so this method returns ``True`` in - this case. + + 1. If the user has already activated, ``self.activated`` will + be ``True``. Re-activating is not permitted, and so this + method returns ``True`` in this case. 2. Otherwise, the date the user signed up is incremented by the number of days specified in the setting @@ -202,19 +367,21 @@ def activation_key_expired(self): activate their account); if the result is less than or equal to the current date, the key has expired and this method returns ``True``. - + """ - expiration_date = datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS) - return self.activation_key == self.ACTIVATED or \ - (self.user.date_joined + expiration_date <= timezone.now()) - activation_key_expired.boolean = True + max_expiry_days = datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS) + expiration_date = self.user.date_joined + max_expiry_days + return self.activated or expiration_date <= datetime_now() - def send_activation_email(self, site): + def send_activation_email(self, site, request=None): """ Send an activation email to the user associated with this ``RegistrationProfile``. - - The activation email will make use of two templates: + + The activation email will use the following templates, + which can be overridden by setting ACTIVATION_EMAIL_SUBJECT, + ACTIVATION_EMAIL_BODY, and ACTIVATION_EMAIL_HTML appropriately: ``registration/activation_email_subject.txt`` This template will be used for the subject line of the @@ -224,11 +391,17 @@ def send_activation_email(self, site): into only a single line. ``registration/activation_email.txt`` - This template will be used for the body of the email. + This template will be used for the text body of the email. + + ``registration/activation_email.html`` + This template will be used for the html body of the email. These templates will each receive the following context variables: + ``user`` + The new user account + ``activation_key`` The activation key for the new account. @@ -242,21 +415,303 @@ def send_activation_email(self, site): is installed, this may be an instance of either ``django.contrib.sites.models.Site`` (if the sites application is installed) or - ``django.contrib.sites.models.RequestSite`` (if + ``django.contrib.sites.requests.RequestSite`` (if not). Consult the documentation for the Django sites framework for details regarding these objects' interfaces. + ``request`` + Optional Django's ``HttpRequest`` object from view. + If supplied will be passed to the template for better + flexibility via ``RequestContext``. """ - ctx_dict = {'activation_key': self.activation_key, - 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, - 'site': site} - subject = render_to_string('registration/activation_email_subject.txt', - ctx_dict) + activation_email_subject = getattr(settings, 'ACTIVATION_EMAIL_SUBJECT', + 'registration/activation_email_subject.txt') + activation_email_body = getattr(settings, 'ACTIVATION_EMAIL_BODY', + 'registration/activation_email.txt') + activation_email_html = getattr(settings, 'ACTIVATION_EMAIL_HTML', + 'registration/activation_email.html') + + ctx_dict = { + 'user': self.user, + 'activation_key': self.activation_key, + 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS, + 'site': site, + } + prefix = getattr(settings, 'REGISTRATION_EMAIL_SUBJECT_PREFIX', '') + subject = prefix + render_to_string( + activation_email_subject, ctx_dict, request=request + ) + # Email subject *must not* contain newlines subject = ''.join(subject.splitlines()) - - message = render_to_string('registration/activation_email.txt', - ctx_dict) - - self.user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) - + from_email = get_from_email(site) + message_txt = render_to_string(activation_email_body, + ctx_dict, request=request) + + email_message = EmailMultiAlternatives(subject, message_txt, + from_email, [self.user.email]) + + if getattr(settings, 'REGISTRATION_EMAIL_HTML', True): + try: + message_html = render_to_string( + activation_email_html, ctx_dict, request=request) + except TemplateDoesNotExist: + pass + else: + email_message.attach_alternative(message_html, 'text/html') + + email_message.send() + + +class SupervisedRegistrationManager(RegistrationManager): + + def activation_key_expired(self): + """ + Determine whether this ``RegistrationProfile``'s activation + key has expired, returning a boolean -- ``True`` if the key + has expired. + + Key expiration is determined by a two-step process: + + 1. If the user has already activated, ``self.activated`` and + `self.user.is_active`` will be ``True``. Re-activating is not + permitted, and so this method returns ``True`` in this case. + + 2. Otherwise, the date the user signed up is incremented by the number + of days specified in the setting ``ACCOUNT_ACTIVATION_DAYS`` (which + should be the number of days after signup during which a user is + allowed to activate their account); if the result is less than or equal + to the current date, the key has expired and this method returns + ``True``. + """ + expiration_date = datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS) + # A user is only considered activated when the entire registration + # process is completed (i.e. an admin has approved the account) + is_activated = self.activated and self.user.is_active + return (is_activated or self.user.date_joined + expiration_date <= datetime_now()) + + def _activate(self, profile, site, get_profile): + """ + Activate the ``SupervisedRegistrationProfile`` given as argument. + + Send an email to the site administrators to approve the user. + + User is not able to login yet, as ``is_active`` is not yet ``True`` + """ + + if not profile.user.is_active and not profile.activated: + self.send_admin_approve_email(profile.user, site) + + # do not set ``User.is_active`` as True. This will be set + # when a site administrator approves this account. + profile.activated = True + profile.save() + if get_profile: + return profile + else: + return profile.user + + def admin_approve_user(self, profile_id, site, get_profile=False, request=None): + """ + Approve the ``SupervisedRegistrationProfile`` + object with the given ``profile_id``. + + If the id is valid, return the ``User`` + after approving. + + If the id is not valid, return ``False``. + + If the id is valid but the ``User`` is already active, + return ``User``. + + If the id is valid but the ``SupervisedRegistrationProfile`` + object is not activated, return ``False``. + """ + try: + profile = SupervisedRegistrationProfile.objects.get(id=profile_id) + if profile.activated: + if profile.user.is_active: + return profile.user + + # If the user has not activated their profile the admin should + # not be able to approve his account (at least not following + # this process) + if profile.activated: + profile.user.is_active = True + else: + return False + + profile.user.save() + profile.send_admin_approve_complete_email(site, request) + + if get_profile: + return profile + else: + return profile.user + except self.model.DoesNotExist: + return False + + def send_admin_approve_email(self, user, site, request=None): + """ + Send an approval email to the site administrators to + approve this user. + + The approval email will use the following templates, + which can be overridden by setting APPROVAL_EMAIL_SUBJECT, + APPROVAL_EMAIL_BODY, and APPROVAL_EMAIL_HTML appropriately: + + ``registration/admin_approve_email_subject.txt`` + This template will be used for the subject line of the + email. Because it is used as the subject line of an email, + this template's output **must** be only a single line of + text; output longer than one line will be forcibly joined + into only a single line. + + ``registration/admin_approve_email.txt`` + This template will be used for the text body of the email. + + ``registration/admin_approve_email.html`` + This template will be used for the html body of the email. + + These templates will each receive the following context + variables: + + ``user`` + The new user account + + ``profile_id`` + The id of the associated``SupervisedRegistrationProfile`` + object. + + ``site`` + An object representing the site on which the user + registered; depending on whether ``django.contrib.sites`` + is installed, this may be an instance of either + ``django.contrib.sites.models.Site`` (if the sites + application is installed) or + ``django.contrib.sites.requests.RequestSite`` (if + not). Consult the documentation for the Django sites + framework for details regarding these objects' interfaces. + + ``request`` + Optional Django's ``HttpRequest`` object from view. + If supplied will be passed to the template for better + flexibility via ``RequestContext``. + """ + + admin_approve_email_subject = getattr( + settings, + 'ADMIN_APPROVAL_EMAIL_SUBJECT', + 'registration/admin_approve_email_subject.txt' + ) + admin_approve_email_body = getattr( + settings, + 'ADMIN_APPROVAL_EMAIL_BODY', + 'registration/admin_approve_email.txt' + ) + admin_approve_email_html = getattr( + settings, + 'ADMIN_APPROVAL_EMAIL_HTML', + 'registration/admin_approve_email.html' + ) + + ctx_dict = { + 'user': user, + 'profile_id': user.registrationprofile.id, + 'site': site, + } + registration_admins = getattr(settings, 'REGISTRATION_ADMINS', None) + if isinstance(registration_admins, str): # We have a getter + admins_getter = import_string(registration_admins) + admins = admins_getter() + else: + admins = registration_admins or getattr(settings, 'ADMINS', None) + if not registration_admins: + warnings.warn('No registration admin defined in' + ' settings.REGISTRATION_ADMINS.' + ' Using settings.ADMINS for the admin approval', + UserWarning) + if not admins: + raise ImproperlyConfigured( + 'Using the admin_approval registration backend' + ' requires at least one admin in settings.ADMINS' + ' or settings.REGISTRATION_ADMINS') + + admins = [admin[1] for admin in admins] + send_email( + admins, ctx_dict, admin_approve_email_subject, + admin_approve_email_body, admin_approve_email_html + ) + + +class SupervisedRegistrationProfile(RegistrationProfile): + + # Same model as ``RegistrationProfile``, just a different + # Manager to implement the extra functionality required + # in admin approval + objects = SupervisedRegistrationManager() + + def send_admin_approve_complete_email(self, site, request=None): + """ + Send an "approval is complete" email to the user associated with this + ``SupervisedRegistrationProfile``. + + The email will use the following templates, + which can be overridden by settings APPROVAL_COMPLETE_EMAIL_SUBJECT, + APPROVAL_COMPLETE_EMAIL_BODY, and APPROVAL_COMPLETE_EMAIL_HTML appropriately: + + ``registration/admin_approve_complete_email_subject.txt`` + This template will be used for the subject line of the + email. Because it is used as the subject line of an email, + this template's output **must** be only a single line of + text; output longer than one line will be forcibly joined + into only a single line. + + ``registration/admin_approve_complete_email.txt`` + This template will be used for the text body of the email. + + ``registration/admin_approve_complete_email.html`` + This template will be used for the text body of the email. + + These templates will each receive the following context + variables: + + ``user`` + The new user account + + ``site`` + An object representing the site on which the user + registered; depending on whether ``django.contrib.sites`` + is installed, this may be an instance of either + ``django.contrib.sites.models.Site`` (if the sites + application is installed) or + ``django.contrib.sites.requests.RequestSite`` (if + not). Consult the documentation for the Django sites + framework for details regarding these objects' interfaces. + + ``request`` + Optional Django's ``HttpRequest`` object from view. + If supplied will be passed to the template for better + flexibility via ``RequestContext``. + """ + admin_approve_complete_email_subject = getattr( + settings, 'APPROVAL_COMPLETE_EMAIL_SUBJECT', + 'registration/admin_approve_complete_email_subject.txt') + admin_approve_complete_email_body = getattr( + settings, 'APPROVAL_COMPLETE_EMAIL_BODY', + 'registration/admin_approve_complete_email.txt') + admin_approve_complete_email_html = getattr( + settings, 'APPROVAL_COMPLETE_EMAIL_HTML', + 'registration/admin_approve_complete_email.html') + + ctx_dict = { + 'user': self.user, + 'site': site, + } + send_email( + [self.user.email], ctx_dict, + admin_approve_complete_email_subject, + admin_approve_complete_email_body, + admin_approve_complete_email_html + ) diff --git a/dependencies/django-registration/registration/signals.py b/dependencies/django-registration/registration/signals.py index 343e3a555..cdd42734c 100644 --- a/dependencies/django-registration/registration/signals.py +++ b/dependencies/django-registration/registration/signals.py @@ -1,8 +1,26 @@ +from django.conf import settings +from django.contrib.auth import get_backends +from django.contrib.auth import login from django.dispatch import Signal +# An admin has approved a user's account +user_approved = Signal(providing_args=["user", "request"]) # A new user has registered. user_registered = Signal(providing_args=["user", "request"]) # A user has activated his or her account. user_activated = Signal(providing_args=["user", "request"]) + + +def login_user(sender, user, request, **kwargs): + """ Automatically authenticate the user when activated """ + backend = get_backends()[0] # Hack to bypass `authenticate()`. + user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__) + login(request, user) + request.session['REGISTRATION_AUTO_LOGIN'] = True + request.session.modified = True + + +if getattr(settings, 'REGISTRATION_AUTO_LOGIN', False): + user_activated.connect(login_user) diff --git a/dependencies/django-registration/registration/tests/__init__.py b/dependencies/django-registration/registration/tests/__init__.py index 92a36285a..5a33f375c 100644 --- a/dependencies/django-registration/registration/tests/__init__.py +++ b/dependencies/django-registration/registration/tests/__init__.py @@ -1,8 +1,7 @@ -from django.test import TestCase +from registration import admin +from registration.backends.default import urls -import registration -from registration.tests.backends import * -from registration.tests.forms import * -from registration.tests.models import * -from registration.tests.views import * +def test(): + assert admin + assert urls diff --git a/dependencies/django-registration/registration/tests/admin_actions.py b/dependencies/django-registration/registration/tests/admin_actions.py new file mode 100644 index 000000000..6c41a4c1c --- /dev/null +++ b/dependencies/django-registration/registration/tests/admin_actions.py @@ -0,0 +1,70 @@ +from __future__ import unicode_literals + +from django.contrib.admin import helpers +from django.core import mail +from django.test import TestCase +from django.test.client import Client +from django.test.utils import override_settings +from django.urls import reverse + +from registration.models import RegistrationProfile +from registration.users import UserModel + + +@override_settings(ACCOUNT_ACTIVATION_DAYS=7, + REGISTRATION_DEFAULT_FROM_EMAIL='registration@email.com', + REGISTRATION_EMAIL_HTML=True, + DEFAULT_FROM_EMAIL='django@email.com') +class AdminCustomActionsTestCase(TestCase): + """ + Test the available admin custom actions + """ + + def setUp(self): + self.client = Client() + admin_user = UserModel().objects.create_superuser( + 'admin', 'admin@test.com', 'admin') + self.client.login(username=admin_user.get_username(), password=admin_user) + + self.user_info = {'username': 'alice', + 'password': 'swordfish', + 'email': 'alice@example.com'} + + def test_activate_users(self): + """ + Test the admin custom command 'activate users' + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = RegistrationProfile.objects.create_profile(new_user) + + self.assertFalse(profile.activated) + + registrationprofile_list = reverse( + 'admin:registration_registrationprofile_changelist') + post_data = { + 'action': 'activate_users', + helpers.ACTION_CHECKBOX_NAME: [profile.pk], + } + self.client.post(registrationprofile_list, post_data, follow=True) + + profile = RegistrationProfile.objects.get(user=new_user) + self.assertTrue(profile.activated) + + def test_resend_activation_email(self): + """ + Test the admin custom command 'resend activation email' + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = RegistrationProfile.objects.create_profile(new_user) + + registrationprofile_list = reverse( + 'admin:registration_registrationprofile_changelist') + post_data = { + 'action': 'resend_activation_email', + helpers.ACTION_CHECKBOX_NAME: [profile.pk], + } + self.client.post(registrationprofile_list, post_data, follow=True) + + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].to, [self.user_info['email']]) diff --git a/dependencies/django-registration/registration/tests/admin_approval_backend.py b/dependencies/django-registration/registration/tests/admin_approval_backend.py new file mode 100644 index 000000000..ddb7b82d8 --- /dev/null +++ b/dependencies/django-registration/registration/tests/admin_approval_backend.py @@ -0,0 +1,117 @@ +from django.conf import settings +from django.core import mail +from django.test.utils import override_settings +from django.urls import reverse + +from .default_backend import DefaultBackendViewTests + +from registration.backends.admin_approval.views import RegistrationView +from registration.models import SupervisedRegistrationProfile +from registration.users import UserModel + + +def get_registration_admins(): + """ + Mock function for testing the admin getter functionality + + """ + return [ + ("Functional admin 1", "func_admin1@fakemail.com"), + ("Functional admin 2", "func_admin2@fakemail.com") + ] + + +@override_settings(ROOT_URLCONF='test_app.urls_admin_approval') +class AdminApprovalBackendViewTests(DefaultBackendViewTests): + """ + Test the admin_approval registration backend. + + Running these tests successfully will require two templates to be + created for the sending of activation emails; details on these + templates and their contexts may be found in the documentation for + the default backend. + + """ + + registration_profile = SupervisedRegistrationProfile + + registration_view = RegistrationView + + def test_approval(self): + """ + Approval of an account functions properly. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + + profile = self.registration_profile.objects.get(user__username='bob') + self.assertFalse(profile.user.is_active) + + resp = self.client.get( + reverse('registration_activate', + args=(), + kwargs={'activation_key': profile.activation_key})) + + admin_user = UserModel().objects.create_superuser('admin', 'admin@test.com', 'admin') + self.client.login(username=admin_user.get_username(), password=admin_user) + + resp = self.client.get( + reverse('registration_admin_approve', + args=(), + kwargs={'profile_id': profile.id})) + profile.user.refresh_from_db() + self.assertTrue(profile.user.is_active) + self.assertRedirects(resp, reverse('registration_approve_complete')) + + @override_settings( + REGISTRATION_ADMINS=[ + ("The admin", "admin_alpha@fakemail.com"), + ("The other admin", "admin_two@fakemail.com") + ] + ) + def test_admins_when_is_list(self): + """ + Admins are pulled from the REGISTRATION_ADMINS list setting + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + + profile = self.registration_profile.objects.get(user__username='bob') + + resp = self.client.get( + reverse('registration_activate', + args=(), + kwargs={'activation_key': profile.activation_key})) + self.assertRedirects(resp, reverse('registration_activation_complete')) + admins_mail = mail.outbox[1] + self.assertEqual(admins_mail.to, [to[1] for to in settings.REGISTRATION_ADMINS]) + + @override_settings( + REGISTRATION_ADMINS="registration.tests.admin_approval_backend.get_registration_admins" + ) + def test_admins_when_is_getter(self): + """ + Admins are pulled from the REGISTRATION_ADMINS string setting + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + + profile = self.registration_profile.objects.get(user__username='bob') + + resp = self.client.get( + reverse('registration_activate', + args=(), + kwargs={'activation_key': profile.activation_key})) + self.assertRedirects(resp, reverse('registration_activation_complete')) + admins_mail = mail.outbox[1] + self.assertEqual(admins_mail.to, [to[1] for to in get_registration_admins()]) diff --git a/dependencies/django-registration/registration/tests/default_backend.py b/dependencies/django-registration/registration/tests/default_backend.py new file mode 100644 index 000000000..3a2a22f20 --- /dev/null +++ b/dependencies/django-registration/registration/tests/default_backend.py @@ -0,0 +1,254 @@ +import datetime + +from django.conf import settings +from django.contrib.auth.models import AnonymousUser +from django.core import mail +from django.db import DatabaseError +from django.test import TransactionTestCase +from django.test.client import RequestFactory +from django.test.utils import override_settings +from django.urls import reverse +from mock import patch + +from registration.backends.default.views import RegistrationView +from registration.forms import RegistrationForm +from registration.models import RegistrationProfile +from registration.users import UserModel + + +@override_settings(ROOT_URLCONF='test_app.urls_default', + ACCOUNT_ACTIVATION_DAYS=7) +class DefaultBackendViewTests(TransactionTestCase): + """ + Test the default registration backend. + + Running these tests successfully will require two templates to be + created for the sending of activation emails; details on these + templates and their contexts may be found in the documentation for + the default backend. + + """ + + registration_profile = RegistrationProfile + + registration_view = RegistrationView + + @override_settings(REGISTRATION_OPEN=True) + def test_registration_open(self): + """ + The setting ``REGISTRATION_OPEN`` appropriately controls + whether registration is permitted. + + """ + resp = self.client.get(reverse('registration_register')) + self.assertEqual(200, resp.status_code) + + @override_settings(REGISTRATION_OPEN=False) + def test_registration_closed(self): + + # Now all attempts to hit the register view should redirect to + # the 'registration is closed' message. + resp = self.client.get(reverse('registration_register')) + self.assertRedirects(resp, reverse('registration_disallowed')) + + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + self.assertRedirects(resp, reverse('registration_disallowed')) + + def test_registration_get(self): + """ + HTTP ``GET`` to the registration view uses the appropriate + template and populates a registration form into the context. + + """ + resp = self.client.get(reverse('registration_register')) + self.assertEqual(200, resp.status_code) + self.assertTemplateUsed(resp, + 'registration/registration_form.html') + self.assertIsInstance(resp.context['form'], RegistrationForm) + + def test_registration(self): + """ + Registration creates a new inactive account and a new profile + with activation key, populates the correct account data and + sends an activation email. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + self.assertRedirects(resp, reverse('registration_complete')) + + new_user = UserModel().objects.get(username='bob') + + self.assertTrue(new_user.check_password('secret')) + self.assertEqual(new_user.email, 'bob@example.com') + + # New user must not be active. + self.assertFalse(new_user.is_active) + + # A registration profile was created, and an activation email + # was sent. + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertEqual(len(mail.outbox), 1) + + def test_registration_no_email(self): + """ + Overridden Registration view does not send an activation email if the + associated class variable is set to ``False`` + + """ + class RegistrationNoEmailView(self.registration_view): + SEND_ACTIVATION_EMAIL = False + + request_factory = RequestFactory() + view = RegistrationNoEmailView.as_view() + request = request_factory.post('/', data={ + 'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + request.user = AnonymousUser() + view(request) + + UserModel().objects.get(username='bob') + # A registration profile was created, and no activation email was sent. + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertEqual(len(mail.outbox), 0) + + @override_settings( + INSTALLED_APPS=('django.contrib.auth', 'registration',) + ) + def test_registration_no_sites(self): + """ + Registration still functions properly when + ``django.contrib.sites`` is not installed; the fallback will + be a ``RequestSite`` instance. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + self.assertEqual(302, resp.status_code) + + new_user = UserModel().objects.get(username='bob') + + self.assertTrue(new_user.check_password('secret')) + self.assertEqual(new_user.email, 'bob@example.com') + + self.assertFalse(new_user.is_active) + + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertEqual(len(mail.outbox), 1) + + def test_registration_failure(self): + """ + Registering with invalid data fails. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'notsecret'}) + self.assertEqual(200, resp.status_code) + self.assertFalse(resp.context['form'].is_valid()) + self.assertEqual(0, len(mail.outbox)) + + @patch('registration.models.RegistrationManager.create_inactive_user') + def test_registration_exception(self, create_inactive_user): + """ + User is not created beforehand if an exception occurred at + creating registration profile. + """ + create_inactive_user.side_effect = DatabaseError() + valid_data = {'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'} + with self.assertRaises(DatabaseError): + self.client.post(reverse('registration_register'), + data=valid_data) + assert not UserModel().objects.filter(username='bob').exists() + + def test_activation(self): + """ + Activation of an account functions properly. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + + profile = self.registration_profile.objects.get(user__username='bob') + + resp = self.client.get( + reverse('registration_activate', + args=(), + kwargs={'activation_key': profile.activation_key})) + self.assertRedirects(resp, reverse('registration_activation_complete')) + + def test_activation_expired(self): + """ + An expired account can't be activated. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + + profile = self.registration_profile.objects.get(user__username='bob') + user = profile.user + user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS) + user.save() + + resp = self.client.get( + reverse('registration_activate', + args=(), + kwargs={'activation_key': profile.activation_key})) + + self.assertEqual(200, resp.status_code) + self.assertTemplateUsed(resp, 'registration/activate.html') + user = UserModel().objects.get(username='bob') + self.assertFalse(user.is_active) + + def test_resend_activation(self): + """ + Resend activation functions properly. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + + profile = self.registration_profile.objects.get(user__username='bob') + + resp = self.client.post(reverse('registration_resend_activation'), + data={'email': profile.user.email}) + self.assertTemplateUsed(resp, + 'registration/resend_activation_complete.html') + self.assertEqual(resp.context['email'], profile.user.email) + + def test_resend_activation_invalid_email(self): + """ + Calling resend with an invalid email shows the same template. + + """ + resp = self.client.post(reverse('registration_resend_activation'), + data={'email': 'invalid@example.com'}) + self.assertTemplateUsed(resp, + 'registration/resend_activation_complete.html') diff --git a/dependencies/django-registration/registration/tests/forms.py b/dependencies/django-registration/registration/tests/forms.py index 15e84105e..d4485ad83 100644 --- a/dependencies/django-registration/registration/tests/forms.py +++ b/dependencies/django-registration/registration/tests/forms.py @@ -1,15 +1,21 @@ -from django.contrib.auth.models import User +from __future__ import unicode_literals + +import django from django.test import TestCase from registration import forms +from registration.users import UserModel + +if django.VERSION[0] < 3: + from django.utils import six -from django.utils import translation class RegistrationFormTests(TestCase): """ Test the default registration forms. """ + def test_registration_form(self): """ Test that ``RegistrationForm`` enforces username constraints @@ -18,7 +24,19 @@ def test_registration_form(self): """ # Create a user so we can verify that duplicate usernames aren't # permitted. - User.objects.create_user('alice', 'alice@example.com', 'secret') + UserModel().objects.create_user('alice', 'alice@example.com', 'secret') + bad_username_error = ( + 'Enter a valid username. This value may contain only letters, ' + 'numbers, and @/./+/-/_ characters.' + ) + if django.VERSION < (1, 10): + bad_username_error = bad_username_error.replace('numbers,', 'numbers') + elif django.VERSION < (3, 0) and six.PY2: + bad_username_error = bad_username_error.replace('letters', 'English letters') + + password_didnt_match_error = "The two password fields didn't match." + if django.VERSION >= (3, 0): + password_didnt_match_error = "The two password fields didn\u2019t match." invalid_data_dicts = [ # Non-alphanumeric username. @@ -26,33 +44,56 @@ def test_registration_form(self): 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}, - 'error': ('username', [u"This value may contain only letters, numbers and @/./+/-/_ characters."])}, + 'error': ('username', [bad_username_error])}, # Already-existing username. {'data': {'username': 'alice', 'email': 'alice@example.com', 'password1': 'secret', 'password2': 'secret'}, - 'error': ('username', [u"A user with that username already exists."])}, + 'error': ('username', ["A user with that username already exists."])}, # Mismatched passwords. {'data': {'username': 'foo', 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'bar'}, - 'error': ('__all__', [u"The two password fields didn't match."])}, - ] + 'error': ('password2', [password_didnt_match_error])}, + ] for invalid_dict in invalid_data_dicts: - with translation.override('en'): - form = forms.RegistrationForm(data=invalid_dict['data']) - self.failIf(form.is_valid()) - self.assertEqual(form.errors[invalid_dict['error'][0]], - invalid_dict['error'][1]) + form = forms.RegistrationForm(data=invalid_dict['data']) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors[invalid_dict['error'][0]], + invalid_dict['error'][1]) form = forms.RegistrationForm(data={'username': 'foo', 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) + + def test_registration_form_username_lowercase(self): + """ + Test that ``RegistrationFormUniqueEmail`` validates uniqueness + of email addresses. + + """ + # Create a user so we can verify that duplicate addresses + # aren't permitted. + UserModel().objects.create_user('alice', 'alice@example.com', 'secret') + + form = forms.RegistrationFormUsernameLowercase(data={'username': 'Alice', + 'email': 'alice@example.com', + 'password1': 'foo', + 'password2': 'foo'}) + self.assertFalse(form.is_valid()) + self.assertEqual(form.errors['username'], + ["A user with that username already exists."]) + + form = forms.RegistrationFormUsernameLowercase(data={'username': 'foo', + 'email': 'alice@example.com', + 'password1': 'foo', + 'password2': 'foo'}) + self.assertTrue(form.is_valid()) def test_registration_form_tos(self): """ @@ -64,16 +105,16 @@ def test_registration_form_tos(self): 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failIf(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual(form.errors['tos'], - [u"You must agree to the terms to register"]) + ["You must agree to the terms to register"]) form = forms.RegistrationFormTermsOfService(data={'username': 'foo', 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo', 'tos': 'on'}) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) def test_registration_form_unique_email(self): """ @@ -83,21 +124,21 @@ def test_registration_form_unique_email(self): """ # Create a user so we can verify that duplicate addresses # aren't permitted. - User.objects.create_user('alice', 'alice@example.com', 'secret') + UserModel().objects.create_user('alice', 'alice@example.com', 'secret') form = forms.RegistrationFormUniqueEmail(data={'username': 'foo', 'email': 'alice@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failIf(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual(form.errors['email'], - [u"This email address is already in use. Please supply a different email address."]) + ["This email address is already in use. Please supply a different email address."]) form = forms.RegistrationFormUniqueEmail(data={'username': 'foo', 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) def test_registration_form_no_free_email(self): """ @@ -110,12 +151,12 @@ def test_registration_form_no_free_email(self): 'password2': 'foo'} for domain in forms.RegistrationFormNoFreeEmail.bad_domains: invalid_data = base_data.copy() - invalid_data['email'] = u"foo@%s" % domain + invalid_data['email'] = "foo@%s" % domain form = forms.RegistrationFormNoFreeEmail(data=invalid_data) - self.failIf(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual(form.errors['email'], - [u"Registration using free email addresses is prohibited. Please supply a different email address."]) + ["Registration using free email addresses is prohibited. Please supply a different email address."]) base_data['email'] = 'foo@example.com' form = forms.RegistrationFormNoFreeEmail(data=base_data) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) diff --git a/dependencies/django-registration/registration/tests/forms_custom_user.py b/dependencies/django-registration/registration/tests/forms_custom_user.py new file mode 100644 index 000000000..364c13b73 --- /dev/null +++ b/dependencies/django-registration/registration/tests/forms_custom_user.py @@ -0,0 +1,50 @@ +from __future__ import unicode_literals + +from django.test import TestCase +from django.test.utils import override_settings + +from registration import forms +from registration.users import UsernameField + +try: + from importlib import reload # Python 3.4+ +except ImportError: + pass # Python 2 reload() + + +@override_settings(AUTH_USER_MODEL='test_app.CustomUser') +class RegistrationFormTests(TestCase): + """ + Test the default registration forms. + + """ + + def setUp(self): + # The form's Meta class is created on import. We have to reload() + # to apply the new AUTH_USER_MODEL to the Meta class. + reload(forms) + + def test_registration_form_adds_custom_user_name_field(self): + """ + Test that ``RegistrationForm`` adds custom username + field and does not raise errors + + """ + + form = forms.RegistrationForm() + + self.assertTrue(UsernameField() in form.fields) + + def test_registration_form_subclass_is_valid(self): + """ + Test that ``RegistrationForm`` subclasses can save + + """ + data = {'new_field': 'custom username', + 'email': 'foo@example.com', + 'password1': 'foo', + 'password2': 'foo'} + + form = forms.RegistrationForm(data=data) + + self.assertTrue(form.is_valid()) diff --git a/dependencies/django-registration/registration/tests/models.py b/dependencies/django-registration/registration/tests/models.py index 1ca291b32..4a22d5d34 100644 --- a/dependencies/django-registration/registration/tests/models.py +++ b/dependencies/django-registration/registration/tests/models.py @@ -1,225 +1,1127 @@ import datetime +import hashlib +import random import re +import string +import warnings +from copy import copy +from datetime import timedelta +import django +from django.apps import apps from django.conf import settings -from django.contrib.auth.models import User -from django.contrib.sites.models import Site from django.core import mail from django.core import management -from django.test import TestCase -from hashlib import sha1 as sha_constructor +from django.core.exceptions import ImproperlyConfigured +from django.test import TransactionTestCase +from django.test import override_settings +from django.utils.crypto import get_random_string +from django.utils.timezone import now as datetime_now from registration.models import RegistrationProfile +from registration.models import SupervisedRegistrationProfile +from registration.users import UserModel +if django.VERSION[0] < 3: + from django.utils.six import text_type, b as six_b +else: + text_type = str -class RegistrationModelTests(TestCase): + def six_b(s): + return s.encode("latin-1") + +Site = apps.get_model('sites', 'Site') + + +@override_settings(ACCOUNT_ACTIVATION_DAYS=7, + REGISTRATION_DEFAULT_FROM_EMAIL='registration@email.com', + REGISTRATION_EMAIL_HTML=True, + DEFAULT_FROM_EMAIL='django@email.com') +class RegistrationModelTests(TransactionTestCase): """ Test the model and manager used in the default backend. - + """ user_info = {'username': 'alice', 'password': 'swordfish', 'email': 'alice@example.com'} - - def setUp(self): - self.old_activation = getattr(settings, 'ACCOUNT_ACTIVATION_DAYS', None) - settings.ACCOUNT_ACTIVATION_DAYS = 7 - def tearDown(self): - settings.ACCOUNT_ACTIVATION_DAYS = self.old_activation + registration_profile = RegistrationProfile + + def setUp(self): + warnings.simplefilter('always', UserWarning) def test_profile_creation(self): """ Creating a registration profile for a user populates the - profile with the correct user and a SHA1 hash to use as + profile with the correct user and a SHA256 hash to use as activation key. - + """ - new_user = User.objects.create_user(**self.user_info) - profile = RegistrationProfile.objects.create_profile(new_user) + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) - self.assertEqual(RegistrationProfile.objects.count(), 1) + self.assertEqual(self.registration_profile.objects.count(), 1) self.assertEqual(profile.user.id, new_user.id) - self.failUnless(re.match('^[a-f0-9]{40}$', profile.activation_key)) - self.assertEqual(str(profile), + self.assertTrue(re.match('^[a-f0-9]{40,64}$', profile.activation_key)) + self.assertEqual(text_type(profile), "Registration information for alice") def test_activation_email(self): """ ``RegistrationProfile.send_activation_email`` sends an email. - + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_activation_email(Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].to, [self.user_info['email']]) + + @override_settings(ACTIVATION_EMAIL_HTML='does-not-exist') + def test_activation_email_missing_template(self): + """ + ``RegistrationProfile.send_activation_email`` sends an + email. + """ - new_user = User.objects.create_user(**self.user_info) - profile = RegistrationProfile.objects.create_profile(new_user) + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) profile.send_activation_email(Site.objects.get_current()) self.assertEqual(len(mail.outbox), 1) self.assertEqual(mail.outbox[0].to, [self.user_info['email']]) + def test_activation_email_uses_registration_default_from_email(self): + """ + ``RegistrationProfile.send_activation_email`` sends an + email. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_activation_email(Site.objects.get_current()) + self.assertEqual(mail.outbox[0].from_email, 'registration@email.com') + + @override_settings(REGISTRATION_DEFAULT_FROM_EMAIL=None) + def test_activation_email_falls_back_to_django_default_from_email(self): + """ + ``RegistrationProfile.send_activation_email`` sends an + email. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_activation_email(Site.objects.get_current()) + self.assertEqual(mail.outbox[0].from_email, 'django@email.com') + + @override_settings(REGISTRATION_USE_SITE_EMAIL=True, + REGISTRATION_SITE_USER_EMAIL='admin') + def test_activation_email_uses_site_address(self): + """ + ``RegistrationProfile.send_activation_email`` sends an + email with the ``from`` address configured by the site. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + site = Site.objects.get_current() + profile.send_activation_email(site) + from_email = 'admin@{}'.format(site.domain) + self.assertEqual(mail.outbox[0].from_email, from_email) + + @override_settings(REGISTRATION_USE_SITE_EMAIL=True) + def test_activation_email_uses_site_address_improperly_configured(self): + """ + ``RegistrationProfile.send_activation_email`` won't send an email if + improperly configured. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + with self.assertRaises(ImproperlyConfigured): + profile.send_activation_email(Site.objects.get_current()) + + def test_activation_email_is_html_by_default(self): + """ + ``RegistrationProfile.send_activation_email`` sends an html + email by default. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_activation_email(Site.objects.get_current()) + + self.assertEqual(len(mail.outbox[0].alternatives), 1) + + @override_settings(REGISTRATION_EMAIL_HTML=False) + def test_activation_email_is_plain_text_if_html_disabled(self): + """ + ``RegistrationProfile.send_activation_email`` sends a plain + text email if settings.REGISTRATION_EMAIL_HTML is False. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_activation_email(Site.objects.get_current()) + + self.assertEqual(len(mail.outbox[0].alternatives), 0) + def test_user_creation(self): """ Creating a new user populates the correct data, and sets the user's account inactive. - + """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - self.assertEqual(new_user.username, 'alice') + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + self.assertEqual(new_user.get_username(), 'alice') self.assertEqual(new_user.email, 'alice@example.com') - self.failUnless(new_user.check_password('swordfish')) - self.failIf(new_user.is_active) + self.assertTrue(new_user.check_password('swordfish')) + self.assertFalse(new_user.is_active) + + expiration_date = datetime_now() - timedelta( + settings.ACCOUNT_ACTIVATION_DAYS + ) + self.assertGreater(new_user.date_joined, expiration_date) def test_user_creation_email(self): """ By default, creating a new user sends an activation email. - + """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) + self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) self.assertEqual(len(mail.outbox), 1) def test_user_creation_no_email(self): """ Passing ``send_email=False`` when creating a new user will not send an activation email. - + """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - send_email=False, - **self.user_info) + self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), + send_email=False, **self.user_info) self.assertEqual(len(mail.outbox), 0) + def test_user_creation_old_date_joined(self): + """ + If ``user.date_joined`` is well in the past, ensure that we reset it. + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + self.assertEqual(new_user.get_username(), 'alice') + self.assertEqual(new_user.email, 'alice@example.com') + self.assertTrue(new_user.check_password('swordfish')) + self.assertFalse(new_user.is_active) + + expiry_date = datetime_now() - timedelta(settings.ACCOUNT_ACTIVATION_DAYS) + self.assertGreater(new_user.date_joined, expiry_date) + + def test_unexpired_account_old_date_joined(self): + """ + ``RegistrationProfile.activation_key_expired()`` is ``False`` within + the activation window. Even if the user was created in the past. + + """ + self.user_info['date_joined'] = datetime_now( + ) - timedelta(settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + self.assertFalse(profile.activation_key_expired()) + def test_unexpired_account(self): """ ``RegistrationProfile.activation_key_expired()`` is ``False`` within the activation window. - + """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - profile = RegistrationProfile.objects.get(user=new_user) - self.failIf(profile.activation_key_expired()) + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + self.assertFalse(profile.activation_key_expired()) + + def test_active_account_activation_key_expired(self): + """ + ``RegistrationProfile.activation_key_expired()`` is ``True`` + when the account is already active. + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + profile.refresh_from_db() + self.assertTrue(profile.activation_key_expired()) + + def test_active_account_and_expired_accountactivation_key_expired(self): + """ + ``RegistrationProfile.activation_key_expired()`` is ``True`` + when the account is already active and the activation window has passed. + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + new_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user.save() + profile = self.registration_profile.objects.get(user=new_user) + self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + profile.refresh_from_db() + self.assertTrue(profile.activation_key_expired()) def test_expired_account(self): """ ``RegistrationProfile.activation_key_expired()`` is ``True`` outside the activation window. - + """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - new_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + new_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) new_user.save() - profile = RegistrationProfile.objects.get(user=new_user) - self.failUnless(profile.activation_key_expired()) + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activation_key_expired()) def test_valid_activation(self): """ Activating a user within the permitted window makes the account active, and resets the activation key. - + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + self.assertEqual(user.id, new_user.id) + self.assertTrue(user.is_active) + self.assertTrue(activated) + + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activated) + + def test_valid_activation_with_profile(self): """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - profile = RegistrationProfile.objects.get(user=new_user) - activated = RegistrationProfile.objects.activate_user(profile.activation_key) + Activating a user within the permitted window makes the + account active, and resets the activation key. - self.failUnless(isinstance(activated, User)) - self.assertEqual(activated.id, new_user.id) - self.failUnless(activated.is_active) + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + profile, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current(), get_profile=True) - profile = RegistrationProfile.objects.get(user=new_user) - self.assertEqual(profile.activation_key, RegistrationProfile.ACTIVATED) + self.assertIsInstance(profile, self.registration_profile) + self.assertEqual(profile.id, profile.id) + self.assertTrue(profile.activated) + self.assertTrue(activated) + + new_user.refresh_from_db() + self.assertTrue(profile.user.id, new_user.id) + self.assertTrue(new_user.is_active) def test_expired_activation(self): """ Attempting to activate outside the permitted window does not activate the account. - + """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - new_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + new_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) new_user.save() - profile = RegistrationProfile.objects.get(user=new_user) - activated = RegistrationProfile.objects.activate_user(profile.activation_key) + profile = self.registration_profile.objects.get(user=new_user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) - self.failIf(isinstance(activated, User)) - self.failIf(activated) + self.assertIs(user, False) + self.assertFalse(activated) - new_user = User.objects.get(username='alice') - self.failIf(new_user.is_active) + new_user = UserModel().objects.get(username='alice') + self.assertFalse(new_user.is_active) - profile = RegistrationProfile.objects.get(user=new_user) - self.assertNotEqual(profile.activation_key, RegistrationProfile.ACTIVATED) + profile = self.registration_profile.objects.get(user=new_user) + self.assertFalse(profile.activated) def test_activation_invalid_key(self): """ - Attempting to activate with a key which is not a SHA1 hash + Attempting to activate with a key which is not a SHA256 hash fails. - + """ - self.failIf(RegistrationProfile.objects.activate_user('foo')) + user, activated = self.registration_profile.objects.activate_user( + 'foo', Site.objects.get_current()) + self.assertIs(user, False) + self.assertFalse(activated) def test_activation_already_activated(self): """ Attempting to re-activate an already-activated account fails. - + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + profile = self.registration_profile.objects.get(user=new_user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.assertEqual(user, new_user) + self.assertFalse(activated) + + def test_activation_deactivated(self): """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - profile = RegistrationProfile.objects.get(user=new_user) - RegistrationProfile.objects.activate_user(profile.activation_key) + Attempting to re-activate a deactivated account fails. + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + # Deactivate the new user. + new_user.is_active = False + new_user.save() - profile = RegistrationProfile.objects.get(user=new_user) - self.failIf(RegistrationProfile.objects.activate_user(profile.activation_key)) + # Try to activate again and ensure False is returned. + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.assertFalse(activated) def test_activation_nonexistent_key(self): """ Attempting to activate with a non-existent key (i.e., one not associated with any account) fails. - + """ # Due to the way activation keys are constructed during # registration, this will never be a valid key. - invalid_key = sha_constructor(b'foo').hexdigest() - self.failIf(RegistrationProfile.objects.activate_user(invalid_key)) + invalid_key = hashlib.sha256(six_b('foo')).hexdigest() + _, activated = self.registration_profile.objects.activate_user( + invalid_key, Site.objects.get_current()) + self.assertFalse(activated) - def test_expired_user_deletion(self): + def test_expired_user_deletion_activation_window(self): """ ``RegistrationProfile.objects.delete_expired_users()`` only deletes inactive users whose activation window has expired. - - """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - expired_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - username='bob', - password='secret', - email='bob@example.com') - expired_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + + """ + self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + expired_user = (self.registration_profile.objects + .create_inactive_user( + site=Site.objects.get_current(), + username='bob', + password='secret', + email='bob@example.com')) + expired_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) expired_user.save() - RegistrationProfile.objects.delete_expired_users() - self.assertEqual(RegistrationProfile.objects.count(), 1) - self.assertRaises(User.DoesNotExist, User.objects.get, username='bob') + self.registration_profile.objects.delete_expired_users() + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertRaises(UserModel().DoesNotExist, + UserModel().objects.get, username='bob') + + def test_expired_user_deletion_ignore_activated(self): + """ + ``RegistrationProfile.objects.delete_expired_users()`` only + deletes inactive users whose activation window has expired and if + their profile is not activated. + + """ + user = (self.registration_profile.objects + .create_inactive_user( + site=Site.objects.get_current(), + username='bob', + password='secret', + email='bob@example.com')) + profile = self.registration_profile.objects.get(user=user) + _, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.assertTrue(activated) + # Expire the activation window. + user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + user.save() + + self.registration_profile.objects.delete_expired_users() + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertEqual(UserModel().objects.get(username='bob'), user) + + def test_expired_user_deletion_missing_user(self): + """ + ``RegistrationProfile.objects.delete_expired_users()`` only deletes + inactive users whose activation window has expired. If a ``UserModel`` + is not present, the delete continues gracefully. + + """ + self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + expired_user = (self.registration_profile.objects + .create_inactive_user( + site=Site.objects.get_current(), + username='bob', + password='secret', + email='bob@example.com')) + expired_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + expired_user.save() + # Ensure that we cleanup the expired profile even if the user does not + # exist + expired_user.delete() + + self.registration_profile.objects.delete_expired_users() + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertRaises(UserModel().DoesNotExist, + UserModel().objects.get, username='bob') + + def test_manually_registered_account(self): + """ + Test if a user failed to go through the registration flow but was + manually marked ``is_active`` in the DB. Although the profile is + expired and not active, we should never delete active users. + """ + active_user = (self.registration_profile.objects + .create_inactive_user( + site=Site.objects.get_current(), + username='bob', + password='secret', + email='bob@example.com')) + active_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + active_user.is_active = True + active_user.save() + + self.registration_profile.objects.delete_expired_users() + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertEqual(UserModel().objects.get(username='bob'), active_user) def test_management_command(self): """ The ``cleanupregistration`` management command properly deletes expired accounts. - - """ - new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - **self.user_info) - expired_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), - username='bob', - password='secret', - email='bob@example.com') - expired_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + + """ + self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + expired_user = (self.registration_profile.objects + .create_inactive_user(site=Site.objects.get_current(), + username='bob', + password='secret', + email='bob@example.com')) + expired_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) expired_user.save() management.call_command('cleanupregistration') - self.assertEqual(RegistrationProfile.objects.count(), 1) - self.assertRaises(User.DoesNotExist, User.objects.get, username='bob') + self.assertEqual(self.registration_profile.objects.count(), 1) + self.assertRaises(UserModel().DoesNotExist, + UserModel().objects.get, username='bob') + + def test_resend_activation_email(self): + """ + Test resending activation email to an existing user + """ + user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), send_email=False, **self.user_info) + self.assertEqual(len(mail.outbox), 0) + + profile = self.registration_profile.objects.get(user=user) + orig_activation_key = profile.activation_key + + self.assertTrue(self.registration_profile.objects.resend_activation_mail( + email=self.user_info['email'], + site=Site.objects.get_current(), + )) + + profile = self.registration_profile.objects.get(pk=profile.pk) + new_activation_key = profile.activation_key + + self.assertNotEqual(orig_activation_key, new_activation_key) + self.assertEqual(len(mail.outbox), 1) + + def test_resend_activation_email_nonexistent_user(self): + """ + Test resending activation email to a nonexisting user + """ + self.assertFalse(self.registration_profile.objects.resend_activation_mail( + email=self.user_info['email'], + site=Site.objects.get_current(), + )) + self.assertEqual(len(mail.outbox), 0) + + def test_resend_activation_email_activated_user(self): + """ + Test the scenario where user tries to resend activation code + to the already activated user's email + """ + user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), send_email=False, **self.user_info) + + profile = self.registration_profile.objects.get(user=user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.assertTrue(user.is_active) + self.assertTrue(activated) + + self.assertFalse(self.registration_profile.objects.resend_activation_mail( + email=self.user_info['email'], + site=Site.objects.get_current(), + )) + self.assertEqual(len(mail.outbox), 0) + + def test_resend_activation_email_expired_user(self): + """ + Test the scenario where user tries to resend activation code + to the expired user's email + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), send_email=False, **self.user_info) + new_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user.save() + + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activation_key_expired()) + + self.assertFalse(self.registration_profile.objects.resend_activation_mail( + email=self.user_info['email'], + site=Site.objects.get_current(), + )) + self.assertEqual(len(mail.outbox), 0) + + def test_resend_activation_email_nonunique_email(self): + """ + Test the scenario where user tries to resend activation code + to the expired user's email + """ + user1 = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), send_email=False, **self.user_info) + user2_info = copy(self.user_info) + user2_info['username'] = 'bob' + user2 = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), send_email=False, **user2_info) + self.assertEqual(user1.email, user2.email) + self.assertFalse(self.registration_profile.objects.resend_activation_mail( + email=self.user_info['email'], + site=Site.objects.get_current(), + )) + self.assertEqual(len(mail.outbox), 0) + + def test_activation_key_backwards_compatibility(self): + """ + Make sure that users created with the old create_new_activation_key + method can still be activated. + """ + current_method = self.registration_profile.create_new_activation_key + + def old_method(self, save=True): + salt = hashlib.sha1( + text_type(random.random()).encode('ascii') + ).hexdigest()[:5] + salt = salt.encode('ascii') + user_pk = str(self.user.pk) + if isinstance(user_pk, text_type): + user_pk = user_pk.encode('utf-8') + self.activation_key = hashlib.sha1(salt + user_pk).hexdigest() + if save: + self.save() + return self.activation_key + + self.registration_profile.create_new_activation_key = old_method + + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + + self.registration_profile.create_new_activation_key = current_method + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + self.assertEqual(user.id, new_user.id) + self.assertTrue(user.is_active) + self.assertTrue(activated) + + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activated) + + def test_activation_key_backwards_compatibility_sha1(self): + """ + Make sure that users created with the old create_new_activation_key + method can still be activated. + """ + current_method = self.registration_profile.create_new_activation_key + + def old_method(self, save=True): + random_string = get_random_string(length=32, allowed_chars=string.printable) + self.activation_key = hashlib.sha1(random_string.encode('utf-8')).hexdigest() + if save: + self.save() + return self.activation_key + + self.registration_profile.create_new_activation_key = old_method + + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + + self.registration_profile.create_new_activation_key = current_method + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + self.assertEqual(user.id, new_user.id) + self.assertTrue(user.is_active) + self.assertTrue(activated) + + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activated) + + +@override_settings( + ADMINS=( + ('T-Rex', 'admin1@iamtrex.com'), + ('Flea', 'admin2@iamaflea.com') + ) +) +class SupervisedRegistrationModelTests(RegistrationModelTests): + """ + Test the model and manager used in the admin_approval backend. + + """ + + user_info = {'username': 'alice', + 'password': 'swordfish', + 'email': 'alice@example.com'} + + registration_profile = SupervisedRegistrationProfile + + def test_valid_activation(self): + """ + Activating a user within the permitted window makes the + account active, and resets the activation key. + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + self.assertEqual(user.id, new_user.id) + self.assertFalse(user.is_active) + self.assertTrue(activated) + + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activated) + + def test_valid_activation_with_profile(self): + """ + Activating a user within the permitted window makes the + account active, and resets the activation key. + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + profile, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current(), get_profile=True) + + self.assertIsInstance(profile, self.registration_profile) + self.assertEqual(profile.id, profile.id) + self.assertTrue(profile.activated) + self.assertTrue(activated) + + new_user.refresh_from_db() + self.assertTrue(profile.user.id, new_user.id) + self.assertFalse(new_user.is_active) + + def test_resend_activation_email_activated_user(self): + """ + Test the scenario where user tries to resend activation code + to the already activated user's email + """ + user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), send_email=False, **self.user_info) + + profile = self.registration_profile.objects.get(user=user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.assertFalse(user.is_active) + self.assertTrue(activated) + + self.assertFalse(self.registration_profile.objects.resend_activation_mail( + email=self.user_info['email'], + site=Site.objects.get_current(), + )) + # Outbox has one mail, admin approve mail + + self.assertEqual(len(mail.outbox), 1) + admins_emails = [value[1] for value in settings.REGISTRATION_ADMINS] + for email in mail.outbox[0].to: + self.assertIn(email, admins_emails) + + def test_admin_approval_email(self): + """ + ``SupervisedRegistrationManager.send_admin_approve_email`` sends an + email to the site administrators + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.activated = True + self.registration_profile.objects.send_admin_approve_email( + new_user, Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + admins_emails = [value[1] for value in settings.REGISTRATION_ADMINS] + for email in mail.outbox[0].to: + self.assertIn(email, admins_emails) + + def test_admin_approval_email_uses_registration_default_from_email(self): + """ + ``SupervisedRegistrationManager.send_admin_approve_email``` sends an + email. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.activated = True + self.registration_profile.objects.send_admin_approve_email( + new_user, Site.objects.get_current()) + self.assertEqual(mail.outbox[0].from_email, 'registration@email.com') + + @override_settings(REGISTRATION_DEFAULT_FROM_EMAIL=None) + def test_admin_approval_email_falls_back_to_django_default_from_email(self): + """ + ``SupervisedRegistrationManager.send_admin_approve_email`` sends an + email. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.activated = True + self.registration_profile.objects.send_admin_approve_email( + new_user, Site.objects.get_current()) + self.assertEqual(mail.outbox[0].from_email, 'django@email.com') + + def test_admin_approval_email_is_html_by_default(self): + """ + ``SupervisedRegistrationProfile.send_activation_email`` sends an html + email by default. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.activated = True + self.registration_profile.objects.send_admin_approve_email( + new_user, Site.objects.get_current()) + + self.assertEqual(len(mail.outbox[0].alternatives), 1) + + @override_settings(REGISTRATION_EMAIL_HTML=False) + def test_admin_approval_email_is_plain_text_if_html_disabled(self): + """ + ``SupervisedRegistrationProfile.send_activation_email`` sends a plain + text email if settings.REGISTRATION_EMAIL_HTML is False. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.activated = True + self.registration_profile.objects.send_admin_approve_email( + new_user, Site.objects.get_current()) + + self.assertEqual(len(mail.outbox[0].alternatives), 0) + + def test_active_account_activation_key_expired(self): + """ + ``SupervisedRegistrationProfile.activation_key_expired()`` is ``True`` + when the account is already active. + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.registration_profile.objects.admin_approve_user( + profile.id, Site.objects.get_current()) + profile.refresh_from_db() + self.assertTrue(profile.activation_key_expired()) + + def test_active_account_and_expired_accountactivation_key_expired(self): + """ + ``SupervisedRegistrationProfile.activation_key_expired()`` is ``True`` + when the account is already active and the activation window has passed. + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + new_user.date_joined -= datetime.timedelta( + days=settings.ACCOUNT_ACTIVATION_DAYS + 1) + new_user.save() + profile = self.registration_profile.objects.get(user=new_user) + self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.registration_profile.objects.admin_approve_user( + profile.id, Site.objects.get_current()) + profile.refresh_from_db() + self.assertTrue(profile.activation_key_expired()) + + def test_admin_approval_complete_email(self): + """ + ``SupervisedRegistrationManager.send_admin_approve_complete_email`` + sends an email to the approved user + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_admin_approve_complete_email(Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].to, [self.user_info['email']]) + + def test_admin_approval_complete_email_uses_registration_default_from_email(self): + """ + ``SupervisedRegistrationManager.send_admin_approve_complete_email`` + sends an email + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_admin_approve_complete_email(Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].from_email, 'registration@email.com') + + @override_settings(REGISTRATION_DEFAULT_FROM_EMAIL=None) + def test_admin_approval_complete_email_falls_back_to_django_default_from_email(self): + """ + ``SupervisedRegistrationManager.send_admin_approve_complete_email`` + sends an email + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_admin_approve_complete_email(Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].from_email, 'django@email.com') + + def test_admin_approval_complete_email_is_html_by_default(self): + """ + ``SupervisedRegistrationProfile.send_admin_approve_complete_email`` + sends an html email by default. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_admin_approve_complete_email(Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(len(mail.outbox[0].alternatives), 1) + + @override_settings(REGISTRATION_EMAIL_HTML=False) + def test_admin_approval_complete_email_is_plain_text_if_html_disabled(self): + """ + ``SupervisedRegistrationProfile.send_admin_approve_complete_email`` + sends a plain text email if settings.REGISTRATION_EMAIL_HTML is False. + + """ + new_user = UserModel().objects.create_user(**self.user_info) + profile = self.registration_profile.objects.create_profile(new_user) + profile.send_admin_approve_complete_email(Site.objects.get_current()) + self.assertEqual(len(mail.outbox), 1) + + self.assertEqual(len(mail.outbox[0].alternatives), 0) + + def test_valid_admin_approval(self): + """ + Approving an already activated user's account makes the user + active + """ + + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + + user = self.registration_profile.objects.admin_approve_user( + profile.id, Site.objects.get_current()) + self.assertIsInstance(user, UserModel()) + self.assertIs(user.is_active, True) + + def test_admin_approval_not_activated(self): + """ + Approving a non activated user's account fails + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + + user = self.registration_profile.objects.admin_approve_user( + profile.id, Site.objects.get_current()) + self.assertIs(user, False) + self.assertIs(profile.user.is_active, False) + + def test_admin_approval_already_approved(self): + """ + Approving an already approved user's account returns the User model + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + self.assertTrue(activated) + + user = self.registration_profile.objects.admin_approve_user( + profile.id, Site.objects.get_current()) + self.assertIsInstance(user, UserModel()) + self.assertIs(user.is_active, True) + + def test_admin_approval_nonexistent_id(self): + """ + Approving a non existent user profile does nothing and returns False + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + + user = self.registration_profile.objects.admin_approve_user( + profile.id, Site.objects.get_current()) + self.assertIs(user, False) + + def test_activation_already_activated(self): + """ + Attempting to re-activate an already-activated account fails. + + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + profile = self.registration_profile.objects.get(user=new_user) + _, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + self.assertFalse(activated) + + def test_activation_key_backwards_compatibility(self): + """ + Make sure that users created with the old create_new_activation_key + method can still be activated. + """ + current_method = self.registration_profile.create_new_activation_key + + def old_method(self, save=True): + salt = hashlib.sha1( + text_type(random.random()).encode('ascii') + ).hexdigest()[:5] + salt = salt.encode('ascii') + user_pk = str(self.user.pk) + if isinstance(user_pk, text_type): + user_pk = user_pk.encode('utf-8') + self.activation_key = hashlib.sha1(salt + user_pk).hexdigest() + if save: + self.save() + return self.activation_key + + self.registration_profile.create_new_activation_key = old_method + + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + + self.registration_profile.create_new_activation_key = current_method + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + self.assertEqual(user.id, new_user.id) + self.assertFalse(user.is_active) + self.assertTrue(activated) + + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activated) + + def test_activation_key_backwards_compatibility_sha1(self): + """ + Make sure that users created with the old create_new_activation_key + method can still be activated. + """ + current_method = self.registration_profile.create_new_activation_key + + def old_method(self, save=True): + random_string = get_random_string(length=32, allowed_chars=string.printable) + self.activation_key = hashlib.sha1(random_string.encode('utf-8')).hexdigest() + if save: + self.save() + return self.activation_key + + self.registration_profile.create_new_activation_key = old_method + + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + profile = self.registration_profile.objects.get(user=new_user) + + self.registration_profile.create_new_activation_key = current_method + user, activated = self.registration_profile.objects.activate_user( + profile.activation_key, Site.objects.get_current()) + + self.assertIsInstance(user, UserModel()) + self.assertEqual(user.id, new_user.id) + self.assertFalse(user.is_active) + self.assertTrue(activated) + + profile = self.registration_profile.objects.get(user=new_user) + self.assertTrue(profile.activated) + + @override_settings(ADMINS=(), REGISTRATION_ADMINS=()) + def test_no_admins_registered(self): + """ + Approving a non existent user profile does nothing and returns False + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + + with self.assertRaises(ImproperlyConfigured): + self.registration_profile.objects.send_admin_approve_email( + new_user, Site.objects.get_current()) + + @override_settings(REGISTRATION_ADMINS=()) + def test_no_registration_admins_registered(self): + """ + Approving a non existent user profile does nothing and returns False + """ + new_user = self.registration_profile.objects.create_inactive_user( + site=Site.objects.get_current(), **self.user_info) + + with warnings.catch_warnings(record=True) as _warning: + self.registration_profile.objects.send_admin_approve_email( + new_user, Site.objects.get_current()) + + assertion_error = '''No warning triggered for unregistered + REGISTRATION_ADMINS''' + self.assertTrue(len(_warning) > 0, assertion_error) + self.assertTrue('REGISTRATION_ADMINS' in str(_warning[-1].message), + assertion_error) diff --git a/dependencies/django-registration/registration/tests/simple_backend.py b/dependencies/django-registration/registration/tests/simple_backend.py new file mode 100644 index 000000000..6ea8138af --- /dev/null +++ b/dependencies/django-registration/registration/tests/simple_backend.py @@ -0,0 +1,86 @@ +from django.conf import settings +from django.test import TestCase +from django.test import override_settings +from django.urls import reverse + +from registration.forms import RegistrationForm +from registration.users import UserModel + + +@override_settings(ROOT_URLCONF='test_app.urls_simple') +class SimpleBackendViewTests(TestCase): + + @override_settings(REGISTRATION_OPEN=True) + def test_registration_open(self): + """ + The setting ``REGISTRATION_OPEN`` appropriately controls + whether registration is permitted. + + """ + resp = self.client.get(reverse('registration_register')) + self.assertEqual(200, resp.status_code) + + @override_settings(REGISTRATION_OPEN=False) + def test_registration_closed(self): + + # Now all attempts to hit the register view should redirect to + # the 'registration is closed' message. + resp = self.client.get(reverse('registration_register')) + self.assertRedirects(resp, reverse('registration_disallowed')) + + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + self.assertRedirects(resp, reverse('registration_disallowed')) + + def test_registration_get(self): + """ + HTTP ``GET`` to the registration view uses the appropriate + template and populates a registration form into the context. + + """ + resp = self.client.get(reverse('registration_register')) + self.assertEqual(200, resp.status_code) + self.assertTemplateUsed(resp, + 'registration/registration_form.html') + self.assertIsInstance(resp.context['form'], RegistrationForm) + + def test_registration(self): + """ + Registration creates a new account and logs the user in. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'secret'}) + new_user = UserModel().objects.get(username='bob') + self.assertEqual(302, resp.status_code) + self.assertIn(getattr(settings, 'SIMPLE_BACKEND_REDIRECT_URL', '/'), + resp['Location']) + + self.assertTrue(new_user.check_password('secret')) + self.assertEqual(new_user.email, 'bob@example.com') + + # New user must be active. + self.assertTrue(new_user.is_active) + + # New user must be logged in. + resp = self.client.get(reverse('registration_register'), follow=True) + self.assertTrue(resp.context['user'].is_authenticated) + + def test_registration_failure(self): + """ + Registering with invalid data fails. + + """ + resp = self.client.post(reverse('registration_register'), + data={'username': 'bob', + 'email': 'bob@example.com', + 'password1': 'secret', + 'password2': 'notsecret'}) + self.assertEqual(200, resp.status_code) + self.assertFalse(resp.context['form'].is_valid()) diff --git a/dependencies/django-registration/registration/tests/urls.py b/dependencies/django-registration/registration/tests/urls.py index c834e1a2d..e5c5cd5a9 100644 --- a/dependencies/django-registration/registration/tests/urls.py +++ b/dependencies/django-registration/registration/tests/urls.py @@ -10,79 +10,70 @@ """ -from django.conf.urls import * -from django.views.generic.base import TemplateView - -from registration.views import activate -from registration.views import register +from django.conf.urls import include +from django.conf.urls import url +from django.views.generic import TemplateView +from registration.views import ActivationView +from registration.views import RegistrationView urlpatterns = [ - # Test the 'activate' view with custom template - # name. - url(r'^activate-with-template-name/(?P<activation_key>\w+)/$', - activate, - {'template_name': 'registration/test_template_name.html', - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_test_activate_template_name'), - # Test the 'activate' view with - # extra_context_argument. - url(r'^activate-extra-context/(?P<activation_key>\w+)/$', - activate, - {'extra_context': {'foo': 'bar', 'callable': lambda: 'called'}, - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_test_activate_extra_context'), - # Test the 'activate' view with success_url argument. - url(r'^activate-with-success-url/(?P<activation_key>\w+)/$', - activate, - {'success_url': 'registration_test_custom_success_url', - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_test_activate_success_url'), - # Test the 'register' view with custom template - # name. - url(r'^register-with-template-name/$', - register, - {'template_name': 'registration/test_template_name.html', - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_test_register_template_name'), - # Test the'register' view with extra_context - # argument. - url(r'^register-extra-context/$', - register, - {'extra_context': {'foo': 'bar', 'callable': lambda: 'called'}, - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_test_register_extra_context'), - # Test the 'register' view with custom URL for - # closed registration. - url(r'^register-with-disallowed-url/$', - register, - {'disallowed_url': 'registration_test_custom_disallowed', - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_test_register_disallowed_url'), - # Set up a pattern which will correspond to the - # custom 'disallowed_url' above. - url(r'^custom-disallowed/$', - TemplateView.as_view(template_name='registration/registration_closed.html'), - name='registration_test_custom_disallowed'), - # Test the 'register' view with custom redirect - # on successful registration. - url(r'^register-with-success_url/$', - register, - {'success_url': 'registration_test_custom_success_url', - 'backend': 'registration.backends.default.DefaultBackend'}, - name='registration_test_register_success_url' - ), - # Pattern for custom redirect set above. - url(r'^custom-success/$', - TemplateView.as_view(template_name='registration/test_template_name.html'), - name='registration_test_custom_success_url'), - (r'', include('registration.backends.default.urls')), - (r'', include('registration.backends.default_with_names.urls')), - (r'', include('search.urls')), - (r'', include('blog.urls')), - (r'', include('mail.urls')), - url(r'^admission/', include('admission.urls')), - url(r'^shad2017/register', 'admission.views.register'), - url(r'^shad2017/activate/(?P<activation_key>\w+)/', 'admission.views.activate'), - url(r'^shad2017/decline/(?P<activation_key>\w+)/', 'admission.views.decline'), - ] + # Test the 'activate' view with custom template + # name. + url(r'^activate-with-template-name/(?P<activation_key>\w+)/$', + ActivationView.as_view(), + {'template_name': 'registration/test_template_name.html', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_activate_template_name'), + # Test the 'activate' view with + # extra_context_argument. + url(r'^activate-extra-context/(?P<activation_key>\w+)/$', + ActivationView.as_view(), + {'extra_context': {'foo': 'bar', 'callable': lambda: 'called'}, + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_activate_extra_context'), + # Test the 'activate' view with success_url argument. + url(r'^activate-with-success-url/(?P<activation_key>\w+)/$', + ActivationView.as_view(), + {'success_url': 'registration_test_custom_success_url', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_activate_success_url'), + # Test the 'register' view with custom template + # name. + url(r'^register-with-template-name/$', + RegistrationView.as_view(), + {'template_name': 'registration/test_template_name.html', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_template_name'), + # Test the'register' view with extra_context + # argument. + url(r'^register-extra-context/$', + RegistrationView.as_view(), + {'extra_context': {'foo': 'bar', 'callable': lambda: 'called'}, + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_extra_context'), + # Test the 'register' view with custom URL for + # closed registration. + url(r'^register-with-disallowed-url/$', + RegistrationView.as_view(), + {'disallowed_url': 'registration_test_custom_disallowed', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_disallowed_url'), + # Set up a pattern which will correspond to the + # custom 'disallowed_url' above. + url(r'^custom-disallowed/$', + TemplateView.as_view(template_name='registration/registration_closed.html'), + name='registration_test_custom_disallowed'), + # Test the 'register' view with custom redirect + # on successful registration. + url(r'^register-with-success_url/$', + RegistrationView.as_view(), + {'success_url': 'registration_test_custom_success_url', + 'backend': 'registration.backends.default.DefaultBackend'}, + name='registration_test_register_success_url'), + # Pattern for custom redirect set above. + url(r'^custom-success/$', + TemplateView.as_view(template_name='registration/test_template_name.html'), + name='registration_test_custom_success_url'), + url(r'', include('registration.backends.default.urls')), +] diff --git a/dependencies/django-registration/registration/users.py b/dependencies/django-registration/registration/users.py new file mode 100644 index 000000000..4246feccf --- /dev/null +++ b/dependencies/django-registration/registration/users.py @@ -0,0 +1,15 @@ +from django.conf import settings +from django.contrib.auth import get_user_model + +UserModel = get_user_model + + +def UserModelString(): + try: + return settings.AUTH_USER_MODEL + except AttributeError: + return 'auth.User' + + +def UsernameField(): + return getattr(UserModel(), 'USERNAME_FIELD', 'username') diff --git a/dependencies/django-registration/registration/utils.py b/dependencies/django-registration/registration/utils.py new file mode 100644 index 000000000..b7dc9d574 --- /dev/null +++ b/dependencies/django-registration/registration/utils.py @@ -0,0 +1,6 @@ +from django import VERSION as DJANGO_VERSION + +if DJANGO_VERSION[0] < 3: + from django.utils.translation import ugettext_lazy as _ # noqa +else: + from django.utils.translation import gettext_lazy as _ # noqa diff --git a/dependencies/django-registration/registration/views.py b/dependencies/django-registration/registration/views.py index 84df576be..9f60b97b5 100644 --- a/dependencies/django-registration/registration/views.py +++ b/dependencies/django-registration/registration/views.py @@ -3,227 +3,176 @@ """ - +from django.conf import settings from django.shortcuts import redirect -from django.shortcuts import render -from django.template import RequestContext -from django.http import HttpResponse +from django.utils.decorators import method_decorator +from django.utils.module_loading import import_string +from django.views.decorators.debug import sensitive_post_parameters +from django.views.generic.base import TemplateView +from django.views.generic.edit import FormView -from registration.backends import get_backend +from registration.forms import ResendActivationForm -from django.contrib.auth.models import User +REGISTRATION_FORM_PATH = getattr(settings, 'REGISTRATION_FORM', + 'registration.forms.RegistrationForm') +REGISTRATION_FORM = import_string(REGISTRATION_FORM_PATH) +ACCOUNT_AUTHENTICATED_REGISTRATION_REDIRECTS = getattr( + settings, 'ACCOUNT_AUTHENTICATED_REGISTRATION_REDIRECTS', True) -def activate(request, backend, - template_name='registration/activate.html', - success_url=None, extra_context=None, **kwargs): - """ - Activate a user's account. - - The actual activation of the account will be delegated to the - backend specified by the ``backend`` keyword argument (see below); - the backend's ``activate()`` method will be called, passing any - keyword arguments captured from the URL, and will be assumed to - return a ``User`` if activation was successful, or a value which - evaluates to ``False`` in boolean context if not. - - Upon successful activation, the backend's - ``post_activation_redirect()`` method will be called, passing the - ``HttpRequest`` and the activated ``User`` to determine the URL to - redirect the user to. To override this, pass the argument - ``success_url`` (see below). - - On unsuccessful activation, will render the template - ``registration/activate.html`` to display an error message; to - override thise, pass the argument ``template_name`` (see below). - - **Arguments** - - ``backend`` - The dotted Python import path to the backend class to - use. Required. - - ``extra_context`` - A dictionary of variables to add to the template context. Any - callable object in this dictionary will be called to produce - the end result which appears in the context. Optional. - - ``success_url`` - The name of a URL pattern to redirect to on successful - acivation. This is optional; if not specified, this will be - obtained by calling the backend's - ``post_activation_redirect()`` method. - - ``template_name`` - A custom template to use. This is optional; if not specified, - this will default to ``registration/activate.html``. - - ``\*\*kwargs`` - Any keyword arguments captured from the URL, such as an - activation key, which will be passed to the backend's - ``activate()`` method. - - **Context:** - - The context will be populated from the keyword arguments captured - in the URL, and any extra variables supplied in the - ``extra_context`` argument (see above). - - **Template:** - - registration/activate.html or ``template_name`` keyword argument. - +class RegistrationView(FormView): """ - backend = get_backend(backend) - account = backend.activate(request, **kwargs) + Base class for user registration views. - if account: - if success_url is None: - to, args, kwargs = backend.post_activation_redirect(request, account) - return redirect(to, *args, **kwargs) - else: + """ + disallowed_url = 'registration_disallowed' + form_class = REGISTRATION_FORM + http_method_names = ['get', 'post', 'head', 'options', 'trace'] + success_url = None + template_name = 'registration/registration_form.html' + + @method_decorator(sensitive_post_parameters('password1', 'password2')) + def dispatch(self, request, *args, **kwargs): + """ + Check that user signup is allowed and if user is logged in before even bothering to + dispatch or do other processing. + + """ + if ACCOUNT_AUTHENTICATED_REGISTRATION_REDIRECTS: + if self.request.user.is_authenticated: + if settings.LOGIN_REDIRECT_URL is not None: + return redirect(settings.LOGIN_REDIRECT_URL) + else: + raise Exception(( + 'You must set a URL with LOGIN_REDIRECT_URL in ' + 'settings.py or set ' + 'ACCOUNT_AUTHENTICATED_REGISTRATION_REDIRECTS=False')) + + if not self.registration_allowed(): + return redirect(self.disallowed_url) + return super(RegistrationView, self).dispatch(request, *args, **kwargs) + + def form_valid(self, form): + new_user = self.register(form) + success_url = self.get_success_url(new_user) + + # success_url may be a simple string, or a tuple providing the + # full argument set for redirect(). Attempting to unpack it + # tells us which one it is. + try: + to, args, kwargs = success_url + except ValueError: return redirect(success_url) + else: + return redirect(to, *args, **kwargs) - if extra_context is None: - extra_context = {} - context = RequestContext(request) - for key, value in extra_context.items(): - context[key] = callable(value) and value() or value - - if not kwargs: - kwargs = {} - kwargs['context_instance'] = context - return render(request, template_name, - kwargs, - context) + def registration_allowed(self): + """ + Override this to enable/disable user registration, either + globally or on a per-request basis. + """ + return True -def register(request, backend, success_url=None, form_class=None, - disallowed_url='registration_disallowed', - template_name='registration/registration_form.html', - extra_context=None): - """ - Allow a new user to register an account. + def register(self, form): + """ + Implement user-registration logic here. - The actual registration of the account will be delegated to the - backend specified by the ``backend`` keyword argument (see below); - it will be used as follows: + """ + raise NotImplementedError - 1. The backend's ``registration_allowed()`` method will be called, - passing the ``HttpRequest``, to determine whether registration - of an account is to be allowed; if not, a redirect is issued to - the view corresponding to the named URL pattern - ``registration_disallowed``. To override this, see the list of - optional arguments for this view (below). + def get_success_url(self, user=None): + """ + Use the new user when constructing success_url. - 2. The form to use for account registration will be obtained by - calling the backend's ``get_form_class()`` method, passing the - ``HttpRequest``. To override this, see the list of optional - arguments for this view (below). + """ + return super(RegistrationView, self).get_success_url() - 3. If valid, the form's ``cleaned_data`` will be passed (as - keyword arguments, and along with the ``HttpRequest``) to the - backend's ``register()`` method, which should return the new - ``User`` object. - 4. Upon successful registration, the backend's - ``post_registration_redirect()`` method will be called, passing - the ``HttpRequest`` and the new ``User``, to determine the URL - to redirect the user to. To override this, see the list of - optional arguments for this view (below). +class ActivationView(TemplateView): + """ + Base class for user activation views. - **Required arguments** + """ + http_method_names = ['get'] + template_name = 'registration/activate.html' + + def get(self, request, *args, **kwargs): + activated_user = self.activate(*args, **kwargs) + if activated_user: + success_url = self.get_success_url(activated_user) + try: + to, args, kwargs = success_url + except ValueError: + return redirect(success_url) + else: + return redirect(to, *args, **kwargs) + return super(ActivationView, self).get(request, *args, **kwargs) - None. + def activate(self, *args, **kwargs): + """ + Implement account-activation logic here. - **Optional arguments** + """ + raise NotImplementedError - ``backend`` - The dotted Python import path to the backend class to use. + def get_success_url(self, user): + raise NotImplementedError - ``disallowed_url`` - URL to redirect to if registration is not permitted for the - current ``HttpRequest``. Must be a value which can legally be - passed to ``django.shortcuts.redirect``. If not supplied, this - will be whatever URL corresponds to the named URL pattern - ``registration_disallowed``. - ``form_class`` - The form class to use for registration. If not supplied, this - will be retrieved from the registration backend. +class ResendActivationView(FormView): + """ + Base class for resending activation views. + """ + form_class = ResendActivationForm + template_name = 'registration/resend_activation_form.html' - ``extra_context`` - A dictionary of variables to add to the template context. Any - callable object in this dictionary will be called to produce - the end result which appears in the context. + def form_valid(self, form): + """ + Regardless if resend_activation is successful, display the same + confirmation template. - ``success_url`` - URL to redirect to after successful registration. Must be a - value which can legally be passed to - ``django.shortcuts.redirect``. If not supplied, this will be - retrieved from the registration backend. + """ + self.resend_activation(form) + return self.render_form_submitted_template(form) - ``template_name`` - A custom template to use. If not supplied, this will default - to ``registration/registration_form.html``. + def resend_activation(self, form): + """ + Implement resend activation key logic here. + """ + raise NotImplementedError - **Context:** + def render_form_submitted_template(self, form): + """ + Implement rendering of confirmation template here. - ``form`` - The registration form. + """ + raise NotImplementedError - Any extra variables supplied in the ``extra_context`` argument - (see above). - **Template:** +class ApprovalView(TemplateView): - registration/registration_form.html or ``template_name`` keyword - argument. + http_method_names = ['get'] + template_name = 'registration/admin_approve.html' - """ - backend = get_backend(backend) - if not backend.registration_allowed(request): - return redirect(disallowed_url) - if form_class is None: - form_class = backend.get_form_class(request) - - if request.method == 'POST': - form = form_class(data=request.POST, files=request.FILES) - if form.is_valid(): - new_user = backend.register(request, **form.cleaned_data) - if success_url is None: - to, args, kwargs = backend.post_registration_redirect(request, new_user) - return redirect(to, *args, **kwargs) - else: + def get(self, request, *args, **kwargs): + approved_user = self.approve(*args, **kwargs) + if approved_user: + success_url = self.get_success_url(approved_user) + try: + to, args, kwargs = success_url + except ValueError: return redirect(success_url) - else: - form = form_class() - - if extra_context is None: - extra_context = {} - context = RequestContext(request) - for key, value in extra_context.items(): - context[key] = callable(value) and value() or value - - return render(request, template_name, - {'form': form}, - context) - - -def ajax_check_username(request): - response = 'false' - if request.is_ajax() and request.method == 'GET' and request.GET['username']: - existing = User.objects.filter(username__iexact=request.GET['username']) - if not existing.exists(): - response = 'true' - - return HttpResponse(response) + else: + return redirect(to, *args, **kwargs) + return super(ApprovalView, self).get(request, *args, **kwargs) + def approve(self, *args, **kwargs): + """ + Implement admin-approval logic here. -def ajax_check_email(request): - response = 'false' - if request.is_ajax() and request.method == 'GET' and request.GET['email']: - if not User.objects.filter(email__iexact=request.GET['email']): - response = 'true' + """ + raise NotImplementedError - return HttpResponse(response) \ No newline at end of file + def get_success_url(self, user): + raise NotImplementedError diff --git a/dependencies/django-registration/requirements.txt b/dependencies/django-registration/requirements.txt new file mode 100644 index 000000000..f60b1cdbb --- /dev/null +++ b/dependencies/django-registration/requirements.txt @@ -0,0 +1,5 @@ +-rtest-requirements.txt +Sphinx +twine +pytest>3.2.1 +Django>1.11 diff --git a/dependencies/django-registration/setup.cfg b/dependencies/django-registration/setup.cfg new file mode 100644 index 000000000..fab5bd896 --- /dev/null +++ b/dependencies/django-registration/setup.cfg @@ -0,0 +1,15 @@ +[tool:pytest] +DJANGO_SETTINGS_MODULE=test_app.settings_test +python_files=registration/tests/*.py + +[easy_install] +zip_ok = False + +[flake8] +exclude = docs,env,build,migrations,.eggs +ignore = E501 + +[isort] +force_single_line = True +forced_separate=registration +known_first_party=django,mock diff --git a/dependencies/django-registration/setup.py b/dependencies/django-registration/setup.py index 0f0fa37a4..e121e045b 100644 --- a/dependencies/django-registration/setup.py +++ b/dependencies/django-registration/setup.py @@ -1,48 +1,58 @@ -from distutils.core import setup -import os +import sys + +from setuptools import find_packages +from setuptools import setup +from setuptools.command.test import test as TestCommand from registration import get_version -# Compile the list of packages available, because distutils doesn't have -# an easy way to do this. -packages, data_files = [], [] -root_dir = os.path.dirname(__file__) -if root_dir: - os.chdir(root_dir) - -for dirpath, dirnames, filenames in os.walk('registration'): - # Ignore dirnames that start with '.' - for i, dirname in enumerate(dirnames): - if dirname.startswith('.'): del dirnames[i] - if '__init__.py' in filenames: - pkg = dirpath.replace(os.path.sep, '.') - if os.path.altsep: - pkg = pkg.replace(os.path.altsep, '.') - packages.append(pkg) - elif filenames: - prefix = dirpath[13:] # Strip "registration/" or "registration\" - for f in filenames: - data_files.append(os.path.join(prefix, f)) - - -setup(name='django-registration', - version=get_version().replace(' ', '-'), - description='An extensible user-registration application for Django', - author='James Bennett', - author_email='james@b-list.org', - url='http://www.bitbucket.org/ubernostrum/django-registration/wiki/', - download_url='http://www.bitbucket.org/ubernostrum/django-registration/get/v0.8.gz', - package_dir={'registration': 'registration'}, - packages=packages, - package_data={'registration': data_files}, - classifiers=['Development Status :: 4 - Beta', - 'Environment :: Web Environment', - 'Framework :: Django', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - 'Topic :: Software Development :: Libraries :: Python Modules', - 'Topic :: Utilities'], - ) +class PyTest(TestCommand): + + def finalize_options(self): + TestCommand.finalize_options(self) + self.test_args = [] + self.test_suite = True + + def run_tests(self): + # import here, cause outside the eggs aren't loaded + import pytest + errno = pytest.main(self.test_args) + sys.exit(errno) + + +setup( + name='django-registration-redux', + version=get_version().replace(' ', '-'), + description='An extensible user-registration application for Django', + long_description=open('README.rst').read(), + author='Andrew Cutler', + author_email='macropin@gmail.com', + url='https://github.com/macropin/django-registration', + package_dir={'registration': 'registration'}, + packages=find_packages(exclude='test_app'), + tests_require=['pytest-django'], + cmdclass={'test': PyTest}, + include_package_data=True, + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Framework :: Django :: 1.11', + 'Framework :: Django :: 2.0', + 'Framework :: Django :: 2.1', + 'Framework :: Django :: 2.2', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Topic :: Software Development :: Libraries :: Python Modules', + 'Topic :: Utilities' + ], +) diff --git a/dependencies/django-registration/tasks.py b/dependencies/django-registration/tasks.py new file mode 100644 index 000000000..fbda4f437 --- /dev/null +++ b/dependencies/django-registration/tasks.py @@ -0,0 +1,30 @@ +from invoke import run +from invoke import task + + +@task +def clean(all=False): + if all: + flag = "--all" + else: + flag = "" + run("python setup.py clean {}".format(flag)) + + +@task +def build(docs=False): + run("python setup.py build") + if docs: + run("sphinx-build docs docs/_build") + + +@task +def test(): + run("python setup.py test") + + +@task +def lint(): + run("rst2html.py README.rst > /dev/null") + run("flake8 registration") + run("isort --recursive --check-only registration") diff --git a/dependencies/django-registration/test-requirements.txt b/dependencies/django-registration/test-requirements.txt new file mode 100644 index 000000000..0a377d34f --- /dev/null +++ b/dependencies/django-registration/test-requirements.txt @@ -0,0 +1,8 @@ +flake8 +coveralls +isort +tox-travis +invoke==0.12.2 +docutils==0.13.1 +mock +pytest-django==3.4.8 diff --git a/dependencies/django-registration/test_app/__init__.py b/dependencies/django-registration/test_app/__init__.py new file mode 100644 index 000000000..57d631c3f --- /dev/null +++ b/dependencies/django-registration/test_app/__init__.py @@ -0,0 +1 @@ +# coding: utf-8 diff --git a/dependencies/django-registration/test_app/models.py b/dependencies/django-registration/test_app/models.py new file mode 100644 index 000000000..b93c5e0f7 --- /dev/null +++ b/dependencies/django-registration/test_app/models.py @@ -0,0 +1,12 @@ +# coding: utf-8 + +from django.contrib.auth.models import AbstractBaseUser +from django.contrib.auth.models import BaseUserManager +from django.db import models + + +class CustomUser(AbstractBaseUser): + new_field = models.CharField(max_length=25) + objects = BaseUserManager() + + USERNAME_FIELD = 'new_field' diff --git a/dependencies/django-registration/test_app/settings.py b/dependencies/django-registration/test_app/settings.py new file mode 100644 index 000000000..5019922ba --- /dev/null +++ b/dependencies/django-registration/test_app/settings.py @@ -0,0 +1,61 @@ +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': 'dr.sqlite3', + }, +} + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.sites', + 'django.contrib.sessions', + 'django.contrib.contenttypes', + 'registration', + 'django.contrib.admin', + 'test_app', +) + +DEBUG = True + +ALLOWED_HOSTS = ['*'] + +SECRET_KEY = '_' + +SITE_ID = 1 + +ROOT_URLCONF = 'test_app.urls_default' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'OPTIONS': { + 'context_processors': [ + 'django.contrib.auth.context_processors.auth', + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'django.contrib.messages.context_processors.messages', + ], + 'loaders': [ + 'django.template.loaders.app_directories.Loader', + ], + }, + }, +] + +MIDDLEWARE = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', +) + +ACCOUNT_ACTIVATION_DAYS = 7 +REGISTRATION_EMAIL_SUBJECT_PREFIX = '[Django Registration Test App]' +SEND_ACTIVATION_EMAIL = True +REGISTRATION_AUTO_LOGIN = False + +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' diff --git a/dependencies/django-registration/test_app/settings_test.py b/dependencies/django-registration/test_app/settings_test.py new file mode 100644 index 000000000..18ac94a74 --- /dev/null +++ b/dependencies/django-registration/test_app/settings_test.py @@ -0,0 +1,64 @@ +# coding: utf-8 +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:', + }, +} + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.admin', + 'django.contrib.sites', + 'django.contrib.sessions', + 'django.contrib.contenttypes', + 'registration', + 'test_app', +) + +DEBUG = True +ALLOWED_HOSTS = ['*'] +SECRET_KEY = '_' +SITE_ID = 1 +ROOT_URLCONF = 'test_app.urls_admin_approval' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'OPTIONS': { + 'context_processors': [ + 'django.contrib.auth.context_processors.auth', + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'django.contrib.messages.context_processors.messages', + ], + 'loaders': [ + 'django.template.loaders.app_directories.Loader', + ], + }, + }, +] + +MIDDLEWARE = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', +) + +ADMINS = ( + ('admin1', 'admin1@mail.server.com'), + ('admin2', 'admin2@mail.server.com'), +) + + +REGISTRATION_ADMINS = ( + ('admin1', 'registration_admin1@mail.server.com'), + ('admin2', 'registration_admin2@mail.server.com'), +) + +ACCOUNT_ACTIVATION_DAYS = 7 diff --git a/dependencies/django-registration/test_app/templates/base.html b/dependencies/django-registration/test_app/templates/base.html new file mode 100644 index 000000000..4877391a5 --- /dev/null +++ b/dependencies/django-registration/test_app/templates/base.html @@ -0,0 +1,38 @@ +{% load i18n %} +<!doctype html> +<html lang="en"> + +<head> + <title>Django Registration Test App + + + + + +
    +

    {% block title %}{% endblock %}

    + {% block content %} + + {% endblock content %} +
    + + + + + diff --git a/dependencies/django-registration/test_app/templates/index.html b/dependencies/django-registration/test_app/templates/index.html new file mode 100644 index 000000000..2595b881e --- /dev/null +++ b/dependencies/django-registration/test_app/templates/index.html @@ -0,0 +1,7 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block title %}Django Registration Test App{% endblock %} + +{% block content %} +{% endblock %} diff --git a/dependencies/django-registration/test_app/templates/profile.html b/dependencies/django-registration/test_app/templates/profile.html new file mode 100644 index 000000000..f4f34c9db --- /dev/null +++ b/dependencies/django-registration/test_app/templates/profile.html @@ -0,0 +1,7 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block title %}Account Profile{% endblock %} + +{% block content %} +{% endblock %} diff --git a/dependencies/django-registration/test_app/urls_admin_approval.py b/dependencies/django-registration/test_app/urls_admin_approval.py new file mode 100644 index 000000000..952d12576 --- /dev/null +++ b/dependencies/django-registration/test_app/urls_admin_approval.py @@ -0,0 +1,28 @@ +from django.conf.urls import include +from django.conf.urls import url +from django.contrib import admin +from django.contrib.auth import views as auth_views +from django.views.generic import TemplateView + +urlpatterns = [ + + url(r'^$', + TemplateView.as_view(template_name='index.html'), + name='index'), + + url(r'^accounts/', + include('registration.backends.admin_approval.urls')), + + url(r'^accounts/profile/', + TemplateView.as_view(template_name='profile.html'), + name='profile'), + + url(r'^login/$', + auth_views.LoginView.as_view( + template_name='registration/login.html'), + name='login'), + + url(r'^admin/', + admin.site.urls, + name='admin'), +] diff --git a/dependencies/django-registration/test_app/urls_default.py b/dependencies/django-registration/test_app/urls_default.py new file mode 100644 index 000000000..e3b6280f9 --- /dev/null +++ b/dependencies/django-registration/test_app/urls_default.py @@ -0,0 +1,28 @@ +from django.conf.urls import include +from django.conf.urls import url +from django.contrib import admin +from django.contrib.auth import views as auth_views +from django.views.generic import TemplateView + +urlpatterns = [ + + url(r'^$', + TemplateView.as_view(template_name='index.html'), + name='index'), + + url(r'^accounts/', + include('registration.backends.default.urls')), + + url(r'^accounts/profile/', + TemplateView.as_view(template_name='profile.html'), + name='profile'), + + url(r'^login/$', + auth_views.LoginView.as_view( + template_name='registration/login.html'), + name='login'), + + url(r'^admin/', + admin.site.urls, + name='admin'), +] diff --git a/dependencies/django-registration/test_app/urls_simple.py b/dependencies/django-registration/test_app/urls_simple.py new file mode 100644 index 000000000..c45cc7aad --- /dev/null +++ b/dependencies/django-registration/test_app/urls_simple.py @@ -0,0 +1,28 @@ +from django.conf.urls import include +from django.conf.urls import url +from django.contrib import admin +from django.contrib.auth import views as auth_views +from django.views.generic import TemplateView + +urlpatterns = [ + + url(r'^$', + TemplateView.as_view(template_name='index.html'), + name='index'), + + url(r'^accounts/', + include('registration.backends.simple.urls')), + + url(r'^accounts/profile/', + TemplateView.as_view(template_name='profile.html'), + name='profile'), + + url(r'^login/$', + auth_views.LoginView.as_view( + template_name='registration/login.html'), + name='login'), + + url(r'^admin/', + admin.site.urls, + name='admin'), +] diff --git a/dependencies/django-registration/tox.ini b/dependencies/django-registration/tox.ini new file mode 100644 index 000000000..9db32fd18 --- /dev/null +++ b/dependencies/django-registration/tox.ini @@ -0,0 +1,31 @@ +# Tox (https://tox.readthedocs.io/) is a tool for running tests +# in multiple virtualenvs. This configuration file will run the +# test suite on all supported python versions. To use it, "pip install tox" +# and then run "tox" from this directory. + +[tox] +envlist = + py{27,34,35,36,37}-django111, + py3{5,6,7}-django20, + py3{5,6,7}-django21, + py3{5,6,7}-django22, + py3{6,7,8}-django30, + +[testenv] +commands = + coverage run --source=registration setup.py test +deps = + -rtest-requirements.txt + django111: Django>=1.11,<2.0 + django20: Django>=2.0,<2.1 + django21: Django>=2.1,<2.2 + django22: Django>=2.2a1,<3.0 + django30: Django>=3.0,<3.1 + +[travis] +python = + 2.7: py27 + 3.5: py35 + 3.6: py36 + 3.7: py37 + 3.8: py38 From 2c36287a12eebf4945aa6eddb29672fe5835a51f Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 12 Jun 2020 17:46:18 +0500 Subject: [PATCH 10/31] Port to python 3.8 --- anytask/admission/models.py | 22 +++ .../migrations/0007_auto_20200612_1427.py | 41 +++++ .../migrations/0002_auto_20200612_1427.py | 25 +++ .../migrations/0004_auto_20200612_1427.py | 26 +++ .../migrations/0003_auto_20200612_1427.py | 30 +++ .../migrations/0003_auto_20200612_1427.py | 173 ++++++++++++++++++ anytask/users/tests.py | 17 +- .../backends/default_with_names/__init__.py | 4 + .../backends/default_with_names/urls.py | 13 +- .../locale/ru/LC_MESSAGES/django.po | 8 + 10 files changed, 345 insertions(+), 14 deletions(-) create mode 100644 anytask/issues/migrations/0007_auto_20200612_1427.py create mode 100644 anytask/lessons/migrations/0002_auto_20200612_1427.py create mode 100644 anytask/mail/migrations/0004_auto_20200612_1427.py create mode 100644 anytask/tasks/migrations/0003_auto_20200612_1427.py create mode 100644 anytask/users/migrations/0003_auto_20200612_1427.py diff --git a/anytask/admission/models.py b/anytask/admission/models.py index 6f0241014..359cf4d1b 100644 --- a/anytask/admission/models.py +++ b/anytask/admission/models.py @@ -4,6 +4,7 @@ from django.conf import settings from django.contrib.sites.models import Site from registration.models import RegistrationManager +from registration.users import UserModel from django.template.loader import render_to_string from django.db.models import Q from django.core.mail import send_mail @@ -11,6 +12,9 @@ from django.contrib.auth.models import User +from django.utils.timezone import now as datetime_now +from django.db import transaction + import datetime import hashlib import random @@ -81,6 +85,24 @@ def create_inactive_user(self, username, email, password, send_email=True): return new_user, registration_profile + def create_profile(self, user): + """ + Create a ``RegistrationProfile`` for a given + ``User``, and return the ``RegistrationProfile``. + + The activation key for the ``RegistrationProfile`` will be a + SHA1 hash, generated from a combination of the ``User``'s + username and a random salt. + + """ + salt = hashlib.sha1(str(random.random()).encode('utf8')).hexdigest()[:5] + username = user.username + if isinstance(username, str): + username = username + activation_key = hashlib.sha1((salt + username).encode('utf8')).hexdigest() + return self.create(user=user, + activation_key=activation_key) + def send_mail_update_user(self, email): subject = render_to_string('email_update_subject.txt') diff --git a/anytask/issues/migrations/0007_auto_20200612_1427.py b/anytask/issues/migrations/0007_auto_20200612_1427.py new file mode 100644 index 000000000..e200ae8f9 --- /dev/null +++ b/anytask/issues/migrations/0007_auto_20200612_1427.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-12 11:27 +from __future__ import unicode_literals + +import colorfield.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('issues', '0006_auto_20200416_1732'), + ] + + operations = [ + migrations.AlterField( + model_name='issue', + name='status', + field=models.CharField(choices=[('new', 'novyj'), ('rework', 'na_dorabotke'), ('verification', 'na_proverke'), ('accepted', 'zachteno'), ('auto_verification', 'na_avtomaticheskoj_proverke'), ('need_info', 'trebuetsja_informacija')], default='new', max_length=20), + ), + migrations.AlterField( + model_name='issuefield', + name='plugin', + field=models.CharField(default='FieldDefaultPlugin', max_length=191), + ), + migrations.AlterField( + model_name='issuefield', + name='plugin_version', + field=models.CharField(default='0.1', max_length=50), + ), + migrations.AlterField( + model_name='issuestatus', + name='color', + field=colorfield.fields.ColorField(default='#818A91', max_length=18), + ), + migrations.AlterField( + model_name='issuestatus', + name='tag', + field=models.CharField(blank=True, choices=[('rework', 'rework'), ('verification', 'verification'), ('accepted', 'accepted'), ('seminar', 'seminar'), ('accepted_after_deadline', 'accepted_after_deadline')], max_length=191, null=True), + ), + ] diff --git a/anytask/lessons/migrations/0002_auto_20200612_1427.py b/anytask/lessons/migrations/0002_auto_20200612_1427.py new file mode 100644 index 000000000..e538fec51 --- /dev/null +++ b/anytask/lessons/migrations/0002_auto_20200612_1427.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-12 11:27 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lessons', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='lesson', + name='description', + field=models.TextField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='lesson', + name='period', + field=models.CharField(choices=[('Once', 'odin_raz'), ('Weekly', 'ezhenedelno')], default='Once', max_length=128), + ), + ] diff --git a/anytask/mail/migrations/0004_auto_20200612_1427.py b/anytask/mail/migrations/0004_auto_20200612_1427.py new file mode 100644 index 000000000..d4e502a61 --- /dev/null +++ b/anytask/mail/migrations/0004_auto_20200612_1427.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-12 11:27 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mail', '0003_auto_20200416_1732'), + ] + + operations = [ + migrations.AlterField( + model_name='message', + name='recipients', + field=models.ManyToManyField(related_name='_message_recipients_+', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='message', + name='recipients_user', + field=models.ManyToManyField(blank=True, null=True, related_name='_message_recipients_user_+', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/anytask/tasks/migrations/0003_auto_20200612_1427.py b/anytask/tasks/migrations/0003_auto_20200612_1427.py new file mode 100644 index 000000000..0f272bca1 --- /dev/null +++ b/anytask/tasks/migrations/0003_auto_20200612_1427.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-12 11:27 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tasks', '0002_auto_20200416_1732'), + ] + + operations = [ + migrations.AlterField( + model_name='task', + name='type', + field=models.CharField(choices=[('All', 's_obsuzhdeniem'), ('Only mark', 'tolko_ocenka'), ('Material', 'material'), ('Seminar', 'seminar'), ('Jupyter Notebook', 'jupyter notebook')], default='All', max_length=128), + ), + migrations.AlterField( + model_name='tasklog', + name='type', + field=models.CharField(choices=[('All', 's_obsuzhdeniem'), ('Only mark', 'tolko_ocenka')], default='All', max_length=128), + ), + migrations.AlterField( + model_name='tasktaken', + name='status_check', + field=models.CharField(choices=[('EDIT', 'Дорешивание'), ('QUEUE', 'Ожидает проверки'), ('OK', 'Задача зачтена и/или больше не принимается')], db_index=True, default='EDIT', max_length=5), + ), + ] diff --git a/anytask/users/migrations/0003_auto_20200612_1427.py b/anytask/users/migrations/0003_auto_20200612_1427.py new file mode 100644 index 000000000..5fbd24e9b --- /dev/null +++ b/anytask/users/migrations/0003_auto_20200612_1427.py @@ -0,0 +1,173 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2020-06-12 11:27 +from __future__ import unicode_literals + +import anytask.storage +import colorfield.fields +from django.db import migrations, models +import users.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0002_auto_20200416_1732'), + ] + + operations = [ + migrations.AlterField( + model_name='userprofile', + name='academic_degree', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='academic_title', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='avatar', + field=models.ImageField(blank=True, null=True, storage=anytask.storage.OverwriteStorage(), upload_to=users.models.get_upload_path, verbose_name='profile picture'), + ), + migrations.AlterField( + model_name='userprofile', + name='info', + field=models.TextField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='language', + field=models.CharField(blank=True, default='ru', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='location', + field=models.TextField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='position', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='time_zone', + field=models.TextField(default='Europe/Moscow'), + ), + migrations.AlterField( + model_name='userprofile', + name='unit', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='ya_contest_login', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='ya_contest_oauth', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='ya_login', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='ya_passport_email', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='ya_passport_login', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofile', + name='ya_passport_oauth', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='academic_degree', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='academic_title', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='avatar', + field=models.ImageField(blank=True, null=True, storage=anytask.storage.OverwriteStorage(), upload_to=users.models.get_upload_path, verbose_name='profile picture'), + ), + migrations.AlterField( + model_name='userprofilelog', + name='info', + field=models.TextField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='language', + field=models.CharField(blank=True, default='ru', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='position', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='unit', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='ya_contest_login', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='ya_contest_oauth', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='ya_login', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='ya_passport_email', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='ya_passport_login', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userprofilelog', + name='ya_passport_oauth', + field=models.CharField(blank=True, default='', max_length=128, null=True), + ), + migrations.AlterField( + model_name='userstatus', + name='color', + field=colorfield.fields.ColorField(default='#818A91', max_length=18), + ), + migrations.AlterField( + model_name='userstatus', + name='tag', + field=models.CharField(blank=True, choices=[('active', 'active'), ('extramural', 'extramural'), ('fulltime', 'fulltime'), ('not_active', 'not_active'), ('academic', 'academic')], max_length=254, null=True), + ), + migrations.AlterField( + model_name='userstatus', + name='type', + field=models.CharField(blank=True, choices=[('activity', 'status_studenta'), ('filial', 'filial'), ('admission', 'status_postupleniya')], max_length=191, null=True), + ), + ] diff --git a/anytask/users/tests.py b/anytask/users/tests.py index ebd0e1ad9..57a4c61f1 100644 --- a/anytask/users/tests.py +++ b/anytask/users/tests.py @@ -36,9 +36,9 @@ def test_register_form(self): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'registration/registration_form.html') - - self.assertContains(response, u"Логин") - self.assertContains(response, u"E-mail") + content = response.content.decode('utf8') + self.assertContains(response, "Логин", html=True) + self.assertContains(response, "E-mail", html=True) def test_login_user__username(self): client = self.client @@ -68,7 +68,7 @@ def test_login_user__bad_login(self): self.assertEqual(response.status_code, 200) self.assertContains( response, - u"Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." + "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль.", html=True ) def test_login_user__bad_password(self): @@ -81,7 +81,7 @@ def test_login_user__bad_password(self): self.assertEqual(response.status_code, 200) self.assertContains( response, - u"Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." + "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль.", html=True ) def test_login_user__bad_email(self): @@ -94,7 +94,7 @@ def test_login_user__bad_email(self): self.assertEqual(response.status_code, 200) self.assertContains( response, - "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль." + "Пожалуйста, введите верные имя пользователя / адрес электронной почты и пароль.".encode('utf8') ) def test_register_user(self): @@ -144,9 +144,12 @@ def test_register_user__email_already_exists(self): "password2": u"qwer1"} response = client.post('/accounts/register/', form_data) + content = response.content.decode('utf8') self.assertEqual(response.status_code, 200) self.assertFormError(response, 'form', 'email', - u"This email address is already in use. Please supply a different email address.") + # Изначально здесь была английская версия этого сообщения, но в новой версии библиотеки, + # она возвращается на русском + "Этот адрес электронной почты уже используется. Пожалуйста, введите другой адрес.") def test_register_user__wrong_passwords(self): client = self.client diff --git a/dependencies/django-registration/registration/backends/default_with_names/__init__.py b/dependencies/django-registration/registration/backends/default_with_names/__init__.py index 35a0abb02..df33478e3 100644 --- a/dependencies/django-registration/registration/backends/default_with_names/__init__.py +++ b/dependencies/django-registration/registration/backends/default_with_names/__init__.py @@ -117,6 +117,10 @@ class RegistrationFormWithNames(RegistrationForm): first_name = forms.CharField(widget=forms.TextInput(attrs=attrs_dict)) last_name = forms.CharField(widget=forms.TextInput(attrs=attrs_dict)) show_email = forms.BooleanField(required=False, initial=True) + 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), + label=_("Password (again)")) #invite = forms.CharField(widget=forms.TextInput(attrs=attrs_dict), label="Инвайт") def __init__(self, *args, **kwargs): diff --git a/dependencies/django-registration/registration/backends/default_with_names/urls.py b/dependencies/django-registration/registration/backends/default_with_names/urls.py index 8ca4ffc7f..35f273a99 100644 --- a/dependencies/django-registration/registration/backends/default_with_names/urls.py +++ b/dependencies/django-registration/registration/backends/default_with_names/urls.py @@ -17,7 +17,7 @@ from registration.backends.default_with_names import AnytaskLoginForm, \ AnytaskPasswordResetForm, AnytaskSetPasswordForm, \ - AnytaskPasswordChangeForm + AnytaskPasswordChangeForm, BootStrapRegistrationFormWithNames from .views import ActivationView from .views import RegistrationView from .views import ajax_check_username, ajax_check_email @@ -39,7 +39,7 @@ 'backend': 'registration.backends.default_with_names.DefaultBackend'}, name='registration_activate'), url(r'^register/$', - RegistrationView.as_view(), + RegistrationView.as_view(form_class=BootStrapRegistrationFormWithNames), { 'backend': 'registration.backends.default_with_names.DefaultBackend'}, name='registration_register'), @@ -58,22 +58,21 @@ ajax_check_email, name='registration.views.ajax_check_email'), url(r'^login/$', - auth_views.LoginView.as_view(template_name='registration/login.html', - extra_context={'form': AnytaskLoginForm}), + auth_views.LoginView.as_view(template_name='registration/login.html', form_class=AnytaskLoginForm), name='auth_login'), url(r'^password/reset/$', auth_views.PasswordResetView.as_view( success_url=reverse_lazy('auth_password_reset_done'), - extra_context={'password_reset_form': AnytaskPasswordResetForm}), + form_class=AnytaskPasswordResetForm), name='auth_password_reset'), url(r'^password/reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', auth_views.PasswordResetConfirmView.as_view( success_url=reverse_lazy('auth_password_reset_complete'), - extra_context={'set_password_form': AnytaskSetPasswordForm}), + form_class=AnytaskSetPasswordForm), name='auth_password_reset_confirm'), url(r'^password/change/$', auth_views.PasswordChangeView.as_view( success_url=reverse_lazy('auth_password_change_done'), - extra_context={'password_change_form': AnytaskPasswordChangeForm}), + form_class=AnytaskPasswordChangeForm), name='auth_password_change'), url(r'', include('registration.auth_urls')), ] diff --git a/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po b/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po index 438695708..23b951b23 100644 --- a/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po +++ b/dependencies/django-registration/registration/locale/ru/LC_MESSAGES/django.po @@ -350,6 +350,14 @@ msgstr "Введите ваш новый пароль:" msgid "Set password" msgstr "Установить пароль" +#: forms.py:41 +msgid "Password" +msgstr "Пароль" + +#: forms.py:43 +msgid "Password (again)" +msgstr "Пароль (снова)" + #: templates/registration/password_reset_done.html:4 msgid "Password reset" msgstr "Сброс пароля" From ef1b209b9e645877c88e987dc9005262356bcb98 Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 12 Jun 2020 18:24:19 +0500 Subject: [PATCH 11/31] Refactoring requirements --- README.md | 3 ++- requirements.txt | 3 +-- requirements3_local.txt | 36 ------------------------------------ requirements_local.txt | 4 ++-- 4 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 requirements3_local.txt diff --git a/README.md b/README.md index a0ea79a33..b4a8bfba2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Anytask [![Build Status](https://travis-ci.org/znick/anytask.svg?branch=master)](https://travis-ci.org/znick/anytask) ======= +Used Python3.8 local install ------------- @@ -11,7 +12,7 @@ Development installation commands: # ... cd ... git submodule init git submodule update - virtualenv .env + virtualenv .env -p python3.8 . .env/bin/activate pip install pip>=10 setuptools>=30 --upgrade pip install -r requirements_local.txt diff --git a/requirements.txt b/requirements.txt index 45e00d7f0..c89167ec0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ argparse==1.4.0 # via dateutils backports-abc==0.5 # via tornado backports.shutil-get-terminal-size==1.0.0 # via ipython beautifulsoup4==4.6.0 # via django-htmlmin -beautifulsoup==3.2.1 bleach==2.1.3 # via nbconvert certifi==2020.4.5.1 # via requests, tornado chardet==3.0.4 # via requests @@ -71,7 +70,7 @@ six==1.11.0 # via bleach, django-bootstrap-breadcrumbs, django-ext sqlparse==0.1.19 terminado==0.8.3 # via notebook testpath==0.3.1 # via nbconvert -tornado==4.5.3 +tornado==5 traitlets==4.3.2 # via ipykernel, ipython, ipywidgets, jupyter-client, jupyter-core, nbconvert, nbformat, notebook unidecode==1.0.22 urllib3==1.24.2 # via requests diff --git a/requirements3_local.txt b/requirements3_local.txt deleted file mode 100644 index 67c5e0f5c..000000000 --- a/requirements3_local.txt +++ /dev/null @@ -1,36 +0,0 @@ -tornado==5 -ipykernel==4.5.2 -django==1.11.29 -pillow==6.2.2 -django-recaptcha==1.4.0 -python-gettext==3.0 -beautifulsoup4 -Werkzeug==0.15.3 -django-extensions==1.6.7 -ipython[notebook]==5.3.0 -ipdb==0.10.2 -sqlparse==0.1.15 -django-debug-toolbar==1.3.2 -django-bootstrap-breadcrumbs==0.9.1 -pycrypto==2.6.1 -python-magic==0.4.15 -django-filemanager==0.0.5 -requests==2.20.0 -flup==1.0.3 -unidecode==1.0.22 -django-dprog-jfu -django-filter==1.1.0 -yandex-oauth-py==0.1.1 -xmltodict==0.11.0 -django-crispy-forms==1.6.0 -mock==3.0.5 -django-colorfield==0.1.14 -django-haystack==2.8.1 -Whoosh==2.7.4 -django-reversion==1.10 -dateutils==0.6.6 -flake8==3.7.9 -django_premailer==0.2.0 -django-environ==0.4 -nose==1.3.7 -rbtools==1.0.3 diff --git a/requirements_local.txt b/requirements_local.txt index 0c2e02349..67c5e0f5c 100644 --- a/requirements_local.txt +++ b/requirements_local.txt @@ -1,10 +1,10 @@ -tornado==4.5.3 +tornado==5 ipykernel==4.5.2 django==1.11.29 pillow==6.2.2 django-recaptcha==1.4.0 python-gettext==3.0 -beautifulsoup==3.2.1 +beautifulsoup4 Werkzeug==0.15.3 django-extensions==1.6.7 ipython[notebook]==5.3.0 From acb04cfc12ffc6188499993cd92404bd1218fe21 Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 12 Jun 2020 18:55:45 +0500 Subject: [PATCH 12/31] Fix flake8 issues and travis.yml --- anytask/admission/models.py | 30 ++++++++----------- anytask/anyrb/common.py | 2 +- anytask/common/ordered_dict.py | 5 ---- anytask/courses/views.py | 1 + anytask/invites/models.py | 4 +-- .../management/commands/fix_seminar_status.py | 10 +++---- anytask/lessons/views.py | 2 +- anytask/simple.py | 7 +++-- anytask/tasks/views.py | 1 + .../users/management/commands/create_shad.py | 2 +- .../management/commands/import_cs_users.py | 2 +- anytask/users/tests.py | 8 +---- 12 files changed, 31 insertions(+), 43 deletions(-) diff --git a/anytask/admission/models.py b/anytask/admission/models.py index 359cf4d1b..7838c34ea 100644 --- a/anytask/admission/models.py +++ b/anytask/admission/models.py @@ -1,26 +1,22 @@ # -*- coding: utf-8 -*- -from django.db import models -from django.conf import settings -from django.contrib.sites.models import Site -from registration.models import RegistrationManager -from registration.users import UserModel -from django.template.loader import render_to_string -from django.db.models import Q -from django.core.mail import send_mail -from mail.common import send_mass_mail_html - -from django.contrib.auth.models import User - -from django.utils.timezone import now as datetime_now -from django.db import transaction - import datetime import hashlib -import random +import json import logging +import random import re -import json + +from django.conf import settings +from django.contrib.auth.models import User +from django.contrib.sites.models import Site +from django.core.mail import send_mail +from django.db import models +from django.db.models import Q +from django.template.loader import render_to_string + +from mail.common import send_mass_mail_html +from registration.models import RegistrationManager logger = logging.getLogger('django.request') diff --git a/anytask/anyrb/common.py b/anytask/anyrb/common.py index ae907aa4f..31622867a 100644 --- a/anytask/anyrb/common.py +++ b/anytask/anyrb/common.py @@ -171,7 +171,7 @@ def create_review_request(self): path=os.path.join(repository_path, '.git'), tool='Git', public=False) - except Exception as e: + except Exception: logger.warning("Cant create repository '%s', trying to find it", repository_name) repository = self.get_repository(repository_name) diff --git a/anytask/common/ordered_dict.py b/anytask/common/ordered_dict.py index 09f6ee69a..b448ea611 100644 --- a/anytask/common/ordered_dict.py +++ b/anytask/common/ordered_dict.py @@ -134,11 +134,6 @@ def itervalues(self): for k in self: yield self[k] - def items(self): - 'od.iteritems -> an iterator over the (key, value) items in od' - for k in self: - yield (k, self[k]) - def update(*args, **kwds): '''od.update(E, **F) -> None. Update od from dict/iterable E and F. diff --git a/anytask/courses/views.py b/anytask/courses/views.py index ace6ad6e4..3342f38b7 100644 --- a/anytask/courses/views.py +++ b/anytask/courses/views.py @@ -40,6 +40,7 @@ from crispy_forms.helper import FormHelper from crispy_forms.layout import HTML +from functools import reduce import json diff --git a/anytask/invites/models.py b/anytask/invites/models.py index b3339fa57..680c25eda 100644 --- a/anytask/invites/models.py +++ b/anytask/invites/models.py @@ -45,7 +45,7 @@ def generate_invite(generated_by, group, size=7): invite.generated_by = generated_by invite.group = group key = Invite._id_generator(size) - for _ in xrange(1000): + for _ in range(1000): try: if Invite.objects.filter(key=key).count(): key = Invite._id_generator(size) @@ -58,7 +58,7 @@ def generate_invite(generated_by, group, size=7): @staticmethod def generate_invites(count, generated_by, group, size=7): - for _ in xrange(count): + for _ in range(count): yield Invite.generate_invite(generated_by, group, size) @staticmethod diff --git a/anytask/issues/management/commands/fix_seminar_status.py b/anytask/issues/management/commands/fix_seminar_status.py index 584e25930..eb307a3a3 100644 --- a/anytask/issues/management/commands/fix_seminar_status.py +++ b/anytask/issues/management/commands/fix_seminar_status.py @@ -16,11 +16,11 @@ def get_mark(task_id, student_id): - return Issue.objects \ - .filter(task__parent_task_id=task_id, student_id=student_id) \ - .exclude(task__is_hidden=True) \ - .exclude(task__score_after_deadline=False, status_field__tag=IssueStatus.STATUS_ACCEPTED_AFTER_DEADLINE) \ - .aggregate(Sum('mark'))['mark__sum'] or 0 + return (Issue.objects + .filter(task__parent_task_id=task_id, student_id=student_id) + .exclude(task__is_hidden=True) + .exclude(task__score_after_deadline=False, status_field__tag=IssueStatus.STATUS_ACCEPTED_AFTER_DEADLINE) + .aggregate(Sum('mark'))['mark__sum'] or 0) class Command(BaseCommand): diff --git a/anytask/lessons/views.py b/anytask/lessons/views.py index 33567ae11..63af9df94 100644 --- a/anytask/lessons/views.py +++ b/anytask/lessons/views.py @@ -67,7 +67,7 @@ def schedule_edit_page(request, lesson_id): def get_lesson_dates(date_startime, date_endtime, date_end, week_days): lesson_dates = [] delta_days = (date_end - date_startime).days - for i in xrange(delta_days + 1): + for i in range(delta_days + 1): curr_date_start = date_startime + datetime.timedelta(days=i) curr_date_end = date_endtime + datetime.timedelta(days=i) if curr_date_start.weekday() in week_days: diff --git a/anytask/simple.py b/anytask/simple.py index b1a231262..1fe82da8b 100644 --- a/anytask/simple.py +++ b/anytask/simple.py @@ -4,9 +4,6 @@ from django.core.exceptions import ImproperlyConfigured # from django.db.models.aggreg import get_app, get_apps from django.apps import apps -get_app = apps.get_app_config -get_apps = apps.get_app_configs - import doctest from django.test.utils import setup_test_environment, teardown_test_environment from doctest import OutputChecker, DocTestRunner @@ -14,6 +11,10 @@ from importlib import import_module from django.utils.module_loading import module_has_submodule +get_app = apps.get_app_config +get_apps = apps.get_app_configs + + __all__ = ('DjangoTestSuiteRunner') # The module name for tests outside models.py diff --git a/anytask/tasks/views.py b/anytask/tasks/views.py index cdd09d210..933fca765 100644 --- a/anytask/tasks/views.py +++ b/anytask/tasks/views.py @@ -26,6 +26,7 @@ from tasks.models import Task from pytz import timezone +from functools import reduce HEADERS = {'Authorization': 'OAuth ' + settings.CONTEST_OAUTH} PROBLEMS_API = settings.CONTEST_API_URL + 'problems?locale={lang}&contestId={cont_id}' diff --git a/anytask/users/management/commands/create_shad.py b/anytask/users/management/commands/create_shad.py index f549f223e..9a9f63ea3 100644 --- a/anytask/users/management/commands/create_shad.py +++ b/anytask/users/management/commands/create_shad.py @@ -82,7 +82,7 @@ def handle(self, **options): user.first_name = first_name if (user.password == "") or (not user.has_usable_password()): - user.set_password(''.join(random.choice(string.letters) for i in xrange(20))) + user.set_password(''.join(random.choice(string.letters) for i in range(20))) user.save() group, _ = Group.objects.get_or_create(year=year, name=group_name) diff --git a/anytask/users/management/commands/import_cs_users.py b/anytask/users/management/commands/import_cs_users.py index aaeec791d..347c1f629 100644 --- a/anytask/users/management/commands/import_cs_users.py +++ b/anytask/users/management/commands/import_cs_users.py @@ -41,7 +41,7 @@ def handle_noargs(self, **options): email=email) if (user.password == "") or (user.has_usable_password() is False): - user.set_password(''.join(random.choice(string.letters) for i in xrange(20))) + user.set_password(''.join(random.choice(string.letters) for i in range(20))) user.save() print("{0} {1}".format(user, user.get_full_name().encode("utf-8"))) diff --git a/anytask/users/tests.py b/anytask/users/tests.py index 57a4c61f1..9da13a4ad 100644 --- a/anytask/users/tests.py +++ b/anytask/users/tests.py @@ -25,8 +25,6 @@ def test_login_form(self): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'registration/login.html') - content = response.content.decode('utf8') - self.assertContains(response, "Логин / E-mail") self.assertContains(response, "Пароль") @@ -36,7 +34,6 @@ def test_register_form(self): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'registration/registration_form.html') - content = response.content.decode('utf8') self.assertContains(response, "Логин", html=True) self.assertContains(response, "E-mail", html=True) @@ -144,12 +141,9 @@ def test_register_user__email_already_exists(self): "password2": u"qwer1"} response = client.post('/accounts/register/', form_data) - content = response.content.decode('utf8') self.assertEqual(response.status_code, 200) self.assertFormError(response, 'form', 'email', - # Изначально здесь была английская версия этого сообщения, но в новой версии библиотеки, - # она возвращается на русском - "Этот адрес электронной почты уже используется. Пожалуйста, введите другой адрес.") + "This email address is already in use. Please supply a different email address.") def test_register_user__wrong_passwords(self): client = self.client From b7ac0789ce1a023804204314f46cf5f3ffba3cfb Mon Sep 17 00:00:00 2001 From: Sergey Date: Fri, 12 Jun 2020 19:02:30 +0500 Subject: [PATCH 13/31] Really fixing .travis.yml file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ba23913a..dcb4fa441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: required language: python python: - - "2.7" + - "3.8" install: - pip install pip>=9.0.1 - pip install --upgrade flake8 From eca13d1f952e0e705c5e21c94efba5e272bb73d3 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sat, 22 Jan 2022 17:39:09 +0300 Subject: [PATCH 14/31] Fix tornado version --- requirements_local.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements_local.txt b/requirements_local.txt index 0611e4f91..b110d8f74 100644 --- a/requirements_local.txt +++ b/requirements_local.txt @@ -1,4 +1,3 @@ -tornado==4.5.3 tornado==5 ipykernel==4.5.2 django==1.11.29 From 8f7b3a63886d11ecd62349bbda86e24723d752a3 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sat, 22 Jan 2022 17:41:14 +0300 Subject: [PATCH 15/31] Switch github actions to python3.8 --- .github/workflows/anytask.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/anytask.yml b/.github/workflows/anytask.yml index 4b57fe878..238cfd03a 100644 --- a/.github/workflows/anytask.yml +++ b/.github/workflows/anytask.yml @@ -20,17 +20,16 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Set up Python 2.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 2.7 + python-version: 3.8 - name: Install dependencies run: | pip install pip>=9.0.1 pip install --upgrade flake8 'setuptools-scm==5.0.2' pip install -r requirements_local.txt sudo apt-get install p7zip-full tar xz-utils bzip2 gzip - sudo apt-get install python3 - name: Lint with flake8 run: | cd anytask From 4590c75ae9b19491c7cb9b0a268bb64e9f558337 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sat, 22 Jan 2022 19:27:06 +0300 Subject: [PATCH 16/31] Fix local reqirements --- requirements_local.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/requirements_local.txt b/requirements_local.txt index b110d8f74..1e8ee7e01 100644 --- a/requirements_local.txt +++ b/requirements_local.txt @@ -1,20 +1,19 @@ tornado==5 ipykernel==4.5.2 django==1.11.29 -pillow==6.2.2 +Pillow==9.0.0 django-recaptcha==1.4.0 python-gettext==3.0 beautifulsoup4 Werkzeug==0.15.3 django-extensions==1.6.7 -ipdb==0.10.2 -sqlparse==0.1.15 +ipdb==0.13.9 +sqlparse==0.4.2 django-debug-toolbar==1.3.2 django-bootstrap-breadcrumbs==0.9.1 -pycrypto==2.6.1 python-magic==0.4.15 django-filemanager==0.0.5 -requests==2.20.0 +requests==2.27.1 flup==1.0.3 text-unidecode==1.3 django-dprog-jfu @@ -25,7 +24,7 @@ mock==3.0.5 django-colorfield==0.1.14 django-haystack==2.8.1 django-storages==1.9.1 -boto3==1.17.30 +boto3==1.20.41 s3cmd==2.1.0 Whoosh==2.7.4 django-reversion==1.10 From 2c7966bb0e2e6080f1f39e177c0712ded06e302a Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sat, 22 Jan 2022 19:44:02 +0300 Subject: [PATCH 17/31] Fix flake8 --- anytask/anycontest/management/commands/check_contest.py | 4 +++- anytask/courses/management/commands/course_copy.py | 2 -- anytask/mail/management/commands/send_mail_notifications.py | 6 +++--- anytask/settings_docker.py | 2 +- anytask/users/management/commands/create_shad.py | 2 -- dependencies/yandex-oauth-py-0.1.1/yandex_oauth.py | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/anytask/anycontest/management/commands/check_contest.py b/anytask/anycontest/management/commands/check_contest.py index 2f9bf6ef9..991901dc3 100644 --- a/anytask/anycontest/management/commands/check_contest.py +++ b/anytask/anycontest/management/commands/check_contest.py @@ -38,7 +38,9 @@ def handle(self, **options): # set_contest_marks(contest_id, students_info) # logging to cron log - print("Command check_contest check {0} submissions ({1} - with marks) took {2} seconds".format(len(contest_submissions), contest_marks_len, time.time() - start_time)) + duration = time.time() - start_time + print(f"Command check_contest check {len(contest_submissions)} submissions ({contest_marks_len} - with marks) " + f"took {duration} seconds") @staticmethod def handle_submission(contest_marks_len, contest_submission): diff --git a/anytask/courses/management/commands/course_copy.py b/anytask/courses/management/commands/course_copy.py index b40b6ab0e..01cc6c884 100644 --- a/anytask/courses/management/commands/course_copy.py +++ b/anytask/courses/management/commands/course_copy.py @@ -4,8 +4,6 @@ from courses.models import Course from tasks.models import Task -from xml.etree.ElementTree import parse -from optparse import make_option import copy diff --git a/anytask/mail/management/commands/send_mail_notifications.py b/anytask/mail/management/commands/send_mail_notifications.py index f5460b06a..118e36bb7 100644 --- a/anytask/mail/management/commands/send_mail_notifications.py +++ b/anytask/mail/management/commands/send_mail_notifications.py @@ -56,9 +56,9 @@ def handle(self, **options): sleep_time += 1 # logging to cron log - print("Command send_mail_notifications send {0} email(s), {1} tg message(s) " \ - "and took {2} seconds (sleep {3} seconds)" - .format(num_sent_email, num_sent_tg, time.time() - start_time, sleep_time)) + time_spent = time.time() - start_time + print(f"Command send_mail_notifications send {num_sent_email} email(s), {num_sent_tg} tg message(s) and took" + f"{time_spent} seconds (sleep {sleep_time} seconds)") def extract_only_notify(): diff --git a/anytask/settings_docker.py b/anytask/settings_docker.py index ec05d8374..a3411a295 100644 --- a/anytask/settings_docker.py +++ b/anytask/settings_docker.py @@ -102,7 +102,7 @@ LANGUAGES = (('ru', u'Русский'), ('en', 'English')) -FILE_UPLOAD_PERMISSIONS = 0644 +FILE_UPLOAD_PERMISSIONS = 644 # 0644 AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID') diff --git a/anytask/users/management/commands/create_shad.py b/anytask/users/management/commands/create_shad.py index 93589d380..951cd01b2 100644 --- a/anytask/users/management/commands/create_shad.py +++ b/anytask/users/management/commands/create_shad.py @@ -17,8 +17,6 @@ from years.models import Year from xml.etree.ElementTree import parse -from optparse import make_option -from xml.dom.minidom import parse import sys import random import string diff --git a/dependencies/yandex-oauth-py-0.1.1/yandex_oauth.py b/dependencies/yandex-oauth-py-0.1.1/yandex_oauth.py index 00cd9c3a8..783b5b036 100644 --- a/dependencies/yandex-oauth-py-0.1.1/yandex_oauth.py +++ b/dependencies/yandex-oauth-py-0.1.1/yandex_oauth.py @@ -82,5 +82,5 @@ def get_basic_auth_token(path1, path2): input pair login / password OR client_id / client_secret make string for basic https authorization join """ - token = "{0}:{1}".format( path1, path2 ).encode('utf-8') - return "Basic {0}".format( base64.b64encode( token ).decode('ascii') ) + token = "{0}:{1}".format(path1, path2).encode('utf-8') + return "Basic {0}".format(base64.b64encode(token).decode('ascii')) From 2c1c158e8ccb7f75d516c2e1899f2e9cb69ee572 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sat, 22 Jan 2022 19:51:59 +0300 Subject: [PATCH 18/31] Fix migrations and drop custom OrderedDict --- anytask/common/ordered_dict.py | 254 --------------------------------- anytask/courses/views.py | 3 +- 2 files changed, 1 insertion(+), 256 deletions(-) delete mode 100644 anytask/common/ordered_dict.py diff --git a/anytask/common/ordered_dict.py b/anytask/common/ordered_dict.py deleted file mode 100644 index b448ea611..000000000 --- a/anytask/common/ordered_dict.py +++ /dev/null @@ -1,254 +0,0 @@ -# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy. -# Passes Python2.7's test suite and incorporates all the latest updates. - -try: - from thread import get_ident as _get_ident -except ImportError: - from _dummy_thread import get_ident as _get_ident - -try: - from _abcoll import KeysView, ValuesView, ItemsView -except ImportError: - pass - - -class OrderedDict(dict): - 'Dictionary that remembers insertion order' - - # An inherited dict maps keys to values. - # The inherited dict provides __getitem__, __len__, __contains__, and get. - # The remaining methods are order-aware. - # Big-O running times for all methods are the same as for regular dictionaries. - - # The internal self.__map dictionary maps keys to links in a doubly linked list. - # The circular doubly linked list starts and ends with a sentinel element. - # The sentinel element never gets deleted (this simplifies the algorithm). - # Each link is stored as a list of length three: [PREV, NEXT, KEY]. - - def __init__(self, *args, **kwds): - '''Initialize an ordered dictionary. Signature is the same as for - regular dictionaries, but keyword arguments are not recommended - because their insertion order is arbitrary. - - ''' - if len(args) > 1: - raise TypeError('expected at most 1 arguments, got %d' % len(args)) - try: - self.__root - except AttributeError: - self.__root = root = [] # sentinel node - root[:] = [root, root, None] - self.__map = {} - self.__update(*args, **kwds) - - def __setitem__(self, key, value, dict_setitem=dict.__setitem__): - 'od.__setitem__(i, y) <==> od[i]=y' - # Setting a new item creates a new link which goes at the end of the linked - # list, and the inherited dictionary is updated with the new key/value pair. - if key not in self: - root = self.__root - last = root[0] - last[1] = root[0] = self.__map[key] = [last, root, key] - dict_setitem(self, key, value) - - def __delitem__(self, key, dict_delitem=dict.__delitem__): - 'od.__delitem__(y) <==> del od[y]' - # Deleting an existing item uses self.__map to find the link which is - # then removed by updating the links in the predecessor and successor nodes. - dict_delitem(self, key) - link_prev, link_next, key = self.__map.pop(key) - link_prev[1] = link_next - link_next[0] = link_prev - - def __iter__(self): - 'od.__iter__() <==> iter(od)' - root = self.__root - curr = root[1] - while curr is not root: - yield curr[2] - curr = curr[1] - - def __reversed__(self): - 'od.__reversed__() <==> reversed(od)' - root = self.__root - curr = root[0] - while curr is not root: - yield curr[2] - curr = curr[0] - - def clear(self): - 'od.clear() -> None. Remove all items from od.' - try: - for node in self.__map.itervalues(): - del node[:] - root = self.__root - root[:] = [root, root, None] - self.__map.clear() - except AttributeError: - pass - dict.clear(self) - - def popitem(self, last=True): - '''od.popitem() -> (k, v), return and remove a (key, value) pair. - Pairs are returned in LIFO order if last is true or FIFO order if false. - - ''' - if not self: - raise KeyError('dictionary is empty') - root = self.__root - if last: - link = root[0] - link_prev = link[0] - link_prev[1] = root - root[0] = link_prev - else: - link = root[1] - link_next = link[1] - root[1] = link_next - link_next[0] = root - key = link[2] - del self.__map[key] - value = dict.pop(self, key) - return key, value - - # -- the following methods do not depend on the internal structure -- - - def keys(self): - 'od.keys() -> list of keys in od' - return list(self) - - def values(self): - 'od.values() -> list of values in od' - return [self[key] for key in self] - - def items(self): - 'od.items() -> list of (key, value) pairs in od' - return [(key, self[key]) for key in self] - - def iterkeys(self): - 'od.iterkeys() -> an iterator over the keys in od' - return iter(self) - - def itervalues(self): - 'od.itervalues -> an iterator over the values in od' - for k in self: - yield self[k] - - def update(*args, **kwds): - '''od.update(E, **F) -> None. Update od from dict/iterable E and F. - - If E is a dict instance, does: for k in E: od[k] = E[k] - If E has a .keys() method, does: for k in E.keys(): od[k] = E[k] - Or if E is an iterable of items, does: for k, v in E: od[k] = v - In either case, this is followed by: for k, v in F.items(): od[k] = v - - ''' - if len(args) > 2: - raise TypeError('update() takes at most 2 positional ' - 'arguments (%d given)' % (len(args),)) - elif not args: - raise TypeError('update() takes at least 1 argument (0 given)') - self = args[0] - # Make progressively weaker assumptions about "other" - other = () - if len(args) == 2: - other = args[1] - if isinstance(other, dict): - for key in other: - self[key] = other[key] - elif hasattr(other, 'keys'): - for key in other.keys(): - self[key] = other[key] - else: - for key, value in other: - self[key] = value - for key, value in kwds.items(): - self[key] = value - - __update = update # let subclasses override update without breaking __init__ - - __marker = object() - - def pop(self, key, default=__marker): - '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value. - If key is not found, d is returned if given, otherwise KeyError is raised. - - ''' - if key in self: - result = self[key] - del self[key] - return result - if default is self.__marker: - raise KeyError(key) - return default - - def setdefault(self, key, default=None): - 'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od' - if key in self: - return self[key] - self[key] = default - return default - - def __repr__(self, _repr_running={}): - 'od.__repr__() <==> repr(od)' - call_key = id(self), _get_ident() - if call_key in _repr_running: - return '...' - _repr_running[call_key] = 1 - try: - if not self: - return '%s()' % (self.__class__.__name__,) - return '%s(%r)' % (self.__class__.__name__, self.items()) - finally: - del _repr_running[call_key] - - def __reduce__(self): - 'Return state information for pickling' - items = [[k, self[k]] for k in self] - inst_dict = vars(self).copy() - for k in vars(OrderedDict()): - inst_dict.pop(k, None) - if inst_dict: - return (self.__class__, (items,), inst_dict) - return self.__class__, (items,) - - def copy(self): - 'od.copy() -> a shallow copy of od' - return self.__class__(self) - - @classmethod - def fromkeys(cls, iterable, value=None): - '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S - and values equal to v (which defaults to None). - - ''' - d = cls() - for key in iterable: - d[key] = value - return d - - def __eq__(self, other): - '''od.__eq__(y) <==> od==y. Comparison to another OD is order-sensitive - while comparison to a regular mapping is order-insensitive. - - ''' - if isinstance(other, OrderedDict): - return len(self) == len(other) and self.items() == other.items() - return dict.__eq__(self, other) - - def __ne__(self, other): - return not self == other - - # -- the following methods are only used in Python 2.7 -- - - def viewkeys(self): - "od.viewkeys() -> a set-like object providing a view on od's keys" - return KeysView(self) - - def viewvalues(self): - "od.viewvalues() -> an object providing a view on od's values" - return ValuesView(self) - - def viewitems(self): - "od.viewitems() -> a set-like object providing a view on od's items" - return ItemsView(self) diff --git a/anytask/courses/views.py b/anytask/courses/views.py index 84e752467..0af0b2090 100644 --- a/anytask/courses/views.py +++ b/anytask/courses/views.py @@ -12,7 +12,7 @@ from django.conf import settings from django.views.decorators.http import require_http_methods -from collections import defaultdict, Counter +from collections import defaultdict, Counter, OrderedDict import datetime import logging import requests @@ -33,7 +33,6 @@ from courses import pythontask from lessons.models import Lesson -from common.ordered_dict import OrderedDict from common.timezone import convert_datetime from courses.forms import default_teacher_forms_factory, DefaultTeacherForm From ab7aa9f822e946fb56aebb4407587ca209415859 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sat, 22 Jan 2022 19:55:34 +0300 Subject: [PATCH 19/31] Switch github actions licences check to python 3.8 --- .github/workflows/licensed.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml index d7a1650e7..256fcd22b 100644 --- a/.github/workflows/licensed.yml +++ b/.github/workflows/licensed.yml @@ -9,10 +9,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Set up Python 2.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 2.7 + python-version: 3.8 - uses: jonabc/setup-licensed@v1 with: version: '2.15.2' @@ -21,8 +21,8 @@ jobs: sudo apt-get install python-virtualenv - name: Init virtualenv run: | - virtualenv --python=python2 venv-2.7 - . venv-2.7/bin/activate + virtualenv --python=python3 venv + . venv/bin/activate pip install pip>=9.0.1 pip install --upgrade flake8 'setuptools-scm==5.0.2' pip install -r requirements.txt From 1e1cadb92313ac7e307a7f7ada97cf35ef463fff Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 30 Jan 2022 23:54:51 +0300 Subject: [PATCH 20/31] requirements cleanup && Dockerfile upgrade --- Dockerfile | 4 +-- requirements.txt | 65 ++++++------------------------------------------ 2 files changed, 10 insertions(+), 59 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3b017e2bc..3d8eb8169 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7-slim +FROM python:3.8-slim ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 @@ -46,7 +46,7 @@ RUN set -ex \ " \ && apt-get update && apt-get install -y --no-install-recommends $BUILD_DEPS \ && pip install -U virtualenv \ - && python2.7 -m virtualenv /venv \ + && python3 -m virtualenv /venv \ && /venv/bin/pip install -U pip \ && /venv/bin/pip install --no-cache-dir -r /requirements.txt \ && /venv/bin/pip install --no-cache-dir dj_database_url \ diff --git a/requirements.txt b/requirements.txt index 40c2d9129..8096623b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,4 @@ -backports-abc==0.5 # via tornado -backports.shutil-get-terminal-size==1.0.0 # via ipython -beautifulsoup4==4.6.0 # via django-htmlmin -bleach==2.1.3 # via nbconvert -certifi==2020.4.5.1 # via requests, tornado -chardet==3.0.4 # via requests -configparser==3.5.0 # via entrypoints -cssselect==1.0.3 # via premailer -cssutils==1.0.2 # via premailer dateutils==0.6.12 -decorator==4.3.0 # via ipython, traitlets django-bootstrap-breadcrumbs==0.9.1 django-colorfield==0.1.14 django-crispy-forms==1.6.0 @@ -24,60 +14,21 @@ django-reversion==1.10 django==1.11.29 django_premailer==0.2.0 django-storages==1.9.1 -boto3==1.17.30 -entrypoints==0.2.3 # via nbconvert -enum34==1.1.6 # via traitlets +boto3==1.20.41 flup==1.0.3 -functools32==3.2.3.post2 # via jsonschema -html5lib==1.0.1 # via bleach, django-htmlmin -idna==2.6 # via requests -ipdb==0.10.2 -ipython-genutils==0.2.0 # via nbformat, notebook, traitlets -ipywidgets==7.2.1 # via ipython -jinja2==2.11.3 # via nbconvert, notebook -jsonschema==2.6.0 # via nbformat -jupyter-client==5.2.3 # via ipykernel, notebook -jupyter-core==4.4.0 # via jupyter-client, nbconvert, nbformat, notebook -lxml==4.2.3 # via premailer -markupsafe==1.0 # via jinja2 -mistune==0.8.3 # via nbconvert -nbconvert==5.3.1 # via notebook -nbformat==4.4.0 # via ipywidgets, nbconvert, notebook -notebook==5.5.0 # via ipython, widgetsnbextension -pandocfilters==1.4.2 # via nbconvert -pathlib2==2.3.5 # via ipython, pickleshare -pexpect==4.6.0 # via ipython -pickleshare==0.7.4 # via ipython -pillow==6.2.2 -premailer==3.0.0 # via django-premailer -prompt-toolkit==1.0.15 # via ipython -psycopg2==2.7.5 -ptyprocess==0.6.0 # via pexpect, terminado -pycrypto==2.6.1 -pygments==2.2.0 # via ipython, nbconvert -python-dateutil==2.7.3 # via dateutils, jupyter-client +ipdb==0.13.9 +Pillow==9.0.0 +psycopg2==2.9.3 python-gettext==3.0 python-magic==0.4.15 -pytz==2021.1 # via dateutils -pyzmq==17.0.0 # via jupyter-client, notebook -requests==2.20.0 -scandir==1.10.0 # via pathlib2 -send2trash==1.5.0 # via notebook -simplegeneric==0.8.1 # via ipython -singledispatch==3.4.0.3 # via tornado -six==1.11.0 # via bleach, django-bootstrap-breadcrumbs, django-extensions, html5lib, pathlib2, prompt-toolkit, python-dateutil, singledispatch, traitlets -sqlparse==0.1.19 -terminado==0.8.3 # via notebook -testpath==0.3.1 # via nbconvert +requests==2.27.1 +sqlparse==0.4.2 tornado==5 -traitlets==4.3.2 # via ipykernel, ipython, ipywidgets, jupyter-client, jupyter-core, nbconvert, nbformat, notebook text-unidecode==1.3 -urllib3==1.26.5 # via requests -wcwidth==0.1.7 # via prompt-toolkit -webencodings==0.5.1 # via html5lib werkzeug==0.15.3 whoosh==2.7.4 -widgetsnbextension==3.2.1 # via ipywidgets xmltodict==0.11.0 mysqlclient==1.4.6 nose==1.3.7 +rbtools==1.0.3 + From 509102ed1aa9472a568255f14cae397798fc1b2e Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Mon, 31 Jan 2022 00:02:54 +0300 Subject: [PATCH 21/31] Switch github actions for 'deploy_local_beta.yml' to python3.8 --- .github/workflows/deploy_local_beta.yml | 6 +++++- deploy_local_beta/deploy_local_beta.sh | 14 +++----------- ...beta_python2.sh => deploy_local_beta_python.sh} | 0 deploy_local_beta/deploy_local_beta_python3.sh | 1 - 4 files changed, 8 insertions(+), 13 deletions(-) rename deploy_local_beta/{deploy_local_beta_python2.sh => deploy_local_beta_python.sh} (100%) delete mode 100755 deploy_local_beta/deploy_local_beta_python3.sh diff --git a/.github/workflows/deploy_local_beta.yml b/.github/workflows/deploy_local_beta.yml index 011faaa57..1059fdd89 100644 --- a/.github/workflows/deploy_local_beta.yml +++ b/.github/workflows/deploy_local_beta.yml @@ -11,7 +11,11 @@ jobs: - uses: actions/checkout@v2 with: submodules: true + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 - name: Install dependencies run: sudo apt-get install python-virtualenv - name: Deploy - run: source deploy_local_beta/run.sh --python-path=python2 + run: source deploy_local_beta/run.sh --python-path=python3 diff --git a/deploy_local_beta/deploy_local_beta.sh b/deploy_local_beta/deploy_local_beta.sh index 0255cc1d1..7ef89f8aa 100755 --- a/deploy_local_beta/deploy_local_beta.sh +++ b/deploy_local_beta/deploy_local_beta.sh @@ -20,17 +20,9 @@ ANYBETA_crash_on_error git submodule update ANYBETA_crash_on_error -# CHOOSE RIGHT VERSION -###################### - -ANYBETA_PYTHON_VERSION_CHECK="from __future__ import print_function; import sys; print(int(sys.version_info < (3, 3)))" - -if test `$ANYBETA_PYTHON_PATH -c "$ANYBETA_PYTHON_VERSION_CHECK"` -eq 1 -then - . $ANYBETA_DEPLOY/deploy_local_beta_python2.sh -else - . $ANYBETA_DEPLOY/deploy_local_beta_python3.sh -fi +# DEPLOY +################ +. $ANYBETA_DEPLOY/deploy_local_beta_python.sh # MINIO ################ diff --git a/deploy_local_beta/deploy_local_beta_python2.sh b/deploy_local_beta/deploy_local_beta_python.sh similarity index 100% rename from deploy_local_beta/deploy_local_beta_python2.sh rename to deploy_local_beta/deploy_local_beta_python.sh diff --git a/deploy_local_beta/deploy_local_beta_python3.sh b/deploy_local_beta/deploy_local_beta_python3.sh deleted file mode 100755 index 649cda9d6..000000000 --- a/deploy_local_beta/deploy_local_beta_python3.sh +++ /dev/null @@ -1 +0,0 @@ -echo "Python 3 coming soon..." From cd999cf9302b4f0594fb10a5aee13cb476caa68f Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 6 Feb 2022 09:10:37 +0300 Subject: [PATCH 22/31] Merge migrations --- .../migrations/0008_merge_20220122_1951.py | 16 ++++++++++++++++ .../migrations/0003_merge_20220122_1951.py | 16 ++++++++++++++++ .../mail/migrations/0005_merge_20220122_1951.py | 16 ++++++++++++++++ .../tasks/migrations/0004_merge_20220122_1951.py | 16 ++++++++++++++++ .../users/migrations/0005_merge_20220122_1951.py | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 anytask/issues/migrations/0008_merge_20220122_1951.py create mode 100644 anytask/lessons/migrations/0003_merge_20220122_1951.py create mode 100644 anytask/mail/migrations/0005_merge_20220122_1951.py create mode 100644 anytask/tasks/migrations/0004_merge_20220122_1951.py create mode 100644 anytask/users/migrations/0005_merge_20220122_1951.py diff --git a/anytask/issues/migrations/0008_merge_20220122_1951.py b/anytask/issues/migrations/0008_merge_20220122_1951.py new file mode 100644 index 000000000..31afa509c --- /dev/null +++ b/anytask/issues/migrations/0008_merge_20220122_1951.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2022-01-22 16:51 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('issues', '0007_auto_20210228_1721'), + ('issues', '0007_auto_20200612_1427'), + ] + + operations = [ + ] diff --git a/anytask/lessons/migrations/0003_merge_20220122_1951.py b/anytask/lessons/migrations/0003_merge_20220122_1951.py new file mode 100644 index 000000000..4a2257a34 --- /dev/null +++ b/anytask/lessons/migrations/0003_merge_20220122_1951.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2022-01-22 16:51 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('lessons', '0002_auto_20210228_1721'), + ('lessons', '0002_auto_20200612_1427'), + ] + + operations = [ + ] diff --git a/anytask/mail/migrations/0005_merge_20220122_1951.py b/anytask/mail/migrations/0005_merge_20220122_1951.py new file mode 100644 index 000000000..43daa0de6 --- /dev/null +++ b/anytask/mail/migrations/0005_merge_20220122_1951.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2022-01-22 16:51 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mail', '0004_auto_20200612_1427'), + ('mail', '0004_auto_20210228_1721'), + ] + + operations = [ + ] diff --git a/anytask/tasks/migrations/0004_merge_20220122_1951.py b/anytask/tasks/migrations/0004_merge_20220122_1951.py new file mode 100644 index 000000000..74ddb5850 --- /dev/null +++ b/anytask/tasks/migrations/0004_merge_20220122_1951.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2022-01-22 16:51 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('tasks', '0003_auto_20200612_1427'), + ('tasks', '0003_auto_20210228_1721'), + ] + + operations = [ + ] diff --git a/anytask/users/migrations/0005_merge_20220122_1951.py b/anytask/users/migrations/0005_merge_20220122_1951.py new file mode 100644 index 000000000..6e5c1c9bc --- /dev/null +++ b/anytask/users/migrations/0005_merge_20220122_1951.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2022-01-22 16:51 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0004_auto_20210424_1055'), + ('users', '0003_auto_20200612_1427'), + ] + + operations = [ + ] From 358c4835ba6e5822dafa237269162d54888a7574 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Tue, 30 Aug 2022 11:01:32 +0300 Subject: [PATCH 23/31] Fix some more tests --- anytask/api/tests.py | 4 ++-- anytask/index/tests.py | 2 +- anytask/issues/tests.py | 2 +- anytask/users/tests.py | 8 ++++++-- deploy_local_beta/generate_test_db.sh | 2 +- deploy_local_beta/settings.sh | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/anytask/api/tests.py b/anytask/api/tests.py index 4d484b580..2b6d90501 100644 --- a/anytask/api/tests.py +++ b/anytask/api/tests.py @@ -334,8 +334,8 @@ def test_get_issue(self, username=None, password=None): self.assertDictEqual(issue, response_data) response = self.client.get(url) - content = ''.join(response.streaming_content) - self.assertEqual('print "_failed_"', content) + content = b''.join(response.streaming_content) + self.assertEqual(b'print "_failed_"', content) def test_get_issue_no_access(self): response = self._request(self.anytask, self.anytask_password, diff --git a/anytask/index/tests.py b/anytask/index/tests.py index f961538bc..a32e1df78 100644 --- a/anytask/index/tests.py +++ b/anytask/index/tests.py @@ -41,7 +41,7 @@ def test_switch_lang(self): self.assertEqual(response.status_code, 200) response = self.client.get(reverse('get_lang')) - self.assertEqual(response.content, lang) + self.assertEqual(response.content.decode("utf-8"), lang) def test_switch_wrong(self): response = self.client.get(reverse('get_lang')) diff --git a/anytask/issues/tests.py b/anytask/issues/tests.py index c7bfb9def..65ad2ec1f 100644 --- a/anytask/issues/tests.py +++ b/anytask/issues/tests.py @@ -6,7 +6,7 @@ Replace this with more appropriate tests for your application. """ -from StringIO import StringIO +from io import StringIO from unittest import skipIf from django.core.management import call_command diff --git a/anytask/users/tests.py b/anytask/users/tests.py index 095a777a5..2afa9baa2 100644 --- a/anytask/users/tests.py +++ b/anytask/users/tests.py @@ -188,9 +188,13 @@ def test_reset_password(self): self.assert_(change_password_url_match) change_password_url = change_password_url_match.group(1) + # change_password_url redirects to real change password form + response = client.get(change_password_url, follow=True) + change_password_url_post = response.redirect_chain[-1][0] + # finnaly set new password - form_data = {"new_password1": u"qwer", "new_password2": u"qwer"} - response = client.post(change_password_url, form_data, follow=True) + form_data = {"new_password1": new_password, "new_password2": new_password} + response = client.post(change_password_url_post, form_data, follow=True) self.assertEqual(response.status_code, 200) # password changed! # check new password finally set diff --git a/deploy_local_beta/generate_test_db.sh b/deploy_local_beta/generate_test_db.sh index 838eb903b..20f4c382b 100755 --- a/deploy_local_beta/generate_test_db.sh +++ b/deploy_local_beta/generate_test_db.sh @@ -11,7 +11,7 @@ ANYBETA_crash_on_error $ANYBETA_ROOT/anytask/manage.py createsuperuser --username=anytask --email=anytask@yandex.ru --noinput ANYBETA_crash_on_error -echo 'from django.contrib.auth.models import User ; user=User.objects.get(username="anytask") ; user.set_password("pass") ; user.save() ; print "Password changed"' | $ANYBETA_ROOT/anytask/manage.py shell --plain +echo 'from django.contrib.auth.models import User ; user=User.objects.get(username="anytask") ; user.set_password("pass") ; user.save() ; print("Password changed")' | $ANYBETA_ROOT/anytask/manage.py shell --plain ANYBETA_crash_on_error ANYBETA_report "root" diff --git a/deploy_local_beta/settings.sh b/deploy_local_beta/settings.sh index 5f158dde5..3b971ae05 100755 --- a/deploy_local_beta/settings.sh +++ b/deploy_local_beta/settings.sh @@ -10,7 +10,7 @@ fi export ANYBETA_ROOT=$PWD export ANYBETA_DEPLOY="$PWD/deploy_local_beta" -export ANYBETA_PYTHON_PATH="/usr/bin/python" +export ANYBETA_PYTHON_PATH="`which python3`" export ANYBETA_VENV_NAME="anytask_venv" export ANYBETA_VENV_DIR="$ANYBETA_ROOT/$ANYBETA_VENV_NAME" From 7b9e1d4a0f078955b4f3ea070825a08ca737d383 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Tue, 30 Aug 2022 11:10:10 +0300 Subject: [PATCH 24/31] Debug is_s3_stored --- anytask/issues/tests.py | 10 ++++++++-- anytask/storage.py | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/anytask/issues/tests.py b/anytask/issues/tests.py index 65ad2ec1f..41aff4687 100644 --- a/anytask/issues/tests.py +++ b/anytask/issues/tests.py @@ -1003,6 +1003,8 @@ def test_attached_file_in_s3(self): @skipIf(not IS_S3_REACHABLE, "S3 seems misconfigured") class S3MigrateIssueAttachments(TestCase, SerializeMixin): + maxDiff = None + def setUp(self): self.teacher_password = 'password1' self.teacher = User.objects.create_user(username='teacher', @@ -1162,7 +1164,8 @@ def test_rewrite_url_only_existing_many_refs(self): out.getvalue().strip()) out = StringIO() - call_command('s3migrate_issue_attachments', '--execute', '--rewrite-only-existing', stdout=out) + err = StringIO() + call_command('s3migrate_issue_attachments', '--execute', '--rewrite-only-existing', stdout=out, stderr=err) for file in [file_first, file_second]: expected_s3_path = S3OverlayStorage.append_s3_prefix(file.file.name) @@ -1173,9 +1176,12 @@ def test_rewrite_url_only_existing_many_refs(self): expected_s3_path, file, expected_s3_path, file, expected_s3_path) expected_stdout = (expected_stdout * 2).strip() file = File.objects.get(pk=file.pk) + cmd_out = out.getvalue().strip() + print(f">>>>>>>>>>>>>>>>>>>filename:{file.file.name} {S3OverlayStorage.is_s3_stored(file.file.name)}") + print(f"==============\n{expected_stdout}\n!=\n{cmd_out}\n======\n{err.getvalue().strip()}\n!!!!!!\n") + self.assertEqual(expected_stdout, cmd_out) self.assertTrue(S3OverlayStorage.is_s3_stored(file.file.name)) self.assertTrue(self.s3_storage.exists(file.file.name)) - self.assertEqual(expected_stdout, out.getvalue().strip()) def test_upload_archives(self): for ext in anyrb.unpacker.get_supported_extensions(): diff --git a/anytask/storage.py b/anytask/storage.py index 2e8efaf57..08f3e2f71 100644 --- a/anytask/storage.py +++ b/anytask/storage.py @@ -58,6 +58,9 @@ def _dispatch(self, name, method_name, *args, **kwargs): @classmethod def is_s3_stored(cls, name): + ret = name.lstrip('/').startswith(cls.S3_STORED_MAGIC + '/') + name_stripped = name.lstrip('/') + print(f"!!!!!!!!!! NAMAE:{name} {name_stripped} {ret}") return name.lstrip('/').startswith(cls.S3_STORED_MAGIC + '/') @classmethod From 53a0f1d360012aca719024ca9c358283df3fde51 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 9 Jul 2023 12:03:11 +0300 Subject: [PATCH 25/31] Fix style --- anytask/courses/pythontask.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/anytask/courses/pythontask.py b/anytask/courses/pythontask.py index dfafbd466..a826ee43a 100644 --- a/anytask/courses/pythontask.py +++ b/anytask/courses/pythontask.py @@ -64,8 +64,10 @@ def _group_update(self, group): group_students = [] for student in group.students.filter(is_active=True).order_by('last_name', 'first_name'): - tasks = TaskTaken.objects.filter(Q(Q(user=student) | Q(issue__costudents=student))).filter(task__in=self.tasks) \ - .filter(Q(Q(status=TaskTaken.STATUS_TAKEN) | Q(status=TaskTaken.STATUS_SCORED))).distinct() + tasks = TaskTaken.objects.filter(Q(Q(user=student) | Q(issue__costudents=student))) \ + .filter(task__in=self.tasks) \ + .filter(Q(Q(status=TaskTaken.STATUS_TAKEN) | Q(status=TaskTaken.STATUS_SCORED))) \ + .distinct() if tasks.count() > 0: stat['active_students'] += 1 @@ -150,10 +152,10 @@ def _conver_group_stat_to_cvs(group_stat): writer.writeheader() for group, user_data in group_stat: - for user, score, _ in user_data: + for user, score, __ in user_data: writer.writerow({'group': group.name.encode('utf-8'), 'name': "{} {}".format(user.last_name.encode('utf-8'), user.first_name.encode('utf-8')), - 'score':score}) + 'score': score}) return fn.getvalue() From f81eaa65db818484352dd8d50a75f1b30e1348e0 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 9 Jul 2023 12:04:45 +0300 Subject: [PATCH 26/31] licensed. pip2 -> pip3 --- .github/workflows/licensed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml index 13e7c91a2..4d8030594 100644 --- a/.github/workflows/licensed.yml +++ b/.github/workflows/licensed.yml @@ -17,7 +17,7 @@ jobs: with: version: '2.15.2' - name: Install virtualenv - run: pip2 install virtualenv + run: pip3 install virtualenv - name: Init virtualenv and install dependencies run: | virtualenv --python=python3 venv From 8a9ff4b71a1d0e568e54f74603d924b13771ad45 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 9 Jul 2023 12:06:05 +0300 Subject: [PATCH 27/31] Fix stringio --- anytask/courses/pythontask.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anytask/courses/pythontask.py b/anytask/courses/pythontask.py index a826ee43a..dde37b846 100644 --- a/anytask/courses/pythontask.py +++ b/anytask/courses/pythontask.py @@ -11,7 +11,7 @@ import csv import datetime -import StringIO +from io import StringIO class PythonTaskStat(object): @@ -146,7 +146,7 @@ def tasks_list(request, course): def _conver_group_stat_to_cvs(group_stat): - fn = StringIO.StringIO() + fn = StringIO() fieldnames = ['group', 'name', 'score'] writer = csv.DictWriter(fn, fieldnames=fieldnames) From 40d28baeb707d493e3f77b463c01f61cedcd91d5 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 5 Nov 2023 16:22:30 +0100 Subject: [PATCH 28/31] Fix S3 uploading --- anytask/common/s3_migrate.py | 15 ++++++++++----- anytask/storage.py | 3 --- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/anytask/common/s3_migrate.py b/anytask/common/s3_migrate.py index fd3c4eae3..52c4df40e 100644 --- a/anytask/common/s3_migrate.py +++ b/anytask/common/s3_migrate.py @@ -5,6 +5,12 @@ from storage import S3OverlayStorage +class S3NotFound(Exception): + def __init__(self, name, *args, **kwargs): + self.name = name + super().__init__(*args, **kwargs) + + def upload_to_s3(file_field, dest_storage, dry_run=True): """Saves content of file_field to S3, adjusting path in database @@ -26,7 +32,7 @@ def upload_to_s3(file_field, dest_storage, dry_run=True): raise ValueError("Path with S3 magic: {}".format(old_path)) new_path = dest_storage.append_s3_prefix(old_path) if dest_storage.exists(new_path): - raise KeyError(new_path) + raise S3NotFound(new_path) if not dry_run: with file_field.storage.open(file_field.name, 'rb') as content: dest_storage.save(new_path, content) @@ -206,8 +212,8 @@ def s3_upload(self, field): result = None # don't update DB model for newly uploaded files else: result = new_path - except KeyError as e: - new_path = e.message + except S3NotFound as e: + new_path = e.name if (new_path in self.newly_uploaded) and self.rewrite_url_only_existing: result = None else: @@ -216,8 +222,7 @@ def s3_upload(self, field): except Exception as e: self.stdout.write(self.ERR_UNHANDLED_EXCEPTION.format(field.name, e)) result = None - finally: - return result + return result def delete_local(self, old_path): self.dest_storage.delete(old_path) diff --git a/anytask/storage.py b/anytask/storage.py index 0d9841e7f..1385581d1 100644 --- a/anytask/storage.py +++ b/anytask/storage.py @@ -58,9 +58,6 @@ def _dispatch(self, name, method_name, *args, **kwargs): @classmethod def is_s3_stored(cls, name): - ret = name.lstrip('/').startswith(cls.S3_STORED_MAGIC + '/') - name_stripped = name.lstrip('/') - print(f"!!!!!!!!!! NAMAE:{name} {name_stripped} {ret}") return name.lstrip('/').startswith(cls.S3_STORED_MAGIC + '/') @classmethod From 8ef3abc90847895bfaf5929da3eb543b371e77a5 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 5 Nov 2023 16:25:18 +0100 Subject: [PATCH 29/31] Cleanup --- anytask/issues/tests.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/anytask/issues/tests.py b/anytask/issues/tests.py index 15ea37046..0709a7e8c 100644 --- a/anytask/issues/tests.py +++ b/anytask/issues/tests.py @@ -1177,8 +1177,6 @@ def test_rewrite_url_only_existing_many_refs(self): expected_stdout = (expected_stdout * 2).strip() file = File.objects.get(pk=file.pk) cmd_out = out.getvalue().strip() - print(f">>>>>>>>>>>>>>>>>>>filename:{file.file.name} {S3OverlayStorage.is_s3_stored(file.file.name)}") - print(f"==============\n{expected_stdout}\n!=\n{cmd_out}\n======\n{err.getvalue().strip()}\n!!!!!!\n") self.assertEqual(expected_stdout, cmd_out) self.assertTrue(S3OverlayStorage.is_s3_stored(file.file.name)) self.assertTrue(self.s3_storage.exists(file.file.name)) From 0d7b13479a2f2c1bd4d27330cb4c0dcc34a7b13b Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Sun, 5 Nov 2023 17:13:38 +0100 Subject: [PATCH 30/31] Exclude IssueField.id==10 in test --- anytask/courses/tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anytask/courses/tests.py b/anytask/courses/tests.py index 5f5c7e8f9..3c4bedd61 100644 --- a/anytask/courses/tests.py +++ b/anytask/courses/tests.py @@ -75,7 +75,8 @@ def test_course_create_filled(self): self.assertCountEqual(course.teachers.all(), teachers) self.assertCountEqual(course.groups.all(), groups) - self.assertCountEqual(course.issue_fields.all(), IssueField.objects.exclude(id=11).exclude(id=12)) + self.assertCountEqual(course.issue_fields.all(), + IssueField.objects.exclude(id=10).exclude(id=11).exclude(id=12)) self.assertEqual(course.contest_integrated, False) self.assertEqual(course.send_rb_and_contest_together, False) From 2e1b1e0d40525b78c029a8c5f5a6314a11cc4759 Mon Sep 17 00:00:00 2001 From: Nikolay Zhuravlev Date: Thu, 7 Dec 2023 00:55:02 +0100 Subject: [PATCH 31/31] itervalues -> values; iteritems -> items --- anytask/anycontest/management/commands/check_contest.py | 2 +- anytask/courses/templates/courses/settings.html | 4 ++-- anytask/courses/templates/courses/tasklist/shad_cpp.html | 2 +- anytask/issues/views.py | 2 +- anytask/mail/templates/mail.html | 2 +- anytask/staff/templates/staff.html | 6 +++--- anytask/tasks/templates/email_notification_task.html | 4 ++-- anytask/tasks/templates/email_notification_task.txt | 4 ++-- anytask/users/templates/user_courses.html | 2 +- deploy_local_beta/settings.sh | 2 +- easyci/easy_ci_robot.py | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/anytask/anycontest/management/commands/check_contest.py b/anytask/anycontest/management/commands/check_contest.py index 991901dc3..fc7d27a6e 100644 --- a/anytask/anycontest/management/commands/check_contest.py +++ b/anytask/anycontest/management/commands/check_contest.py @@ -34,7 +34,7 @@ def handle(self, **options): except Exception as e: logger.exception(e) - # for contest_id, students_info in contest_marks.iteritems(): + # for contest_id, students_info in contest_marks.items(): # set_contest_marks(contest_id, students_info) # logging to cron log diff --git a/anytask/courses/templates/courses/settings.html b/anytask/courses/templates/courses/settings.html index d176e114e..0d3a63b80 100644 --- a/anytask/courses/templates/courses/settings.html +++ b/anytask/courses/templates/courses/settings.html @@ -240,7 +240,7 @@
    {% trans "jakontest" %}