onboarding: Use "Moving to Zulip" guide in emails & Welcome bot message.

Replaces links to "Getting your organization started with Zulip"
in onboarding emails and Welcome bot direct message for owners of
new organizations.

Revises text in those emails and messages to reflect the new
"Moving to Zulip" help center guide that is now used.

templates/zerver/emails/account_registered.html

@@ -46,9 +46,9 @@
 </p>
 
 <p>
-    {% trans %}If you are new to Zulip, check out our <a href="{{ getting_user_started_link }}">Getting started guide</a>!{% endtrans %}
+    {% trans %}If you are new to Zulip, check out our <a href="{{ getting_user_started_link }}">getting started guide</a>!{% endtrans %}
     {% if is_realm_admin %}
-    {% trans %}We also have a guide for <a href="{{ getting_organization_started_link }}">Setting up your organization</a>.{% endtrans %}
+    {% trans %}We also have a guide for <a href="{{ getting_organization_started_link }}">moving your organization to Zulip</a>.{% endtrans %}
     {% endif %}
 </p>
 

templates/zerver/emails/account_registered.txt

@@ -26,9 +26,9 @@
 {% endif %}
 
 
-{% trans %}If you are new to Zulip, check out our Getting started guide ({{ getting_user_started_link }})!{% endtrans %}
+{% trans %}If you are new to Zulip, check out our getting started guide ({{ getting_user_started_link }})!{% endtrans %}
 {% if is_realm_admin %}
-{% trans %} We also have a guide for Setting up your organization ({{ getting_organization_started_link }}).{% endtrans %}
+{% trans %} We also have a guide for moving your organization to Zulip ({{ getting_organization_started_link }}).{% endtrans %}
 {% endif %}
 
 

templates/zerver/emails/onboarding_team_to_zulip.html

@@ -7,7 +7,7 @@
 {% block content %}
 
 <p>
-    {% trans %}If you've already decided to use Zulip for your organization, welcome! You can use our <a href="{{ get_organization_started }}">guide for setting up your organization</a> to get started.{% endtrans %}
+    {% trans %}If you've already decided to use Zulip for your organization, welcome! You can use our <a href="{{ get_organization_started }}">guide for moving to Zulip</a> to get started.{% endtrans %}
 </p>
 <p>
     {% trans %}Otherwise, here is some advice we often hear from customers for evaluating <i>any</i> team chat product:{% endtrans %}

templates/zerver/emails/onboarding_team_to_zulip.txt

@@ -1,4 +1,4 @@
-{% trans %}If you've already decided to use Zulip for your organization, welcome! You can use our guide for setting up your organization to get started.{% endtrans %} [ {{ get_organization_started }} ]
+{% trans %}If you've already decided to use Zulip for your organization, welcome! You can use our guide for moving to Zulip to get started.{% endtrans %} [ {{ get_organization_started }} ]
 
 {% trans %}Otherwise, here is some advice we often hear from customers for evaluating any team chat product:{% endtrans %}
 

zerver/lib/email_notifications.py

@@ -805,7 +805,7 @@ def send_account_registered_email(user: UserProfile, realm_creation: bool = Fals
     )
 
     account_registered_context["getting_organization_started_link"] = (
-        realm_url + "/help/getting-your-organization-started-with-zulip"
+        realm_url + "/help/moving-to-zulip"
     )
 
     account_registered_context["getting_user_started_link"] = (
@@ -918,8 +918,7 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool = False) -> N
         onboarding_team_to_zulip_context = common_context(user)
         onboarding_team_to_zulip_context.update(
             unsubscribe_link=unsubscribe_link,
-            get_organization_started=realm_url
-            + "/help/getting-your-organization-started-with-zulip",
+            get_organization_started=realm_url + "/help/moving-to-zulip",
             invite_users=realm_url + "/help/invite-users-to-join",
             trying_out_zulip=realm_url + "/help/trying-out-zulip",
             why_zulip="https://zulip.com/why-zulip/",

zerver/lib/onboarding.py

@@ -51,11 +51,11 @@ def send_initial_direct_message(user: UserProfile) -> int:
     with override_language(user.default_language):
         if education_organization:
             getting_started_string = _("""
-To learn more, check out our [Using Zulip for a class guide]({getting_started_url})!
+To learn more, check out our [using Zulip for a class guide]({getting_started_url})!
 """).format(getting_started_url="/help/using-zulip-for-a-class")
         else:
             getting_started_string = _("""
-To learn more, check out our [Getting started guide]({getting_started_url})!
+To learn more, check out our [getting started guide]({getting_started_url})!
 """).format(getting_started_url="/help/getting-started-with-zulip")
 
         organization_setup_string = ""
@@ -63,12 +63,12 @@ To learn more, check out our [Getting started guide]({getting_started_url})!
         if user.is_realm_admin:
             if education_organization:
                 organization_setup_string = _("""
-We also have a guide for [Setting up Zulip for a class]({organization_setup_url}).
+We also have a guide for [setting up Zulip for a class]({organization_setup_url}).
 """).format(organization_setup_url="/help/setting-up-zulip-for-a-class")
             else:
                 organization_setup_string = _("""
-We also have a guide for [Setting up your organization]({organization_setup_url}).
-""").format(organization_setup_url="/help/getting-your-organization-started-with-zulip")
+We also have a guide for [moving your organization to Zulip]({organization_setup_url}).
+""").format(organization_setup_url="/help/moving-to-zulip")
 
         demo_organization_warning_string = ""
         # Add extra content about automatic deletion for demo organization owners.

zerver/tests/test_email_notifications.py

@@ -266,7 +266,7 @@ class TestFollowupEmails(ZulipTestCase):
         self.assertEqual(email_data["context"]["is_realm_admin"], True)
         self.assertEqual(
             email_data["context"]["getting_organization_started_link"],
-            "http://zulip.testserver/help/getting-your-organization-started-with-zulip",
+            "http://zulip.testserver/help/moving-to-zulip",
         )
         self.assertEqual(
             email_data["context"]["getting_user_started_link"],

zerver/tests/test_signup.py

@@ -1750,8 +1750,8 @@ class RealmCreationTest(ZulipTestCase):
 
         # Organization type is not education or education_nonprofit,
         # and organization is not a demo organization.
-        self.assertIn("Getting started guide", welcome_msg.content)
-        self.assertNotIn("Using Zulip for a class guide", welcome_msg.content)
+        self.assertIn("getting started guide", welcome_msg.content)
+        self.assertNotIn("using Zulip for a class guide", welcome_msg.content)
         self.assertNotIn("demo organization", welcome_msg.content)
 
         # Organization has tracked onboarding messages.
@@ -1818,8 +1818,8 @@ class RealmCreationTest(ZulipTestCase):
         self.assertTrue(welcome_msg.content.startswith("Hello, and welcome to Zulip!"))
 
         # Organization type is education, and organization is a demo organization.
-        self.assertNotIn("Getting started guide", welcome_msg.content)
-        self.assertIn("Using Zulip for a class guide", welcome_msg.content)
+        self.assertNotIn("getting started guide", welcome_msg.content)
+        self.assertIn("using Zulip for a class guide", welcome_msg.content)
         self.assertIn("demo organization", welcome_msg.content)
 
     @override_settings(OPEN_REALM_CREATION=True)