paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 07:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

web: Save two 301 redirects from /terms to /terms/ to /policies/terms.

Browse Source
This commit is contained in:
Alex Vandiver
2023-03-23 03:07:19 +00:00
committed by Tim Abbott
parent d9daeb13e0
commit ce847fd09c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/accounts_accept_terms.html
View File

@@ -49,7 +49,7 @@ the registration flow has its own (nearly identical) copy of the fields below in
<input id="id_terms" class="required" type="checkbox" name="terms" <input id="id_terms" class="required" type="checkbox" name="terms"
{% if form.terms.value() %}checked="checked"{% endif %} /> {% if form.terms.value() %}checked="checked"{% endif %} />
<span></span> <span></span>
{% trans %}I agree to the <a href="{{ root_domain_uri }}/terms" target="_blank" rel="noopener noreferrer">Terms of Service</a>.{% endtrans %} {% trans %}I agree to the <a href="{{ root_domain_uri }}/policies/terms" target="_blank" rel="noopener noreferrer">Terms of Service</a>.{% endtrans %}
</label> </label>
{% if form.terms.errors %} {% if form.terms.errors %}
{% for error in form.terms.errors %} {% for error in form.terms.errors %}

2
templates/zerver/register.html
View File

@@ -266,7 +266,7 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
<input id="id_terms" class="required" type="checkbox" name="terms" <input id="id_terms" class="required" type="checkbox" name="terms"
{% if form.terms.value() %}checked="checked"{% endif %} /> {% if form.terms.value() %}checked="checked"{% endif %} />
<span></span> <span></span>
{% trans %}I agree to the <a href="{{ root_domain_uri }}/terms" target="_blank" rel="noopener noreferrer">Terms of Service</a>.{% endtrans %} {% trans %}I agree to the <a href="{{ root_domain_uri }}/policies/terms" target="_blank" rel="noopener noreferrer">Terms of Service</a>.{% endtrans %}
</label> </label>
{% if form.terms.errors %} {% if form.terms.errors %}
{% for error in form.terms.errors %} {% for error in form.terms.errors %}

2
tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py
View File

@@ -70,7 +70,7 @@ class PorticoDocumentationSpider(BaseDocumentationSpider):
"http://localhost:9981/team/", "http://localhost:9981/team/",
"http://localhost:9981/apps/", "http://localhost:9981/apps/",
"http://localhost:9981/integrations/", "http://localhost:9981/integrations/",
"http://localhost:9981/terms", "http://localhost:9981/policies/terms",
"http://localhost:9981/privacy", "http://localhost:9981/privacy",
"http://localhost:9981/features", "http://localhost:9981/features",
"http://localhost:9981/why-zulip", "http://localhost:9981/why-zulip",

2
zerver/tests/test_docs.py
View File

@@ -636,7 +636,7 @@ class PrivacyTermsTest(ZulipTestCase):
self.assert_in_success_response(["Kandra Labs"], result) self.assert_in_success_response(["Kandra Labs"], result)
def test_no_nav(self) -> None: def test_no_nav(self) -> None:
# Test that our ?nav=0 feature of /privacy and /terms, # Test that our ?nav=0 feature of /privacy and /policies/terms,
# designed to comply with the Apple App Store draconian # designed to comply with the Apple App Store draconian
# policies that ToS/Privacy pages linked from an iOS app have # policies that ToS/Privacy pages linked from an iOS app have
# no links to the rest of the site if there's pricing # no links to the rest of the site if there's pricing