mirror of
https://github.com/zulip/zulip.git
synced 2025-11-05 14:35:27 +00:00
terms: Rename and tweak FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE.
We do s/TOS/TERMS_OF_SERVICE/ on the name, and while we're at it, remove the assumed zerver/ namespace for the template, which isn't correct -- Zulip Cloud related content should be in the corporate/ directory.
This commit is contained in:
@@ -496,7 +496,7 @@ class HomeTest(ZulipTestCase):
|
||||
user.tos_version = None
|
||||
user.save()
|
||||
|
||||
with self.settings(FIRST_TIME_TOS_TEMPLATE="hello.html"), self.settings(
|
||||
with self.settings(FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE="zerver/hello.html"), self.settings(
|
||||
TERMS_OF_SERVICE_VERSION="99.99"
|
||||
):
|
||||
result = self.client_post("/accounts/accept_terms/")
|
||||
|
||||
@@ -49,8 +49,11 @@ def accounts_accept_terms(request: HttpRequest) -> HttpResponse:
|
||||
|
||||
email = request.user.delivery_email
|
||||
special_message_template = None
|
||||
if request.user.tos_version is None and settings.FIRST_TIME_TOS_TEMPLATE is not None:
|
||||
special_message_template = "zerver/" + settings.FIRST_TIME_TOS_TEMPLATE
|
||||
if (
|
||||
request.user.tos_version is None
|
||||
and settings.FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE is not None
|
||||
):
|
||||
special_message_template = settings.FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE
|
||||
return render(
|
||||
request,
|
||||
"zerver/accounts_accept_terms.html",
|
||||
|
||||
@@ -360,7 +360,7 @@ REALM_CREATION_LINK_VALIDITY_DAYS = 7
|
||||
# Zulip again on the web.
|
||||
TERMS_OF_SERVICE_VERSION: Optional[str] = None
|
||||
# Template to use when bumping TERMS_OF_SERVICE_VERSION to explain situation.
|
||||
FIRST_TIME_TOS_TEMPLATE: Optional[str] = None
|
||||
FIRST_TIME_TERMS_OF_SERVICE_TEMPLATE: Optional[str] = None
|
||||
|
||||
# Hostname used for Zulip's statsd logging integration.
|
||||
STATSD_HOST = ""
|
||||
|
||||
Reference in New Issue
Block a user