diff --git a/templates/zerver/developer-community.html b/templates/zerver/development-community.html similarity index 88% rename from templates/zerver/developer-community.html rename to templates/zerver/development-community.html index 72fdaef47d..1935fc6225 100644 --- a/templates/zerver/developer-community.html +++ b/templates/zerver/development-community.html @@ -1,11 +1,11 @@ {% extends "zerver/portico.html" %} {% set entrypoint = "landing-page" %} -{% set OPEN_GRAPH_TITLE = 'The Zulip developer community' %} +{% set OPEN_GRAPH_TITLE = 'The Zulip development community' %} {% set OPEN_GRAPH_DESCRIPTION = 'Join the Zulip community to contribute, ask questions, or provide feedback to the creators of Zulip.' %} {% block title %} -The Zulip developer community +The Zulip development community {% endblock %} {% block customhead %} @@ -21,7 +21,7 @@
-

{% trans %}The Zulip developer community{% endtrans %}

+

{% trans %}The Zulip development community{% endtrans %}

Join today! The buttons below provide customized stream subscriptions. @@ -41,7 +41,7 @@
- {{ render_markdown_path('zerver/developer-community.md') }} + {{ render_markdown_path('zerver/development-community.md') }}
diff --git a/templates/zerver/developer-community.md b/templates/zerver/development-community.md similarity index 100% rename from templates/zerver/developer-community.md rename to templates/zerver/development-community.md diff --git a/templates/zerver/faq.html b/templates/zerver/faq.html index d41f005f98..d6299c5647 100644 --- a/templates/zerver/faq.html +++ b/templates/zerver/faq.html @@ -37,7 +37,7 @@ The Recurse Center. If you’d like to see a large Zulip in action, the - Zulip + Zulip community server has thousands of accounts and hundreds of weekly active users, and is run on a single machine with 8GB of RAM.

@@ -124,7 +124,7 @@

Stop by the - Zulip + Zulip community server to see Zulip in action and chat with the developers, tweet @zulip, or diff --git a/templates/zerver/footer.html b/templates/zerver/footer.html index 164a13b679..c2e1d0bf1f 100644 --- a/templates/zerver/footer.html +++ b/templates/zerver/footer.html @@ -75,7 +75,7 @@ {{ _("Help center") }}

  • - + {{ _("Community chat") }}
    • @@ -121,7 +121,7 @@ {{ _("Contributing to Zulip") }} -
  • {{ _("Development community") }}
    • +
  • {{ _("Development community") }}
  • {{ _("Translation") }} diff --git a/templates/zerver/for-companies.html b/templates/zerver/for-companies.html index 22b35a8cbb..62e307bce9 100644 --- a/templates/zerver/for-companies.html +++ b/templates/zerver/for-companies.html @@ -502,7 +502,7 @@

    Getting started or moving from another platform is easy! Import your existing organization from Slack, Mattermost, Gitter, or Rocket.Chat.

    -

    If you have any questions, please contact us at sales@zulip.com. You can also drop by our friendly developer community at chat.zulip.org to ask for help or suggest improvements!

    +

    If you have any questions, please contact us at sales@zulip.com. You can also drop by our friendly development community at chat.zulip.org to ask for help or suggest improvements!

    diff --git a/templates/zerver/for-education.html b/templates/zerver/for-education.html index a5c59b23cd..54954bd089 100644 --- a/templates/zerver/for-education.html +++ b/templates/zerver/for-education.html @@ -347,7 +347,7 @@ questions or feedback, please contact us at sales@zulip.com. You can also drop by - our friendly developer + our friendly development community at chat.zulip.org to ask for help or suggest improvements!

    diff --git a/templates/zerver/for-events.html b/templates/zerver/for-events.html index 05c56f9f4e..d9850825af 100644 --- a/templates/zerver/for-events.html +++ b/templates/zerver/for-events.html @@ -291,7 +291,7 @@ and research communities. If you have any questions, please contact us at sales@zulip.com. You can also drop by - our friendly developer community at + our friendly development community at chat.zulip.org to ask for help or suggest improvements!

    diff --git a/templates/zerver/for-open-source.html b/templates/zerver/for-open-source.html index 8b40ccd319..1dc3868b4a 100644 --- a/templates/zerver/for-open-source.html +++ b/templates/zerver/for-open-source.html @@ -652,7 +652,7 @@ If you have any questions, please contact us at sales@zulip.com. You can also drop by our - friendly developer + friendly development community at chat.zulip.org to ask for help or suggest improvements! diff --git a/templates/zerver/for-research.html b/templates/zerver/for-research.html index 699c275a5f..944d4c0a80 100644 --- a/templates/zerver/for-research.html +++ b/templates/zerver/for-research.html @@ -348,7 +348,7 @@
  • Getting started or moving from another platform is easy! Import your existing organization from Slack, Mattermost, Gitter, or Rocket.Chat.
    • -
  • If you have any questions, please contact us at sales@zulip.com. You can also drop by our friendly developer community at chat.zulip.org to ask for help or suggest improvements!
    • +
  • If you have any questions, please contact us at sales@zulip.com. You can also drop by our friendly development community at chat.zulip.org to ask for help or suggest improvements!
    • diff --git a/templates/zerver/for/tum-case-study.md b/templates/zerver/for/tum-case-study.md index 601d773d48..f2ab5bf4d8 100644 --- a/templates/zerver/for/tum-case-study.md +++ b/templates/zerver/for/tum-case-study.md @@ -63,7 +63,7 @@ self-hosted to comply with European laws about protecting student data,” Robert says. “Zulip has been extremely stable and requires no maintenance beyond installing updates.” -When questions arise, Robert stops by the Zulip developer community to ask for +When questions arise, Robert stops by the Zulip development community to ask for advice. “Right before exams, we had over 1000 students online at once, and I was worried that the CPU usage was high. The community investigated my problem immediately, and a couple of days later they [shared a patch] @@ -84,6 +84,6 @@ and [research](/for/research)! [tum-ranking]: https://www.in.tum.de/en/the-department/profile-of-the-department/facts-figures/facts-and-figures-2020/ -[chat-zulip-org]: /developer-community/ +[chat-zulip-org]: /development-community/ [czo-patch-thread]: https://chat.zulip.org/#narrow/stream/3-backend/topic/Tornado.20performance/near/1111686 [zulip-4-blog]: https://blog.zulip.com/2021/05/13/zulip-4-0-released/ diff --git a/templates/zerver/hello.html b/templates/zerver/hello.html index 87fd97fba4..82e71739df 100644 --- a/templates/zerver/hello.html +++ b/templates/zerver/hello.html @@ -358,7 +358,7 @@ from all around the world. With 160,000 words of developer documentation, a high quality code base, and a - welcoming community, + welcoming community, it’s easy to extend or tweak Zulip.

    diff --git a/templates/zerver/help/getting-your-organization-started-with-zulip.md b/templates/zerver/help/getting-your-organization-started-with-zulip.md index eb863cffe3..30e3d87cec 100644 --- a/templates/zerver/help/getting-your-organization-started-with-zulip.md +++ b/templates/zerver/help/getting-your-organization-started-with-zulip.md @@ -10,7 +10,7 @@ our guide to [Getting started with Zulip][getting-started]. [getting-started]: /help/getting-started-with-zulip If you encounter any problems as you're getting started, please drop -by our [friendly developer community](/developer-community/) and let +by our [friendly development community](/development-community/) and let us know! ## Trying out Zulip diff --git a/templates/zerver/help/include/trying-out-zulip.md b/templates/zerver/help/include/trying-out-zulip.md index 1c447a3efc..0e24d78993 100644 --- a/templates/zerver/help/include/trying-out-zulip.md +++ b/templates/zerver/help/include/trying-out-zulip.md @@ -7,5 +7,5 @@ We also highly recommend trying Zulip for yourself! You can: * [Create a Zulip Cloud organization](/new/) for free with just a few clicks. -* [Join the Zulip developer community](/developer-community/) to see +* [Join the Zulip development community](/development-community/) to see Zulip in action. Feel free to introduce yourself and ask questions! diff --git a/templates/zerver/help/setting-up-zulip-for-a-class.md b/templates/zerver/help/setting-up-zulip-for-a-class.md index 8fbcaff7d1..96ddc99d21 100644 --- a/templates/zerver/help/setting-up-zulip-for-a-class.md +++ b/templates/zerver/help/setting-up-zulip-for-a-class.md @@ -13,7 +13,7 @@ class](/help/using-zulip-for-a-class) guide. [setting-up]: /help/getting-your-organization-started-with-zulip If you encounter any problems as you're getting started, please drop -by our [friendly developer community](/developer-community/) and let +by our [friendly development community](/development-community/) and let us know! ## Trying out Zulip @@ -29,7 +29,7 @@ We also highly recommend trying Zulip for yourself! You can: * [Create a Zulip Cloud organization](/new/) for free with just a few clicks. -* [Join the Zulip developer community](/developer-community/) to see +* [Join the Zulip development community](/development-community/) to see Zulip in action. Feel free to introduce yourself and ask questions! diff --git a/templates/zerver/landing_nav.html b/templates/zerver/landing_nav.html index 5f75c9a519..5b5d62e43e 100644 --- a/templates/zerver/landing_nav.html +++ b/templates/zerver/landing_nav.html @@ -95,7 +95,7 @@ Help center

  • - + Community chat
    • diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py index c757159540..79b396fdd1 100644 --- a/zerver/tests/test_docs.py +++ b/zerver/tests/test_docs.py @@ -154,7 +154,7 @@ class DocPageTest(ZulipTestCase): self._test("/apps/", "Apps for every platform.") self._test("/features/", "Beautiful messaging") self._test("/hello/", "Chat for distributed teams", landing_missing_strings=["Log in"]) - self._test("/developer-community/", "Zulip developer community") + self._test("/development-community/", "Zulip development community") self._test("/why-zulip/", "Why Zulip?") self._test("/for/open-source/", "for open source projects") self._test("/for/events/", "for conferences and events") @@ -185,6 +185,10 @@ class DocPageTest(ZulipTestCase): self.assertEqual(result.status_code, 301) self.assertIn("hello", result["Location"]) + result = self.client_get("/developer-community/") + self.assertEqual(result.status_code, 301) + self.assertIn("development-community", result["Location"]) + def test_portico_pages_open_graph_metadata(self) -> None: # Why Zulip url = "/why-zulip/" diff --git a/zproject/urls.py b/zproject/urls.py index 8d8c6996c9..780ae05f79 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -608,7 +608,9 @@ i18n_urls = [ path("apps/download/", app_download_link_redirect), path("apps/", apps_view), path( - "developer-community/", landing_view, {"template_name": "zerver/developer-community.html"} + "development-community/", + landing_view, + {"template_name": "zerver/development-community.html"}, ), path("attribution/", landing_view, {"template_name": "zerver/attribution.html"}), path("team/", team_view), @@ -637,6 +639,9 @@ i18n_urls = [ # Terms of Service and privacy pages. path("terms/", terms_view), path("privacy/", privacy_view), + path( + "developer-community/", RedirectView.as_view(url="/development-community/", permanent=True) + ), ] # Make a copy of i18n_urls so that they appear without prefix for english