From 7b4a74cc4d343037838534eabec3d32fde4452b9 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 9 Oct 2023 11:41:12 -0700 Subject: [PATCH] codespell: Fix typos caught by codespell. Signed-off-by: Anders Kaseorg --- docs/overview/changelog.md | 2 +- docs/production/authentication-methods.md | 2 +- docs/testing/mypy.md | 2 +- web/src/bundles/hello.ts | 2 +- web/styles/portico/hello.css | 2 +- web/styles/portico/integrations.css | 2 +- web/styles/tooltips.css | 2 +- web/tests/compose_validate.test.js | 2 +- web/tests/markdown_parse.test.js | 2 +- web/tests/settings_user_groups_legacy.test.js | 2 +- zerver/models.py | 2 +- zerver/openapi/curl_param_value_generators.py | 2 +- zerver/tests/test_invite.py | 2 +- zerver/tests/test_markdown.py | 2 +- zerver/tests/test_push_notifications.py | 2 +- zerver/tests/test_read_receipts.py | 2 +- zerver/views/registration.py | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/overview/changelog.md b/docs/overview/changelog.md index da12757744..2bddc29a54 100644 --- a/docs/overview/changelog.md +++ b/docs/overview/changelog.md @@ -333,7 +333,7 @@ _Released 2023-05-31_ - New webhook integrations: Rundeck. - Reworked linkifiers to use URL templates for the URL patterns. - Improved left sidebar to show more topics within the current stream, - and more private message converations, especially when many are + and more private message conversations, especially when many are unread. - Reworked the internals of the main message feed scrollbar, fixing several longstanding bugs. diff --git a/docs/production/authentication-methods.md b/docs/production/authentication-methods.md index c97271932d..74a1cd4858 100644 --- a/docs/production/authentication-methods.md +++ b/docs/production/authentication-methods.md @@ -384,7 +384,7 @@ You can restrict access to your Zulip server to a set of LDAP groups using the `AUTH_LDAP_REQUIRE_GROUP` and `AUTH_LDAP_DENY_GROUP` settings in `/etc/zulip/settings.py`. -An example configation for Active Directory group restriction can be: +An example configuration for Active Directory group restriction can be: ```python import django_auth_ldap diff --git a/docs/testing/mypy.md b/docs/testing/mypy.md index 681f6d00ea..231fabdfc8 100644 --- a/docs/testing/mypy.md +++ b/docs/testing/mypy.md @@ -184,7 +184,7 @@ class FooTestCase(ZulipTestCase): return self.client_get("/bar") ``` -We sometimes encounter innaccurate type annotations in the Django +We sometimes encounter inaccurate type annotations in the Django stubs project. We prefer to address these by [submitting a pull request](https://github.com/typeddjango/django-stubs/pulls) to fix the issue in the upstream project, just like we do with `typeshed` bugs. diff --git a/web/src/bundles/hello.ts b/web/src/bundles/hello.ts index 891be1c66a..75bd17a2a2 100644 --- a/web/src/bundles/hello.ts +++ b/web/src/bundles/hello.ts @@ -1,4 +1,4 @@ -// TODO: Use `common.ts` directly in hello page when `boostrap` is +// TODO: Use `common.ts` directly in hello page when `bootstrap` is // removed from it. import "source-sans/source-sans-3VF.css"; diff --git a/web/styles/portico/hello.css b/web/styles/portico/hello.css index d9b497a73e..23aef346d4 100644 --- a/web/styles/portico/hello.css +++ b/web/styles/portico/hello.css @@ -705,7 +705,7 @@ ul { } } - /* Make sure breakpoints apprear sorted so that lower breakpoints always + /* Make sure breakpoints appear sorted so that lower breakpoints always override higher ones. */ @media (width <= 1320px) { .client-logos { diff --git a/web/styles/portico/integrations.css b/web/styles/portico/integrations.css index 60b702d7bd..fc9f587976 100644 --- a/web/styles/portico/integrations.css +++ b/web/styles/portico/integrations.css @@ -217,7 +217,7 @@ $category-text: hsl(219deg 23% 33%); } @media (width <= 906px) { - /* Change it to `display: block` when enabling catergories. */ + /* Change it to `display: block` when enabling categories. */ display: none; width: 670px; diff --git a/web/styles/tooltips.css b/web/styles/tooltips.css index 9faa4ae0d7..27c5d6f19a 100644 --- a/web/styles/tooltips.css +++ b/web/styles/tooltips.css @@ -92,7 +92,7 @@ space offscreen and cause document to have the wrong scroll height. Setting `display: none` makes sure it doesn't occupy any offscreen space. - NOTE: This data attribtute has changed each time in the past 3 releases and + NOTE: This data attribute has changed each time in the past 3 releases and if we upgrade tippy from v6, we should check if this attribute is still valid. See https://github.com/atomiks/tippyjs/issues/555 for some discussion on this. diff --git a/web/tests/compose_validate.test.js b/web/tests/compose_validate.test.js index f0ef906e42..1df9bf1009 100644 --- a/web/tests/compose_validate.test.js +++ b/web/tests/compose_validate.test.js @@ -66,7 +66,7 @@ const welcome_bot = { people.add_cross_realm_user(welcome_bot); function test_ui(label, f) { - // The sloppy_$ flag lets us re-use setup from prior tests. + // The sloppy_$ flag lets us reuse setup from prior tests. run_test(label, (helpers) => { $("#compose-textarea").val("some message"); f(helpers); diff --git a/web/tests/markdown_parse.test.js b/web/tests/markdown_parse.test.js index ec5ba5fef7..1e53500078 100644 --- a/web/tests/markdown_parse.test.js +++ b/web/tests/markdown_parse.test.js @@ -356,7 +356,7 @@ run_test("topic links ordering by priority", () => { {pattern: "a#(?P[a-z]+)", url_template: "http://example.com/a/{id}"}, ]); - // There should be 5 link matches in the topic, if ordered from the most priortized to the least: + // There should be 5 link matches in the topic, if ordered from the most prioritized to the least: // 1. "http" (linkifier) // 2. "b#bar" (linkifier) // 3. "a#asd b#bar" (linkifier) diff --git a/web/tests/settings_user_groups_legacy.test.js b/web/tests/settings_user_groups_legacy.test.js index ab1ccc57e7..a8ed597e16 100644 --- a/web/tests/settings_user_groups_legacy.test.js +++ b/web/tests/settings_user_groups_legacy.test.js @@ -45,7 +45,7 @@ function reset_test_setup($pill_container_stub) { } function test_ui(label, f) { - // The sloppy_$ flag lets us re-use setup from prior tests. + // The sloppy_$ flag lets us reuse setup from prior tests. run_test(label, f, {sloppy_$: true}); } diff --git a/zerver/models.py b/zerver/models.py index 10129cb14d..d1565fdae6 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -2687,7 +2687,7 @@ class Stream(models.Model): message_retention_days = models.IntegerField(null=True, default=None) # on_delete field here is set to RESTRICT because we don't want to allow - # deleting a user group in case it is referenced by this settig. + # deleting a user group in case it is referenced by this setting. # We are not using PROTECT since we want to allow deletion of user groups # when realm itself is deleted. can_remove_subscribers_group = models.ForeignKey(UserGroup, on_delete=models.RESTRICT) diff --git a/zerver/openapi/curl_param_value_generators.py b/zerver/openapi/curl_param_value_generators.py index 03dba9d259..168c883d39 100644 --- a/zerver/openapi/curl_param_value_generators.py +++ b/zerver/openapi/curl_param_value_generators.py @@ -35,7 +35,7 @@ helpers = ZulipTestCase() def openapi_param_value_generator( endpoints: List[str], ) -> Callable[[Callable[[], Dict[str, object]]], Callable[[], Dict[str, object]]]: - """This decorator is used to register OpenAPI param value genarator functions + """This decorator is used to register OpenAPI param value generator functions with endpoints. Example usage: @openapi_param_value_generator(["/messages/render:post"]) diff --git a/zerver/tests/test_invite.py b/zerver/tests/test_invite.py index e6915a1a24..d97497327b 100644 --- a/zerver/tests/test_invite.py +++ b/zerver/tests/test_invite.py @@ -1636,7 +1636,7 @@ so we didn't send them an invitation. We did send invitations to everyone else!" prereg_user.refresh_from_db() self.assertIsNotNone(prereg_user.created_user) - # Now attempt to re-use the same key. + # Now attempt to reuse the same key. result = self.client_post("/accounts/register/", {"key": registration_key}) self.assertEqual(result.status_code, 404) self.assert_in_response( diff --git a/zerver/tests/test_markdown.py b/zerver/tests/test_markdown.py index c75f129c50..24a2990e30 100644 --- a/zerver/tests/test_markdown.py +++ b/zerver/tests/test_markdown.py @@ -1508,7 +1508,7 @@ class MarkdownTest(ZulipTestCase): "[a-z]+) http://example.com/a/{id}>", ], ) - # There should be 5 link matches in the topic, if ordered from the most priortized to the least: + # There should be 5 link matches in the topic, if ordered from the most prioritized to the least: # 1. "http" (linkifier) # 2. "b#bar" (linkifier) # 3. "a#asd b#bar" (linkifier) diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py index 62b47c7b31..f5cca48e74 100644 --- a/zerver/tests/test_push_notifications.py +++ b/zerver/tests/test_push_notifications.py @@ -1774,7 +1774,7 @@ class HandlePushNotificationTest(PushNotificationTest): # Topic wildcard mention in followed topic should soft reactivate the user # user should be a topic participant - self.send_stream_message(self.user_profile, "Denmark", "topic paticipant") + self.send_stream_message(self.user_profile, "Denmark", "topic participant") def send_topic_wildcard_mention() -> None: mention = "@**topic**" diff --git a/zerver/tests/test_read_receipts.py b/zerver/tests/test_read_receipts.py index 62b1e0de16..f3a2449146 100644 --- a/zerver/tests/test_read_receipts.py +++ b/zerver/tests/test_read_receipts.py @@ -117,7 +117,7 @@ class TestReadReceipts(ZulipTestCase): self.assertTrue(hamlet.id not in result.json()["user_ids"]) self.assertTrue(cordelia.id in result.json()["user_ids"]) - # Reactivate hamlet and verify hamlet appears again in read recipts. + # Reactivate hamlet and verify hamlet appears again in read receipts. do_reactivate_user(hamlet, acting_user=None) result = self.client_get(f"/json/messages/{message_id}/read_receipts") self.assert_json_success(result) diff --git a/zerver/views/registration.py b/zerver/views/registration.py index e45f82df7f..b63895e541 100644 --- a/zerver/views/registration.py +++ b/zerver/views/registration.py @@ -172,12 +172,12 @@ def check_prereg_key( if realm_creation: assert isinstance(prereg_object, PreregistrationRealm) - # Defensive assert to make sure no mix-up in how .status is set leading to re-use + # Defensive assert to make sure no mix-up in how .status is set leading to reuse # of a PreregistrationRealm object. assert prereg_object.created_realm is None else: assert isinstance(prereg_object, PreregistrationUser) - # Defensive assert to make sure no mix-up in how .status is set leading to re-use + # Defensive assert to make sure no mix-up in how .status is set leading to reuse # of a PreregistrationUser object. assert prereg_object.created_user is None