diff --git a/docs/git/using.md b/docs/git/using.md index cb57a37af4..d24b5df2e0 100644 --- a/docs/git/using.md +++ b/docs/git/using.md @@ -326,7 +326,7 @@ are sloppy, so phrases like `Partially fixes #1234` will automatically close the issue. Phrases like `Fixes part of #1234` are a good alternative. -Make as many commits as you need to to address the issue or implement your feature. +Make as many commits as you need to address the issue or implement your feature. ## Push your commits to GitHub diff --git a/docs/translating/german.md b/docs/translating/german.md index 16880cafdd..3a454cbc45 100644 --- a/docs/translating/german.md +++ b/docs/translating/german.md @@ -281,7 +281,7 @@ _"Schränke auf ... ein." (Transifex) "Begrenze auf ... ." (Transifex)_ - Filter - **Filtern** -A direct translation is fine here. Watch out to to use the infinitive instead +A direct translation is fine here. Watch out to use the infinitive instead of the imperative, e.g., "Nachrichten filtern" instead of "Filtere Nachrichten". _"Filtern" (Thunderbird, LinkedIn)_ diff --git a/docs/tutorials/new-feature-tutorial.md b/docs/tutorials/new-feature-tutorial.md index 446bbf48bf..79c0643e00 100644 --- a/docs/tutorials/new-feature-tutorial.md +++ b/docs/tutorials/new-feature-tutorial.md @@ -312,7 +312,7 @@ def do_set_realm_property( realm: Realm, name: str, value: Any, *, acting_user: Optional[UserProfile] ) -> None: """Takes in a realm object, the name of an attribute to update, the - value to update and and the user who initiated the update. + value to update and the user who initiated the update. """ property_type = Realm.property_types[name] assert isinstance(value, property_type), ( diff --git a/web/src/fetch_status.ts b/web/src/fetch_status.ts index b9783d408f..f60f4b4c4e 100644 --- a/web/src/fetch_status.ts +++ b/web/src/fetch_status.ts @@ -101,7 +101,7 @@ export class FetchStatus { // // 1. Client initiates GET /messages to fetch the last // batch of messages in this view. The server - // completes the database access and and starts sending + // completes the database access and starts sending // the response with found_newest=true. // 1. A new message is sent matching the view, the event reaches // the client. We discard the message because found_newest=false. diff --git a/web/styles/app_variables.css b/web/styles/app_variables.css index 893576d6a7..49161665ec 100644 --- a/web/styles/app_variables.css +++ b/web/styles/app_variables.css @@ -336,7 +336,7 @@ /* 46px at 14px/1em */ --message-box-avatar-column-width: 3.2857em; /* Increase the margin here to account for the - focus ring, which is is offset by -1px, as well + focus ring, which is offset by -1px, as well as the vertical height between the hover icons and focus ring. */ --message-box-vertical-margin: calc( diff --git a/zerver/management/commands/send_custom_email.py b/zerver/management/commands/send_custom_email.py index ed6ed91dc3..1425517903 100644 --- a/zerver/management/commands/send_custom_email.py +++ b/zerver/management/commands/send_custom_email.py @@ -67,7 +67,7 @@ class Command(ZulipBaseCommand): # This is an additional filter which is composed with the above parser.add_argument( "--admins-only", - help="Filter recipients selected via other options to to only organization administrators", + help="Filter recipients selected via other options to only organization administrators", action="store_true", ) diff --git a/zerver/models/messages.py b/zerver/models/messages.py index f511eb7d1e..96fa062610 100644 --- a/zerver/models/messages.py +++ b/zerver/models/messages.py @@ -42,7 +42,7 @@ class AbstractMessage(models.Model): RESOLVE_TOPIC_NOTIFICATION = 2 # IMPORTANT: message.type is not to be confused with the - # "recipient type" ("channel" or "direct"), which is is sometimes + # "recipient type" ("channel" or "direct"), which is sometimes # called message_type in the APIs, CountStats or some variable # names. We intend to rename those to recipient_type. # diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index cbe4051dc9..3d6c350cc6 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -2751,7 +2751,7 @@ class UserSignUpTest(ZulipTestCase): user_profile = UserProfile.objects.get(delivery_email=email) self.assertEqual(user_profile.delivery_email, email) - # Now try to to register using the first confirmation url: + # Now try to register using the first confirmation url: result = self.client_get(first_confirmation_url) self.assertEqual(result.status_code, 404) result = self.client_post( diff --git a/zerver/views/streams.py b/zerver/views/streams.py index 70a0f02819..2510631c85 100644 --- a/zerver/views/streams.py +++ b/zerver/views/streams.py @@ -253,7 +253,7 @@ def update_stream_backend( Json[int | None], ApiParamConfig("can_remove_subscribers_group") ] = None, ) -> HttpResponse: - # We allow realm administrators to to update the stream name and + # We allow realm administrators to update the stream name and # description even for private streams. (stream, sub) = access_stream_for_delete_or_update(user_profile, stream_id)