settings: Change example NOREPLY_EMAIL_ADDRESS to have a display name.

We used to use constructions like
from_email = "Zulip <%s>" % (settings.NOREPLY_EMAIL_ADDRESS,)
but no longer do. All references to settings.NOREPLY_EMAIL_ADDRESS in the
codebase now do not append a display name.
This commit is contained in:
Rishi Gupta 2017-05-05 00:04:36 -07:00 committed by Tim Abbott
parent 8321bd3f92
commit 962b56efbd
4 changed files with 4 additions and 4 deletions

View File

@ -37,7 +37,7 @@ class TestMissedMessages(ZulipTestCase):
if settings.EMAIL_GATEWAY_PATTERN != "":
reply_to_addresses = [settings.EMAIL_GATEWAY_PATTERN % (u'mm' + t) for t in tokens]
else:
reply_to_addresses = ["noreply@example.com"]
reply_to_addresses = ["Zulip <noreply@example.com>"]
msg = mail.outbox[0]
sender = settings.NOREPLY_EMAIL_ADDRESS
from_email = sender

View File

@ -49,7 +49,7 @@ EMAIL_USE_TLS = True
DEFAULT_FROM_EMAIL = "Zulip <zulip@zulip.com>"
# The noreply address to be used as Reply-To for certain generated emails.
NOREPLY_EMAIL_ADDRESS = "noreply@zulip.com"
NOREPLY_EMAIL_ADDRESS = "Zulip <noreply@zulip.com>"
WELCOME_EMAIL_SENDER = {'email': 'wdaher@zulip.com', 'name': 'Waseem Daher'}
SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"

View File

@ -68,7 +68,7 @@ EMAIL_USE_TLS = True
DEFAULT_FROM_EMAIL = "Zulip <zulip@example.com>"
# The noreply address to be used as Reply-To for certain generated emails.
# Messages sent to this address should not be delivered anywhere.
NOREPLY_EMAIL_ADDRESS = "noreply@example.com"
NOREPLY_EMAIL_ADDRESS = "Zulip <noreply@example.com>"
### AUTHENTICATION SETTINGS

View File

@ -234,7 +234,7 @@ REQUIRED_SETTINGS = [("EXTERNAL_HOST", "zulip.example.com"),
# case, it seems worth having in this list
("SECRET_KEY", ""),
("AUTHENTICATION_BACKENDS", ()),
("NOREPLY_EMAIL_ADDRESS", "noreply@example.com"),
("NOREPLY_EMAIL_ADDRESS", "Zulip <noreply@example.com>"),
("DEFAULT_FROM_EMAIL", "Zulip <zulip@example.com>"),
]