diff --git a/config/__pycache__/settings.cpython-311.pyc b/config/__pycache__/settings.cpython-311.pyc index 6563639..10939c5 100644 Binary files a/config/__pycache__/settings.cpython-311.pyc and b/config/__pycache__/settings.cpython-311.pyc differ diff --git a/config/settings.py b/config/settings.py index 0905d2c..80aa2b0 100644 --- a/config/settings.py +++ b/config/settings.py @@ -167,13 +167,13 @@ EMAIL_BACKEND = os.getenv( "EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend" ) -EMAIL_HOST = os.getenv("EMAIL_HOST", "127.0.0.1") -EMAIL_PORT = int(os.getenv("EMAIL_PORT", "587")) -EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER", "") -EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD", "") -EMAIL_USE_TLS = os.getenv("EMAIL_USE_TLS", "true").lower() == "true" -EMAIL_USE_SSL = os.getenv("EMAIL_USE_SSL", "false").lower() == "true" -DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL", "no-reply@example.com") +EMAIL_HOST = os.getenv("EMAIL_HOST", os.getenv("SMTP_HOST", "127.0.0.1")) +EMAIL_PORT = int(os.getenv("EMAIL_PORT", os.getenv("SMTP_PORT", "587"))) +EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER", os.getenv("SMTP_USER", "")) +EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD", os.getenv("SMTP_PASS", "")) +EMAIL_USE_TLS = os.getenv("EMAIL_USE_TLS", "true").lower() == "true" if os.getenv("SMTP_SECURE") != "ssl" else False +EMAIL_USE_SSL = os.getenv("EMAIL_USE_SSL", "false").lower() == "true" or os.getenv("SMTP_SECURE") == "ssl" +DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL", os.getenv("MAIL_FROM", "no-reply@example.com")) CONTACT_EMAIL_TO = [ item.strip() for item in os.getenv("CONTACT_EMAIL_TO", DEFAULT_FROM_EMAIL).split(",") diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 78ba3c3..52953c4 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/templates/core/index.html b/core/templates/core/index.html index c083a43..95911fe 100644 --- a/core/templates/core/index.html +++ b/core/templates/core/index.html @@ -227,7 +227,7 @@ document.addEventListener('DOMContentLoaded', function() {
+
+
+ {% trans "Your password has been set. You may go ahead and log in now." %}
+ {% trans "Log in" %} +{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}
+{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}
+ {% trans "Return to login" %} +