diff -Nru django-allauth-0.41.0+ds/allauth/account/adapter.py django-allauth-0.42.0+ds/allauth/account/adapter.py --- django-allauth-0.41.0+ds/allauth/account/adapter.py 2019-12-09 16:11:08.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/account/adapter.py 2020-05-04 20:03:57.000000000 +0000 @@ -412,8 +412,13 @@ 'first_name', 'last_name', 'email']) def is_safe_url(self, url): - from django.utils.http import is_safe_url - return is_safe_url(url, allowed_hosts=None) + try: + from django.utils.http import url_has_allowed_host_and_scheme + except ImportError: + from django.utils.http import \ + is_safe_url as url_has_allowed_host_and_scheme + + return url_has_allowed_host_and_scheme(url, allowed_hosts=None) def get_email_confirmation_url(self, request, emailconfirmation): """Constructs the email confirmation (activation) url. diff -Nru django-allauth-0.41.0+ds/allauth/__init__.py django-allauth-0.42.0+ds/allauth/__init__.py --- django-allauth-0.41.0+ds/allauth/__init__.py 2019-12-18 17:51:37.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/__init__.py 2020-05-24 18:46:05.000000000 +0000 @@ -8,7 +8,7 @@ """ -VERSION = (0, 41, 0, 'final', 0) +VERSION = (0, 42, 0, 'final', 0) __title__ = 'django-allauth' __version_info__ = VERSION @@ -16,4 +16,4 @@ VERSION[3], VERSION[4] or '') if VERSION[3] != 'final' else '') __author__ = 'Raymond Penners' __license__ = 'MIT' -__copyright__ = 'Copyright 2010-2019 Raymond Penners and contributors' +__copyright__ = 'Copyright 2010-2020 Raymond Penners and contributors' diff -Nru django-allauth-0.41.0+ds/allauth/locale/ar/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/ar/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/ar/LC_MESSAGES/django.po 2019-12-18 17:53:25.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/ar/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2016-01-19 19:32+0100\n" "Last-Translator: David D Lowe \n" "Language-Team: Arabic\n" @@ -25,11 +25,11 @@ #: account/adapter.py:49 msgid "Too many failed login attempts. Try again later." -msgstr "" +msgstr "تجاوزت الحد المسموح لمحاولة تسجيل الدخول, حاول في وقت لاحق" #: account/adapter.py:51 msgid "A user is already registered with this e-mail address." -msgstr "هنالك مستخدم مسجل سابقا مع نفس عنوان البريد الاكتروني‪.‬" +msgstr "هنالك مستخدم مسجل سابقا مع نفس عنوان البريد الالكتروني‪.‬" #: account/adapter.py:294 #, python-brace-format @@ -50,7 +50,7 @@ #: account/forms.py:92 msgid "Remember Me" -msgstr "ذكرني" +msgstr "تذكرني" #: account/forms.py:98 msgid "This account is currently inactive." @@ -81,7 +81,7 @@ #: account/forms.py:130 msgid "Username or e-mail" -msgstr "اسم المستخدم أو البريج الالكتروني" +msgstr "اسم المستخدم أو البريد الالكتروني" #: account/forms.py:133 msgctxt "field label" @@ -89,14 +89,10 @@ msgstr "تسجيل الدخول" #: account/forms.py:292 -#, fuzzy -#| msgid "E-mail (optional)" msgid "E-mail (again)" -msgstr "البريد الالكتروني ‪)‬اختياري‪(‬" +msgstr "البريد الالكتروني ‪(مجددا)‬" #: account/forms.py:296 -#, fuzzy -#| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "تأكيد البريد الإلكتروني" @@ -105,10 +101,8 @@ msgstr "البريد الالكتروني ‪)‬اختياري‪(‬" #: account/forms.py:345 -#, fuzzy -#| msgid "You must type the same password each time." msgid "You must type the same email each time." -msgstr "يجب عليك كتابة نفس كلمة المرور في كل مرة‪.‬" +msgstr "يجب عليك كتابة نفس البريد الالكتروني في كل مرة‪.‬" #: account/forms.py:368 account/forms.py:477 msgid "Password (again)" @@ -144,7 +138,7 @@ #: account/forms.py:568 msgid "The password reset token was invalid." -msgstr "" +msgstr "خطأ في شهادة اعادة تعيين كلمة المرور." #: account/models.py:21 msgid "user" @@ -176,7 +170,7 @@ #: account/models.py:82 msgid "sent" -msgstr "مبعوث" +msgstr "تم ارساله" #: account/models.py:83 socialaccount/models.py:55 msgid "key" @@ -209,7 +203,7 @@ #: socialaccount/apps.py:7 msgid "Social Accounts" -msgstr "الحسابات الاجتماعية" +msgstr "حسابات التواصل الاجتماعية" #: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" @@ -241,11 +235,11 @@ #: socialaccount/models.py:66 msgid "social application" -msgstr "" +msgstr "تطبيق اجتماعي" #: socialaccount/models.py:67 msgid "social applications" -msgstr "" +msgstr "تطبيقات اجتماعية" #: socialaccount/models.py:95 msgid "uid" @@ -253,23 +247,23 @@ #: socialaccount/models.py:97 msgid "last login" -msgstr "" +msgstr "أخر دخول" #: socialaccount/models.py:99 msgid "date joined" -msgstr "" +msgstr "تاريخ الانضمام" #: socialaccount/models.py:101 msgid "extra data" -msgstr "" +msgstr "بيانات اضافية" #: socialaccount/models.py:105 msgid "social account" -msgstr "" +msgstr "حساب تواصل اجتماعي" #: socialaccount/models.py:106 msgid "social accounts" -msgstr "" +msgstr "حسابات تواصل اجتماعي" #: socialaccount/models.py:131 msgid "token" @@ -289,7 +283,7 @@ #: socialaccount/models.py:140 msgid "expires at" -msgstr "" +msgstr "ينتهي في" #: socialaccount/models.py:144 msgid "social application token" @@ -301,7 +295,7 @@ #: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" -msgstr "" +msgstr "معلومات بروفايل غير صالحة" #: socialaccount/providers/oauth/client.py:78 #, python-format @@ -337,11 +331,7 @@ msgid "This account is inactive." msgstr "هذا الحساب غير نشط" -#: templates/account/email.html:5 -msgid "Account" -msgstr "حساب" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "عناوين البريد الالكتروني" @@ -367,7 +357,7 @@ #: templates/account/email.html:35 msgid "Re-send Verification" -msgstr "ابعث رسالة التحقيق مرة أخرى" +msgstr "اعادة ارسال رسالة التأكيد" #: templates/account/email.html:36 templates/socialaccount/connections.html:35 msgid "Remove" @@ -382,13 +372,12 @@ "You currently do not have any e-mail address set up. You should really add " "an e-mail address so you can receive notifications, reset your password, etc." msgstr "" -"أنت حاليا ليس لديك أي عنوان البريد الإلكتروني. يجب أن تضيف عنوان البريد " -"الإلكتروني حتى تتمكن من تلقي الإخطارات، إعادة تعيين كلمة المرور الخاصة بك، " -"الخ" +"ليس لديك أي عنوان البريد الإلكتروني. يجب أن تضيف عنوان البريدالإلكتروني حتى " +"تتمكن من تلقي الاشعارات, إعادة تعيين كلمة المرور الخاصة بك، الخ" #: templates/account/email.html:48 msgid "Add E-mail Address" -msgstr "أضف عنوان البريد الاكتريني" +msgstr "أضف عنوان البريد الالكتروني" #: templates/account/email.html:53 msgid "Add E-mail" @@ -396,15 +385,10 @@ #: templates/account/email.html:62 msgid "Do you really want to remove the selected e-mail address?" -msgstr "هل تريد حقا ان تحذف عنوان البريد الاكتروني المختار؟" +msgstr "هل تريد حقا ان تحذف عنوان البريد الالكتروني المحدد؟" #: templates/account/email/email_confirmation_message.txt:1 -#, fuzzy, python-format -#| msgid "" -#| "User %(user_display)s at %(site_name)s has given this as an email " -#| "address.\n" -#| "\n" -#| "To confirm this is correct, go to %(activate_url)s\n" +#, python-format msgid "" "Hello from %(site_name)s!\n" "\n" @@ -413,10 +397,12 @@ "\n" "To confirm this is correct, go to %(activate_url)s\n" msgstr "" -"المستخدم %(user_display)s في الموقع %(site_name)s أعطى هذا كعنوان بريد " -"إلكتروني.\n" -"‏\n" -"لتأكيد هذه المعلومات صحيحة، انتقل إلى %(activate_url)s\n" +"مرحبا من %(site_name)s!\n" +"\n" +"تتلقى هذه الرسالة بسبب أن المستخدم %(user_display)s قام باضافة بريدك " +"الالكترني لحسابه في الموقع.\n" +"\n" +"لتأكيد صحة هذا الاجراء, اضغط على الرابط %(activate_url)s\n" #: templates/account/email/email_confirmation_message.txt:7 #, python-format @@ -424,20 +410,15 @@ "Thank you from %(site_name)s!\n" "%(site_domain)s" msgstr "" +"شكرا لك من فريق %(site_name)s!\n" +"%(site_domain)s" #: templates/account/email/email_confirmation_subject.txt:3 -#, fuzzy -#| msgid "Confirm E-mail Address" msgid "Please Confirm Your E-mail Address" -msgstr "قم بتحقيق عنوان البريد الاكتروني" +msgstr "قم بتأكيد عنوان البريد الالكتروني" #: templates/account/email/password_reset_key_message.txt:1 -#, fuzzy, python-format -#| msgid "" -#| "You're receiving this e-mail because you or someone else has requested a " -#| "password for your user account at %(site_domain)s.\n" -#| "It can be safely ignored if you did not request a password reset. Click " -#| "the link below to reset your password." +#, python-format msgid "" "Hello from %(site_name)s!\n" "\n" @@ -446,10 +427,12 @@ "It can be safely ignored if you did not request a password reset. Click the " "link below to reset your password." msgstr "" -"تلقيت هذا البريد الإلكتروني لأنك ‪)‬أو أي شخص آخر‪(‬ قد طلب كلمة مرور لحساب " -"المستخدم الخاص بك في%(site_domain)s‪.‬\n" -"يمكن تجاهل هذه الرسالة بأمان إذا كنت لم تطلب إعادة تعيين كلمة مرور. انقر فوق " -"الارتباط الموجود أدناه لإعادة تعيين كلمة المرور الخاصة بك." +"مرحبا من %(site_name)s!\n" +"\n" +"أنت تتلقى هذه الرسالة بسبب طلبك أو طلب شخص أخرالحصول على كلمة المرور الخاصة " +"بك.\n" +"اذا لم تقم بطلب كلمة مرور يمكنك تجاهل هذه الريالة. اضغط على الرابط بالاسفل " +"لاعادة تعيين كلمة المرور." #: templates/account/email/password_reset_key_message.txt:8 #, python-format @@ -462,6 +445,8 @@ "Thank you for using %(site_name)s!\n" "%(site_domain)s" msgstr "" +"شكرا لاستخدامك %(site_name)s!\n" +"%(site_domain)s" #: templates/account/email/password_reset_key_subject.txt:3 msgid "Password Reset E-mail" @@ -470,7 +455,7 @@ #: templates/account/email_confirm.html:6 #: templates/account/email_confirm.html:10 msgid "Confirm E-mail Address" -msgstr "قم بتحقيق عنوان البريد الاكتروني" +msgstr "قم بتحقيق عنوان البريد الالكتروني" #: templates/account/email_confirm.html:16 #, python-format @@ -555,7 +540,7 @@ #: templates/account/messages/email_deleted.txt:2 #, python-format msgid "Removed e-mail address %(email)s." -msgstr "قد أزلنا عنوان البريد الاكتروني %(email)s." +msgstr "قد أزلنا عنوان البريد الالكتروني %(email)s." #: templates/account/messages/logged_in.txt:4 #, python-format @@ -597,7 +582,7 @@ #: templates/account/password_reset_done.html:6 #: templates/account/password_reset_done.html:9 msgid "Password Reset" -msgstr "إعادة ضبط كلمة المرور" +msgstr "إعادة تعيين كلمة المرور" #: templates/account/password_reset.html:15 msgid "" @@ -768,7 +753,7 @@ #: templates/socialaccount/login_cancelled.html:5 #: templates/socialaccount/login_cancelled.html:9 msgid "Login Cancelled" -msgstr "الدخول تم إلغاؤه‪.‬" +msgstr "تم الغاء تسجيل الدخول" #: templates/socialaccount/login_cancelled.html:13 #, python-format @@ -783,15 +768,15 @@ #: templates/socialaccount/messages/account_connected.txt:2 msgid "The social account has been connected." -msgstr "قد تم ربط الحساب الاجتماعي." +msgstr "قد تم ربط حساب التواصل الاجتماعي." #: templates/socialaccount/messages/account_connected_other.txt:2 msgid "The social account is already connected to a different account." -msgstr "الحساب الاجتماعي متصل مسبقاً إلى حساب مختلف." +msgstr "حساب التواصل الاجتماعي متصل مسبقاً إلى حساب مختلف." #: templates/socialaccount/messages/account_disconnected.txt:2 msgid "The social account has been disconnected." -msgstr "تم قطع الاتصال بالحساب الاجتماعي." +msgstr "تم قطع الاتصال بحساب التواصل الاجتماعي." #: templates/socialaccount/signup.html:10 #, python-format @@ -802,6 +787,9 @@ "أنت على وشك استخدام حسابك من %(provider_name)s لتسجيل الدخول إلى " "%(site_name)s. وكخطوة أخيرة، يرجى ملء النموذج التالي:" +#~ msgid "Account" +#~ msgstr "حساب" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "تسجيل الدخول و / أو كلمة المرور الذي حددته غير صحيحة." @@ -812,9 +800,8 @@ #~ msgstr "اسم المستخدم مسجل مسبقا. الرجاء اختيار اسم اخر‪.‬" #, fuzzy -#~| msgid "Sign In" #~ msgid "Shopify Sign In" -#~ msgstr "تسجيل الدخول" +#~ msgstr "تسجيل الدخول Shopify" #~ msgid "" #~ "You have confirmed that %(email)s is an " @@ -827,21 +814,21 @@ #~ msgstr "شكرا لاستخدام موقعنا!" #~ msgid "Confirmation e-mail sent to %(email)s" -#~ msgstr "דואל אישור נשלח אל %(email)s" +#~ msgstr "ارسلت رسالة التأكيد الى بريدك الالكتروني %(email)s" #~ msgid "Delete Password" -#~ msgstr "מחיקת סיסמא" +#~ msgstr "احذف كلمة المرور" #~ msgid "" #~ "You may delete your password since you are currently logged in using " #~ "OpenID." -#~ msgstr "אתה רשאי למחוק את סיסמאתך כיוון שהנך מחובר באמצעות OpenID" +#~ msgstr "بامكانك حذف كلمة المرور بما انك قمت بتسجيل الدخول بواسطة OpenID" #~ msgid "delete my password" -#~ msgstr "מחק סיסמא" +#~ msgstr "احذف كلمة المرور الخاصة بي" #~ msgid "Password Deleted" -#~ msgstr "הסיסמא נמחקה" +#~ msgstr "تم حذف كلمة المرور" #~ msgid "Your password has been deleted." -#~ msgstr "סיסמתך נמחקה מהמערכת." +#~ msgstr "تم حذف كلمة المرور الخاصة بك." diff -Nru django-allauth-0.41.0+ds/allauth/locale/cs/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/cs/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/cs/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/cs/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.35\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2018-04-17 16:52+0200\n" "Last-Translator: Beda Kosata \n" "Language-Team: Czech <>\n" @@ -331,11 +331,7 @@ msgid "This account is inactive." msgstr "Tento účet není aktivní." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Účet" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mailové adresy" @@ -793,6 +789,9 @@ "Chystáte se použít vaš %(provider_name)s účtu k přihlášení na naše stránky \n" "%(site_name)s. Jako poslední krok, prosím, vyplňte následující formulář:" +#~ msgid "Account" +#~ msgstr "Účet" + #~| msgid "The password reset token was invalid." #~ msgid "The provided password is not valid." #~ msgstr "Použité heslo není platné." diff -Nru django-allauth-0.41.0+ds/allauth/locale/da/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/da/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/da/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/da/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2018-09-03 16:04+0200\n" "Last-Translator: b'Tuk Bredsdorff '\n" "Language-Team: \n" @@ -330,11 +330,7 @@ msgid "This account is inactive." msgstr "Denne konto er inaktiv." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Konto" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mail adresser" @@ -792,3 +788,6 @@ msgstr "" "Du er ved at bruge din %(provider_name)s -konto til at logge ind i\n" "%(site_name)s. Som et sidste skridt, udfyld venligst denne formular:" + +#~ msgid "Account" +#~ msgstr "Konto" diff -Nru django-allauth-0.41.0+ds/allauth/locale/de/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/de/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/de/LC_MESSAGES/django.po 2019-12-18 17:53:25.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/de/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2019-08-07 12:13+0200\n" "Last-Translator: Jannis Vajen \n" "Language-Team: German (http://www.transifex.com/projects/p/django-allauth/" @@ -334,11 +334,7 @@ msgid "This account is inactive." msgstr "Dieses Konto ist inaktiv." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Konto" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-Mail-Adressen" @@ -806,6 +802,9 @@ "%(site_name)s anzumelden. Zum Abschluss bitte das folgende Formular " "ausfüllen:" +#~ msgid "Account" +#~ msgstr "Konto" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Die Anmeldedaten sind leider falsch." diff -Nru django-allauth-0.41.0+ds/allauth/locale/el/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/el/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/el/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/el/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:29+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -336,11 +336,7 @@ msgid "This account is inactive." msgstr "Αυτός ο λογαριασμός είναι ανενεργός." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Λογαριασμός" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Διεύθυνση e-mail" @@ -811,3 +807,6 @@ "Πρόκειται να χρησιμοποιήσετε τον %(provider_name)s λογαριασμό σας για να " "συνδεθείτε στην σελίδα\n" "%(site_name)s. Ως τελικό βήμα, παρακαλούμε συμπληρώστε την παρακάτω φόρμα:" + +#~ msgid "Account" +#~ msgstr "Λογαριασμός" diff -Nru django-allauth-0.41.0+ds/allauth/locale/en/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/en/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/en/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/en/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -327,11 +327,7 @@ msgid "This account is inactive." msgstr "" -#: templates/account/email.html:5 -msgid "Account" -msgstr "" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "" diff -Nru django-allauth-0.41.0+ds/allauth/locale/es/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/es/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/es/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/es/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2018-02-14 17:46-0600\n" "Last-Translator: Jannis Š\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/django-allauth/" @@ -334,11 +334,7 @@ msgid "This account is inactive." msgstr "Esta cuenta está desactivada." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Cuenta" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Direcciones de correo electrónico" @@ -780,9 +776,8 @@ "accounts. If this was a mistake, please proceed to sign in." msgstr "" -"Has decidido cancelar el inicio de sesión a nuestro sitio usando las " -"siguientes cuentas. Si esto fue un error, inicie " -"sesión." +"Has decidido cancelar el inicio de sesión a nuestro sitio usando una de tus " +"cuentas. Si esto fue un error, inicie sesión." #: templates/socialaccount/messages/account_connected.txt:2 msgid "The social account has been connected." @@ -805,6 +800,9 @@ "Estas a punto de utilizar tu cuenta %(provider_name)s para acceder a " "%(site_name)s. Como paso final, por favor completa el siguiente formulario:" +#~ msgid "Account" +#~ msgstr "Cuenta" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "" #~ "El correo electrónico/usuario y/o la contraseña que especificaste no son " diff -Nru django-allauth-0.41.0+ds/allauth/locale/eu/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/eu/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/eu/LC_MESSAGES/django.po 2019-12-18 17:53:28.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/eu/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2018-08-29 08:16+0200\n" "Last-Translator: Eneko Illarramendi \n" "Language-Team: Basque \n" @@ -332,11 +332,7 @@ msgid "This account is inactive." msgstr "Kontu hau ez dago aktiboa." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Kontua" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Helbide elektronikoak" @@ -801,3 +797,6 @@ "Zure %(provider_name)s kontua erabiltzear zaude %(site_name)s\n" "webgunean saioa hasteko. Azken pausu bezala, mesedez osa ezazu\n" "formulario hau:" + +#~ msgid "Account" +#~ msgstr "Kontua" diff -Nru django-allauth-0.41.0+ds/allauth/locale/fa/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/fa/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/fa/LC_MESSAGES/django.po 2019-12-18 17:53:28.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/fa/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2015-09-14 12:40-0000\n" "Last-Translator: NARIMAN GHARIB \n" "Language-Team: \n" @@ -339,11 +339,7 @@ msgid "This account is inactive." msgstr "این حساب کاربری غیرفعال است." -#: templates/account/email.html:5 -msgid "Account" -msgstr "حساب کاربری" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "آدرس‌های ایمیل" @@ -819,6 +815,9 @@ "%(site_name)s. شوید. برای مراحل آخر لطفا در ادامه فرم‌های مورد نظر را تکمیل " "فرمایید." +#~ msgid "Account" +#~ msgstr "حساب کاربری" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "نام کاربری یا رمز عبور صحیح نمی‌باشد." diff -Nru django-allauth-0.41.0+ds/allauth/locale/fi/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/fi/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/fi/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/fi/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2015-08-13 15:17+0300\n" "Last-Translator: Anonymous User \n" "Language-Team: LANGUAGE \n" @@ -338,11 +338,7 @@ msgid "This account is inactive." msgstr "Tämä tili ei ole käytössä." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Tili" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Sähköpostiosoitteet" @@ -813,6 +809,9 @@ "Olet aikeissa käyttää %(provider_name)s-tiliäsi kirjautuaksesi palveluun\n" "%(site_name)s. Täytä vielä seuraava lomake:" +#~ msgid "Account" +#~ msgstr "Tili" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Kirjautumistiedot eivät ole oikein." diff -Nru django-allauth-0.41.0+ds/allauth/locale/fr/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/fr/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/fr/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/fr/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2019-08-12 15:14+0200\n" "Last-Translator: Gilou \n" "Language-Team: français <>\n" @@ -334,11 +334,7 @@ msgid "This account is inactive." msgstr "Ce compte est inactif." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Compte" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Adresses e-mail" @@ -406,8 +402,8 @@ "To confirm this is correct, go to %(activate_url)s\n" msgstr "" "Bonjour, c'est %(site_name)s !\n" -"Vous recevez cet e-mail car l'utilisateur %(user_display)s l'a indiquée pour " -"se connecter à son compte.\n" +"Vous recevez cet e-mail car l'utilisateur %(user_display)s a indiqué votre " +"adresse pour se connecter à son compte.\n" "\n" "Pour confirmer que vous en êtes bien le propriétaire, allez à " "%(activate_url)s\n" @@ -807,6 +803,9 @@ "au site %(site_name)s. Merci de compléter le formulaire suivant pour " "confirmer la connexion." +#~ msgid "Account" +#~ msgstr "Compte" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "L'identifiant ou le mot de passe sont incorrects." diff -Nru django-allauth-0.41.0+ds/allauth/locale/he/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/he/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/he/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/he/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2017-08-26 16:11+0300\n" "Last-Translator: Udi Oron \n" "Language-Team: Hebrew\n" @@ -330,11 +330,7 @@ msgid "This account is inactive." msgstr "חשבון זה אינו פעיל." -#: templates/account/email.html:5 -msgid "Account" -msgstr "חשבון" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "כתובות אימייל" @@ -781,6 +777,9 @@ "אתה עומד להשתמש בחשבון %(provider_name)s שלך כדי\n" "להתחבר ל%(site_name)s. לסיום, אנא מלא את הטופס הבא:" +#~ msgid "Account" +#~ msgstr "חשבון" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "שם המשתמש ו/או הסיסמא אינם נכונים" diff -Nru django-allauth-0.41.0+ds/allauth/locale/hr/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/hr/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/hr/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/hr/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:31+0200\n" "Last-Translator: \n" "Language-Team: Bojan Mihelac \n" @@ -341,11 +341,7 @@ msgid "This account is inactive." msgstr "Ovaj korisnički račun je neaktivan." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Korisnički račun" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mail adrese" @@ -817,6 +813,9 @@ "stranicu %(site_name)s. Kao posljednji korak, molimo vas ispunite sljedeći " "obrazac:" +#~ msgid "Account" +#~ msgstr "Korisnički račun" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Korisničko ime i/ili zaporka nisu ispravni." diff -Nru django-allauth-0.41.0+ds/allauth/locale/hu/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/hu/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/hu/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/hu/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2015-05-08 22:42+0100\n" "Last-Translator: Tamás Makó \n" "Language-Team: \n" @@ -335,11 +335,7 @@ msgid "This account is inactive." msgstr "A felhasználó nem aktív." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Felhasználó" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Email címek" @@ -804,6 +800,9 @@ "bejelentkezés\n" "Utolsó lépésként kérlek töltsd ki az alábbi adatlapot:" +#~ msgid "Account" +#~ msgstr "Felhasználó" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "A megadott bejelentkezési azonosító vagy a jelszó hibás." diff -Nru django-allauth-0.41.0+ds/allauth/locale/it/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/it/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/it/LC_MESSAGES/django.po 2019-12-18 17:53:25.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/it/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2019-09-30 00:03+0200\n" "Last-Translator: Sandro \n" "Language: it\n" @@ -332,11 +332,7 @@ msgid "This account is inactive." msgstr "Questo account non è attivo." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Account" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Indirizzi e-mail" @@ -797,6 +793,9 @@ "%(site_name)s. Come ultima operazione ti chiediamo di riempire il form qui " "sotto:" +#~ msgid "Account" +#~ msgstr "Account" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Il login e/o la password che hai usato non sono corretti." diff -Nru django-allauth-0.41.0+ds/allauth/locale/ja/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/ja/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/ja/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/ja/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:32+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -338,11 +338,7 @@ msgid "This account is inactive." msgstr "このアカウントは無効です。" -#: templates/account/email.html:5 -msgid "Account" -msgstr "アカウント" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "メールアドレス" @@ -804,6 +800,9 @@ "す。\n" "ユーザー登録のために、以下のフォームに記入してください。" +#~ msgid "Account" +#~ msgstr "アカウント" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "入力されたログインIDもしくはパスワードが正しくありません。" diff -Nru django-allauth-0.41.0+ds/allauth/locale/ko/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/ko/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/ko/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/ko/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -330,11 +330,7 @@ msgid "This account is inactive." msgstr "해당 계정은 비활성화된 상태입니다." -#: templates/account/email.html:5 -msgid "Account" -msgstr "계정" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "이메일 계정" @@ -778,6 +774,9 @@ "%(provider_name)s 의 계정을 이용하여 %(site_name)s 으로 로그인하려 합니다.\n" "마지막으로 다음 폼을 작성해주세요:" +#~ msgid "Account" +#~ msgstr "계정" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "로그인 또는 비밀번호가 올바르지 않습니다." diff -Nru django-allauth-0.41.0+ds/allauth/locale/ky/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/ky/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/ky/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/ky/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2016-07-20 22:24+0600\n" "Last-Translator: Murat Jumashev \n" "Language-Team: LANGUAGE \n" @@ -335,11 +335,7 @@ msgid "This account is inactive." msgstr "Бул эсеп активдүү эмес." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Эсеп" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Эмейл даректер" @@ -812,6 +808,9 @@ "сайтына кирейин деп турасыз. Акыркы кадам катары кийинки калыпты\n" "толтуруп коюңузду суранабыз :" +#~ msgid "Account" +#~ msgstr "Эсеп" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Сиз берген логин жана/же купуя туура эмес." diff -Nru django-allauth-0.41.0+ds/allauth/locale/lt/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/lt/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/lt/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/lt/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -339,11 +339,7 @@ msgid "This account is inactive." msgstr "Ši paskyra neaktyvi." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Paskyra" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "El. pašto adresai" @@ -821,6 +817,9 @@ "Jūs beveik prisijungėte prie %(site_name)s naudodami %(provider_name)s\n" "paskyrą. Liko paskutinis žingsnis, užpildyti sekančią formą:" +#~ msgid "Account" +#~ msgstr "Paskyra" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Pateiktas prisijungimo vardas ir/arba slaptažodis yra neteisingi." diff -Nru django-allauth-0.41.0+ds/allauth/locale/lv/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/lv/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/lv/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/lv/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -339,11 +339,7 @@ msgid "This account is inactive." msgstr "Šis konts ir neaktīvs." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Konts" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-pasta adreses" @@ -819,6 +815,9 @@ "Jūs izmantosiet savu %(provider_name)s kontu, lai ieietu\n" "%(site_name)s. Kā pēdējo soli, lūdzu aizpildiet sekojošo formu:" +#~ msgid "Account" +#~ msgstr "Konts" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Nepareiza pieteikšanās informācija un/vai parole." diff -Nru django-allauth-0.41.0+ds/allauth/locale/nl/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/nl/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/nl/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/nl/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2016-07-25 15:18+0200\n" "Last-Translator: pennersr \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/django-allauth/" @@ -337,11 +337,7 @@ msgid "This account is inactive." msgstr "Dit account is niet actief" -#: templates/account/email.html:5 -msgid "Account" -msgstr "Account" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mailadressen" @@ -815,6 +811,9 @@ "Om bij %(site_name)s in te kunnen loggen via %(provider_name)s hebben we de " "volgende gegevens nodig:" +#~ msgid "Account" +#~ msgstr "Account" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Je login en wachtwoord komen niet overeen." diff -Nru django-allauth-0.41.0+ds/allauth/locale/no/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/no/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/no/LC_MESSAGES/django.po 2019-12-18 17:56:03.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/no/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2019-12-18 18:56+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -329,11 +329,7 @@ msgid "This account is inactive." msgstr "Denne kontoen er inaktiv." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Konto" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-postadresser" @@ -495,7 +491,8 @@ "for a %(site_name)s account and sign in below:" msgstr "" "Vennligst logg in med en\n" -"av dine eksisterende tredjeparts kontoer på %(site_name)s. Eller, registrer deg\n" +"av dine eksisterende tredjeparts kontoer på %(site_name)s. Eller, registrer deg\n" "og logg inn nedenfor:" #: templates/account/login.html:25 @@ -790,3 +787,6 @@ msgstr "" "Du er på vei til å bruke din %(provider_name)s konto for å logge inn på\n" "%(site_name)s. Som et siste steg, vennligst fullfør følgende skjema:" + +#~ msgid "Account" +#~ msgstr "Konto" diff -Nru django-allauth-0.41.0+ds/allauth/locale/pl/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/pl/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/pl/LC_MESSAGES/django.po 2019-12-18 17:53:28.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/pl/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2018-10-04 02:18+0200\n" "Last-Translator: Adam Dobrawy \n" "Language-Team: \n" @@ -328,11 +328,7 @@ msgid "This account is inactive." msgstr "To konto jest nieaktywne." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Konto" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Adresy e-mail" @@ -564,7 +560,7 @@ #: templates/account/messages/primary_email_set.txt:2 msgid "Primary e-mail address set." -msgstr "Ustaw podstawowy adres e-mail." +msgstr "Podstawowy adres e-mail został ustawiony." #: templates/account/messages/unverified_primary_email.txt:2 msgid "Your primary e-mail address must be verified." @@ -794,6 +790,9 @@ "Masz zamiar użyć konta %(provider_name)s do zalogowania się w \n" "%(site_name)s. Jako ostatni krok, proszę wypełnij formularz:" +#~ msgid "Account" +#~ msgstr "Konto" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Login i/lub hasło, które podałeś, są niepoprawne." diff -Nru django-allauth-0.41.0+ds/allauth/locale/pt_BR/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/pt_BR/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/pt_BR/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/pt_BR/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-12-01 01:20+0000\n" "Last-Translator: cacarrara \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -340,11 +340,7 @@ msgid "This account is inactive." msgstr "A sua conta está inativa." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Conta" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Endereços de E-mail" @@ -809,6 +805,9 @@ "Você está prestes a usar sua conta do %(provider_name)s para acessar o\n" "%(site_name)s. Como etapa final, por favor preencha o seguinte formulário:" +#~ msgid "Account" +#~ msgstr "Conta" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "O nome de usuário e/ou senha especificados não estão corretos." diff -Nru django-allauth-0.41.0+ds/allauth/locale/pt_PT/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/pt_PT/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/pt_PT/LC_MESSAGES/django.po 2019-12-18 17:53:28.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/pt_PT/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2019-02-26 19:48+0100\n" "Last-Translator: Jannis Š\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/" @@ -332,11 +332,7 @@ msgid "This account is inactive." msgstr "A sua conta foi desactivada." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Conta" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Endereços de E-mail" @@ -792,6 +788,9 @@ "Está prestes a usar a sua conta no %(provider_name)s para entrar no " "%(site_name)s. Como um passo final, por favor complete o seguinte formulário:" +#~ msgid "Account" +#~ msgstr "Conta" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "O login e/ou password que especificou não estão corretos" diff -Nru django-allauth-0.41.0+ds/allauth/locale/ru/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/ru/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/ru/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/ru/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2017-04-05 22:48+0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -329,11 +329,7 @@ msgid "This account is inactive." msgstr "Этот аккаунт неактивен." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Аккаунт" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mail адреса" @@ -786,6 +782,9 @@ "Вы используете %(provider_name)s для авторизации на \n" "%(site_name)s. Чтобы завершить, заполните следующую форму:" +#~ msgid "Account" +#~ msgstr "Аккаунт" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Логин и/или пароль не верны." diff -Nru django-allauth-0.41.0+ds/allauth/locale/sk/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/sk/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/sk/LC_MESSAGES/django.po 2019-12-18 17:53:28.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/sk/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2017-04-26 12:48+0200\n" "Last-Translator: Tomas Babej \n" "Language-Team: \n" @@ -333,11 +333,7 @@ msgid "This account is inactive." msgstr "Tento účet je neaktívny." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Účet" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mailová adresa" @@ -807,5 +803,8 @@ "Chystáte sa použiť váš %(provider_name)s účet na prihlásenie do\n" "%(site_name)s. Ako posledný krok vyplňte nasledujúci formulár:" +#~ msgid "Account" +#~ msgstr "Účet" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Uvedený login alebo heslo nie je správne." diff -Nru django-allauth-0.41.0+ds/allauth/locale/sr/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/sr/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/sr/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/sr/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nikola Vulovic \n" "Language-Team: NONE\n" @@ -332,11 +332,7 @@ msgid "This account is inactive." msgstr "Овај налог је неактиван." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Рачун" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Адресе е-поште" @@ -801,3 +797,6 @@ msgstr "" "Управо користите свој рачун код %(provider_name)s да бисте се пријавили на\n" "%(site_name)s. Као последњи корак, молимо попуните следећи образац:" + +#~ msgid "Account" +#~ msgstr "Рачун" diff -Nru django-allauth-0.41.0+ds/allauth/locale/sr_Latn/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/sr_Latn/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/sr_Latn/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/sr_Latn/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nikola Vulovic \n" "Language-Team: NONE\n" @@ -332,11 +332,7 @@ msgid "This account is inactive." msgstr "Ovaj nalog je neaktivan." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Račun" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Adrese e-pošte" @@ -801,3 +797,6 @@ msgstr "" "Upravo koristite svoj račun kod %(provider_name)s da biste se prijavili na\n" "%(site_name)s. Kao poslednji korak, molimo popunite sledeći obrazac:" + +#~ msgid "Account" +#~ msgstr "Račun" diff -Nru django-allauth-0.41.0+ds/allauth/locale/sv/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/sv/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/sv/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/sv/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:35+0200\n" "Last-Translator: Jannis Š\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/django-allauth/" @@ -340,11 +340,7 @@ msgid "This account is inactive." msgstr "Detta konto är inaktivt." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Konto" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "Epost-adresser" @@ -808,6 +804,9 @@ "Du håller på att logga in via ditt konto på %(provider_name)s på \n" "%(site_name)s. Fyll i följande formulär för att slutföra inloggningen:" +#~ msgid "Account" +#~ msgstr "Konto" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Inloggningen och/eller lösenordet är felaktigt." diff -Nru django-allauth-0.41.0+ds/allauth/locale/th/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/th/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/th/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/th/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2015-06-26 13:09+0700\n" "Last-Translator: Nattaphoom Chaipreecha \n" "Language-Team: Thai \n" @@ -336,11 +336,7 @@ msgid "This account is inactive." msgstr "บัญชีนี้ไม่มีการใช้งาน" -#: templates/account/email.html:5 -msgid "Account" -msgstr "บัญชี" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "อีเมล" @@ -803,6 +799,9 @@ "คุณกำลังจะทำการใช้บัญชี %(provider_name)s ของคุณ ในการเข้าสู่ระบบของ\n" "%(site_name)s. ในขั้นตอนสุดท้าย กรุณากรอกฟอร์มข้างล่าง:" +#~ msgid "Account" +#~ msgstr "บัญชี" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "การลงชื่เข้าใช้และ/หรือรหัสผ่านที่ระบุมาไม่ถูกต้อง" diff -Nru django-allauth-0.41.0+ds/allauth/locale/tr/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/tr/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/tr/LC_MESSAGES/django.po 2019-12-18 17:53:28.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/tr/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:35+0200\n" "Last-Translator: Jannis Š\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/django-allauth/" @@ -343,11 +343,7 @@ msgid "This account is inactive." msgstr "Bu hesap etkin değil." -#: templates/account/email.html:5 -msgid "Account" -msgstr "Hesap" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-posta Adresleri" @@ -811,6 +807,9 @@ "%(site_name)s sitesine giriş yapmak için %(provider_name)s hesabınızı " "kullanmak üzeresiniz. Son bir adım olarak, lütfen şu formu doldurun:" +#~ msgid "Account" +#~ msgstr "Hesap" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Girdiğiniz giriş bilgisi ve/veya parola doğru değil." diff -Nru django-allauth-0.41.0+ds/allauth/locale/uk/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/uk/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/uk/LC_MESSAGES/django.po 2019-12-18 17:53:28.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/uk/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:36+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -334,11 +334,7 @@ msgid "This account is inactive." msgstr "Даний акаунт неактивний" -#: templates/account/email.html:5 -msgid "Account" -msgstr "Акаунт" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mail адреса" @@ -817,6 +813,9 @@ "Ви використовуєте Ваш %(provider_name)s акаунт для авторизації на\n" "%(site_name)s. Для завершення, будь ласка, заповніть наступну форму:" +#~ msgid "Account" +#~ msgstr "Акаунт" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "Введений login і/або пароль є некоректними." diff -Nru django-allauth-0.41.0+ds/allauth/locale/zh_CN/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/zh_CN/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/zh_CN/LC_MESSAGES/django.po 2019-12-18 17:53:25.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/zh_CN/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:36+0200\n" "Last-Translator: jresins \n" "Language-Team: LANGUAGE \n" @@ -338,11 +338,7 @@ msgid "This account is inactive." msgstr "此账号未激活" -#: templates/account/email.html:5 -msgid "Account" -msgstr "账号" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mail地址" @@ -793,6 +789,9 @@ "您将使用您的%(provider_name)s账号登录\n" "%(site_name)s。作为最后一步，请完成以下表单：" +#~ msgid "Account" +#~ msgstr "账号" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "您提供的账号或密码错误" diff -Nru django-allauth-0.41.0+ds/allauth/locale/zh_Hans/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/zh_Hans/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/zh_Hans/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/zh_Hans/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -340,11 +340,7 @@ msgid "This account is inactive." msgstr "此账号未激活" -#: templates/account/email.html:5 -msgid "Account" -msgstr "账号" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "E-mail地址" @@ -794,6 +790,9 @@ "您将使用您的%(provider_name)s账号登录\n" "%(site_name)s。作为最后一步，请完成以下表单：" +#~ msgid "Account" +#~ msgstr "账号" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "您提供的账号或密码错误" diff -Nru django-allauth-0.41.0+ds/allauth/locale/zh_Hant/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/zh_Hant/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/zh_Hant/LC_MESSAGES/django.po 2019-12-18 17:53:27.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/zh_Hant/LC_MESSAGES/django.po 2020-05-24 18:46:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -336,11 +336,7 @@ msgid "This account is inactive." msgstr "這個帳號未啟用" -#: templates/account/email.html:5 -msgid "Account" -msgstr "帳號" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "電子郵件地址" @@ -794,6 +790,9 @@ "您將使用 %(provider_name)s 這個帳號登入\n" " %(site_name)s 這個網站。最後一步，請填完下列表單：" +#~ msgid "Account" +#~ msgstr "帳號" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "您提供的帳號或密碼不正確。" diff -Nru django-allauth-0.41.0+ds/allauth/locale/zh_TW/LC_MESSAGES/django.po django-allauth-0.42.0+ds/allauth/locale/zh_TW/LC_MESSAGES/django.po --- django-allauth-0.41.0+ds/allauth/locale/zh_TW/LC_MESSAGES/django.po 2019-12-18 17:53:26.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/locale/zh_TW/LC_MESSAGES/django.po 2020-05-24 18:46:57.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:36+0200\n" "Last-Translator: jresins \n" "Language-Team: Chinese (Traditional)\n" @@ -333,11 +333,7 @@ msgid "This account is inactive." msgstr "這個帳號未啟用" -#: templates/account/email.html:5 -msgid "Account" -msgstr "帳號" - -#: templates/account/email.html:8 +#: templates/account/email.html:5 templates/account/email.html:8 msgid "E-mail Addresses" msgstr "電子郵件地址" @@ -791,6 +787,9 @@ "您將使用 %(provider_name)s 這個帳號登入\n" " %(site_name)s 這個網站。最後一步，請填完下列表單：" +#~ msgid "Account" +#~ msgstr "帳號" + #~ msgid "The login and/or password you specified are not correct." #~ msgstr "您提供的帳號或密碼不正確。" diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/fields.py django-allauth-0.42.0+ds/allauth/socialaccount/fields.py --- django-allauth-0.41.0+ds/allauth/socialaccount/fields.py 2019-12-09 16:11:08.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/fields.py 2020-05-04 20:03:57.000000000 +0000 @@ -10,7 +10,7 @@ """Simple JSON field that stores python structures as JSON strings on database. """ - if django.VERSION < (2, 0): + if django.VERSION < (3, 0): def from_db_value(self, value, expression, connection, context): return self.to_python(value) else: diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/amazon/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/amazon/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/amazon/views.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/amazon/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -13,7 +13,7 @@ provider_id = AmazonProvider.id access_token_url = 'https://api.amazon.com/auth/o2/token' authorize_url = 'http://www.amazon.com/ap/oa' - profile_url = 'https://www.amazon.com/ap/user/profile' + profile_url = 'https://api.amazon.com/user/profile' supports_state = False redirect_uri_protocol = 'https' diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/discord/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/discord/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/discord/views.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/discord/views.py 2020-05-16 19:40:08.000000000 +0000 @@ -10,9 +10,9 @@ class DiscordOAuth2Adapter(OAuth2Adapter): provider_id = DiscordProvider.id - access_token_url = 'https://discordapp.com/api/oauth2/token' - authorize_url = 'https://discordapp.com/api/oauth2/authorize' - profile_url = 'https://discordapp.com/api/users/@me' + access_token_url = 'https://discord.com/api/oauth2/token' + authorize_url = 'https://discord.com/api/oauth2/authorize' + profile_url = 'https://discord.com/api/users/@me' def complete_login(self, request, app, token, **kwargs): headers = { diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/provider.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/provider.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,32 @@ +from allauth.socialaccount.providers.base import ProviderAccount +from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider + + +class EdxAccount(ProviderAccount): + def get_profile_url(self): + if self.account.extra_data['profile_image']['has_image']: + return self.account.extra_data['image_url_full'] + + +class EdxProvider(OAuth2Provider): + id = 'edx' + name = 'Edx' + account_class = EdxAccount + + def get_default_scope(self): + return ['profile'] + + def extract_uid(self, data): + """Extract uid ('id') and ensure it's a str.""" + return str(data['username']) + + def extract_common_fields(self, data): + return dict( + email=data.get('email'), + username=data.get('username'), + name=data.get('name'), + user_id=data.get('user_id'), + ) + + +provider_classes = [EdxProvider] diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/tests.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/tests.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/tests.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/tests.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,44 @@ +from allauth.socialaccount.tests import OAuth2TestsMixin +from allauth.tests import MockedResponse, TestCase + +from .provider import EdxProvider + + +class EdxTests(OAuth2TestsMixin, TestCase): + provider_id = EdxProvider.id + + def get_mocked_response(self): + print(self) + return MockedResponse(200, """{ +"username":"krzysztof", +"bio":null, +"requires_parental_consent":true, +"language_proficiencies":[ + +], +"name":"Krzysztof Hoffmann", +"country":null, +"social_links":[ + +], +"is_active":true, +"profile_image":{ + "image_url_small":"http://draft.navoica.pl/static/images/profiles/default_30.png", + "image_url_full":"http://draft.navoica.pl/static/images/profiles/default_500.png", + "image_url_large":"http://draft.navoica.pl/static/images/profiles/default_120.png", + "image_url_medium":"http://draft.navoica.pl/static/images/profiles/default_50.png", + "has_image":false +}, +"extended_profile":[ + +], +"year_of_birth":null, +"level_of_education":null, +"goals":"", +"accomplishments_shared":false, +"gender":null, +"date_joined":"2019-09-21T07:48:31Z", +"mailing_address":"", +"email":"krzysztof.hoffmann@opi.org.pl", +"account_privacy":"private" +}""") diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/urls.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/urls.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/urls.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/urls.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,6 @@ +from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns + +from .provider import EdxProvider + + +urlpatterns = default_urlpatterns(EdxProvider) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/edx/views.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/edx/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,46 @@ +import requests + +from allauth.socialaccount import app_settings +from allauth.socialaccount.providers.oauth2.views import ( + OAuth2Adapter, + OAuth2CallbackView, + OAuth2LoginView, +) + +from .provider import EdxProvider + + +class EdxOAuth2Adapter(OAuth2Adapter): + provider_id = EdxProvider.id + provider_default_url = 'https://edx.org' + + settings = app_settings.PROVIDERS.get(provider_id, {}) + provider_base_url = settings.get('EDX_URL', provider_default_url) + + access_token_url = '{0}/oauth2/access_token'.format(provider_base_url) + authorize_url = '{0}/oauth2/authorize/'.format(provider_base_url) + profile_url = '{0}/api/user/v1/me'.format(provider_base_url) + account_url = '{0}/api/user/v1/accounts/{1}' + supports_state = False + redirect_uri_protocol = 'https' + + def complete_login(self, request, app, token, **kwargs): + response = requests.get( + self.profile_url, + params={'access_token': token}) + extra_data = response.json() + + if extra_data.get('email', None) is None: + response = requests.get( + self.account_url.format(self.provider_base_url, + extra_data['username']), + params={'access_token': token}) + extra_data = response.json() + + return self.get_provider().sociallogin_from_response( + request, + extra_data) + + +oauth2_login = OAuth2LoginView.adapter_view(EdxOAuth2Adapter) +oauth2_callback = OAuth2CallbackView.adapter_view(EdxOAuth2Adapter) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/facebook/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/facebook/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/facebook/provider.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/facebook/provider.py 2020-05-16 19:42:33.000000000 +0000 @@ -24,7 +24,7 @@ GRAPH_API_VERSION = getattr(settings, 'SOCIALACCOUNT_PROVIDERS', {}).get( - 'facebook', {}).get('VERSION', 'v2.12') + 'facebook', {}).get('VERSION', 'v7.0') GRAPH_API_URL = 'https://graph.facebook.com/' + GRAPH_API_VERSION NONCE_SESSION_KEY = 'allauth_facebook_nonce' @@ -72,20 +72,17 @@ js = "allauth.facebook.login(%s, %s, %s, %s)" % ( next, action, process, scope) ret = "javascript:%s" % (urlquote(js),) - else: - assert method == 'oauth2' + elif method == 'oauth2': ret = super(FacebookProvider, self).get_login_url(request, **kwargs) + else: + raise RuntimeError('Invalid method specified: %s' % method) return ret def _get_locale_callable(self): settings = self.get_settings() - f = settings.get('LOCALE_FUNC') - if f: - f = import_callable(f) - else: - f = get_default_locale_callable() - return f + func = settings.get('LOCALE_FUNC') + return import_callable(func) if func else get_default_locale_callable() def get_locale_for_request(self, request): if not self._locale_callable_cache: diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/github/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/github/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/github/views.py 2019-12-15 11:40:04.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/github/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -26,20 +26,19 @@ emails_url = '{0}/user/emails'.format(api_url) def complete_login(self, request, app, token, **kwargs): - params = {'access_token': token.token} - resp = requests.get(self.profile_url, params=params) + headers = {'Authorization': 'token {}'.format(token.token)} + resp = requests.get(self.profile_url, headers=headers) resp.raise_for_status() extra_data = resp.json() if app_settings.QUERY_EMAIL and not extra_data.get('email'): - extra_data['email'] = self.get_email(token) + extra_data['email'] = self.get_email(headers) return self.get_provider().sociallogin_from_response( request, extra_data ) - def get_email(self, token): + def get_email(self, headers): email = None - params = {'access_token': token.token} - resp = requests.get(self.emails_url, params=params) + resp = requests.get(self.emails_url, headers=headers) resp.raise_for_status() emails = resp.json() if resp.status_code == 200 and emails: diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/instagram/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/instagram/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/instagram/provider.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/instagram/provider.py 2020-05-16 19:52:07.000000000 +0000 @@ -9,9 +9,6 @@ def get_profile_url(self): return self.PROFILE_URL + self.account.extra_data.get('username') - def get_avatar_url(self): - return self.account.extra_data.get('profile_picture') - def to_str(self): dflt = super(InstagramAccount, self).to_str() return self.account.extra_data.get('username', dflt) @@ -23,17 +20,16 @@ account_class = InstagramAccount def extract_extra_data(self, data): - return data.get('data', {}) + return data def get_default_scope(self): return ['basic'] def extract_uid(self, data): - return str(data['data']['id']) + return str(data['id']) def extract_common_fields(self, data): - return dict(username=data['data'].get('username'), - name=data['data'].get('full_name')) + return dict(username=data.get('username')) provider_classes = [InstagramProvider] diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/instagram/tests.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/instagram/tests.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/instagram/tests.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/instagram/tests.py 2020-05-24 18:56:27.000000000 +0000 @@ -10,10 +10,6 @@ def get_mocked_response(self): return MockedResponse(200, """ { - "meta": { - "code": 200 - }, - "data": { "username": "georgewhewell", "bio": "", "website": "", @@ -26,5 +22,4 @@ "follows": 104 }, "id": "11428116" - } }""") # noqa diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/instagram/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/instagram/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/instagram/views.py 2019-12-15 19:50:12.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/instagram/views.py 2020-05-16 19:52:07.000000000 +0000 @@ -13,11 +13,12 @@ provider_id = InstagramProvider.id access_token_url = 'https://api.instagram.com/oauth/access_token' authorize_url = 'https://api.instagram.com/oauth/authorize' - profile_url = 'https://api.instagram.com/v1/users/self' + profile_url = 'https://graph.instagram.com/me' def complete_login(self, request, app, token, **kwargs): resp = requests.get(self.profile_url, - params={'access_token': token.token}) + params={'access_token': token.token, + 'fields': ['id', 'username']}) resp.raise_for_status() extra_data = resp.json() return self.get_provider().sociallogin_from_response(request, diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/kakao/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/kakao/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/kakao/views.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/kakao/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -18,6 +18,7 @@ def complete_login(self, request, app, token, **kwargs): headers = {'Authorization': 'Bearer {0}'.format(token.token)} resp = requests.get(self.profile_url, headers=headers) + resp.raise_for_status() extra_data = resp.json() return self.get_provider().sociallogin_from_response(request, extra_data) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/provider.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/provider.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +from allauth.socialaccount.providers.base import ProviderAccount +from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider + + +class KeycloakAccount(ProviderAccount): + + def get_avatar_url(self): + return self.account.extra_data.get('picture') + + def to_str(self): + dflt = super(KeycloakAccount, self).to_str() + return self.account.extra_data.get('name', dflt) + + +class KeycloakProvider(OAuth2Provider): + id = 'keycloak' + name = 'Keycloak' + account_class = KeycloakAccount + + def get_default_scope(self): + return ['openid', 'profile', 'email'] + + def extract_uid(self, data): + return str(data['id']) + + def extract_common_fields(self, data): + return dict( + email=data.get('email'), + username=data.get('username'), + name=data.get('name'), + user_id=data.get('user_id'), + picture=data.get('picture'), + ) + + +provider_classes = [KeycloakProvider] diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/tests.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/tests.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/tests.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/tests.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from allauth.socialaccount.providers.keycloak.provider import KeycloakProvider +from allauth.socialaccount.tests import OAuth2TestsMixin +from allauth.tests import MockedResponse, TestCase + + +class KeycloakTests(OAuth2TestsMixin, TestCase): + provider_id = KeycloakProvider.id + + def get_mocked_response(self): + return MockedResponse(200, """ + { + "picture": "https://secure.gravatar.com/avatar/123", + "email": "mr.bob@your.Keycloak.server.example.com", + "id": 2, + "sub": 2, + "identities": [], + "name": "Mr Bob" + } + """) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/urls.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/urls.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/urls.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/urls.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +from allauth.socialaccount.providers.keycloak.provider import KeycloakProvider +from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns + + +urlpatterns = default_urlpatterns(KeycloakProvider) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/keycloak/views.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/keycloak/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +import requests + +from allauth.socialaccount import app_settings +from allauth.socialaccount.providers.keycloak.provider import KeycloakProvider +from allauth.socialaccount.providers.oauth2.views import ( + OAuth2Adapter, + OAuth2CallbackView, + OAuth2LoginView, +) + + +class KeycloakOAuth2Adapter(OAuth2Adapter): + provider_id = KeycloakProvider.id + supports_state = True + + settings = app_settings.PROVIDERS.get(provider_id, {}) + provider_base_url = '{0}/realms/{1}'.format( + settings.get("KEYCLOAK_URL"), settings.get("KEYCLOAK_REALM")) + + access_token_url = '{0}/protocol/openid-connect/token' \ + .format(provider_base_url) + authorize_url = '{0}/protocol/openid-connect/auth' \ + .format(provider_base_url) + profile_url = '{0}/protocol/openid-connect/userinfo' \ + .format(provider_base_url) + + def complete_login(self, request, app, token, response): + response = requests.post(self.profile_url, headers={ + 'Authorization': 'Bearer ' + str(token) + }) + response.raise_for_status() + extra_data = response.json() + extra_data['id'] = extra_data['sub'] + del extra_data['sub'] + + return self.get_provider().sociallogin_from_response( + request, + extra_data + ) + + +oauth2_login = OAuth2LoginView.adapter_view(KeycloakOAuth2Adapter) +oauth2_callback = OAuth2CallbackView.adapter_view(KeycloakOAuth2Adapter) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/microsoft/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/microsoft/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/microsoft/provider.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/microsoft/provider.py 2020-05-04 20:03:57.000000000 +0000 @@ -8,7 +8,7 @@ def to_str(self): name = self.account.extra_data.get('displayName') - if name.strip() != '': + if name and name.strip() != '': return name return super(MicrosoftGraphAccount, self).to_str() diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/provider.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/provider.py 2020-05-16 19:53:21.000000000 +0000 @@ -0,0 +1,37 @@ +from allauth.socialaccount.providers.base import ProviderAccount +from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider + + +class MixerAccount(ProviderAccount): + def _get_token(self): + return self.account.extra_data.get('channel', {}).get('token') + + def get_profile_url(self): + return 'https://mixer.com/' + self._get_token() + + def get_avatar_url(self): + return self.account.extra_data.get('avatarUrl') + + def to_str(self): + return self._get_token() + + +class MixerProvider(OAuth2Provider): + id = 'mixer' + name = 'Mixer' + account_class = MixerAccount + + def get_default_scope(self): + return ['user:details:self'] + + def extract_uid(self, data): + return str(data['id']) + + def extract_common_fields(self, data): + return { + 'username': data.get('username'), + 'email': data.get('email'), + } + + +provider_classes = [MixerProvider] diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/tests.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/tests.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/tests.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/tests.py 2020-05-16 19:53:21.000000000 +0000 @@ -0,0 +1,45 @@ +from allauth.socialaccount.tests import OAuth2TestsMixin +from allauth.tests import MockedResponse, TestCase + +from .provider import MixerProvider + + +class MixerTests(OAuth2TestsMixin, TestCase): + provider_id = MixerProvider.id + + def get_mocked_response(self): + return MockedResponse(200, """ + { + "avatarUrl": "https://uploads.mixer.com/avatar/2evg7cnb.jpg", + "id": 101052282, + "bio": "Ninja is the one of the world's most popular gamers.", + "channel": { + "id": 90571077, + "audience": "teen", + "token": "ninja", + "viewersCurrent": 0, + "viewersTotal": 43349053, + "numFollowers": 2840127, + "name": "TEM TEM TIME", + "online": false, + "languageId": "en" + }, + "createdAt": "2019-08-01T16:45:00.000Z", + "deleatedAt": null, + "experience": 401922, + "frontendVersion": null, + "groups": [ + {"id": 1, "name": "User"}, + {"id": 19, "name": "Partner"}, + {"id": 12, "name": "Pro"} + ], + "level": 103, + "primaryTeam": null, + "social": { + "facebook": "https://www.facebook.com/NinjaTB" + }, + "sparks": 7874598, + "updatedAt": "2020-01-06T19:26:43.640Z", + "username": "Ninja", + "verified": true + }""") diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/urls.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/urls.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/urls.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/urls.py 2020-05-16 19:53:21.000000000 +0000 @@ -0,0 +1,6 @@ +from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns + +from .provider import MixerProvider + + +urlpatterns = default_urlpatterns(MixerProvider) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/mixer/views.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/mixer/views.py 2020-05-16 19:53:21.000000000 +0000 @@ -0,0 +1,31 @@ +import requests + +from allauth.socialaccount.providers.oauth2.views import ( + OAuth2Adapter, + OAuth2CallbackView, + OAuth2LoginView, +) + +from .provider import MixerProvider + + +class MixerOAuth2Adapter(OAuth2Adapter): + provider_id = MixerProvider.id + access_token_url = 'https://mixer.com/api/v1/oauth/token' + authorize_url = 'https://mixer.com/oauth/authorize' + profile_url = 'https://mixer.com/api/v1/users/current' + + def complete_login(self, request, app, token, **kwargs): + headers = {'Authorization': 'Bearer {}'.format(token.token)} + response = requests.get(self.profile_url, headers=headers) + response.raise_for_status() + + data = response.json() + + return self.get_provider().sociallogin_from_response( + request, data + ) + + +oauth2_login = OAuth2LoginView.adapter_view(MixerOAuth2Adapter) +oauth2_callback = OAuth2CallbackView.adapter_view(MixerOAuth2Adapter) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/naver/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/naver/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/naver/views.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/naver/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -18,6 +18,7 @@ def complete_login(self, request, app, token, **kwargs): headers = {'Authorization': 'Bearer {0}'.format(token.token)} resp = requests.get(self.profile_url, headers=headers) + resp.raise_for_status() extra_data = resp.json().get('response') return self.get_provider().sociallogin_from_response(request, extra_data) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/nextcloud/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/nextcloud/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/nextcloud/views.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/nextcloud/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -25,7 +25,7 @@ request, extra_data) def get_user_info(self, token, user_id): - headers = {'Authorization': 'Bearer {0}'.format(self.server)} + headers = {'Authorization': 'Bearer {0}'.format(token)} resp = requests.get(self.profile_url + user_id, headers=headers) resp.raise_for_status() data = ET.fromstring(resp.content.decode())[1] diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/odnoklassniki/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/odnoklassniki/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/odnoklassniki/provider.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/odnoklassniki/provider.py 2020-05-16 19:52:07.000000000 +0000 @@ -4,7 +4,7 @@ class OdnoklassnikiAccount(ProviderAccount): def get_profile_url(self): - return self.account.extra_data.get('link') + return 'https://ok.ru/profile/' + self.account.extra_data['uid'] def get_avatar_url(self): ret = None diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/twitch/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/twitch/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/twitch/provider.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/twitch/provider.py 2020-05-04 20:03:57.000000000 +0000 @@ -7,7 +7,10 @@ return 'http://twitch.tv/' + self.account.extra_data.get('login') def get_avatar_url(self): - return self.account.extra_data.get('logo') + # We're using `logo` as a failback for legacy profiles retrieved + # with the old https://api.twitch.tv/kraken/user endpoint. + logo = self.account.extra_data.get('logo') + return self.account.extra_data.get('profile_image_url', logo) def to_str(self): dflt = super(TwitchAccount, self).to_str() diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/twitch/tests.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/twitch/tests.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/twitch/tests.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/twitch/tests.py 2020-05-06 17:08:15.000000000 +0000 @@ -1,3 +1,6 @@ +from django.test.client import RequestFactory +from django.urls import reverse + from allauth.socialaccount.models import SocialToken from allauth.socialaccount.providers.oauth2.client import OAuth2Error from allauth.socialaccount.tests import OAuth2TestsMixin @@ -7,10 +10,6 @@ from .views import TwitchOAuth2Adapter -class MockObject(object): - pass - - class TwitchTests(OAuth2TestsMixin, TestCase): provider_id = TwitchProvider.id @@ -86,8 +85,12 @@ we can check that the specific erros are raised before they are caught and rendered to generic error HTML """ - request = MockObject() - app = MockObject() + request = RequestFactory().get( + reverse(self.provider.id + '_login'), + {'process': 'login'}, + ) + adapter = TwitchOAuth2Adapter(request) + app = adapter.get_provider().get_app(request) token = SocialToken(token='this-is-my-fake-token') with mocked_response(resp_mock): diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/twitch/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/twitch/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/twitch/views.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/twitch/views.py 2020-05-06 17:08:15.000000000 +0000 @@ -17,7 +17,10 @@ profile_url = 'https://api.twitch.tv/helix/users' def complete_login(self, request, app, token, **kwargs): - headers = {'Authorization': 'Bearer {}'.format(token.token)} + headers = { + 'Authorization': 'Bearer {}'.format(token.token), + 'Client-ID': app.client_id, + } response = requests.get(self.profile_url, headers=headers) data = response.json() diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/untappd/client.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/untappd/client.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/untappd/client.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/untappd/client.py 2020-05-04 20:03:57.000000000 +0000 @@ -1,10 +1,13 @@ import requests +from allauth.socialaccount import app_settings from allauth.socialaccount.providers.oauth2.client import ( OAuth2Client, OAuth2Error, ) +from .provider import UntappdProvider + class UntappdOAuth2Client(OAuth2Client): """ @@ -26,11 +29,16 @@ if self.access_token_method == 'GET': params = data data = None + # Allow custom User Agent to comply with Untappd API + settings = app_settings.PROVIDERS.get(UntappdProvider.id, {}) + headers = { + 'User-Agent': settings.get('USER_AGENT', 'django-allauth')} # TODO: Proper exception handling resp = requests.request(self.access_token_method, url, params=params, - data=data) + data=data, + headers=headers) access_token = None if resp.status_code == 200: access_token = resp.json()['response'] diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/vk/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/vk/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/vk/provider.py 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/vk/provider.py 2020-05-04 20:03:57.000000000 +0000 @@ -5,7 +5,7 @@ class VKAccount(ProviderAccount): def get_profile_url(self): - return 'https://vk.com/id%s' % self.account.extra_data.get('uid') + return 'https://vk.com/id%s' % self.account.extra_data.get('id') def get_avatar_url(self): ret = None diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/provider.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/provider.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/provider.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/provider.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,53 @@ +from allauth.account.models import EmailAddress +from allauth.socialaccount import app_settings +from allauth.socialaccount.providers.base import ProviderAccount +from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider + + +class YandexAccout(ProviderAccount): + def to_str(self): + first_name = self.account.extra_data.get("first_name", "") + last_name = self.account.extra_data.get("last_name", "") + name = " ".join([first_name, last_name]).strip() + return name or super(YandexAccout, self).to_str() + + +class YandexProvider(OAuth2Provider): + id = "yandex" + name = "Yandex" + account_class = YandexAccout + + def get_default_scope(self): + scope = ["login:info"] + if app_settings.QUERY_EMAIL: + scope.append("login:email") + return scope + + def extract_uid(self, data): + return str(data["id"]) + + def get_user_email(self, data): + email = data.get("default_email") + if not email: + emails = data.get("emails") + email = emails[0] if emails else "" + return email + + def extract_common_fields(self, data): + email = self.get_user_email(data) + return dict( + email=email, + last_name=data.get("last_name"), + username=data.get("display_name"), + first_name=data.get("first_name"), + ) + + def extract_email_addresses(self, data): + ret = [] + email = self.get_user_email(data) + if email: + ret.append(EmailAddress(email=email, verified=True, primary=True)) + return ret + + +provider_classes = [YandexProvider] diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/tests.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/tests.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/tests.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/tests.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,41 @@ +from __future__ import absolute_import + +from allauth.socialaccount.tests import OAuth2TestsMixin +from allauth.tests import MockedResponse, TestCase + +from .provider import YandexProvider + + +class YandexTests(OAuth2TestsMixin, TestCase): + provider_id = YandexProvider.id + + yandex_data = """ + { + "login": "vasya", + "old_social_login": "uid-mmzxrnry", + "default_email": "test@yandex.ru", + "id": "1000034426", + "client_id": "4760187d81bc4b7799476b42b5103713", + "emails": [ + "test@yandex.ru", + "other-test@yandex.ru" + ], + "openid_identities": [ + "http://openid.yandex.ru/vasya/", + "http://vasya.ya.ru/" + ] + }""" + + def get_mocked_response(self, data=None): + if data is None: + data = self.yandex_data + return MockedResponse(200, data) + + def get_login_response_json(self, with_refresh_token=True): + return """ + { + "access_token":"testac", + "refresh_token":"1:GN686QVt0mmakDd9:A4pYuW9LGk0_UnlrMIWklk", + "token_type":"bearer", + "expires_in":124234123534 + }""" diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/urls.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/urls.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/urls.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/urls.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,6 @@ +from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns + +from .provider import YandexProvider + + +urlpatterns = default_urlpatterns(YandexProvider) diff -Nru django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/views.py django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/views.py --- django-allauth-0.41.0+ds/allauth/socialaccount/providers/yandex/views.py 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/socialaccount/providers/yandex/views.py 2020-05-04 20:03:57.000000000 +0000 @@ -0,0 +1,31 @@ +import requests + +from allauth.socialaccount.providers.oauth2.views import ( + OAuth2Adapter, + OAuth2CallbackView, + OAuth2LoginView, +) + +from .provider import YandexProvider + + +class YandexAuth2Adapter(OAuth2Adapter): + provider_id = YandexProvider.id + access_token_url = "https://oauth.yandex.ru/token" + authorize_url = "https://oauth.yandex.com/authorize" + profile_url = "https://login.yandex.ru/info" + + def complete_login(self, request, app, token, **kwargs): + resp = requests.get( + self.profile_url, + params={"oauth_token": token.token, "format": "json"}, + ) + resp.raise_for_status() + extra_data = resp.json() + return self.get_provider().sociallogin_from_response( + request, extra_data + ) + + +oauth2_login = OAuth2LoginView.adapter_view(YandexAuth2Adapter) +oauth2_callback = OAuth2CallbackView.adapter_view(YandexAuth2Adapter) diff -Nru django-allauth-0.41.0+ds/allauth/templates/account/email.html django-allauth-0.42.0+ds/allauth/templates/account/email.html --- django-allauth-0.41.0+ds/allauth/templates/account/email.html 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/templates/account/email.html 2020-05-04 20:03:57.000000000 +0000 @@ -2,7 +2,7 @@ {% load i18n %} -{% block head_title %}{% trans "Account" %}{% endblock %} +{% block head_title %}{% trans "E-mail Addresses" %}{% endblock %} {% block content %}

{% trans "E-mail Addresses" %}

diff -Nru django-allauth-0.41.0+ds/allauth/tests.py django-allauth-0.42.0+ds/allauth/tests.py --- django-allauth-0.41.0+ds/allauth/tests.py 2019-12-09 16:11:08.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/tests.py 2020-05-04 20:03:57.000000000 +0000 @@ -5,6 +5,7 @@ import requests from datetime import date, datetime +import django from django.core.files.base import ContentFile from django.db import models from django.test import RequestFactory, TestCase @@ -93,9 +94,14 @@ class SomeField(models.Field): def get_prep_value(self, value): return 'somevalue' - - def from_db_value(self, value, expression, connection, context): - return some_value + if django.VERSION < (3, 0): + def from_db_value( + self, value, expression, connection, context + ): + return some_value + else: + def from_db_value(self, value, expression, connection): + return some_value class SomeModel(models.Model): dt = models.DateTimeField() diff -Nru django-allauth-0.41.0+ds/allauth/utils.py django-allauth-0.42.0+ds/allauth/utils.py --- django-allauth-0.41.0+ds/allauth/utils.py 2019-12-13 20:14:53.000000000 +0000 +++ django-allauth-0.42.0+ds/allauth/utils.py 2020-05-04 20:03:57.000000000 +0000 @@ -8,6 +8,7 @@ from collections import OrderedDict from urllib.parse import urlsplit +import django from django.contrib.auth import get_user_model from django.contrib.sites.models import Site from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured @@ -219,7 +220,12 @@ try: # This is quite an ugly hack, but will cover most # use cases... - v = f.from_db_value(v, None, None, None) + # The signature of `from_db_value` changed in Django 3 + # https://docs.djangoproject.com/en/3.0/releases/3.0/#features-removed-in-3-0 + if django.VERSION < (3, 0): + v = f.from_db_value(v, None, None, None) + else: + v = f.from_db_value(v, None, None) except Exception: raise ImproperlyConfigured( "Unable to auto serialize field '{}', custom" diff -Nru django-allauth-0.41.0+ds/AUTHORS django-allauth-0.42.0+ds/AUTHORS --- django-allauth-0.41.0+ds/AUTHORS 2019-12-14 11:27:28.000000000 +0000 +++ django-allauth-0.42.0+ds/AUTHORS 2020-05-16 19:53:21.000000000 +0000 @@ -28,6 +28,7 @@ Biel Massot Björn Andersson Bojan Mihelac +Bruno Alla Chris Beaven Chris Davis Christian Carter @@ -56,8 +57,10 @@ Guilhem Saurel Guillaume Vincent Guoyu Hao +Haesung Park Hatem Nassrat Hyunwoo Shim +Ignacio Ocampo J. Erm J. Fernando Sánchez Jack Shedd @@ -74,6 +77,7 @@ Jihoon Park Jiyoon Ha Joe Vanderstelt +Joel Fernandes John Bazik John Whitlock Jonas Aule @@ -99,9 +103,11 @@ Markus Kaiserswerth Markus Thielen Martin Bächtold +Matt Nishi-Broach Mauro Stettler Morgante Pell Nariman Gharib +Nathan Strobbe Niklas A Emanuelsson Patrick Paul Paulo Eduardo Neves @@ -125,6 +131,7 @@ Sanghyeok Lee Seizan Shimazaki Serafeim Papastefanos +Sergey Silaev Shane Rice Stuart Ross Terry Jones @@ -138,9 +145,11 @@ Victor Semionov Volodymyr Yatsyk Vuong Nguyen +Vlad Dmitrievich Wendy Edwards Will Gordon Will Ross William Li Yaroslav Muravsky Yuri Kriachko +Youcef Mammar diff -Nru django-allauth-0.41.0+ds/ChangeLog.rst django-allauth-0.42.0+ds/ChangeLog.rst --- django-allauth-0.41.0+ds/ChangeLog.rst 2019-12-18 17:51:22.000000000 +0000 +++ django-allauth-0.42.0+ds/ChangeLog.rst 2020-05-24 18:45:41.000000000 +0000 @@ -1,3 +1,17 @@ +0.42.0 (2020-05-24) +******************* + +Note worthy changes +------------------- + +- New providers: EDX, Yandex, Mixer. + +- Fixed Twitch ``get_avatar_url()`` method to use the profile picture retrieved + by new user details endpoint introduced in version 0.40.0. + +- The Facebook API version now defaults to v7.0. + + 0.41.0 (2019-12-18) ******************* @@ -17,6 +31,8 @@ ``settings.SOCIALACCOUNT_PROVIDERS`` settings instead of storing them in the database using a ``SocialApp`` record. +- Adding Keycloak Provider + Backwards incompatible changes ------------------------------ diff -Nru django-allauth-0.41.0+ds/debian/changelog django-allauth-0.42.0+ds/debian/changelog --- django-allauth-0.41.0+ds/debian/changelog 2019-12-25 17:52:33.000000000 +0000 +++ django-allauth-0.42.0+ds/debian/changelog 2020-05-26 08:20:09.000000000 +0000 @@ -1,3 +1,17 @@ +django-allauth (0.42.0+ds-1) unstable; urgency=medium + + [ Pierre-Elliott Bécue ] + * New upstream release 0.42.0 + * Bump debhelper-compat level to 13 + * Add the Repository entries to d/uptream/metadata + + [ Debian Janitor ] + * Set field Upstream-Name in debian/copyright. + * Set upstream metadata fields: Bug-Database, Bug-Submit. + * Update standards version to 4.5.0, no changes needed. + + -- Pierre-Elliott Bécue Tue, 26 May 2020 10:20:09 +0200 + django-allauth (0.41.0+ds-1) unstable; urgency=medium * New upstream release 0.41.0 diff -Nru django-allauth-0.41.0+ds/debian/control django-allauth-0.42.0+ds/debian/control --- django-allauth-0.41.0+ds/debian/control 2019-12-25 17:50:30.000000000 +0000 +++ django-allauth-0.42.0+ds/debian/control 2020-05-26 07:44:07.000000000 +0000 @@ -4,7 +4,7 @@ Pierre-Elliott Bécue Section: python Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), dh-python, python3-all, python3-django, @@ -12,7 +12,7 @@ python3-setuptools, python3-sphinx Rules-Requires-Root: no -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/python-team/modules/django-allauth Vcs-Git: https://salsa.debian.org/python-team/modules/django-allauth.git Homepage: https://github.com/pennersr/django-allauth diff -Nru django-allauth-0.41.0+ds/debian/copyright django-allauth-0.42.0+ds/debian/copyright --- django-allauth-0.41.0+ds/debian/copyright 2019-10-26 09:29:05.000000000 +0000 +++ django-allauth-0.42.0+ds/debian/copyright 2020-05-26 07:40:34.000000000 +0000 @@ -4,6 +4,7 @@ Comment: DS rebuild to remove all .mo files from allauth/locale/*/LC_MESSAGES, as they're not fit to be there. Files-Excluded: allauth/locale/*/LC_MESSAGES/django.mo +Upstream-Name: django-allauth Files: * Copyright: © 2010-2018 Raymond Penners and contributors diff -Nru django-allauth-0.41.0+ds/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch django-allauth-0.42.0+ds/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch --- django-allauth-0.41.0+ds/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch 2019-12-25 17:51:00.000000000 +0000 +++ django-allauth-0.42.0+ds/debian/patches/0002-Fixes-wrongly-encoded-characters-in-some-.po-files.patch 2020-05-26 07:42:41.000000000 +0000 @@ -10,12 +10,12 @@ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/allauth/locale/es/LC_MESSAGES/django.po b/allauth/locale/es/LC_MESSAGES/django.po -index a7dade5..e54c03b 100644 +index bc39ee0..feb6af1 100644 --- a/allauth/locale/es/LC_MESSAGES/django.po +++ b/allauth/locale/es/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2019-12-18 11:53-0600\n" + "POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2018-02-14 17:46-0600\n" -"Last-Translator: Jannis Š\n" +"Last-Translator: Jannis Š\n" @@ -23,12 +23,12 @@ "language/es/)\n" "Language: es\n" diff --git a/allauth/locale/pt_PT/LC_MESSAGES/django.po b/allauth/locale/pt_PT/LC_MESSAGES/django.po -index 183c6ae..9b39981 100644 +index b480c5a..efe819f 100644 --- a/allauth/locale/pt_PT/LC_MESSAGES/django.po +++ b/allauth/locale/pt_PT/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2019-12-18 11:53-0600\n" + "POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2019-02-26 19:48+0100\n" -"Last-Translator: Jannis Š\n" +"Last-Translator: Jannis Š\n" @@ -36,12 +36,12 @@ "django-allauth/language/pt_PT/)\n" "Language: pt_PT\n" diff --git a/allauth/locale/sv/LC_MESSAGES/django.po b/allauth/locale/sv/LC_MESSAGES/django.po -index cffe67c..b487966 100644 +index af67995..5f278b4 100644 --- a/allauth/locale/sv/LC_MESSAGES/django.po +++ b/allauth/locale/sv/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2019-12-18 11:53-0600\n" + "POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:35+0200\n" -"Last-Translator: Jannis Š\n" +"Last-Translator: Jannis Š\n" @@ -49,12 +49,12 @@ "language/sv/)\n" "Language: sv\n" diff --git a/allauth/locale/tr/LC_MESSAGES/django.po b/allauth/locale/tr/LC_MESSAGES/django.po -index d264661..fbea6cf 100644 +index 1b841c1..fc43dc5 100644 --- a/allauth/locale/tr/LC_MESSAGES/django.po +++ b/allauth/locale/tr/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2019-12-18 11:53-0600\n" + "POT-Creation-Date: 2020-05-24 13:46-0500\n" "PO-Revision-Date: 2014-08-12 00:35+0200\n" -"Last-Translator: Jannis Š\n" +"Last-Translator: Jannis Š\n" diff -Nru django-allauth-0.41.0+ds/debian/upstream/metadata django-allauth-0.42.0+ds/debian/upstream/metadata --- django-allauth-0.41.0+ds/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ django-allauth-0.42.0+ds/debian/upstream/metadata 2020-05-26 08:20:05.000000000 +0000 @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/pennersr/django-allauth/issues +Bug-Submit: https://github.com/pennersr/django-allauth/issues/new +Repository: https://github.com/pennersr/django-allauth.git +Repository-Browse: https://github.com/pennersr/django-allauth diff -Nru django-allauth-0.41.0+ds/django_allauth.egg-info/PKG-INFO django-allauth-0.42.0+ds/django_allauth.egg-info/PKG-INFO --- django-allauth-0.41.0+ds/django_allauth.egg-info/PKG-INFO 2019-12-18 17:58:05.000000000 +0000 +++ django-allauth-0.42.0+ds/django_allauth.egg-info/PKG-INFO 2020-05-24 21:53:38.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: django-allauth -Version: 0.41.0 +Version: 0.42.0 Summary: Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication. Home-page: http://github.com/pennersr/django-allauth Author: Raymond Penners diff -Nru django-allauth-0.41.0+ds/django_allauth.egg-info/SOURCES.txt django-allauth-0.42.0+ds/django_allauth.egg-info/SOURCES.txt --- django-allauth-0.41.0+ds/django_allauth.egg-info/SOURCES.txt 2019-12-18 17:58:05.000000000 +0000 +++ django-allauth-0.42.0+ds/django_allauth.egg-info/SOURCES.txt 2020-05-24 21:53:38.000000000 +0000 @@ -276,6 +276,11 @@ allauth/socialaccount/providers/edmodo/tests.py allauth/socialaccount/providers/edmodo/urls.py allauth/socialaccount/providers/edmodo/views.py +allauth/socialaccount/providers/edx/__init__.py +allauth/socialaccount/providers/edx/provider.py +allauth/socialaccount/providers/edx/tests.py +allauth/socialaccount/providers/edx/urls.py +allauth/socialaccount/providers/edx/views.py allauth/socialaccount/providers/eventbrite/__init__.py allauth/socialaccount/providers/eventbrite/provider.py allauth/socialaccount/providers/eventbrite/tests.py @@ -374,6 +379,11 @@ allauth/socialaccount/providers/kakao/tests.py allauth/socialaccount/providers/kakao/urls.py allauth/socialaccount/providers/kakao/views.py +allauth/socialaccount/providers/keycloak/__init__.py +allauth/socialaccount/providers/keycloak/provider.py +allauth/socialaccount/providers/keycloak/tests.py +allauth/socialaccount/providers/keycloak/urls.py +allauth/socialaccount/providers/keycloak/views.py allauth/socialaccount/providers/line/__init__.py allauth/socialaccount/providers/line/models.py allauth/socialaccount/providers/line/provider.py @@ -412,6 +422,11 @@ allauth/socialaccount/providers/microsoft/tests.py allauth/socialaccount/providers/microsoft/urls.py allauth/socialaccount/providers/microsoft/views.py +allauth/socialaccount/providers/mixer/__init__.py +allauth/socialaccount/providers/mixer/provider.py +allauth/socialaccount/providers/mixer/tests.py +allauth/socialaccount/providers/mixer/urls.py +allauth/socialaccount/providers/mixer/views.py allauth/socialaccount/providers/naver/__init__.py allauth/socialaccount/providers/naver/models.py allauth/socialaccount/providers/naver/provider.py @@ -627,6 +642,11 @@ allauth/socialaccount/providers/yahoo/tests.py allauth/socialaccount/providers/yahoo/urls.py allauth/socialaccount/providers/yahoo/views.py +allauth/socialaccount/providers/yandex/__init__.py +allauth/socialaccount/providers/yandex/provider.py +allauth/socialaccount/providers/yandex/tests.py +allauth/socialaccount/providers/yandex/urls.py +allauth/socialaccount/providers/yandex/views.py allauth/socialaccount/providers/ynab/__init__.py allauth/socialaccount/providers/ynab/provider.py allauth/socialaccount/providers/ynab/tests.py diff -Nru django-allauth-0.41.0+ds/docs/advanced.rst django-allauth-0.42.0+ds/docs/advanced.rst --- django-allauth-0.41.0+ds/docs/advanced.rst 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/docs/advanced.rst 2020-05-04 20:03:57.000000000 +0000 @@ -80,7 +80,7 @@ - ``allauth.socialaccount.adapter.DefaultSocialAccountAdapter``: - - ``is_open_for_signup(self, request)``: The default function + - ``is_open_for_signup(self, request, socialaccount)``: The default function returns that is the same as ``ACCOUNT_ADAPTER`` in ``settings.py``. You can override this method by returning ``True``/``False`` if you want to enable/disable socialaccount signup. diff -Nru django-allauth-0.41.0+ds/docs/faq.rst django-allauth-0.42.0+ds/docs/faq.rst --- django-allauth-0.41.0+ds/docs/faq.rst 2019-12-15 13:29:08.000000000 +0000 +++ django-allauth-0.42.0+ds/docs/faq.rst 2020-05-04 20:03:57.000000000 +0000 @@ -17,14 +17,12 @@ Here are a few third party resources to help you get started: +- https://dev.to/gajesh/the-complete-django-allauth-guide-la3 - https://www.youtube.com/watch?v=2QLAc7RJ99s - https://speakerdeck.com/tedtieken/signing-up-and-signing-in-users-in-django-with-django-allauth - https://stackoverflow.com/questions/tagged/django-allauth - http://www.sarahhagstrom.com/2013/09/the-missing-django-allauth-tutorial/ - https://github.com/aellerton/demo-allauth-bootstrap -- https://medium.com/@gajeshbhat/django-allauth-setup-and-configuration-tutorial-63417bba339c -- https://medium.com/@gajeshbhat/extending-and-customizing-django-allauth-eed206623a1a -- https://medium.com/@gajeshbhat/django-allauth-social-login-tutorial-ad021c24d666 I think I found a security issue... now what? ********************************************* diff -Nru django-allauth-0.41.0+ds/docs/installation.rst django-allauth-0.42.0+ds/docs/installation.rst --- django-allauth-0.41.0+ds/docs/installation.rst 2019-12-14 11:00:56.000000000 +0000 +++ django-allauth-0.42.0+ds/docs/installation.rst 2020-05-24 18:44:26.000000000 +0000 @@ -27,7 +27,7 @@ }, ] - AUTHENTICATION_BACKENDS = ( + AUTHENTICATION_BACKENDS = [ ... # Needed to login by username in Django admin, regardless of `allauth` 'django.contrib.auth.backends.ModelBackend', @@ -35,9 +35,9 @@ # `allauth` specific authentication methods, such as login by e-mail 'allauth.account.auth_backends.AuthenticationBackend', ... - ) + ] - INSTALLED_APPS = ( + INSTALLED_APPS = [ ... # The following apps are required: 'django.contrib.auth', @@ -71,6 +71,7 @@ 'allauth.socialaccount.providers.dropbox', 'allauth.socialaccount.providers.dwolla', 'allauth.socialaccount.providers.edmodo', + 'allauth.socialaccount.providers.edx', 'allauth.socialaccount.providers.eveonline', 'allauth.socialaccount.providers.evernote', 'allauth.socialaccount.providers.exist', @@ -87,6 +88,7 @@ 'allauth.socialaccount.providers.instagram', 'allauth.socialaccount.providers.jupyterhub', 'allauth.socialaccount.providers.kakao', + 'allauth.socialaccount.providers.keycloak', 'allauth.socialaccount.providers.line', 'allauth.socialaccount.providers.linkedin', 'allauth.socialaccount.providers.linkedin_oauth2', @@ -94,6 +96,7 @@ 'allauth.socialaccount.providers.mailchimp', 'allauth.socialaccount.providers.meetup', 'allauth.socialaccount.providers.microsoft', + 'allauth.socialaccount.providers.mixer', 'allauth.socialaccount.providers.naver', 'allauth.socialaccount.providers.nextcloud', 'allauth.socialaccount.providers.odnoklassniki', @@ -128,9 +131,10 @@ 'allauth.socialaccount.providers.weixin', 'allauth.socialaccount.providers.windowslive', 'allauth.socialaccount.providers.xing', + 'allauth.socialaccount.providers.yandex', 'allauth.socialaccount.providers.ynab', ... - ) + ] SITE_ID = 1 @@ -152,7 +156,7 @@ urlpatterns = [ ... - url(r'^accounts/', include('allauth.urls')), + path('accounts/', include('allauth.urls')), ... ] diff -Nru django-allauth-0.41.0+ds/docs/overview.rst django-allauth-0.42.0+ds/docs/overview.rst --- django-allauth-0.41.0+ds/docs/overview.rst 2019-12-09 16:11:08.000000000 +0000 +++ django-allauth-0.42.0+ds/docs/overview.rst 2020-05-16 19:53:21.000000000 +0000 @@ -83,6 +83,8 @@ - Edmodo (OAuth2) +- Edx (open.edx.org) (OAuth2) + - Eve Online (OAuth2) - Eventbrite (OAuth2) @@ -115,6 +117,8 @@ - Kakao (OAuth2) +- Keycloak (OAuth2) + - Line (OAuth2) - LinkedIn (OAuth, OAuth2) @@ -127,6 +131,8 @@ - Microsoft (Graph) (OAuth2) +- Mixer (OAuth2) + - NextCloud (OAuth2) - Naver (OAuth2) @@ -197,6 +203,8 @@ - Yahoo (OAuth2) +- Yandex (OAuth2) + - YNAB (OAuth2) diff -Nru django-allauth-0.41.0+ds/docs/providers.rst django-allauth-0.42.0+ds/docs/providers.rst --- django-allauth-0.41.0+ds/docs/providers.rst 2019-12-13 20:14:53.000000000 +0000 +++ django-allauth-0.42.0+ds/docs/providers.rst 2020-05-16 19:53:21.000000000 +0000 @@ -403,6 +403,23 @@ } +Edx +------ + +Open Edx OAuth2 documentation + https://course-catalog-api-guide.readthedocs.io/en/latest/authentication/ + +It is necessary to set ``EDX_URL`` to your open edx installation. If no ``EDX_URL`` +value is set, the Edx provider will use ``https://edx.org`` which does not work: + +.. code-block:: python + + SOCIALACCOUNT_PROVIDERS = { + 'edx': { + 'EDX_URL': "https://openedx.local", + } + } + Eve Online ---------- @@ -516,7 +533,7 @@ 'facebook': { 'METHOD': 'oauth2', 'SDK_URL': '//connect.facebook.net/{locale}/sdk.js', - 'SCOPE': ['email', 'public_profile', 'user_friends'], + 'SCOPE': ['email', 'public_profile'], 'AUTH_PARAMS': {'auth_type': 'reauthenticate'}, 'INIT_PARAMS': {'cookie': True}, 'FIELDS': [ @@ -535,7 +552,7 @@ 'EXCHANGE_TOKEN': True, 'LOCALE_FUNC': 'path.to.callable', 'VERIFIED_EMAIL': False, - 'VERSION': 'v2.12', + 'VERSION': 'v7.0', } } @@ -553,7 +570,7 @@ SCOPE: By default, the ``email`` scope is required depending on whether or not ``SOCIALACCOUNT_QUERY_EMAIL`` is enabled. - Apps using permissions beyond ``email``, ``public_profile`` and ``user_friends`` + Apps using permissions beyond ``email`` and ``public_profile`` require review by Facebook. See `Permissions with Facebook Login `_ for more information. @@ -603,7 +620,7 @@ risk. VERSION: - The Facebook Graph API version to use. The default is ``v2.12``. + The Facebook Graph API version to use. The default is ``v7.0``. App registration (get your key and secret here) A key and secret key can be obtained by @@ -882,6 +899,34 @@ Development callback URL http://localhost:8000/accounts/kakao/login/callback/ +Keycloak +-------- + +Creating and Registering the Client + https://www.keycloak.org/docs/latest/getting_started/index.html#creating-and-registering-the-client + +Development callback URL + http://localhost:8000/accounts/keycloak/login/callback/ + +The following Keycloak settings are available. + +KEYCLOAK_URL: + The url of your hosted keycloak server, it must end with ``/auth``. For + example, you can use: ``https://your.keycloak.server/auth`` + +KEYCLOAK_REAML: + The name of the ``realm`` you want to use. + +Example: + +.. code-block:: python + + SOCIALACCOUNT_PROVIDERS = { + 'keycloak': { + 'KEYCLOAK_URL': 'https://keycloak.custom/auth', + 'KEYCLOAK_REALM': 'master' + } + } Line ---- @@ -1048,6 +1093,33 @@ } +Mixer +----- + +API documentation + https://dev.mixer.com/guides/core/introduction + +App registration (get your key and secret here) + https://mixer.com/lab/oauth + +Development callback URL + http://localhost:8000/accounts/mixer/login/callback/ + +You can change scopes for Mixer using the ``SCOPE`` parameter. For example, to add the ability to edit your mixer profile, you'd use: + +.. code-block:: python + + SOCIALACCOUNT_PROVIDERS = { + 'mixer': { + 'SCOPE': [ + 'user:details:self', + 'user:update:self', + ] + } + } + +The default scope list is ``['user:details:self']``, which is required to get your email address from Mixer. The full list of scopes is available at https://dev.mixer.com/reference/oauth/scopes + Naver ----- @@ -1684,6 +1756,20 @@ * Secret key: "Client Secret" from Untappd * Sites: choose your site +In addition, you should override your user agent to comply with Untappd's API +rules, and specify something in the format +``::``. Otherwise, +you will risk additional rate limiting in your application. + +.. code-block:: python + + SOCIALACCOUNT_PROVIDERS = { + 'untappd': { + 'USER_AGENT': 'django:myappid:1.0', + } + } + + Telegram -------- @@ -1795,6 +1881,21 @@ Register your OAuth2 app below and enter the resultant client id and secret into admin https://developer.yahoo.com/apps/create/ + +Yandex +------ + +App registration (get key and secret here) + https://oauth.yandex.com/client/new + +Development callback URL + https://oauth.yandex.com/verification_code + +Yandex OAuth app has many different access rights for its services. For the basic access level, +you just need to a choose "Yandex.Passport API" section and check "Access to email address" and +"Access to username, first name and surname, gender". Everything else is optional. + + YNAB ------ diff -Nru django-allauth-0.41.0+ds/docs/signals.rst django-allauth-0.42.0+ds/docs/signals.rst --- django-allauth-0.41.0+ds/docs/signals.rst 2019-10-21 07:44:21.000000000 +0000 +++ django-allauth-0.42.0+ds/docs/signals.rst 2020-05-24 18:44:26.000000000 +0000 @@ -10,76 +10,61 @@ - ``allauth.account.signals.user_logged_in(request, user)`` - - Sent when a user logs in. + Sent when a user logs in. - ``allauth.account.signals.user_logged_out(request, user)`` - - Sent when a user logs out. + Sent when a user logs out. - ``allauth.account.signals.user_signed_up(request, user)`` - - Sent when a user signs up for an account. This signal is - typically followed by a ``user_logged_in``, unless e-mail verification - prohibits the user to log in. + Sent when a user signs up for an account. This signal is + typically followed by a ``user_logged_in``, unless e-mail verification + prohibits the user to log in. - ``allauth.account.signals.password_set(request, user)`` - - Sent when a password has been successfully set for the first time. + Sent when a password has been successfully set for the first time. - ``allauth.account.signals.password_changed(request, user)`` - - Sent when a password has been successfully changed. + Sent when a password has been successfully changed. - ``allauth.account.signals.password_reset(request, user)`` - - Sent when a password has been successfully reset. + Sent when a password has been successfully reset. - ``allauth.account.signals.email_confirmed(request, email_address)`` - - Sent after the email address in the db was updated and set to confirmed. + Sent after the email address in the db was updated and set to confirmed. - ``allauth.account.signals.email_confirmation_sent(request, confirmation, signup)`` - - Sent right after the email confirmation is sent. + Sent right after the email confirmation is sent. - ``allauth.account.signals.email_changed(request, user, from_email_address, to_email_address)`` - - Sent when a primary email address has been changed. + Sent when a primary email address has been changed. - ``allauth.account.signals.email_added(request, user, email_address)`` - - Sent when a new email address has been added. + Sent when a new email address has been added. - ``allauth.account.signals.email_removed(request, user, email_address)`` - - Sent when an email address has been deleted. + Sent when an email address has been deleted. allauth.socialaccount --------------------- - ``allauth.socialaccount.signals.pre_social_login(request, sociallogin)`` - - Sent after a user successfully authenticates via a social provider, - but before the login is fully processed. This signal is emitted as - part of the social login and/or signup process, as well as when - connecting additional social accounts to an existing account. Access - tokens and profile information, if applicable for the provider, is - provided. + Sent after a user successfully authenticates via a social provider, + but before the login is fully processed. This signal is emitted as + part of the social login and/or signup process, as well as when + connecting additional social accounts to an existing account. Access + tokens and profile information, if applicable for the provider, is + provided. - ``allauth.socialaccount.signals.social_account_added(request, sociallogin)`` - - Sent after a user connects a social account to a their local account. + Sent after a user connects a social account to a their local account. - ``allauth.socialaccount.signals.social_account_updated(request, sociallogin)`` - - Sent after a social account has been updated. This happens when a user - logs in using an already connected social account, or completes a `connect` - flow for an already connected social account. Useful if you need to - unpack extra data for social accounts as they are updated. + Sent after a social account has been updated. This happens when a user + logs in using an already connected social account, or completes a `connect` + flow for an already connected social account. Useful if you need to + unpack extra data for social accounts as they are updated. - ``allauth.socialaccount.signals.social_account_removed(request, socialaccount)`` - - Sent after a user disconnects a social account from their local - account. + Sent after a user disconnects a social account from their local + account. diff -Nru django-allauth-0.41.0+ds/PKG-INFO django-allauth-0.42.0+ds/PKG-INFO --- django-allauth-0.41.0+ds/PKG-INFO 2019-12-18 17:58:08.000000000 +0000 +++ django-allauth-0.42.0+ds/PKG-INFO 2020-05-24 21:53:40.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: django-allauth -Version: 0.41.0 +Version: 0.42.0 Summary: Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication. Home-page: http://github.com/pennersr/django-allauth Author: Raymond Penners diff -Nru django-allauth-0.41.0+ds/test_settings.py django-allauth-0.42.0+ds/test_settings.py --- django-allauth-0.41.0+ds/test_settings.py 2019-12-09 16:10:55.000000000 +0000 +++ django-allauth-0.42.0+ds/test_settings.py 2020-05-16 19:53:21.000000000 +0000 @@ -78,6 +78,7 @@ 'allauth.socialaccount.providers.dropbox', 'allauth.socialaccount.providers.dwolla', 'allauth.socialaccount.providers.edmodo', + 'allauth.socialaccount.providers.edx', 'allauth.socialaccount.providers.eveonline', 'allauth.socialaccount.providers.evernote', 'allauth.socialaccount.providers.eventbrite', @@ -96,6 +97,7 @@ 'allauth.socialaccount.providers.instagram', 'allauth.socialaccount.providers.jupyterhub', 'allauth.socialaccount.providers.kakao', + 'allauth.socialaccount.providers.keycloak', 'allauth.socialaccount.providers.line', 'allauth.socialaccount.providers.linkedin', 'allauth.socialaccount.providers.linkedin_oauth2', @@ -103,6 +105,7 @@ 'allauth.socialaccount.providers.mailru', 'allauth.socialaccount.providers.meetup', 'allauth.socialaccount.providers.microsoft', + 'allauth.socialaccount.providers.mixer', 'allauth.socialaccount.providers.naver', 'allauth.socialaccount.providers.nextcloud', 'allauth.socialaccount.providers.odnoklassniki', @@ -141,6 +144,7 @@ 'allauth.socialaccount.providers.windowslive', 'allauth.socialaccount.providers.xing', 'allauth.socialaccount.providers.yahoo', + 'allauth.socialaccount.providers.yandex', 'allauth.socialaccount.providers.ynab', )