docs: Consistently hyphenate “self-host” and “self-service”.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2022-01-04 18:22:30 -08:00 committed by Tim Abbott
parent b3886af651
commit 1696144df7
7 changed files with 12 additions and 12 deletions

View File

@ -78,7 +78,7 @@ class TestSupportEndpoint(ZulipTestCase):
f"<b>First human user</b>: {first_human_user.delivery_email}\n", f"<b>First human user</b>: {first_human_user.delivery_email}\n",
f'<input type="hidden" name="realm_id" value="{zulip_realm.id}"', f'<input type="hidden" name="realm_id" value="{zulip_realm.id}"',
"Zulip Dev</h3>", "Zulip Dev</h3>",
'<option value="1" selected>Self hosted</option>', '<option value="1" selected>Self-hosted</option>',
'<option value="2" >Limited</option>', '<option value="2" >Limited</option>',
'input type="number" name="discount" value="None"', 'input type="number" name="discount" value="None"',
'<option value="active" selected>Active</option>', '<option value="active" selected>Active</option>',
@ -96,7 +96,7 @@ class TestSupportEndpoint(ZulipTestCase):
[ [
f'<input type="hidden" name="realm_id" value="{lear_realm.id}"', f'<input type="hidden" name="realm_id" value="{lear_realm.id}"',
"Lear &amp; Co.</h3>", "Lear &amp; Co.</h3>",
'<option value="1" selected>Self hosted</option>', '<option value="1" selected>Self-hosted</option>',
'<option value="2" >Limited</option>', '<option value="2" >Limited</option>',
'input type="number" name="discount" value="None"', 'input type="number" name="discount" value="None"',
'<option value="active" selected>Active</option>', '<option value="active" selected>Active</option>',
@ -353,7 +353,7 @@ class TestSupportEndpoint(ZulipTestCase):
) )
m.assert_called_once_with(get_realm("zulip"), 2, acting_user=iago) m.assert_called_once_with(get_realm("zulip"), 2, acting_user=iago)
self.assert_in_success_response( self.assert_in_success_response(
["Plan type of zulip changed from self hosted to limited"], result ["Plan type of zulip changed from self-hosted to limited"], result
) )
with mock.patch("analytics.views.support.do_change_realm_plan_type") as m: with mock.patch("analytics.views.support.do_change_realm_plan_type") as m:
@ -362,7 +362,7 @@ class TestSupportEndpoint(ZulipTestCase):
) )
m.assert_called_once_with(get_realm("zulip"), 10, acting_user=iago) m.assert_called_once_with(get_realm("zulip"), 10, acting_user=iago)
self.assert_in_success_response( self.assert_in_success_response(
["Plan type of zulip changed from self hosted to plus"], result ["Plan type of zulip changed from self-hosted to plus"], result
) )
def test_change_org_type(self) -> None: def test_change_org_type(self) -> None:

View File

@ -59,7 +59,7 @@ if settings.BILLING_ENABLED:
def get_plan_name(plan_type: int) -> str: def get_plan_name(plan_type: int) -> str:
return { return {
Realm.PLAN_TYPE_SELF_HOSTED: "self hosted", Realm.PLAN_TYPE_SELF_HOSTED: "self-hosted",
Realm.PLAN_TYPE_LIMITED: "limited", Realm.PLAN_TYPE_LIMITED: "limited",
Realm.PLAN_TYPE_STANDARD: "standard", Realm.PLAN_TYPE_STANDARD: "standard",
Realm.PLAN_TYPE_STANDARD_FREE: "open source", Realm.PLAN_TYPE_STANDARD_FREE: "open source",

View File

@ -72,7 +72,7 @@ in a stable release.
to chat.zulip.org to facilitate design feedback. to chat.zulip.org to facilitate design feedback.
- We maintain Git branches with names like `4.x` containing backported - We maintain Git branches with names like `4.x` containing backported
commits from `main` that we plan to include in the next maintenance commits from `main` that we plan to include in the next maintenance
release. Self hosters can [upgrade][upgrade-from-git] to these release. Self-hosters can [upgrade][upgrade-from-git] to these
stable release branches to get bug fixes staged for the next stable stable release branches to get bug fixes staged for the next stable
release (which is very useful when you reported a bug whose fix we release (which is very useful when you reported a bug whose fix we
choose to backport). We support these branches as though they were a choose to backport). We support these branches as though they were a

View File

@ -67,7 +67,7 @@
{{ csrf_input }} {{ csrf_input }}
<input type="hidden" name="realm_id" value="{{ realm.id }}" /> <input type="hidden" name="realm_id" value="{{ realm.id }}" />
<select name="plan_type"> <select name="plan_type">
<option value="1" {% if realm.plan_type == 1 %}selected{% endif %}>Self hosted</option> <option value="1" {% if realm.plan_type == 1 %}selected{% endif %}>Self-hosted</option>
<option value="2" {% if realm.plan_type == 2 %}selected{% endif %}>Limited</option> <option value="2" {% if realm.plan_type == 2 %}selected{% endif %}>Limited</option>
<option value="3" {% if realm.plan_type == 3 %}selected{% endif %}>Standard</option> <option value="3" {% if realm.plan_type == 3 %}selected{% endif %}>Standard</option>
<option value="4" {% if realm.plan_type == 4 %}selected{% endif %}>Standard Free</option> <option value="4" {% if realm.plan_type == 4 %}selected{% endif %}>Standard Free</option>

View File

@ -32,7 +32,7 @@
<td class="no"></td> <td class="no"></td>
</tr> </tr>
<tr> <tr>
<td>Self hosting available</td> <td>Self-hosting available</td>
<td class="yes"></td> <td class="yes"></td>
<td class="no"></td> <td class="no"></td>
<td class="yes"></td> <td class="yes"></td>

View File

@ -107,12 +107,12 @@
<div class="block"> <div class="block">
<div class="plan-title responsive-title"> <div class="plan-title responsive-title">
Self host Zulip Self-host Zulip
</div> </div>
<div class="price-box" tabindex="-1"> <div class="price-box" tabindex="-1">
<div class="text-content"> <div class="text-content">
<h2>Self service</h2> <h2>Self-service</h2>
<div class="description"> <div class="description">
Retain full control over your data. Retain full control over your data.
</div> </div>
@ -148,7 +148,7 @@
</div> </div>
<hr /> <hr />
<ul class="feature-list"> <ul class="feature-list">
<li>All self service features included</li> <li>All self-service features included</li>
<li>Professional support with SLAs</li> <li>Professional support with SLAs</li>
<li>High availability</li> <li>High availability</li>
<li>Incident collaboration</li> <li>Incident collaboration</li>

View File

@ -394,7 +394,7 @@ class PlansPageTest(ZulipTestCase):
def test_plans_auth(self) -> None: def test_plans_auth(self) -> None:
root_domain = "" root_domain = ""
result = self.client_get("/plans/", subdomain=root_domain) result = self.client_get("/plans/", subdomain=root_domain)
self.assert_in_success_response(["Self host Zulip"], result) self.assert_in_success_response(["Self-host Zulip"], result)
self.assert_not_in_success_response(["/upgrade#sponsorship"], result) self.assert_not_in_success_response(["/upgrade#sponsorship"], result)
self.assert_in_success_response(["/accounts/go/?next=/upgrade%23sponsorship"], result) self.assert_in_success_response(["/accounts/go/?next=/upgrade%23sponsorship"], result)