From d2fa058cc1ef76030e56649912d6da6b369cc6b1 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 28 Mar 2020 01:25:56 +0100 Subject: [PATCH] text: Fix some typos (most of them found and fixed by codespell). Signed-off-by: Stefan Weil --- corporate/lib/stripe.py | 2 +- corporate/tests/test_stripe.py | 2 +- frontend_tests/node_tests/compose.js | 4 ++-- frontend_tests/node_tests/dispatch.js | 4 ++-- frontend_tests/node_tests/fenced_code.js | 2 +- frontend_tests/node_tests/narrow.js | 4 ++-- frontend_tests/node_tests/notifications.js | 2 +- frontend_tests/node_tests/people.js | 2 +- frontend_tests/node_tests/settings_org.js | 2 +- frontend_tests/node_tests/stream_list.js | 2 +- frontend_tests/node_tests/typeahead_helper.js | 4 ++-- frontend_tests/node_tests/typing_status.js | 2 +- frontend_tests/node_tests/zblueslip.js | 2 +- frontend_tests/node_tests/zjquery.js | 2 +- frontend_tests/zjsunit/bugdown_assert.js | 2 +- puppet/zulip/manifests/dockervoyager.pp | 2 +- .../zulip_ops/files/apt/apt.conf.d/50unattended-upgrades | 2 +- puppet/zulip_ops/files/munin-plugins/rabbitmq_connections | 4 ++-- puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers | 4 ++-- puppet/zulip_ops/files/munin-plugins/rabbitmq_messages | 4 ++-- .../files/munin-plugins/rabbitmq_messages_unacknowledged | 4 ++-- .../files/munin-plugins/rabbitmq_messages_uncommitted | 4 ++-- .../zulip_ops/files/munin-plugins/rabbitmq_queue_memory | 4 ++-- puppet/zulip_ops/files/munin-plugins/tornado_event_queues | 4 ++-- puppet/zulip_ops/files/nagios3/nagios.cfg | 4 ++-- puppet/zulip_ops/files/zulip-ec2-configure-interfaces | 2 +- puppet/zulip_ops/templates/munin/munin.conf.erb | 2 +- scripts/lib/zulip_tools.py | 2 +- static/js/buddy_data.js | 2 +- static/js/compose.js | 6 +++--- static/js/composebox_typeahead.js | 2 +- static/js/emoji_picker.js | 4 ++-- static/js/input_pill.js | 2 +- static/js/lightbox_canvas.js | 2 +- static/js/list_render.js | 2 +- static/js/message_fetch.js | 4 ++-- static/js/narrow.js | 2 +- static/js/navigate.js | 2 +- static/js/notifications.js | 2 +- static/js/overlays.js | 2 +- static/js/portico/integrations_dev_panel.js | 2 +- static/js/reactions.js | 2 +- static/js/settings_users.js | 2 +- static/js/stream_create.js | 2 +- static/js/upload_widget.js | 4 ++-- static/styles/night_mode.scss | 2 +- static/third/marked/README.md | 2 +- templates/zerver/api/get-all-users.md | 2 +- templates/zerver/api/get-events-from-queue.md | 2 +- templates/zerver/api/get-subscribed-streams.md | 6 +++--- templates/zerver/api/get-user.md | 2 +- templates/zerver/api/incoming-webhooks-overview.md | 2 +- templates/zerver/features.html | 4 ++-- templates/zerver/help/change-your-email-address.md | 2 +- templates/zerver/help/desktop-app-install-guide.md | 2 +- tools/ci/production-helper | 2 +- tools/clean-branches | 2 +- tools/setup/emoji/emoji_names.py | 4 ++-- tools/setup/emoji/emoji_setup_utils.py | 2 +- tools/update-authors-json | 2 +- zerver/data_import/import_util.py | 6 +++--- zerver/data_import/mattermost.py | 2 +- zerver/data_import/slack.py | 2 +- zerver/lib/actions.py | 6 +++--- zerver/lib/bugdown/__init__.py | 2 +- zerver/lib/bulk_create.py | 2 +- zerver/lib/cache.py | 2 +- zerver/lib/external_accounts.py | 2 +- zerver/lib/import_realm.py | 2 +- zerver/lib/message.py | 2 +- zerver/lib/streams.py | 2 +- zerver/lib/test_runner.py | 2 +- .../management/commands/generate_realm_creation_link.py | 2 +- zerver/management/commands/restore_messages.py | 2 +- zerver/management/commands/send_to_email_mirror.py | 2 +- zerver/models.py | 8 ++++---- zerver/openapi/openapi.py | 2 +- zerver/openapi/zulip.yaml | 2 +- zerver/tests/test_archive.py | 2 +- zerver/tests/test_auth_backends.py | 4 ++-- zerver/tests/test_custom_profile_data.py | 2 +- zerver/tests/test_docs.py | 2 +- zerver/tests/test_i18n.py | 2 +- zerver/tests/test_integrations_dev_panel.py | 2 +- zerver/tests/test_messages.py | 4 ++-- zerver/tests/test_push_notifications.py | 2 +- zerver/tests/test_retention.py | 2 +- zerver/tests/test_signup.py | 2 +- zerver/tests/test_slack_importer.py | 2 +- zerver/tests/test_upload.py | 4 ++-- zerver/tests/test_users.py | 6 +++--- zerver/views/reactions.py | 2 +- zerver/views/users.py | 2 +- zerver/webhooks/front/doc.md | 2 +- zerver/webhooks/github/fixtures/issue_comment.json | 2 +- zerver/webhooks/github/fixtures/issues.json | 2 +- zerver/webhooks/github/tests.py | 6 +++--- zerver/webhooks/github/view.py | 2 +- zerver/webhooks/groove/view.py | 2 +- .../webhooks/librato/fixtures/three_conditions_alert.json | 2 +- zerver/webhooks/pagerduty/doc.md | 2 +- zerver/webhooks/reviewboard/doc.md | 2 +- zerver/webhooks/statuspage/fixtures/incident_created.json | 2 +- zerver/webhooks/statuspage/fixtures/incident_update.json | 2 +- zerver/webhooks/statuspage/tests.py | 2 +- zerver/webhooks/travis/fixtures/build.json | 4 ++-- zerver/webhooks/travis/fixtures/pull_request.json | 4 ++-- zerver/webhooks/zabbix/doc.md | 2 +- zerver/webhooks/zendesk/doc.md | 2 +- zerver/webhooks/zendesk/view.py | 2 +- zproject/backends.py | 2 +- zproject/dev_urls.py | 2 +- zproject/test_settings.py | 2 +- zproject/urls.py | 2 +- 114 files changed, 151 insertions(+), 151 deletions(-) diff --git a/corporate/lib/stripe.py b/corporate/lib/stripe.py index 4021b199f9..347b0b5dd3 100644 --- a/corporate/lib/stripe.py +++ b/corporate/lib/stripe.py @@ -214,7 +214,7 @@ def do_replace_payment_source(user: UserProfile, stripe_token: str, for stripe_invoice in stripe.Invoice.list( billing='charge_automatically', customer=stripe_customer.id, status='open'): # The user will get either a receipt or a "failed payment" email, but the in-app - # messaging could be clearer here (e.g. it could explictly tell the user that there + # messaging could be clearer here (e.g. it could explicitly tell the user that there # were payment(s) and that they succeeded or failed). # Worth fixing if we notice that a lot of cards end up failing at this step. stripe.Invoice.pay(stripe_invoice) diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py index e1c46d9d39..625a0506ad 100644 --- a/corporate/tests/test_stripe.py +++ b/corporate/tests/test_stripe.py @@ -1093,7 +1093,7 @@ class BillingHelpersTest(ZulipTestCase): datetime(2021, 2, 28, 1, 2, 3).replace(tzinfo=timezone_utc)] with self.assertRaises(AssertionError): add_months(anchor, -1) - # Explictly test add_months for each value of MAX_DAY_FOR_MONTH and + # Explicitly test add_months for each value of MAX_DAY_FOR_MONTH and # for crossing a year boundary for i, boundary in enumerate(period_boundaries): self.assertEqual(add_months(anchor, i), boundary) diff --git a/frontend_tests/node_tests/compose.js b/frontend_tests/node_tests/compose.js index 09a345f6c1..5b1628914b 100644 --- a/frontend_tests/node_tests/compose.js +++ b/frontend_tests/node_tests/compose.js @@ -328,8 +328,8 @@ run_test('validate_stream_message', () => { }); run_test('test_validate_stream_message_post_policy', () => { - // This test is in continuation with test_validate but it has been seperated out - // for better readabilty. Their relative position of execution should not be changed. + // This test is in continuation with test_validate but it has been separated out + // for better readability. Their relative position of execution should not be changed. // Although the position with respect to test_validate_stream_message does not matter // as `get_stream_post_policy` is reset at the end. page_params.is_admin = false; diff --git a/frontend_tests/node_tests/dispatch.js b/frontend_tests/node_tests/dispatch.js index 8a70858610..069d20da19 100644 --- a/frontend_tests/node_tests/dispatch.js +++ b/frontend_tests/node_tests/dispatch.js @@ -766,7 +766,7 @@ with_overrides(function (override) { }); with_overrides(function (override) { - // attachements + // attachments const event = event_fixtures.attachment; global.with_stub(function (stub) { override('attachments_ui.update_attachments', stub.f); @@ -1524,7 +1524,7 @@ with_overrides(function (override) { }); with_overrides(function (override) { - // attachements + // attachments let event = event_fixtures.user_status__set_away; global.with_stub(function (stub) { override('activity.on_set_away', stub.f); diff --git a/frontend_tests/node_tests/fenced_code.js b/frontend_tests/node_tests/fenced_code.js index b448fa448d..cf63bae510 100644 --- a/frontend_tests/node_tests/fenced_code.js +++ b/frontend_tests/node_tests/fenced_code.js @@ -11,7 +11,7 @@ run_test('get_unused_fence', () => { // ``` // ```` // ````` - // ... upto N chars + // ... up to N chars // We insert a N + 1 character fence. for (let i = 3; i <= 20; i += 1) { large_testcase += '`'.repeat(i) + '\n'; diff --git a/frontend_tests/node_tests/narrow.js b/frontend_tests/node_tests/narrow.js index d6928a407c..9c7057dce7 100644 --- a/frontend_tests/node_tests/narrow.js +++ b/frontend_tests/node_tests/narrow.js @@ -303,7 +303,7 @@ run_test('narrow_to_compose_target', () => { {operator: 'pm-with', operand: 'alice@example.com,ray@example.com'}, ]); - // Test with some inavlid persons + // Test with some invalid persons global.compose_state.private_message_recipient = () => 'alice@example.com,random,ray@example.com'; args.called = false; narrow.to_compose_target(); @@ -312,7 +312,7 @@ run_test('narrow_to_compose_target', () => { {operator: 'is', operand: 'private'}, ]); - // Test with all inavlid persons + // Test with all invalid persons global.compose_state.private_message_recipient = () => 'alice,random,ray'; args.called = false; narrow.to_compose_target(); diff --git a/frontend_tests/node_tests/notifications.js b/frontend_tests/node_tests/notifications.js index 179059a4a3..88f7598f61 100644 --- a/frontend_tests/node_tests/notifications.js +++ b/frontend_tests/node_tests/notifications.js @@ -78,7 +78,7 @@ run_test('message_is_notifiable', () => { // Not notifiable because it was sent by the current user assert.equal(notifications.message_is_notifiable(message), false); - // Case 2: If the user has already been sent a notificaton about this message, + // Case 2: If the user has already been sent a notification about this message, // DO NOT notify the user // In this test, all other circumstances should trigger notification // EXCEPT notification_sent, which should trump them diff --git a/frontend_tests/node_tests/people.js b/frontend_tests/node_tests/people.js index a14766d4d8..bfe31c87eb 100644 --- a/frontend_tests/node_tests/people.js +++ b/frontend_tests/node_tests/people.js @@ -763,7 +763,7 @@ run_test('get_people_for_search_bar', () => { // As long as there are 5+ results among the user_ids // in message_store, we will get a small result and not - // seach all people. + // search all people. assert.equal(small_results.length, 6); }); diff --git a/frontend_tests/node_tests/settings_org.js b/frontend_tests/node_tests/settings_org.js index 0a64eeb20f..4cec5cf3c1 100644 --- a/frontend_tests/node_tests/settings_org.js +++ b/frontend_tests/node_tests/settings_org.js @@ -794,7 +794,7 @@ run_test('set_up', () => { const stub_render_notifications_stream_ui = settings_org.render_notifications_stream_ui; settings_org.render_notifications_stream_ui = noop; $("#id_realm_message_content_edit_limit_minutes").set_parent($.create('')); - $("#id_realm_message_content_delete_limit_minutes").set_parent($.create('')); + $("#id_realm_message_content_delete_limit_minutes").set_parent($.create('')); $("#message_content_in_email_notifications_label").set_parent($.create('')); $("#enable_digest_emails_label").set_parent($.create('')); $("#id_realm_digest_weekday").set_parent($.create('')); diff --git a/frontend_tests/node_tests/stream_list.js b/frontend_tests/node_tests/stream_list.js index a3baf7efa3..91c16a7ae0 100644 --- a/frontend_tests/node_tests/stream_list.js +++ b/frontend_tests/node_tests/stream_list.js @@ -529,7 +529,7 @@ run_test('separators_only_pinned_and_dormant', () => { subscribed: true, }; add_row(RomeSub); - // dorment stream + // dormant stream const DenmarkSub = { name: 'Denmark', stream_id: 3000, diff --git a/frontend_tests/node_tests/typeahead_helper.js b/frontend_tests/node_tests/typeahead_helper.js index 637a42bcb9..3e05d1c1af 100644 --- a/frontend_tests/node_tests/typeahead_helper.js +++ b/frontend_tests/node_tests/typeahead_helper.js @@ -250,7 +250,7 @@ run_test('sort_recipients', () => { stream_data.update_calculated_fields(dev_sub); stream_data.update_calculated_fields(linux_sub); - // For spliting based on whether a PM was sent + // For splitting based on whether a PM was sent global.pm_conversations.set_partner(5); global.pm_conversations.set_partner(6); global.pm_conversations.set_partner(2); @@ -502,7 +502,7 @@ run_test('highlight_with_escaping', () => { }); run_test('render_person when emails hidden', () => { - // Test render_person with regular person, under hidden email visiblity case + // Test render_person with regular person, under hidden email visibility case page_params.is_admin = false; let rendered = false; global.stub_templates(function (template_name, args) { diff --git a/frontend_tests/node_tests/typing_status.js b/frontend_tests/node_tests/typing_status.js index cda0f8ad5d..b0d63b6a73 100644 --- a/frontend_tests/node_tests/typing_status.js +++ b/frontend_tests/node_tests/typing_status.js @@ -274,7 +274,7 @@ run_test('basics', () => { }); } - // User ids of poeple in compose narrow doesn't change and is same as stat.current_recipent + // User ids of people in compose narrow doesn't change and is same as stat.current_recipient // so counts of function should increase except stop_last_notification typing_status.update(worker, typing.get_recipient()); assert.deepEqual(call_count.maybe_ping_server, 1); diff --git a/frontend_tests/node_tests/zblueslip.js b/frontend_tests/node_tests/zblueslip.js index 82bdf8d2cc..8f4daeca8c 100644 --- a/frontend_tests/node_tests/zblueslip.js +++ b/frontend_tests/node_tests/zblueslip.js @@ -60,7 +60,7 @@ run_test('basics', () => { blueslip.clear_test_data(); // Let's repeat the above procedue with warnings. Unlike errors, - // warnings shoudln't stop the code execution, and thus, the + // warnings shouldn't stop the code execution, and thus, the // behaviour is slightly different. function throw_a_warning() { diff --git a/frontend_tests/node_tests/zjquery.js b/frontend_tests/node_tests/zjquery.js index 8ee21b2dea..26d0670dce 100644 --- a/frontend_tests/node_tests/zjquery.js +++ b/frontend_tests/node_tests/zjquery.js @@ -167,7 +167,7 @@ run_test('events', () => { stopPropagation: function () {}, }; - // Now call the hander. + // Now call the handler. red_handler_func(stub_event); // And verify it did what it was supposed to do. diff --git a/frontend_tests/zjsunit/bugdown_assert.js b/frontend_tests/zjsunit/bugdown_assert.js index 46bfd8989a..8e4040931b 100644 --- a/frontend_tests/zjsunit/bugdown_assert.js +++ b/frontend_tests/zjsunit/bugdown_assert.js @@ -12,7 +12,7 @@ * assert.notEqual(). * * There is a default _output_formatter used to create the - * AssertionError error message; this function can be overriden using + * AssertionError error message; this function can be overridden using * the exported setFormatter() function below. * * The HTML passed to the _output_formatter is not the original HTML, but diff --git a/puppet/zulip/manifests/dockervoyager.pp b/puppet/zulip/manifests/dockervoyager.pp index b765fd6ee3..1c003c6684 100644 --- a/puppet/zulip/manifests/dockervoyager.pp +++ b/puppet/zulip/manifests/dockervoyager.pp @@ -1,6 +1,6 @@ # This class includes all the modules you need to install/run a Zulip installation # in a single container (without the database, memcached, redis services). -# The database, memcached, redis services need to be run in seperate containers. +# The database, memcached, redis services need to be run in separate containers. # Through this split of services, it is easier to scale the services to the needs. class zulip::dockervoyager { include zulip::base diff --git a/puppet/zulip_ops/files/apt/apt.conf.d/50unattended-upgrades b/puppet/zulip_ops/files/apt/apt.conf.d/50unattended-upgrades index e34dc46421..d45ad58497 100644 --- a/puppet/zulip_ops/files/apt/apt.conf.d/50unattended-upgrades +++ b/puppet/zulip_ops/files/apt/apt.conf.d/50unattended-upgrades @@ -26,7 +26,7 @@ Unattended-Upgrade::Package-Blacklist { // is running is possible (with a small delay) //Unattended-Upgrade::MinimalSteps "true"; -// Install all unattended-upgrades when the machine is shuting down +// Install all unattended-upgrades when the machine is shutting down // instead of doing it in the background while the machine is running // This will (obviously) make shutdown slower //Unattended-Upgrade::InstallOnShutdown "true"; diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections b/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections index 618c7cb3ec..2a6e762b90 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_connections @@ -14,8 +14,8 @@ #%# family=auto #%# capabilities=autoconf -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by +# If run with the "autoconf"-parameter, give our opinion on whether we +# should be run on this system or not. This is optional, and only used by # munin-config. In the case of this plugin, we should most probably # always be included. diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers b/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers index d2e7c9f375..03b8f812e0 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_consumers @@ -14,8 +14,8 @@ #%# family=auto #%# capabilities=autoconf -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by +# If run with the "autoconf"-parameter, give our opinion on whether we +# should be run on this system or not. This is optional, and only used by # munin-config. In the case of this plugin, we should most probably # always be included. diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages index ac81ac2aa9..b7269ad5ba 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages @@ -14,8 +14,8 @@ #%# family=auto #%# capabilities=autoconf -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by +# If run with the "autoconf"-parameter, give our opinion on whether we +# should be run on this system or not. This is optional, and only used by # munin-config. In the case of this plugin, we should most probably # always be included. diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged index 5e7b9bcca4..2d7660b607 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_unacknowledged @@ -14,8 +14,8 @@ #%# family=auto #%# capabilities=autoconf -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by +# If run with the "autoconf"-parameter, give our opinion on whether we +# should be run on this system or not. This is optional, and only used by # munin-config. In the case of this plugin, we should most probably # always be included. diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted index 7032134058..94fdb1acd4 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_messages_uncommitted @@ -14,8 +14,8 @@ #%# family=auto #%# capabilities=autoconf -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by +# If run with the "autoconf"-parameter, give our opinion on whether we +# should be run on this system or not. This is optional, and only used by # munin-config. In the case of this plugin, we should most probably # always be included. diff --git a/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory b/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory index 4ca01e2eaf..e1ae4a70e5 100755 --- a/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory +++ b/puppet/zulip_ops/files/munin-plugins/rabbitmq_queue_memory @@ -14,8 +14,8 @@ #%# family=auto #%# capabilities=autoconf -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by +# If run with the "autoconf"-parameter, give our opinion on whether we +# should be run on this system or not. This is optional, and only used by # munin-config. In the case of this plugin, we should most probably # always be included. diff --git a/puppet/zulip_ops/files/munin-plugins/tornado_event_queues b/puppet/zulip_ops/files/munin-plugins/tornado_event_queues index 6acba46a53..94fb252c6b 100755 --- a/puppet/zulip_ops/files/munin-plugins/tornado_event_queues +++ b/puppet/zulip_ops/files/munin-plugins/tornado_event_queues @@ -12,8 +12,8 @@ #%# family=auto #%# capabilities=autoconf -# If run with the "autoconf"-parameter, give our opinion on wether we -# should be run on this system or not. This is optinal, and only used by +# If run with the "autoconf"-parameter, give our opinion on whether we +# should be run on this system or not. This is optional, and only used by # munin-config. In the case of this plugin, we should most probably # always be included. diff --git a/puppet/zulip_ops/files/nagios3/nagios.cfg b/puppet/zulip_ops/files/nagios3/nagios.cfg index 293d7f1992..2b0a5421d5 100644 --- a/puppet/zulip_ops/files/nagios3/nagios.cfg +++ b/puppet/zulip_ops/files/nagios3/nagios.cfg @@ -877,7 +877,7 @@ process_performance_data=0 # performance data files are opened in write ("w") or append ("a") # mode. If you want to use named pipes, you should use the special # pipe ("p") mode which avoid blocking at startup, otherwise you will -# likely want the defult append ("a") mode. +# likely want the default append ("a") mode. #host_perfdata_file_mode=a #service_perfdata_file_mode=a @@ -906,7 +906,7 @@ process_performance_data=0 # HOST AND SERVICE PERFORMANCE DATA PROCESS EMPTY RESULTS -# THese options determine wether the core will process empty perfdata +# THese options determine whether the core will process empty perfdata # results or not. This is needed for distributed monitoring, and intentionally # turned on by default. # If you don't require empty perfdata - saving some cpu cycles diff --git a/puppet/zulip_ops/files/zulip-ec2-configure-interfaces b/puppet/zulip_ops/files/zulip-ec2-configure-interfaces index f618f5affd..ea88f57f1e 100755 --- a/puppet/zulip_ops/files/zulip-ec2-configure-interfaces +++ b/puppet/zulip_ops/files/zulip-ec2-configure-interfaces @@ -142,7 +142,7 @@ for device in macs.values(): ip, '-j', 'MARK', '--set-mark', str(device_number)]) for throwaway in range(2): - # Don't freak out if this doens't work. + # Don't freak out if this doesn't work. subprocess.call( ['/sbin/ip', 'route', 'del', '10.0.0.0/8']) diff --git a/puppet/zulip_ops/templates/munin/munin.conf.erb b/puppet/zulip_ops/templates/munin/munin.conf.erb index dce5938d8b..1a4caf2c84 100644 --- a/puppet/zulip_ops/templates/munin/munin.conf.erb +++ b/puppet/zulip_ops/templates/munin/munin.conf.erb @@ -88,7 +88,7 @@ end # #rrdcached_socket /var/run/rrdcached.sock -# Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime +# Drop somejuser@fnord.comm and anotheruser@blibb.comm an email every time # something changes (OK -> WARNING, CRITICAL -> OK, etc) #contact.someuser.command mail -s "Munin notification" somejuser@fnord.comm #contact.anotheruser.command mail -s "Munin notification" anotheruser@blibb.comm diff --git a/scripts/lib/zulip_tools.py b/scripts/lib/zulip_tools.py index 8f4f3cacbe..96a55ecfd4 100755 --- a/scripts/lib/zulip_tools.py +++ b/scripts/lib/zulip_tools.py @@ -399,7 +399,7 @@ def file_or_package_hash_updated(paths, hash_name, is_force, package_versions=[] with open(path, 'rb') as file_to_hash: sha1sum.update(file_to_hash.read()) - # The ouput of tools like build_pygments_data depends + # The output of tools like build_pygments_data depends # on the version of some pip packages as well. for package_version in package_versions: sha1sum.update(package_version.encode("utf-8")) diff --git a/static/js/buddy_data.js b/static/js/buddy_data.js index b688b896c9..20a2da2c98 100644 --- a/static/js/buddy_data.js +++ b/static/js/buddy_data.js @@ -271,7 +271,7 @@ exports.get_item = function (user_id) { }; function user_is_recently_active(user_id) { - // return true if the user has a green/orange cirle + // return true if the user has a green/orange circle return exports.level(user_id) <= 2; } diff --git a/static/js/compose.js b/static/js/compose.js index 26f909da7c..ff598d4f91 100644 --- a/static/js/compose.js +++ b/static/js/compose.js @@ -685,10 +685,10 @@ exports.handle_keydown = function (event, textarea) { const position = textarea.caret(); const txt = document.getElementById(textarea[0].id); - // Include selected text in between [] parantheses and insert '(url)' + // Include selected text in between [] parentheses and insert '(url)' // where "url" should be automatically selected. // Position of cursor depends on whether browser supports exec - // command or not. So set cursor position accrodingly. + // command or not. So set cursor position accordingly. if (range.length > 0) { if (document.queryCommandEnabled('insertText')) { txt.selectionStart = position - 4; @@ -1039,7 +1039,7 @@ exports.initialize = function () { e.preventDefault(); let target_textarea; - // The data-message-id atribute is only present in the video + // The data-message-id attribute is only present in the video // call icon present in the message edit form. If present, // the request is for the edit UI; otherwise, it's for the // compose box. diff --git a/static/js/composebox_typeahead.js b/static/js/composebox_typeahead.js index 1c689dfaf8..07a29e0b93 100644 --- a/static/js/composebox_typeahead.js +++ b/static/js/composebox_typeahead.js @@ -777,7 +777,7 @@ exports.content_typeahead_selected = function (item, event) { beginning = beginning.substring(0, backticks) + item; } } else if (this.completing === 'topic_jump') { - // Put the cursor at the end of immediately preceeding stream mention syntax, + // Put the cursor at the end of immediately preceding stream mention syntax, // just before where the `**` at the end of the syntax. This will delete that // final ** and set things up for the topic_list typeahead. const index = beginning.lastIndexOf('**'); diff --git a/static/js/emoji_picker.js b/static/js/emoji_picker.js index 0cfc80fac2..a2a73988fe 100644 --- a/static/js/emoji_picker.js +++ b/static/js/emoji_picker.js @@ -644,12 +644,12 @@ exports.register_click_handlers = function () { $("body").on("click", "#emoji_map", function (e) { e.preventDefault(); e.stopPropagation(); - // The data-message-id atribute is only present in the emoji icon present in + // The data-message-id attribute is only present in the emoji icon present in // the message edit form. So the following check will return false if this // event was not fired from message edit form. if ($(this).attr("data-message-id") !== undefined) { // Store data-message-id value in global variable edit_message_id so that - // its value can be further used to correclty find the message textarea element. + // its value can be further used to correctly find the message textarea element. edit_message_id = $(this).attr("data-message-id"); } else { edit_message_id = null; diff --git a/static/js/input_pill.js b/static/js/input_pill.js index 8d0f28ae66..7e995de4aa 100644 --- a/static/js/input_pill.js +++ b/static/js/input_pill.js @@ -212,7 +212,7 @@ exports.create = function (opts) { // this sends a flag that the operation wasn't completely successful, // which in this case is defined as some of the pills not autofilling - // correclty. + // correctly. if (drafts.length > 0) { return false; } diff --git a/static/js/lightbox_canvas.js b/static/js/lightbox_canvas.js index 6b8a307dfd..03429c61e8 100644 --- a/static/js/lightbox_canvas.js +++ b/static/js/lightbox_canvas.js @@ -79,7 +79,7 @@ const funcs = { canvas.addEventListener("wheel", function (e) { e.preventDefault(); - // this is to reverese scrolling directions for the image. + // this is to reverse scrolling directions for the image. let delta = meta.direction * e.deltaY; if (e.deltaMode === DELTA_MODE.LINE) { diff --git a/static/js/list_render.js b/static/js/list_render.js index 158cbe6ee2..81e6bf61c3 100644 --- a/static/js/list_render.js +++ b/static/js/list_render.js @@ -86,7 +86,7 @@ exports.create = function ($container, list, opts) { const prototype = { // Reads the provided list (in the scope directly above) // and renders the next block of messages automatically - // into the specified contianer. + // into the specified container. render: function (load_count) { load_count = load_count || opts.load_count || DEFAULTS.LOAD_COUNT; diff --git a/static/js/message_fetch.js b/static/js/message_fetch.js index bd4b6e73d8..79f927a6c4 100644 --- a/static/js/message_fetch.js +++ b/static/js/message_fetch.js @@ -263,7 +263,7 @@ exports.get_frontfill_anchor = function (msg_list) { exports.maybe_load_older_messages = function (opts) { // This function gets called when you scroll to the top // of your window, and you want to get messages older - // than what the browers originally fetched. + // than what the browsers originally fetched. const msg_list = opts.msg_list; if (!msg_list.fetch_status.can_load_older_messages()) { // We may already be loading old messages or already @@ -301,7 +301,7 @@ exports.do_backfill = function (opts) { exports.maybe_load_newer_messages = function (opts) { // This function gets called when you scroll to the top // of your window, and you want to get messages newer - // than what the browers originally fetched. + // than what the browsers originally fetched. const msg_list = opts.msg_list; if (!msg_list.fetch_status.can_load_newer_messages()) { diff --git a/static/js/narrow.js b/static/js/narrow.js index d72381e463..00fa06ea71 100644 --- a/static/js/narrow.js +++ b/static/js/narrow.js @@ -872,7 +872,7 @@ function show_search_query() { // if query contains stop words, it is enclosed by a tag if (page_params.stop_words.includes(query_word)) { - // stop_words do not need sanitization so this is unnecesary but it is fail-safe. + // stop_words do not need sanitization so this is unnecessary but it is fail-safe. search_string_display.append($('').text(query_word)); query_contains_stop_words = true; } else { diff --git a/static/js/navigate.js b/static/js/navigate.js index e70be3cafc..c31d15a63f 100644 --- a/static/js/navigate.js +++ b/static/js/navigate.js @@ -90,7 +90,7 @@ exports.page_up_the_right_amount = function () { // because we can't rely on the browser to account for certain // page elements, like the compose box, that sit in fixed // positions above the message pane. For other scrolling - // related adjustements, try to make those happen in the + // related adjustments, try to make those happen in the // scroll handlers, not here. const delta = amount_to_paginate(); message_viewport.scrollTop(message_viewport.scrollTop() - delta); diff --git a/static/js/notifications.js b/static/js/notifications.js index af7fd03504..458b3dcf6f 100644 --- a/static/js/notifications.js +++ b/static/js/notifications.js @@ -267,7 +267,7 @@ exports.notify_above_composebox = function (note, link_class, link_msg_id, link_ if (window.electron_bridge !== undefined) { // The code below is for sending a message received from notification reply which - // is often refered to as inline reply feature. This is done so desktop app doesn't + // is often referred to as inline reply feature. This is done so desktop app doesn't // have to depend on channel.post for setting crsf_token and narrow.by_topic // to narrow to the message being sent. window.electron_bridge.send_notification_reply_message_supported = true; diff --git a/static/js/overlays.js b/static/js/overlays.js index 4bdb7b2191..090c8720fb 100644 --- a/static/js/overlays.js +++ b/static/js/overlays.js @@ -100,7 +100,7 @@ exports.open_modal = function (name) { $("#" + name).modal("show").attr("aria-hidden", false); // Disable background mouse events when modal is active $('.overlay.show').attr("style", "pointer-events: none"); - // Remove previous alert messsages from modal, if exists. + // Remove previous alert messages from modal, if exists. $("#" + name).find(".alert").hide(); $("#" + name).find(".alert-notification").html(""); }; diff --git a/static/js/portico/integrations_dev_panel.js b/static/js/portico/integrations_dev_panel.js index 055708eb87..e92de327a1 100644 --- a/static/js/portico/integrations_dev_panel.js +++ b/static/js/portico/integrations_dev_panel.js @@ -143,7 +143,7 @@ function update_url() { /* Construct the URL that the webhook should be targeting, using the bot's API key and the integration name. The stream and topic are both optional, and for the sake of completeness, it should be - noted that the topic is irrelavent without specifying the + noted that the topic is irrelevant without specifying the stream. */ const url_field = $("#URL")[0]; diff --git a/static/js/reactions.js b/static/js/reactions.js index b7d46422e7..355740ce47 100644 --- a/static/js/reactions.js +++ b/static/js/reactions.js @@ -74,7 +74,7 @@ function update_ui_and_send_reaction_ajax(message_id, reaction_info) { success: function () {}, error: function (xhr) { const response = channel.xhr_error_message("Error sending reaction", xhr); - // Errors are somewhat commmon here, due to race conditions + // Errors are somewhat common here, due to race conditions // where the user tries to add/remove the reaction when there is already // an in-flight request. We eventually want to make this a blueslip // error, rather than a warning, but we need to implement either diff --git a/static/js/settings_users.js b/static/js/settings_users.js index d2696d870d..769a2c3f71 100644 --- a/static/js/settings_users.js +++ b/static/js/settings_users.js @@ -453,7 +453,7 @@ exports.on_load_success = function (realm_people_data) { } else { const new_profile_data = []; $("#user-info-form-modal .custom_user_field_value").each(function () { - // Remove duplicate datepicker input element genearted flatpicker library + // Remove duplicate datepicker input element generated flatpicker library if (!$(this).hasClass("form-control")) { new_profile_data.push({ id: parseInt($(this).closest(".custom_user_field").attr("data-field-id"), 10), diff --git a/static/js/stream_create.js b/static/js/stream_create.js index fcf637368b..d74a587b59 100644 --- a/static/js/stream_create.js +++ b/static/js/stream_create.js @@ -240,7 +240,7 @@ exports.new_stream_clicked = function (stream_name) { // focus the button on that page, the entire app view jumps over to // the other tab, and the animation breaks. // it is unclear whether this is a browser bug or "feature", however what - // is clear is that this shoudn't be touched unless you're also changing + // is clear is that this shouldn't be touched unless you're also changing // the mobile @media query at 700px. if (window.innerWidth > 700) { $('#create_stream_name').focus(); diff --git a/static/js/upload_widget.js b/static/js/upload_widget.js index 956bc3c848..2cd5ab1a00 100644 --- a/static/js/upload_widget.js +++ b/static/js/upload_widget.js @@ -23,7 +23,7 @@ exports.build_widget = function ( upload_button, // jQuery button to open file dialog max_file_upload_size ) { - // default value of max upladed file size + // default value of max uploaded file size max_file_upload_size = max_file_upload_size || default_max_file_size; function accept(file) { @@ -109,7 +109,7 @@ exports.build_direct_upload_widget = function ( upload_function, max_file_upload_size ) { - // default value of max upladed file size + // default value of max uploaded file size max_file_upload_size = max_file_upload_size || default_max_file_size; function accept() { input_error.hide(); diff --git a/static/styles/night_mode.scss b/static/styles/night_mode.scss index c8188c7a6b..18f334422e 100644 --- a/static/styles/night_mode.scss +++ b/static/styles/night_mode.scss @@ -378,7 +378,7 @@ on a dark background, and don't change the dark labels dark either. */ } #invite_user_form .modal-footer { - // no transperancy prevents overlap issues + // no transparency prevents overlap issues background-color: hsl(211, 28%, 14%); } diff --git a/static/third/marked/README.md b/static/third/marked/README.md index efa71aaaab..bb4b3a9652 100644 --- a/static/third/marked/README.md +++ b/static/third/marked/README.md @@ -297,7 +297,7 @@ $ cat hello.html The point of marked was to create a markdown compiler where it was possible to frequently parse huge chunks of markdown without having to worry about -caching the compiled output somehow...or blocking for an unnecesarily long time. +caching the compiled output somehow...or blocking for an unnecessarily long time. marked is very concise and still implements all markdown features. It is also now fully compatible with the client-side. diff --git a/templates/zerver/api/get-all-users.md b/templates/zerver/api/get-all-users.md index 36014128d8..641b748a5b 100644 --- a/templates/zerver/api/get-all-users.md +++ b/templates/zerver/api/get-all-users.md @@ -59,7 +59,7 @@ You may pass the `client_gravatar` query parameter as follows: * `email`: The email address of the user or bot. * `is_bot`: A boolean specifying whether the user is a bot or not. * `avatar_url`: URL to the user's gravatar. `None` if the `client_gravatar` - query paramater was set to `True`. + query parameter was set to `True`. * `full_name`: Full name of the user or bot. * `is_admin`: A boolean specifying whether the user is an admin or not. * `bot_type`: `None` if the user isn't a bot. `1` for a `Generic` bot. diff --git a/templates/zerver/api/get-events-from-queue.md b/templates/zerver/api/get-events-from-queue.md index 51775585d0..edc714586f 100644 --- a/templates/zerver/api/get-events-from-queue.md +++ b/templates/zerver/api/get-events-from-queue.md @@ -81,7 +81,7 @@ endpoint and a queue would be registered in the absence of a `queue_id`. #### Return values * `events`: An array (possibly zero-length if `dont_block` is set) of events - with IDs newer than `last_event_id`. Event IDs are guaranted to be increasing, + with IDs newer than `last_event_id`. Event IDs are guaranteed to be increasing, but they are not guaranteed to be consecutive. #### Example response diff --git a/templates/zerver/api/get-subscribed-streams.md b/templates/zerver/api/get-subscribed-streams.md index df55f25638..4c73a8eaa1 100644 --- a/templates/zerver/api/get-subscribed-streams.md +++ b/templates/zerver/api/get-subscribed-streams.md @@ -57,11 +57,11 @@ You may pass the `include_subscribers` query parameter as follows: Only people who have been invited can access a private stream. * `subscribers`: A list of email addresses of users who are also subscribed to a given stream. Included only if `include_subscribers` is `true`. - * `desktop_notifications`: A boolean specifiying whether desktop notifications + * `desktop_notifications`: A boolean specifying whether desktop notifications are enabled for the given stream. - * `push_notifications`: A boolean specifiying whether push notifications + * `push_notifications`: A boolean specifying whether push notifications are enabled for the given stream. - * `audible_notifications`: A boolean specifiying whether audible notifications + * `audible_notifications`: A boolean specifying whether audible notifications are enabled for the given stream. * `pin_to_top`: A boolean specifying whether the given stream has been pinned to the top. diff --git a/templates/zerver/api/get-user.md b/templates/zerver/api/get-user.md index 36621af2b3..f5708c984b 100644 --- a/templates/zerver/api/get-user.md +++ b/templates/zerver/api/get-user.md @@ -39,7 +39,7 @@ You may pass the `client_gravatar` or `include_custom_profile_fields` query para * `email`: The email address of the user or bot. * `is_bot`: A boolean specifying whether the user is a bot or not. * `avatar_url`: URL to the user's gravatar. `None` if the `client_gravatar` - query paramater was set to `True`. + query parameter was set to `True`. * `full_name`: Full name of the user or bot. * `is_admin`: A boolean specifying whether the user is an admin or not. * `bot_type`: `None` if the user isn't a bot. `1` for a `Generic` bot. diff --git a/templates/zerver/api/incoming-webhooks-overview.md b/templates/zerver/api/incoming-webhooks-overview.md index 3aeb00fe70..d3bdc48080 100644 --- a/templates/zerver/api/incoming-webhooks-overview.md +++ b/templates/zerver/api/incoming-webhooks-overview.md @@ -90,7 +90,7 @@ below are for a webhook named `MyWebHook`. platform/server/product you are integrating. Used on the documentation pages as well as the sender's avatar for messages sent by the integration. * `static/images/integrations/mywebbook/001.svg`: A screenshot of a message - sent by the integration, used on the documenation page. + sent by the integration, used on the documentation page. ### Files that need to be updated diff --git a/templates/zerver/features.html b/templates/zerver/features.html index 1c16b7b776..8cfd04d22c 100644 --- a/templates/zerver/features.html +++ b/templates/zerver/features.html @@ -131,7 +131,7 @@ notifications? Enjoy Zulip on your desktop.

+ arrangement uses the proper cell size with 4 elements in 2 rows.-->
@@ -301,7 +301,7 @@ your use case is missing, you can make it happen!

+ arrangement uses the proper cell size with 4 elements in 2 rows.-->
diff --git a/templates/zerver/help/change-your-email-address.md b/templates/zerver/help/change-your-email-address.md index fc85f6a0d2..e6abf5113e 100644 --- a/templates/zerver/help/change-your-email-address.md +++ b/templates/zerver/help/change-your-email-address.md @@ -2,7 +2,7 @@ By default, anyone can change their email address at any time. -Organization adminstrators can +Organization administrators can [restrict users to certain email domains](/help/change-a-users-name), or [prevent users from changing their email](/help/restrict-name-and-email-changes). diff --git a/templates/zerver/help/desktop-app-install-guide.md b/templates/zerver/help/desktop-app-install-guide.md index 246c972e59..f44435d6b5 100644 --- a/templates/zerver/help/desktop-app-install-guide.md +++ b/templates/zerver/help/desktop-app-install-guide.md @@ -103,7 +103,7 @@ Get a peek at new features before they're released! Start by finding the latest version marked "Pre-release" on the [release list page][release-list]. There may or may not be a "Pre-release" -later than the latest release. If there is, download the approriate Zulip +later than the latest release. If there is, download the appropriate Zulip installer or app from there, and follow the instructions for your operating system above. diff --git a/tools/ci/production-helper b/tools/ci/production-helper index cecff834b3..643d41ee07 100755 --- a/tools/ci/production-helper +++ b/tools/ci/production-helper @@ -22,7 +22,7 @@ apt-mark hold initramfs-tools initramfs-tools-bin udev base-files linux-firmware apt-mark hold accountsservice apparmor apport apt apt-transport-https apt-utils bash bash-completion bind9-host binutils binutils-doc bsdutils bzr cloud-guest-utils cloud-init coreutils cpio dbus dnsutils dosfstools dpkg dpkg-dev e2fslibs e2fsprogs eject gcc-4.9-base git-core grub-common grub-pc grub-pc-bin grub2-common icu-devtools ifupdown imagemagick imagemagick-common init-system-helpers initscripts irqbalance isc-dhcp-client isc-dhcp-common klibc-utils krb5-locales krb5-multidev libaccountsservice0 libapparmor-perl libapparmor1 libblkid1 libc-bin libc-dev-bin libc6 libc6-dev libcdt5 libcgmanager0 libcgraph6 libcups2 libcurl3-gnutls libdbus-1-3 libdpkg-perl libdrm-intel1 libdrm-nouveau2 libdrm-radeon1 libdrm2 libevent-2.0-5 libexpat1 libexpat1-dev libgc1c2 libgcc1 libgd3 libgl1-mesa-dri libgl1-mesa-glx libglapi-mesa libgnutls-openssl27 libgraphite2-3 libgraphviz-dev libgssapi-krb5-2 libgssrpc4 libgtk2.0-0 libgtk2.0-common libgvc6 libgvpr2 libicu-dev libjasper-dev libjasper1 libk5crypto3 libkadm5clnt-mit9 libkadm5srv-mit9 libklibc libkrb5-3 libkrb5-dev libkrb5support0 liblcms2-2 liblcms2-dev libmagickwand-dev libmount1 libmysqlclient-dev libnl-3-200 libnl-genl-3-200 libnspr4 libnss3 libnss3-nssdb libnuma1 libpam-modules libpam-modules-bin libpam-runtime libpam-systemd libpam0g libpam0g-dev libpathplan4 libpci3 libpcre3 libpcre3-dev libpcsclite1 libpixman-1-0 libpixman-1-dev libpng12-0 libpng12-dev libpolkit-agent-1-0 libpolkit-backend-1-0 libpolkit-gobject-1-0 libpython3.4 libsndfile1 libss2 libssl-dev libssl1.0.0 libtasn1-6 libtiff5 libtiff5-dev libtiffxx5 libuuid1 libxdot4 libxml2 libxml2-dev libxpm4 linux-libc-dev login lsb-base lshw makedev mongodb-org mongodb-org-mongos mongodb-org-server mongodb-org-shell mongodb-org-tools mount multiarch-support mysql-client-5.7 mysql-client-core-5.7 mysql-common mysql-server-5.7 mysql-server-core-5.7 ntpdate openssh-client openssh-server openssh-sftp-server os-prober overlayroot passwd pciutils perl perl-base pgdg-keyring policykit-1 pollinate postgresql-client postgresql-client-common postgresql-common python-apt python-apt-common python-bzrlib python-urllib3 python3-apport python3-apt python3-distupgrade python3-gdbm python3-problem-report python3-software-properties python3-update-manager python3.4 python3.4-minimal rsync software-properties-common sudo sysv-rc sysvinit-utils tar tcpdump tzdata ubuntu-release-upgrader-core unzip update-manager-core usbutils util-linux uuid-runtime w3m if ! apt-get dist-upgrade -y "${APT_OPTIONS[@]}"; then - echo "\`apt-get dist-upgrade\`: Failure occured while trying to perform distribution upgrade, Retrying..." + echo "\`apt-get dist-upgrade\`: Failure occurred while trying to perform distribution upgrade, Retrying..." apt-get dist-upgrade -y "${APT_OPTIONS[@]}" fi diff --git a/tools/clean-branches b/tools/clean-branches index a0af6417e6..226307ee82 100755 --- a/tools/clean-branches +++ b/tools/clean-branches @@ -9,7 +9,7 @@ set -e # usage: clean-branches --reviews # Deletes all the above mentioned branches as well as branches # created by the scripts like `fetch-rebase-pull-request`. Be careful -# as this would also remove other branches woth names like review-* +# as this would also remove other branches with names like review-* review=0 if [ $# -ne 0 ] && [ "$1" == "--reviews" ]; then diff --git a/tools/setup/emoji/emoji_names.py b/tools/setup/emoji/emoji_names.py index 313d5ea0e3..d297244f76 100644 --- a/tools/setup/emoji/emoji_names.py +++ b/tools/setup/emoji/emoji_names.py @@ -15,7 +15,7 @@ EMOJI_NAME_MAPS = { # laughter_tears from https://beebom.com/emoji-meanings/ '1f602': {'canonical_name': 'joy', 'aliases': ['tears', 'laughter_tears']}, '1f923': {'canonical_name': 'rolling_on_the_floor_laughing', 'aliases': ['rofl']}, - # not sure how the glpyhs match relaxed, but both iamcal and gemoji have it + # not sure how the glyphs match relaxed, but both iamcal and gemoji have it '263a': {'canonical_name': 'smile', 'aliases': ['relaxed']}, '1f60a': {'canonical_name': 'blush', 'aliases': []}, # halo comes from gemoji/unicode @@ -894,7 +894,7 @@ EMOJI_NAME_MAPS = { '26f5': {'canonical_name': 'boat', 'aliases': ['sailboat']}, '1f6e5': {'canonical_name': 'motor_boat', 'aliases': []}, '1f6a4': {'canonical_name': 'speedboat', 'aliases': []}, - # yatch and cruise seem like reasonable additions + # yacht and cruise seem like reasonable additions '1f6f3': {'canonical_name': 'passenger_ship', 'aliases': ['yacht', 'cruise']}, '26f4': {'canonical_name': 'ferry', 'aliases': []}, '1f6a2': {'canonical_name': 'ship', 'aliases': []}, diff --git a/tools/setup/emoji/emoji_setup_utils.py b/tools/setup/emoji/emoji_setup_utils.py index 182fd17a8c..ccc39b9471 100644 --- a/tools/setup/emoji/emoji_setup_utils.py +++ b/tools/setup/emoji/emoji_setup_utils.py @@ -92,7 +92,7 @@ def generate_emoji_catalog(emoji_data: List[Dict[str, Any]], return dict(emoji_catalog) # Use only those names for which images are present in all -# the emoji sets so that we can switch emoji sets seemlessly. +# the emoji sets so that we can switch emoji sets seamlessly. def emoji_is_universal(emoji_dict: Dict[str, Any]) -> bool: for emoji_set in EMOJISETS: if not emoji_dict['has_img_' + emoji_set]: diff --git a/tools/update-authors-json b/tools/update-authors-json index 61cd242e40..63e1d08368 100755 --- a/tools/update-authors-json +++ b/tools/update-authors-json @@ -113,7 +113,7 @@ def run_production() -> None: contribs_list[username] = contrib_data # remove duplicate contributions count - # find commits at the time of split and substract from zulip-server + # find commits at the time of split and subtract from zulip-server with open(duplicate_commits_file, 'r') as f: duplicate_commits = json.load(f) for committer in duplicate_commits: diff --git a/zerver/data_import/import_util.py b/zerver/data_import/import_util.py index f19c12aca3..9f73a44d37 100644 --- a/zerver/data_import/import_util.py +++ b/zerver/data_import/import_util.py @@ -528,7 +528,7 @@ def process_avatars(avatar_list: List[ZerverFieldsT], avatar_dir: str, realm_id: avatar_original['s3_path'] = original_image_path avatar_original_list.append(avatar_original) - # Run downloads parallely + # Run downloads in parallel output = [] for (status, job) in run_parallel_wrapper(get_avatar, avatar_upload_list, threads=threads): output.append(job) @@ -617,7 +617,7 @@ def process_uploads(upload_list: List[ZerverFieldsT], upload_dir: str, upload_url_list.append([upload_url, upload_s3_path]) upload['path'] = upload_s3_path - # Run downloads parallely + # Run downloads in parallel output = [] for (status, job) in run_parallel_wrapper(get_uploads, upload_url_list, threads=threads): output.append(job) @@ -678,7 +678,7 @@ def process_emojis(zerver_realmemoji: List[ZerverFieldsT], emoji_dir: str, emoji_records.append(emoji_record) - # Run downloads parallely + # Run downloads in parallel output = [] for (status, job) in run_parallel_wrapper(get_emojis, upload_emoji_list, threads=threads): output.append(job) diff --git a/zerver/data_import/mattermost.py b/zerver/data_import/mattermost.py index 57e2e649e7..e7b1142126 100644 --- a/zerver/data_import/mattermost.py +++ b/zerver/data_import/mattermost.py @@ -651,7 +651,7 @@ def label_mirror_dummy_users(num_teams: int, team_name: str, mattermost_data: Di username_to_user: Dict[str, Dict[str, Any]]) -> None: # This function might looks like a great place to label admin users. But # that won't be fully correct since we are iterating only though posts and - # it covers only users that has sent atleast one message. + # it covers only users that have sent at least one message. for post in mattermost_data["post"]["channel_post"]: post_team = post["team"] if post_team == team_name: diff --git a/zerver/data_import/slack.py b/zerver/data_import/slack.py index 029638f69b..6cf6eb7208 100755 --- a/zerver/data_import/slack.py +++ b/zerver/data_import/slack.py @@ -493,7 +493,7 @@ def process_long_term_idle_users(slack_data_dir: str, users: List[ZerverFieldsT] """Algorithmically, we treat users who have sent at least 10 messages or have sent a message within the last 60 days as active. Everyone else is treated as long-term idle, which means they will - have a slighly slower first page load when coming back to + have a slightly slower first page load when coming back to Zulip. """ all_messages = get_messages_iterator(slack_data_dir, added_channels, added_mpims, dm_members) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index f8efdf25b7..fda6f8cf31 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -826,7 +826,7 @@ def do_deactivate_stream(stream: Stream, log: bool=True) -> None: new_name = ("!DEACTIVATED:" + old_name)[:Stream.MAX_NAME_LENGTH] for i in range(20): if stream_name_in_use(new_name, stream.realm_id): - # This stream has alrady been deactivated, keep prepending !s until + # This stream has already been deactivated, keep prepending !s until # we have a unique stream name or you've hit a rename limit. new_name = ("!" + new_name)[:Stream.MAX_NAME_LENGTH] else: @@ -1223,7 +1223,7 @@ def get_service_bot_events(sender: UserProfile, service_bot_tuples: List[Tuple[i # Mention triggers, for stream messages if is_stream and user_profile_id in mentioned_user_ids: trigger = 'mention' - # PM triggers for personal and huddle messsages + # PM triggers for personal and huddle messages elif (not is_stream) and (user_profile_id in active_user_ids): trigger = 'private_message' else: @@ -5239,7 +5239,7 @@ def do_revoke_user_invite(prereg_user: PreregistrationUser) -> None: email = prereg_user.email # Delete both the confirmation objects and the prereg_user object. - # TODO: Probably we actaully want to set the confirmation objects + # TODO: Probably we actually want to set the confirmation objects # to a "revoked" status so that we can give the invited user a better # error message. content_type = ContentType.objects.get_for_model(PreregistrationUser) diff --git a/zerver/lib/bugdown/__init__.py b/zerver/lib/bugdown/__init__.py index d8a6800979..4f99499fdc 100644 --- a/zerver/lib/bugdown/__init__.py +++ b/zerver/lib/bugdown/__init__.py @@ -2091,7 +2091,7 @@ def privacy_clean_markdown(content: str) -> str: def log_bugdown_error(msg: str) -> None: """We use this unusual logging approach to log the bugdown error, in - order to prevent AdminNotifyHandler from sending the santized + order to prevent AdminNotifyHandler from sending the sanitized original markdown formatting into another Zulip message, which could cause an infinite exception loop.""" bugdown_logger.error(msg) diff --git a/zerver/lib/bulk_create.py b/zerver/lib/bulk_create.py index ec7e6b68a6..757e3229f3 100644 --- a/zerver/lib/bulk_create.py +++ b/zerver/lib/bulk_create.py @@ -99,7 +99,7 @@ def bulk_set_users_or_streams_recipient_fields(model: Model, # we take adventage of this, instead of calling save individually. result.save(update_fields=['recipient']) -# This is only sed in populate_db, so doesn't realy need tests +# This is only sed in populate_db, so doesn't really need tests def bulk_create_streams(realm: Realm, stream_dict: Dict[str, Dict[str, Any]]) -> None: # nocoverage existing_streams = frozenset([name.lower() for name in diff --git a/zerver/lib/cache.py b/zerver/lib/cache.py index 0955e3876a..c97e3ce3ac 100644 --- a/zerver/lib/cache.py +++ b/zerver/lib/cache.py @@ -656,7 +656,7 @@ def ignore_unhashable_lru_cache(maxsize: int=128, typed: bool=False) -> DECORATO pass # Deliberately calling this function from outside of exception - # handler to get a more descriptive traceback. Otherise traceback + # handler to get a more descriptive traceback. Otherwise traceback # can include the exception from cached_enabled_user_function as # well. return user_function(*args, **kwargs) diff --git a/zerver/lib/external_accounts.py b/zerver/lib/external_accounts.py index 1548da31fb..bcb08c17c6 100644 --- a/zerver/lib/external_accounts.py +++ b/zerver/lib/external_accounts.py @@ -8,7 +8,7 @@ from zerver.lib.validator import check_required_string, \ check_external_account_url_pattern, check_dict_only from zerver.lib.types import ProfileFieldData -# Default external account fields are by default avaliable +# Default external account fields are by default available # to realm admins, where realm admin only need to select # the default field and other values(i.e. name, url) will be # fetch from this dictionary. diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py index 1aa3234515..de520ef9f7 100644 --- a/zerver/lib/import_realm.py +++ b/zerver/lib/import_realm.py @@ -48,7 +48,7 @@ realm_tables = [("zerver_defaultstream", DefaultStream, "defaultstream"), # that map old ids to new ids. We use this in # re_map_foreign_keys and other places. # -# We explicity initialize ID_MAP with the tables that support +# We explicitly initialize ID_MAP with the tables that support # id re-mapping. # # Code reviewers: give these tables extra scrutiny, as we need to diff --git a/zerver/lib/message.py b/zerver/lib/message.py index ad138c23a7..f3d3066420 100644 --- a/zerver/lib/message.py +++ b/zerver/lib/message.py @@ -170,7 +170,7 @@ class MessageDict: @staticmethod def wide_dict(message: Message) -> Dict[str, Any]: ''' - The next two lines get the cachable field related + The next two lines get the cacheable field related to our message object, with the side effect of populating the cache. ''' diff --git a/zerver/lib/streams.py b/zerver/lib/streams.py index 65c774d743..ebdafc1d35 100644 --- a/zerver/lib/streams.py +++ b/zerver/lib/streams.py @@ -238,7 +238,7 @@ def list_to_streams(streams_raw: Iterable[Mapping[str, Any]], @param streams_raw The list of stream dictionaries to process; names should already be stripped of whitespace by the caller. - @param user_profile The user for whom we are retreiving the streams + @param user_profile The user for whom we are retrieving the streams @param autocreate Whether we should create streams if they don't already exist """ # Validate all streams, getting extant ones, then get-or-creating the rest. diff --git a/zerver/lib/test_runner.py b/zerver/lib/test_runner.py index 3469146bb4..fd0510f19a 100644 --- a/zerver/lib/test_runner.py +++ b/zerver/lib/test_runner.py @@ -382,7 +382,7 @@ class ParallelTestSuite(django_runner.ParallelTestSuite): def check_import_error(test_name: str) -> None: try: - # Directly using __import__ is not recommeded, but here it gives + # Directly using __import__ is not recommended, but here it gives # clearer traceback as compared to importlib.import_module. __import__(test_name) except ImportError as exc: diff --git a/zerver/management/commands/generate_realm_creation_link.py b/zerver/management/commands/generate_realm_creation_link.py index e5ee6366ad..5bbc2ff0f2 100644 --- a/zerver/management/commands/generate_realm_creation_link.py +++ b/zerver/management/commands/generate_realm_creation_link.py @@ -18,7 +18,7 @@ class Command(ZulipBaseCommand): def handle(self, *args: Any, **options: Any) -> None: try: - # first check if the db has been initalized + # first check if the db has been initialized Realm.objects.first() except ProgrammingError: raise CommandError("The Zulip database does not appear to exist. " diff --git a/zerver/management/commands/restore_messages.py b/zerver/management/commands/restore_messages.py index eca14dc4ab..9570658d01 100644 --- a/zerver/management/commands/restore_messages.py +++ b/zerver/management/commands/restore_messages.py @@ -20,7 +20,7 @@ Zulip's message retention and deletion features. Examples: To restore all recently deleted messages: ./manage.py restore_messages -To restore a specfic ArchiveTransaction: +To restore a specific ArchiveTransaction: ./manage.py restore_messages --transaction-id=1 """ diff --git a/zerver/management/commands/send_to_email_mirror.py b/zerver/management/commands/send_to_email_mirror.py index 281d872dcf..282ed0d6b0 100644 --- a/zerver/management/commands/send_to_email_mirror.py +++ b/zerver/management/commands/send_to_email_mirror.py @@ -23,7 +23,7 @@ from zerver.models import Realm, get_realm, get_stream # See zerver/tests/fixtures/email/1.txt for a very simple example, # but anything that the message_from_binary_file function # from the email library can parse should work. -# Value of the TO: header doesn't matter, as it is overriden +# Value of the TO: header doesn't matter, as it is overridden # by the command in order for the email to be sent to the correct stream. class Command(ZulipBaseCommand): diff --git a/zerver/models.py b/zerver/models.py index 9011b16801..16efeb4ec0 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -377,7 +377,7 @@ class Realm(models.Model): max_length=1) # type: str icon_version = models.PositiveSmallIntegerField(default=1) # type: int - # Logo is the horizonal logo we show in top-left of webapp navbar UI. + # Logo is the horizontal logo we show in top-left of webapp navbar UI. LOGO_DEFAULT = u'D' LOGO_UPLOADED = u'U' LOGO_SOURCES = ( @@ -795,7 +795,7 @@ class UserProfile(AbstractBaseUser, PermissionsMixin): # with EMAIL_ADDRESS_VISIBILITY_EVERYONE. For other # organizations, it will be a unique value of the form # user1234@example.com. This field exists for backwards - # compatibility in Zulip APIs where users are refered to by their + # compatibility in Zulip APIs where users are referred to by their # email address, not their ID; it should be used in all API use cases. # # Both fields are unique within a realm (in a case-insensitive fashion). @@ -1668,7 +1668,7 @@ class Message(AbstractMessage): Find out whether a message is a stream message by looking up its recipient.type. TODO: Make this an easier operation by denormalizing the message - type onto Message, either explicity (message.type) + type onto Message, either explicitly (message.type) or implicitly (message.stream_id is not None). ''' return self.recipient.type == Recipient.STREAM @@ -2061,7 +2061,7 @@ class Subscription(models.Model): # Whether the user has since unsubscribed. We mark Subscription # objects as inactive, rather than deleting them, when a user - # unsubscribes, so we can preseve user customizations like + # unsubscribes, so we can preserve user customizations like # notification settings, stream color, etc., if the user later # resubscribes. active = models.BooleanField(default=True) # type: bool diff --git a/zerver/openapi/openapi.py b/zerver/openapi/openapi.py index 08ef299087..eaaf41b4b9 100644 --- a/zerver/openapi/openapi.py +++ b/zerver/openapi/openapi.py @@ -117,7 +117,7 @@ def validate_against_openapi_schema(content: Dict[str, Any], endpoint: str, raise SchemaError('Expected to find the "{}" required key') def to_python_type(py_type: str) -> type: - """Transform an OpenAPI-like type to a Pyton one. + """Transform an OpenAPI-like type to a Python one. https://swagger.io/docs/specification/data-models/data-types """ TYPES = { diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 250bbbac5a..689fda0e3a 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -125,7 +125,7 @@ paths: description: An array of `event` objects (possibly zero-length if `dont_block` is set) of events with IDs newer than `last_event_id`. Event IDs are - guaranted to be increasing, but they are not + guaranteed to be increasing, but they are not guaranteed to be consecutive. - example: { diff --git a/zerver/tests/test_archive.py b/zerver/tests/test_archive.py index f1ba505c06..2a2be4b98d 100644 --- a/zerver/tests/test_archive.py +++ b/zerver/tests/test_archive.py @@ -8,7 +8,7 @@ from zerver.models import get_realm class GlobalPublicStreamTest(ZulipTestCase): def test_non_existant_stream_id(self) -> None: - # Here we use a relatively big number as stream id assumming such an id + # Here we use a relatively big number as stream id assuming such an id # won't exist in the test DB. result = self.client_get("/archive/streams/100000000/topics/TopicGlobal") self.assert_in_success_response(["This stream does not exist."], result) diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py index c7116eff81..ee34585144 100644 --- a/zerver/tests/test_auth_backends.py +++ b/zerver/tests/test_auth_backends.py @@ -646,7 +646,7 @@ class DesktopFlowTestingLib(ZulipTestCase): class SocialAuthBase(DesktopFlowTestingLib, ZulipTestCase): """This is a base class for testing social-auth backends. These - methods are often overriden by subclasses: + methods are often overridden by subclasses: register_extra_endpoints() - If the backend being tested calls some extra endpoints then they can be added here. @@ -1576,7 +1576,7 @@ class SAMLAuthBackendTest(SocialAuthBase): self.assert_in_success_response(["Log in with Second Test IdP"], result) self.assert_in_success_response(["/accounts/login/social/saml/test_idp2"], result) - # Try succesful authentication with the regular idp from all previous tests: + # Try successful authentication with the regular idp from all previous tests: self.test_social_auth_success() # Now test with the second idp: diff --git a/zerver/tests/test_custom_profile_data.py b/zerver/tests/test_custom_profile_data.py index fca265cd60..0ed07343b3 100644 --- a/zerver/tests/test_custom_profile_data.py +++ b/zerver/tests/test_custom_profile_data.py @@ -143,7 +143,7 @@ class CreateCustomProfileFieldTest(CustomProfileFieldTestCase): name=invalid_field_name, )) self.assert_json_success(result) - # Sliently overwrite name and hint with values set in default fields dict + # Silently overwrite name and hint with values set in default fields dict # for default custom external account fields. with self.assertRaises(CustomProfileField.DoesNotExist): field = CustomProfileField.objects.get(name=invalid_field_name, realm=realm) diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py index 93ff2b7f25..8fa5d928dd 100644 --- a/zerver/tests/test_docs.py +++ b/zerver/tests/test_docs.py @@ -365,7 +365,7 @@ class PlansPageTest(ZulipTestCase): # Test root domain result = self.client_get("/plans/", subdomain="") self.assert_in_success_response(["Sign up now"], result) - # Test non-existant domain + # Test non-existent domain result = self.client_get("/plans/", subdomain="moo") self.assertEqual(result.status_code, 404) self.assert_in_response("does not exist", result) diff --git a/zerver/tests/test_i18n.py b/zerver/tests/test_i18n.py index 79c8e29f2f..044a71efbe 100644 --- a/zerver/tests/test_i18n.py +++ b/zerver/tests/test_i18n.py @@ -56,7 +56,7 @@ class EmailTranslationTestCase(ZulipTestCase): class TranslationTestCase(ZulipTestCase): """ - Tranlations strings should change with locale. URLs should be locale + Translations strings should change with locale. URLs should be locale aware. """ diff --git a/zerver/tests/test_integrations_dev_panel.py b/zerver/tests/test_integrations_dev_panel.py index ca647caacd..dcbb456144 100644 --- a/zerver/tests/test_integrations_dev_panel.py +++ b/zerver/tests/test_integrations_dev_panel.py @@ -233,7 +233,7 @@ class TestIntegrationsDevPanel(ZulipTestCase): # We have to use this roundabout manner since the order may vary each time. This is not # an issue. Basically, we're trying to compare 2 lists and since we're not resorting to # using sets or a sorted order, we're sticking with O(n*m) time complexity for this - # comparision (where n and m are the lengths of the two lists respectively). But since + # comparison (where n and m are the lengths of the two lists respectively). But since # this is just a unit test and more importantly n = m = some-low-number we don't really # care about the time complexity being what it is. self.assertTrue(r in expected_responses) diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index 9e6e4bd05b..c1236994d7 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -4333,14 +4333,14 @@ class DeleteMessageTest(ZulipTestCase): result = test_delete_message_by_admin(msg_id=msg_id_2) self.assert_json_success(result) - # Test mulitple delete requests with no latency issues + # Test multiple delete requests with no latency issues msg_id = self.send_stream_message(hamlet, "Scotland") result = test_delete_message_by_owner(msg_id=msg_id) self.assert_json_success(result) result = test_delete_message_by_owner(msg_id=msg_id) self.assert_json_error(result, "Invalid message(s)") - # Test handling of 500 error caused by mulitple delete requests due to latency. + # Test handling of 500 error caused by multiple delete requests due to latency. # see issue #11219. with mock.patch("zerver.views.messages.do_delete_messages") as m, \ mock.patch("zerver.views.messages.validate_can_delete_message", return_value=None), \ diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py index 2563153c1b..4f097d6b82 100644 --- a/zerver/tests/test_push_notifications.py +++ b/zerver/tests/test_push_notifications.py @@ -376,7 +376,7 @@ class PushBouncerNotificationTest(BouncerTestCase): server=server)) self.assertEqual(len(tokens), 2) - # Now we succesfully remove them: + # Now we successfully remove them: do_regenerate_api_key(user, user) tokens = list(RemotePushDeviceToken.objects.filter(user_id=user.id, server=server)) diff --git a/zerver/tests/test_retention.py b/zerver/tests/test_retention.py index e9ebb8a987..743429ac8d 100644 --- a/zerver/tests/test_retention.py +++ b/zerver/tests/test_retention.py @@ -309,7 +309,7 @@ class TestArchiveMessagesGeneral(ArchiveMessagesTestingBase): expired_usermsg_ids = self._get_usermessage_ids(expired_msg_ids) archive_messages(chunk_size=2) # Specify low chunk_size to test batching. - # Make sure we archived what neeeded: + # Make sure we archived what needed: self._verify_archive_data(expired_msg_ids, expired_usermsg_ids) restore_all_data_from_archive() diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index abf1e81d4d..0acdc55401 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -3186,7 +3186,7 @@ class UserSignUpTest(InviteUserBase): self.assertEqual(result.url, "/accounts/login/?email=newuser%40zulip.com") self.assertFalse(UserProfile.objects.filter(delivery_email=email).exists()) - # If the email is outside of LDAP_APPEND_DOMAIN, we succesfully create a non-ldap account, + # If the email is outside of LDAP_APPEND_DOMAIN, we successfully create a non-ldap account, # with the password managed in the zulip database. with self.settings( POPULATE_PROFILE_VIA_LDAP=True, diff --git a/zerver/tests/test_slack_importer.py b/zerver/tests/test_slack_importer.py index f714aa4914..5280653973 100644 --- a/zerver/tests/test_slack_importer.py +++ b/zerver/tests/test_slack_importer.py @@ -438,7 +438,7 @@ class SlackImporter(ZulipTestCase): self.assertDictEqual(test_dm_members, dm_members) # We can't do an assertDictEqual since during the construction of Personal - # recipients, slack_user_id_to_zulip_user_id are iterated in diffrent order in Python 3.5 and 3.6. + # recipients, slack_user_id_to_zulip_user_id are iterated in different order in Python 3.5 and 3.6. self.assertEqual(set(slack_recipient_name_to_zulip_recipient_id.keys()), slack_recipient_names) self.assertEqual(set(slack_recipient_name_to_zulip_recipient_id.values()), set(i for i in range(11))) diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py index 5554cae9e9..68bc75dc35 100644 --- a/zerver/tests/test_upload.py +++ b/zerver/tests/test_upload.py @@ -87,7 +87,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase): data = b"".join(response.streaming_content) self.assertEqual(b"zulip!", data) - # Files uploaded through the API should be accesible via the web client + # Files uploaded through the API should be accessible via the web client self.login('hamlet') self.assert_url_serves_contents_of_file(uri, b"zulip!") @@ -529,7 +529,7 @@ class FileUploadTest(UploadSerializeMixin, ZulipTestCase): self.logout() self.assertEqual(len(queries), 5) - # Subscribed user who recieved the message should be able to view file + # Subscribed user who received the message should be able to view file self.login_user(cordelia) with queries_captured() as queries: response = self.client_get(uri) diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py index 28c98122ae..9f633f1521 100644 --- a/zerver/tests/test_users.py +++ b/zerver/tests/test_users.py @@ -500,7 +500,7 @@ class PermissionTest(ZulipTestCase): {'profile_data': ujson.dumps(new_profile_data)}) self.assert_json_error(result, error_msg) - # non-existant field and no data + # non-existent field and no data invalid_profile_data = [{ 'id': 9001, 'value': '' @@ -509,7 +509,7 @@ class PermissionTest(ZulipTestCase): {'profile_data': ujson.dumps(invalid_profile_data)}) self.assert_json_error(result, 'Field id 9001 not found.') - # non-existant field and data + # non-existent field and data invalid_profile_data = [{ 'id': 9001, 'value': 'some data' @@ -776,7 +776,7 @@ class UserProfileTest(ZulipTestCase): self.assertEqual(check_valid_user_ids(realm.id, [bot.id]), "User with ID %d is a bot" % (bot.id,)) - # Succesfully get non-bot, active user belong to your realm + # Successfully get non-bot, active user belong to your realm self.assertEqual(check_valid_user_ids(realm.id, [othello.id]), None) def test_cache_invalidation(self) -> None: diff --git a/zerver/views/reactions.py b/zerver/views/reactions.py index b7fb7ec00e..992311ad3c 100644 --- a/zerver/views/reactions.py +++ b/zerver/views/reactions.py @@ -50,7 +50,7 @@ def add_reaction(request: HttpRequest, user_profile: UserProfile, message_id: in # If another user has already reacted to this message with # same emoji code, we treat the new reaction as a vote for the # existing reaction. So the emoji name used by that earlier - # reaction takes precendence over whatever was passed in this + # reaction takes precedence over whatever was passed in this # request. This is necessary to avoid a message having 2 # "different" emoji reactions with the same emoji code (and # thus same image) on the same message, which looks ugly. diff --git a/zerver/views/users.py b/zerver/views/users.py index c3c12a2e7e..02c99d3380 100644 --- a/zerver/views/users.py +++ b/zerver/views/users.py @@ -379,7 +379,7 @@ def get_bots_backend(request: HttpRequest, user_profile: UserProfile) -> HttpRes default_events_register_stream = get_stream_name(bot_profile.default_events_register_stream) # Bots are supposed to have only one API key, at least for now. - # Therefore we can safely asume that one and only valid API key will be + # Therefore we can safely assume that one and only valid API key will be # the first one. api_key = get_api_key(bot_profile) diff --git a/zerver/webhooks/front/doc.md b/zerver/webhooks/front/doc.md index 45cb90210b..6a2989a84e 100644 --- a/zerver/webhooks/front/doc.md +++ b/zerver/webhooks/front/doc.md @@ -1,6 +1,6 @@ Front lets you manage all of your communication channels in one place, and helps your team collaborate around every message. Follow these steps -to recieve Front notifications without leaving Zulip! +to receive Front notifications without leaving Zulip! 1. {!create-stream.md!} diff --git a/zerver/webhooks/github/fixtures/issue_comment.json b/zerver/webhooks/github/fixtures/issue_comment.json index 6f6e7d8975..dcb3292573 100644 --- a/zerver/webhooks/github/fixtures/issue_comment.json +++ b/zerver/webhooks/github/fixtures/issue_comment.json @@ -43,7 +43,7 @@ "created_at": "2015-05-05T23:40:28Z", "updated_at": "2015-05-05T23:40:28Z", "closed_at": null, - "body": "It looks like you accidently spelled 'commit' with two 't's." + "body": "It looks like you accidentally spelled 'commit' with two 't's." }, "comment": { "url": "https://api.github.com/repos/baxterthehacker/public-repo/issues/comments/99262140", diff --git a/zerver/webhooks/github/fixtures/issues.json b/zerver/webhooks/github/fixtures/issues.json index dbbb045d2f..25a052a8f9 100644 --- a/zerver/webhooks/github/fixtures/issues.json +++ b/zerver/webhooks/github/fixtures/issues.json @@ -43,7 +43,7 @@ "created_at": "2015-05-05T23:40:28Z", "updated_at": "2015-05-05T23:40:28Z", "closed_at": null, - "body": "It looks like you accidently spelled 'commit' with two 't's." + "body": "It looks like you accidentally spelled 'commit' with two 't's." }, "repository": { "id": 35129377, diff --git a/zerver/webhooks/github/tests.py b/zerver/webhooks/github/tests.py index 9055906164..68a5da0fb8 100644 --- a/zerver/webhooks/github/tests.py +++ b/zerver/webhooks/github/tests.py @@ -131,13 +131,13 @@ class GithubWebhookTest(WebhookTestCase): self.send_and_test_stream_message('issue_comment', expected_topic, expected_message) def test_issue_msg(self) -> None: - expected_message = u"baxterthehacker opened [Issue #2](https://github.com/baxterthehacker/public-repo/issues/2):\n\n~~~ quote\nIt looks like you accidently spelled 'commit' with two 't's.\n~~~" + expected_message = u"baxterthehacker opened [Issue #2](https://github.com/baxterthehacker/public-repo/issues/2):\n\n~~~ quote\nIt looks like you accidentally spelled 'commit' with two 't's.\n~~~" self.send_and_test_stream_message('issues', self.EXPECTED_TOPIC_ISSUE_EVENTS, expected_message) def test_issue_msg_with_custom_topic_in_url(self) -> None: self.url = self.build_webhook_url(topic='notifications') expected_topic = u"notifications" - expected_message = u"baxterthehacker opened [Issue #2 Spelling error in the README file](https://github.com/baxterthehacker/public-repo/issues/2):\n\n~~~ quote\nIt looks like you accidently spelled 'commit' with two 't's.\n~~~" + expected_message = u"baxterthehacker opened [Issue #2 Spelling error in the README file](https://github.com/baxterthehacker/public-repo/issues/2):\n\n~~~ quote\nIt looks like you accidentally spelled 'commit' with two 't's.\n~~~" self.send_and_test_stream_message('issues', expected_topic, expected_message) def test_membership_msg(self) -> None: @@ -210,7 +210,7 @@ class GithubWebhookTest(WebhookTestCase): self.send_and_test_stream_message('release', self.EXPECTED_TOPIC_REPO_EVENTS, expected_message) def test_page_build_msg(self) -> None: - expected_message = u"Github Pages build, trigerred by baxterthehacker, has finished building." + expected_message = u"Github Pages build, triggered by baxterthehacker, has finished building." self.send_and_test_stream_message('page_build', self.EXPECTED_TOPIC_REPO_EVENTS, expected_message) def test_status_msg(self) -> None: diff --git a/zerver/webhooks/github/view.py b/zerver/webhooks/github/view.py index 19d309a837..793c5b6de1 100644 --- a/zerver/webhooks/github/view.py +++ b/zerver/webhooks/github/view.py @@ -257,7 +257,7 @@ def get_page_build_body(payload: Dict[str, Any]) -> str: CONTENT_MESSAGE_TEMPLATE.format(message=build['error']['message']) ) - return u"Github Pages build, trigerred by {}, {}.".format( + return u"Github Pages build, triggered by {}, {}.".format( payload['build']['pusher']['login'], action ) diff --git a/zerver/webhooks/groove/view.py b/zerver/webhooks/groove/view.py index cee879168e..790420a930 100644 --- a/zerver/webhooks/groove/view.py +++ b/zerver/webhooks/groove/view.py @@ -73,7 +73,7 @@ def replied_body(payload: Dict[str, Any], actor: str, action: str) -> str: return body def get_event_handler(event: str) -> Callable[..., str]: - # The main reason for this function existance is because of mypy + # The main reason for this function existence is because of mypy handler = EVENTS_FUNCTION_MAPPER.get(event) # type: Any if handler is None: raise UnexpectedWebhookEventType("Groove", event) diff --git a/zerver/webhooks/librato/fixtures/three_conditions_alert.json b/zerver/webhooks/librato/fixtures/three_conditions_alert.json index 22c96485b2..e9741b84bf 100644 --- a/zerver/webhooks/librato/fixtures/three_conditions_alert.json +++ b/zerver/webhooks/librato/fixtures/three_conditions_alert.json @@ -4,7 +4,7 @@ "name": "ToHighTemeprature", "runbook_url": "http://www.use.water.pl", "version": 2, - "description": "Measurment of temperature in your computer" + "description": "Measurement of temperature in your computer" }, "account": "lizonr@gmail.com", "trigger_time": 1460407214, diff --git a/zerver/webhooks/pagerduty/doc.md b/zerver/webhooks/pagerduty/doc.md index d4c00698db..1fb08fc184 100644 --- a/zerver/webhooks/pagerduty/doc.md +++ b/zerver/webhooks/pagerduty/doc.md @@ -10,7 +10,7 @@ Get Zulip notifications for your PagerDuty services! 1. Set **Extension Type** to **Generic V1 Webhook**. Set **Name** to a name of your choice, such as `Zulip`. Under **Details**, set **URL** to the - URL contructed above, and click **Save**. + URL constructed above, and click **Save**. {!congrats.md!} diff --git a/zerver/webhooks/reviewboard/doc.md b/zerver/webhooks/reviewboard/doc.md index 09320aa079..96f841c990 100644 --- a/zerver/webhooks/reviewboard/doc.md +++ b/zerver/webhooks/reviewboard/doc.md @@ -8,7 +8,7 @@ Get ReviewBoard notifications in Zulip! corner, and click **Team administration**. Select **WebHooks** on the left sidebar, and click **+ Create a WebHook**. -1. Make sure the **Enabled** option is checked. Set **URL** to the URL constucted +1. Make sure the **Enabled** option is checked. Set **URL** to the URL constructed above, and select the events you'd like to be notified about. Set **Encoding** to **JSON**, and click **Create WebHook**. diff --git a/zerver/webhooks/statuspage/fixtures/incident_created.json b/zerver/webhooks/statuspage/fixtures/incident_created.json index adbdfcb39c..9dda2569b1 100644 --- a/zerver/webhooks/statuspage/fixtures/incident_created.json +++ b/zerver/webhooks/statuspage/fixtures/incident_created.json @@ -37,7 +37,7 @@ "incident_updates": [ { "status": "identified", - "body": "We just encountered that database queries are timing out resulting in inconvenience to our end users...we'll do quick fix latest by tommorow !!!", + "body": "We just encountered that database queries are timing out resulting in inconvenience to our end users...we'll do quick fix latest by tomorrow !!!", "created_at": "2017-12-26T07:32:00.548Z", "wants_twitter_update": false, "twitter_updated_at": null, diff --git a/zerver/webhooks/statuspage/fixtures/incident_update.json b/zerver/webhooks/statuspage/fixtures/incident_update.json index 8704a684ba..6af0dcc67f 100644 --- a/zerver/webhooks/statuspage/fixtures/incident_update.json +++ b/zerver/webhooks/statuspage/fixtures/incident_update.json @@ -58,7 +58,7 @@ }, { "status": "identified", - "body": "We just encountered that database queries are timing out resulting in inconvenience to our end users...we'll do quick fix latest by tommorow !!!", + "body": "We just encountered that database queries are timing out resulting in inconvenience to our end users...we'll do quick fix latest by tomorrow !!!", "created_at": "2017-12-26T07:32:00.548Z", "wants_twitter_update": false, "twitter_updated_at": null, diff --git a/zerver/webhooks/statuspage/tests.py b/zerver/webhooks/statuspage/tests.py index 5e93e3a1a9..d5ff11c66e 100644 --- a/zerver/webhooks/statuspage/tests.py +++ b/zerver/webhooks/statuspage/tests.py @@ -11,7 +11,7 @@ class StatuspageHookTests(WebhookTestCase): expected_message = """ **Database query delays**: * State: **identified** -* Description: We just encountered that database queries are timing out resulting in inconvenience to our end users...we'll do quick fix latest by tommorow !!! +* Description: We just encountered that database queries are timing out resulting in inconvenience to our end users...we'll do quick fix latest by tomorrow !!! """.strip() self.send_and_test_stream_message('incident_created', expected_topic, diff --git a/zerver/webhooks/travis/fixtures/build.json b/zerver/webhooks/travis/fixtures/build.json index e582284f7c..08d654d0f3 100644 --- a/zerver/webhooks/travis/fixtures/build.json +++ b/zerver/webhooks/travis/fixtures/build.json @@ -8,7 +8,7 @@ }, "number": "4601", "config": { - "langauge": "java", + "language": "java", "jdk": [ "oraclejdk8" ], @@ -54,7 +54,7 @@ "number": "4601.1", "state": "finished", "config": { - "langauge": "java", + "language": "java", "jdk": "oraclejdk8", "script": "./build.sh", "sudo": false, diff --git a/zerver/webhooks/travis/fixtures/pull_request.json b/zerver/webhooks/travis/fixtures/pull_request.json index cdb751192a..4d832118ea 100644 --- a/zerver/webhooks/travis/fixtures/pull_request.json +++ b/zerver/webhooks/travis/fixtures/pull_request.json @@ -8,7 +8,7 @@ }, "number": "4601", "config": { - "langauge": "java", + "language": "java", "jdk": [ "oraclejdk8" ], @@ -54,7 +54,7 @@ "number": "4601.1", "state": "finished", "config": { - "langauge": "java", + "language": "java", "jdk": "oraclejdk8", "script": "./build.sh", "sudo": false, diff --git a/zerver/webhooks/zabbix/doc.md b/zerver/webhooks/zabbix/doc.md index d796441be0..ec49bf0af7 100644 --- a/zerver/webhooks/zabbix/doc.md +++ b/zerver/webhooks/zabbix/doc.md @@ -36,7 +36,7 @@ Receive Zabbix notifications in Zulip! to use to set the notification. Click **Media**, and click **Add**. 1. Set **Type** to **Zulip**, and set **Send To** to the URL constructed. - Tweak the serverity for notifications as appropriate, and check the + Tweak the severity for notifications as appropriate, and check the **Enabled** option. 1. Go back to your Zabbix Web Interface, and click **Configuration**. diff --git a/zerver/webhooks/zendesk/doc.md b/zerver/webhooks/zendesk/doc.md index 0d45be765e..368cd4534c 100644 --- a/zerver/webhooks/zendesk/doc.md +++ b/zerver/webhooks/zendesk/doc.md @@ -40,7 +40,7 @@ top right. Let's say you want a notification each time a ticket is updated. Put in a descriptive title like "Announce ticket update". Under **Meet all of -the folllowing conditions** select **Ticket: is...** and then select +the following conditions** select **Ticket: is...** and then select **Updated**. In the **Perform these actions** section, select **Notification: Notify target**, then select **Zulip**. diff --git a/zerver/webhooks/zendesk/view.py b/zerver/webhooks/zendesk/view.py index 0d9de550b9..50a3c305cd 100644 --- a/zerver/webhooks/zendesk/view.py +++ b/zerver/webhooks/zendesk/view.py @@ -19,7 +19,7 @@ def api_zendesk_webhook(request: HttpRequest, user_profile: UserProfile, ticket_title: str=REQ(), ticket_id: str=REQ(), message: str=REQ()) -> HttpResponse: """ - Zendesk uses trigers with message templates. This webhook uses the + Zendesk uses triggers with message templates. This webhook uses the ticket_id and ticket_title to create a subject. And passes with zendesk user's configured message to zulip. """ diff --git a/zproject/backends.py b/zproject/backends.py index d88ac84433..13fdf2b3fe 100644 --- a/zproject/backends.py +++ b/zproject/backends.py @@ -1491,7 +1491,7 @@ class SAMLAuthBackend(SocialAuthMixin, SAMLAuth): # If an attacker managed to eavesdrop on the RelayState token, # they may pass it here to the endpoint with an invalid SAMLResponse. # We remove these potentially sensitive parameters that we have set in the session - # ealier, to avoid leaking their values. + # earlier, to avoid leaking their values. self.strategy.session_set(param, None) return result diff --git a/zproject/dev_urls.py b/zproject/dev_urls.py index 1ede697174..76539f496d 100644 --- a/zproject/dev_urls.py +++ b/zproject/dev_urls.py @@ -54,7 +54,7 @@ urls = [ url(r'^errors/404/$', TemplateView.as_view(template_name='404.html')), url(r'^errors/5xx/$', TemplateView.as_view(template_name='500.html')), - # Add a convinient way to generate webhook messages from fixtures. + # Add a convenient way to generate webhook messages from fixtures. url(r'^devtools/integrations/$', zerver.views.development.integrations.dev_panel), url(r'^devtools/integrations/check_send_webhook_fixture_message$', zerver.views.development.integrations.check_send_webhook_fixture_message), diff --git a/zproject/test_settings.py b/zproject/test_settings.py index 8d8d086c3c..7fd7600719 100644 --- a/zproject/test_settings.py +++ b/zproject/test_settings.py @@ -159,7 +159,7 @@ HOME_NOT_LOGGED_IN = '/login/' LOGIN_URL = '/accounts/login/' # By default will not send emails when login occurs. -# Explicity set this to True within tests that must have this on. +# Explicitly set this to True within tests that must have this on. SEND_LOGIN_EMAILS = False GOOGLE_OAUTH2_CLIENT_ID = "id" diff --git a/zproject/urls.py b/zproject/urls.py index 3e50a1913e..822a994417 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -608,7 +608,7 @@ urls += [ {'override_api_url_scheme'})}), ] -# This url serves as a way to recieve CSP violation reports from the users. +# This url serves as a way to receive CSP violation reports from the users. # We use this endpoint to just log these reports. urls += url(r'^report/csp_violations$', zerver.views.report.report_csp_violations, name='zerver.views.report.report_csp_violations'),