From c686c5ed0f461e41b12ee98d0ef1978017f3330c Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 23 Mar 2023 02:53:14 +0000 Subject: [PATCH] web: Save a needless 301 redirect from /plans to /plans/. --- corporate/views/portico.py | 4 ++-- docs/production/multiple-organizations.md | 2 +- help/message-retention-policy.md | 2 +- help/zulip-cloud-billing.md | 2 +- templates/corporate/billing.html | 2 +- templates/corporate/for/communities.html | 4 ++-- templates/corporate/for/events.html | 4 ++-- templates/corporate/for/open-source.html | 6 +++--- templates/corporate/for/research.html | 6 +++--- templates/corporate/hello.html | 4 ++-- templates/corporate/team.html | 2 +- templates/corporate/values.md | 2 +- .../spiders/check_help_documentation.py | 2 +- web/templates/gear_menu.hbs | 8 ++++---- zerver/lib/markdown/help_relative_links.py | 2 +- zerver/tests/test_docs.py | 6 +++--- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/corporate/views/portico.py b/corporate/views/portico.py index b787386448..22cedc0ebc 100644 --- a/corporate/views/portico.py +++ b/corporate/views/portico.py @@ -60,9 +60,9 @@ def plans_view(request: HttpRequest) -> HttpResponse: if realm is not None: if realm.plan_type == Realm.PLAN_TYPE_SELF_HOSTED and settings.PRODUCTION: - return HttpResponseRedirect("https://zulip.com/plans") + return HttpResponseRedirect("https://zulip.com/plans/") if not request.user.is_authenticated: - return redirect_to_login(next="/plans") + return redirect_to_login(next="/plans/") if request.user.is_guest: return TemplateResponse(request, "404.html", status=404) customer = get_customer_by_realm(realm) diff --git a/docs/production/multiple-organizations.md b/docs/production/multiple-organizations.md index b3b7c4e0bc..0777f000f8 100644 --- a/docs/production/multiple-organizations.md +++ b/docs/production/multiple-organizations.md @@ -146,7 +146,7 @@ browsers will experience weird/confusing redirects. ## Open realm creation -Installations like [Zulip Cloud](https://zulip.com/plans) that wish to +Installations like [Zulip Cloud](https://zulip.com/plans/) that wish to allow anyone on the Internet to create new Zulip organizations can do so by setting `OPEN_REALM_CREATION = True` in `/etc/zulip/settings.py`. Note that offering Zulip hosting to anyone diff --git a/help/message-retention-policy.md b/help/message-retention-policy.md index 9a5ca6b0f8..c055fc1620 100644 --- a/help/message-retention-policy.md +++ b/help/message-retention-policy.md @@ -20,7 +20,7 @@ Zulip's system supports: period. In Zulip Cloud, message retention policies are available on the Zulip -Cloud Standard and Zulip Cloud Plus [plans](https://zulip.com/plans), +Cloud Standard and Zulip Cloud Plus [plans](https://zulip.com/plans/), as well as for the hundreds of communities with sponsored Cloud Standard hosting. diff --git a/help/zulip-cloud-billing.md b/help/zulip-cloud-billing.md index f904bf869c..f909e6d0d6 100644 --- a/help/zulip-cloud-billing.md +++ b/help/zulip-cloud-billing.md @@ -1,7 +1,7 @@ # Zulip Cloud billing This page answers some frequently asked questions about [Zulip Cloud plans and -pricing](https://zulip.com/plans). If you have any other questions, please don't hesitate to +pricing](https://zulip.com/plans/). If you have any other questions, please don't hesitate to reach out at sales@zulip.com. ## Differences between Zulip Cloud plans diff --git a/templates/corporate/billing.html b/templates/corporate/billing.html index f268ba9125..d005b52f42 100644 --- a/templates/corporate/billing.html +++ b/templates/corporate/billing.html @@ -204,7 +204,7 @@ - +

diff --git a/templates/corporate/for/communities.html b/templates/corporate/for/communities.html index 1e897705f5..93f9c100cb 100644 --- a/templates/corporate/for/communities.html +++ b/templates/corporate/for/communities.html @@ -22,7 +22,7 @@

Open-source projects, research collaborations, volunteer organizations.
Most communities get an 85%+ discount - on Zulip Cloud Standard! + on Zulip Cloud Standard!

Learn how the Recurse @@ -50,7 +50,7 @@

- Most communities get an 85%+ discount on Zulip Cloud Standard! + Most communities get an 85%+ discount on Zulip Cloud Standard!

Join the hundreds of communities we sponsor. Contact diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index e4ba4e0122..af7c87bb6d 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -22,7 +22,7 @@

Zulip for conferences and events

Conferences, workshops, hackathons. In-person, online, and anything in between. -
Zulip Cloud Standard is free for +
Zulip Cloud Standard is free for academic conferences and most other non-profit events!

@@ -280,7 +280,7 @@

- Zulip Cloud Standard is free for academic conferences and + Zulip Cloud Standard is free for academic conferences and most other non-profit events!

diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index 950df2aa0d..80f15d527a 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -22,7 +22,7 @@

Zulip for open source projects

Grow your community with thoughtful and inclusive discussion. -
Zulip Cloud Standard is free for open-source +
Zulip Cloud Standard is free for open-source projects!

@@ -123,7 +123,7 @@
  • Maintain access to your organization's entire - message history with free Zulip + message history with free Zulip Cloud Standard hosting. Information is at your fingertips with Zulip's powerful full-text @@ -710,7 +710,7 @@

    - Zulip Cloud Standard is free for open-source projects! + Zulip Cloud Standard is free for open-source projects!

    Join the hundreds of open-source projects we sponsor.

    diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 3b4cafd659..56dd0c9af1 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -23,7 +23,7 @@

    Zulip for research

    Chat for your project, research group, department or scientific - field.
    Zulip Cloud Standard is free for academic + field.
    Zulip Cloud Standard is free for academic research!

    @@ -128,7 +128,7 @@
  • Maintain access to your organization's entire - message history with free Zulip + message history with free Zulip Cloud Standard hosting. Information is at your fingertips with Zulip's powerful full-text @@ -394,7 +394,7 @@

    - Zulip Cloud Standard is free for + Zulip Cloud Standard is free for academic research!

    diff --git a/templates/corporate/hello.html b/templates/corporate/hello.html index aded33e2ee..724f9b49f1 100644 --- a/templates/corporate/hello.html +++ b/templates/corporate/hello.html @@ -129,7 +129,7 @@

    Zulip Free is free for an unlimited number of users.

    - + {{ _('See plans and pricing') }}
    @@ -552,7 +552,7 @@ {{ _('Log in now') }} {% else %} - + {{ _('See plans and pricing') }} {% endif %} diff --git a/templates/corporate/team.html b/templates/corporate/team.html index cb74e54dce..9e84a695de 100644 --- a/templates/corporate/team.html +++ b/templates/corporate/team.html @@ -62,7 +62,7 @@ contributors, and more than 75 with 100+ commits." %}

    Kandra Labs provides commercial Zulip hosting and on-premises support - at https://zulip.com, + at https://zulip.com, and employs the core developers of the project. It was started in June 2016 to help sustain the growth of the Zulip project. Kandra Labs is funded by diff --git a/templates/corporate/values.md b/templates/corporate/values.md index 7f94806998..a24f20ada8 100644 --- a/templates/corporate/values.md +++ b/templates/corporate/values.md @@ -82,7 +82,7 @@ An important part of Zulip’s mission is ensuring that worthy organizations, fr communities](/case-studies/lean/), are able to use Zulip whether or not they have funding. -We sponsor [Zulip Cloud Standard](/plans) hosting for [open-source +We sponsor [Zulip Cloud Standard](/plans/) hosting for [open-source projects](/for/open-source/), [research groups](/for/research/), [education](/for/education/), [non-profits](/for/communities/) and other [communities](/for/communities/). This program has grown exponentially since its diff --git a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py index b092aa3404..e4bddfb962 100644 --- a/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py +++ b/tools/documentation_crawler/documentation_crawler/spiders/check_help_documentation.py @@ -66,7 +66,7 @@ class PorticoDocumentationSpider(BaseDocumentationSpider): start_urls = [ "http://localhost:9981/hello/", "http://localhost:9981/history/", - "http://localhost:9981/plans", + "http://localhost:9981/plans/", "http://localhost:9981/team", "http://localhost:9981/apps", "http://localhost:9981/integrations/", diff --git a/web/templates/gear_menu.hbs b/web/templates/gear_menu.hbs index f8a31bafac..6f078da688 100644 --- a/web/templates/gear_menu.hbs +++ b/web/templates/gear_menu.hbs @@ -18,11 +18,11 @@ {{else}}

  • {{#if is_plan_limited }} - Zulip Cloud Free + Zulip Cloud Free {{else if is_plan_standard}} - Zulip Cloud Standard + Zulip Cloud Standard {{else if is_plan_standard_sponsored_for_free}} - Zulip Cloud Standard (sponsored) + Zulip Cloud Standard (sponsored) {{/if}}
    • {{/if}} @@ -149,7 +149,7 @@ {{/if}} {{#if show_plans}} diff --git a/zerver/lib/markdown/help_relative_links.py b/zerver/lib/markdown/help_relative_links.py index ddd0a5743b..665dae633a 100644 --- a/zerver/lib/markdown/help_relative_links.py +++ b/zerver/lib/markdown/help_relative_links.py @@ -23,7 +23,7 @@ gear_info = { "organization-settings": ["Organization settings", "/#organization/organization-profile"], "integrations": ["Integrations", "/integrations/"], "stats": ["Usage statistics", "/stats"], - "plans": ["Plans and pricing", "/plans"], + "plans": ["Plans and pricing", "/plans/"], "billing": ["Billing", "/billing"], "invite": ["Invite users", "/#invite"], "about-zulip": ["About Zulip", "/#about-zulip"], diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py index 8e0d296303..54aa2ebe51 100644 --- a/zerver/tests/test_docs.py +++ b/zerver/tests/test_docs.py @@ -423,7 +423,7 @@ class PlansPageTest(ZulipTestCase): realm.save(update_fields=["plan_type"]) result = self.client_get("/plans/", subdomain="zulip") self.assertEqual(result.status_code, 302) - self.assertEqual(result["Location"], "/accounts/login/?next=/plans") + self.assertEqual(result["Location"], "/accounts/login/?next=/plans/") guest_user = "polonius" self.login(guest_user) @@ -463,14 +463,14 @@ class PlansPageTest(ZulipTestCase): with self.settings(PRODUCTION=True): result = self.client_get("/plans/", subdomain="zulip") self.assertEqual(result.status_code, 302) - self.assertEqual(result["Location"], "https://zulip.com/plans") + self.assertEqual(result["Location"], "https://zulip.com/plans/") self.login("iago") # SELF_HOSTED should hide the local plans page, even if logged in result = self.client_get("/plans/", subdomain="zulip") self.assertEqual(result.status_code, 302) - self.assertEqual(result["Location"], "https://zulip.com/plans") + self.assertEqual(result["Location"], "https://zulip.com/plans/") # But in the development environment, it renders a page result = self.client_get("/plans/", subdomain="zulip")