mirror of https://github.com/zulip/zulip.git
Fix typos caught by typos.
https://github.com/crate-ci/typos Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
730b93c338
commit
bd884c88ed
|
@ -1482,7 +1482,7 @@ class StripeTest(StripeTestCase):
|
|||
self.assertEqual(ledger_entry.licenses_at_next_renewal, new_seat_count)
|
||||
|
||||
@mock_stripe()
|
||||
def test_upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_begining(
|
||||
def test_upgrade_first_card_fails_and_retry_with_another_card_without_starting_from_beginning(
|
||||
self, *mocks: Mock
|
||||
) -> None:
|
||||
user = self.example_user("hamlet")
|
||||
|
@ -1652,7 +1652,7 @@ class StripeTest(StripeTestCase):
|
|||
self.assertEqual("/billing/", response["Location"])
|
||||
|
||||
@mock_stripe()
|
||||
def test_upgrade_first_card_fails_and_restart_from_begining(self, *mocks: Mock) -> None:
|
||||
def test_upgrade_first_card_fails_and_restart_from_beginning(self, *mocks: Mock) -> None:
|
||||
user = self.example_user("hamlet")
|
||||
self.login_user(user)
|
||||
# From https://stripe.com/docs/testing#cards: Attaching this card to
|
||||
|
|
|
@ -18,7 +18,7 @@ The pills will automatically be inserted in before the ".input" in order.
|
|||
## Basic usage
|
||||
|
||||
```js
|
||||
var $pill_containter = $("#input_container");
|
||||
var $pill_container = $("#input_container");
|
||||
var pills = input_pill.create({
|
||||
$container: $pill_container,
|
||||
create_item_from_text: user_pill.create_item_from_email,
|
||||
|
|
|
@ -185,7 +185,7 @@ class FooTestCase(ZulipTestCase):
|
|||
```
|
||||
|
||||
We sometimes encounter innaccurate type annotations in the Django
|
||||
stubs project. We prefer to address these by [submiting a pull
|
||||
stubs project. We prefer to address these by [submitting a pull
|
||||
request](https://github.com/typeddjango/django-stubs/pulls) to fix the
|
||||
issue in the upstream project, just like we do with `typeshed` bugs.
|
||||
|
||||
|
|
|
@ -127,7 +127,7 @@ Use commas in whole sentences where it is required. You can use these instructio
|
|||
- Subscribe a stream - **Tilaa kanava**
|
||||
- Subdomain - **Aliverkkotunnus**
|
||||
- Shortcuts - **Pikanäppäimet**
|
||||
- Unsubscripe - **Peru tilaus**
|
||||
- Unsubscribe - **Peru tilaus**
|
||||
- Unsupported - **Ei-tuettu**
|
||||
- Unresolve - **Merkitse ratkaisemattomaksi**
|
||||
- Webhook - **Webhook**
|
||||
|
|
|
@ -299,7 +299,7 @@ test("get_list_info", ({override}) => {
|
|||
more_conversations_unread_count: 0,
|
||||
});
|
||||
|
||||
// Now, add additional converstaions until we exceed
|
||||
// Now, add additional conversations until we exceed
|
||||
// `max_conversations_to_show_with_unreads`.
|
||||
|
||||
pm_conversations.recent.insert([zoe.user_id], 3);
|
||||
|
|
|
@ -265,7 +265,7 @@ test("sort_languages", () => {
|
|||
Object.assign(pygments_data, {
|
||||
langs: {
|
||||
python: {priority: 26},
|
||||
javscript: {priority: 27},
|
||||
javascript: {priority: 27},
|
||||
php: {priority: 16},
|
||||
pascal: {priority: 15},
|
||||
perl: {priority: 3},
|
||||
|
|
|
@ -59,7 +59,7 @@ def inline_template(template_source_name: str) -> None:
|
|||
# Thus, we strip this stuff out if the template extends
|
||||
# another template.
|
||||
if template_name not in ["email_base_default", "email_base_marketing", "macros"]:
|
||||
output = strip_unnecesary_tags(output)
|
||||
output = strip_unnecessary_tags(output)
|
||||
|
||||
if (
|
||||
"zerver/emails/compiled/email_base_default.html" in output
|
||||
|
@ -82,7 +82,7 @@ def escape_jinja2_characters(text: str) -> str:
|
|||
return text
|
||||
|
||||
|
||||
def strip_unnecesary_tags(text: str) -> str:
|
||||
def strip_unnecessary_tags(text: str) -> str:
|
||||
end_block = "</body>\n</html>"
|
||||
start_block = "{% extends"
|
||||
start = text.find(start_block)
|
||||
|
|
|
@ -181,10 +181,10 @@ export function submit_api_request(
|
|||
request_method({
|
||||
url,
|
||||
data,
|
||||
success(reponse_data) {
|
||||
success(response_data) {
|
||||
close_modal();
|
||||
if (success_continuation !== undefined) {
|
||||
success_continuation(reponse_data);
|
||||
success_continuation(response_data);
|
||||
}
|
||||
},
|
||||
error(xhr) {
|
||||
|
|
|
@ -20,7 +20,7 @@ let $active_popover_element;
|
|||
// Only used if popover called from edit message, otherwise it is `undefined`.
|
||||
let edit_message_id;
|
||||
|
||||
export function is_popped_from_edit_messsage() {
|
||||
export function is_popped_from_edit_message() {
|
||||
return $active_popover_element && edit_message_id !== undefined;
|
||||
}
|
||||
|
||||
|
|
|
@ -288,7 +288,7 @@ export function process_escape_key(e) {
|
|||
return true;
|
||||
}
|
||||
|
||||
if (giphy.is_popped_from_edit_messsage()) {
|
||||
if (giphy.is_popped_from_edit_message()) {
|
||||
giphy.focus_current_edit_message();
|
||||
// Hide after setting focus so that `edit_message_id` is
|
||||
// still set in giphy.
|
||||
|
@ -299,7 +299,7 @@ export function process_escape_key(e) {
|
|||
if (compose_state.composing()) {
|
||||
// Check if the giphy popover was open using compose box.
|
||||
// Hide GIPHY popover if it's open.
|
||||
if (!giphy.is_popped_from_edit_messsage() && giphy.hide_giphy_popover()) {
|
||||
if (!giphy.is_popped_from_edit_message() && giphy.hide_giphy_popover()) {
|
||||
$("#compose-textarea").trigger("focus");
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -539,7 +539,7 @@ export class MessageListView {
|
|||
return true;
|
||||
}
|
||||
|
||||
// We may need to add a subscripton marker after merging the groups.
|
||||
// We may need to add a subscription marker after merging the groups.
|
||||
this.maybe_add_subscription_marker(second_group, last_msg_container, first_msg_container);
|
||||
|
||||
return false;
|
||||
|
|
|
@ -184,7 +184,7 @@ $(() => {
|
|||
},
|
||||
});
|
||||
|
||||
function check_subdomain_avilable(subdomain) {
|
||||
function check_subdomain_available(subdomain) {
|
||||
const url = "/json/realm/subdomain/" + subdomain;
|
||||
$.get(url, (response) => {
|
||||
if (response.msg !== "available") {
|
||||
|
@ -223,7 +223,7 @@ $(() => {
|
|||
});
|
||||
$("#id_team_subdomain").on("keyup", () => {
|
||||
clearTimeout(timer);
|
||||
timer = setTimeout(check_subdomain_avilable, 250, $("#id_team_subdomain").val());
|
||||
timer = setTimeout(check_subdomain_available, 250, $("#id_team_subdomain").val());
|
||||
});
|
||||
|
||||
// GitHub auth
|
||||
|
|
|
@ -15,7 +15,7 @@ function get_new_heights() {
|
|||
const res = {};
|
||||
const viewport_height = message_viewport.height();
|
||||
const top_navbar_height = $("#top_navbar").safeOuterHeight(true);
|
||||
const right_sidebar_shorcuts_height = $(".right-sidebar-shortcuts").safeOuterHeight(true) || 0;
|
||||
const right_sidebar_shortcuts_height = $(".right-sidebar-shortcuts").safeOuterHeight(true) || 0;
|
||||
|
||||
res.bottom_whitespace_height = viewport_height * 0.4;
|
||||
|
||||
|
@ -39,7 +39,7 @@ function get_new_heights() {
|
|||
Number.parseInt($("#right-sidebar").css("marginTop"), 10) -
|
||||
$("#userlist-header").safeOuterHeight(true) -
|
||||
$("#user_search_section").safeOuterHeight(true) -
|
||||
right_sidebar_shorcuts_height;
|
||||
right_sidebar_shortcuts_height;
|
||||
|
||||
res.buddy_list_wrapper_max_height = Math.max(80, usable_height);
|
||||
|
||||
|
|
|
@ -426,7 +426,7 @@ function set_org_join_restrictions_dropdown() {
|
|||
);
|
||||
}
|
||||
|
||||
function set_message_content_in_email_notifications_visiblity() {
|
||||
function set_message_content_in_email_notifications_visibility() {
|
||||
change_element_block_display_property(
|
||||
"message_content_in_email_notifications_label",
|
||||
page_params.realm_message_content_allowed_in_email_notifications,
|
||||
|
@ -522,7 +522,7 @@ function update_dependent_subsettings(property_name) {
|
|||
set_org_join_restrictions_dropdown();
|
||||
break;
|
||||
case "realm_message_content_allowed_in_email_notifications":
|
||||
set_message_content_in_email_notifications_visiblity();
|
||||
set_message_content_in_email_notifications_visibility();
|
||||
break;
|
||||
case "realm_digest_emails_enabled":
|
||||
settings_notifications.set_enable_digest_emails_visibility(
|
||||
|
@ -1156,7 +1156,7 @@ export function build_page() {
|
|||
set_delete_own_message_policy_dropdown(page_params.realm_delete_own_message_policy);
|
||||
set_message_retention_setting_dropdown();
|
||||
set_org_join_restrictions_dropdown();
|
||||
set_message_content_in_email_notifications_visiblity();
|
||||
set_message_content_in_email_notifications_visibility();
|
||||
set_digest_emails_weekday_visibility();
|
||||
set_create_web_public_stream_dropdown_visibility();
|
||||
|
||||
|
|
|
@ -43,13 +43,13 @@ export function do_settings_change(
|
|||
request_method({
|
||||
url,
|
||||
data,
|
||||
success(reponse_data) {
|
||||
success(response_data) {
|
||||
setTimeout(() => {
|
||||
ui_report.success(success_msg_html, $spinner, remove_after);
|
||||
display_checkmark($spinner);
|
||||
}, appear_after);
|
||||
if (success_continuation !== undefined) {
|
||||
success_continuation(reponse_data);
|
||||
success_continuation(response_data);
|
||||
}
|
||||
},
|
||||
error(xhr) {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<div class="general_notifications {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||
<div class="subsection-header inline-block">
|
||||
<h3>{{t "Notification triggers" }}</h3>
|
||||
{{> settings_save_discard_widget section_name="general-notifiy-settings" show_only_indicator=(not for_realm_settings) }}
|
||||
{{> settings_save_discard_widget section_name="general-notify-settings" show_only_indicator=(not for_realm_settings) }}
|
||||
</div>
|
||||
<p>{{t "Configure how Zulip notifies you about new messages." }}</p>
|
||||
<table class="notification-table table table-condensed table-bordered wrapped-table">
|
||||
|
|
|
@ -174,23 +174,23 @@ if vendor == "debian" and os_version in [] or vendor == "ubuntu" and os_version
|
|||
*VENV_DEPENDENCIES,
|
||||
]
|
||||
elif "debian" in os_families():
|
||||
DEBIAN_DEPENDECIES = UBUNTU_COMMON_APT_DEPENDENCIES
|
||||
DEBIAN_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES
|
||||
# The below condition is required since libappindicator is
|
||||
# not available for Debian 11. "libgroonga1" is an
|
||||
# additional dependency for postgresql-13-pgdg-pgroonga.
|
||||
#
|
||||
# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895037
|
||||
if vendor == "debian" and os_version == "11":
|
||||
DEBIAN_DEPENDECIES.remove("libappindicator1")
|
||||
DEBIAN_DEPENDECIES.append("libgroonga0")
|
||||
DEBIAN_DEPENDENCIES.remove("libappindicator1")
|
||||
DEBIAN_DEPENDENCIES.append("libgroonga0")
|
||||
|
||||
# If we are on an aarch64 processor, ninja will be built from source,
|
||||
# so cmake is required
|
||||
if platform.machine() == "aarch64":
|
||||
DEBIAN_DEPENDECIES.append("cmake")
|
||||
DEBIAN_DEPENDENCIES.append("cmake")
|
||||
|
||||
SYSTEM_DEPENDENCIES = [
|
||||
*DEBIAN_DEPENDECIES,
|
||||
*DEBIAN_DEPENDENCIES,
|
||||
f"postgresql-{POSTGRESQL_VERSION}",
|
||||
f"postgresql-{POSTGRESQL_VERSION}-pgroonga",
|
||||
*VENV_DEPENDENCIES,
|
||||
|
@ -355,8 +355,8 @@ def main(options: argparse.Namespace) -> NoReturn:
|
|||
# hash the apt dependencies
|
||||
sha_sum = hashlib.sha1()
|
||||
|
||||
for apt_depedency in SYSTEM_DEPENDENCIES:
|
||||
sha_sum.update(apt_depedency.encode())
|
||||
for apt_dependency in SYSTEM_DEPENDENCIES:
|
||||
sha_sum.update(apt_dependency.encode())
|
||||
if "debian" in os_families():
|
||||
with open("scripts/lib/setup-apt-repo", "rb") as fb:
|
||||
sha_sum.update(fb.read())
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue