diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.js b/app/assets/javascripts/discourse/app/lib/plugin-api.js index d80ca1e5e2b..0ab14474de5 100644 --- a/app/assets/javascripts/discourse/app/lib/plugin-api.js +++ b/app/assets/javascripts/discourse/app/lib/plugin-api.js @@ -1691,7 +1691,7 @@ class PluginApi { /** * Add a function to be called when there is a keyDown even on the search-menu widget. * This function runs before the default logic, and if one callback returns a falsey value - * the logic chain will stop, to prevent the core behavior from occuring. + * the logic chain will stop, to prevent the core behavior from occurring. * * Example usage: * ``` @@ -2279,7 +2279,7 @@ class PluginApi { } /** - * Registers a hastag type and its corresponding class. + * Registers a hashtag type and its corresponding class. * This is used when generating CSS classes in the hashtag-css-generator. * * @param {string} type - The type of the hashtag. diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js index c912ff97467..6c8118171b5 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/user-card-test.js @@ -37,7 +37,7 @@ acceptance( server.get("/u/eviltrout/card.json", () => helper.response(cardResponse)); }); - test("it displays the person's username followed by ther fullname", async function (assert) { + test("it displays the person's username followed by their fullname", async function (assert) { await visit("/t/this-is-a-test-topic/9"); await click('a[data-user-card="eviltrout"]'); diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 1af73960fe5..bcc17c9fcc3 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -37,7 +37,7 @@ class Admin::GroupsController < Admin::StaffController if group.automatic can_not_modify_automatic else - StaffActionLogger.new(current_user).log_group_deletetion(group) + StaffActionLogger.new(current_user).log_group_deletion(group) group.destroy! render json: success_json diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index c2416add4fb..359c9f31fca 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -957,7 +957,7 @@ class StaffActionLogger ) end - def log_group_deletetion(group) + def log_group_deletion(group) raise Discourse::InvalidParameters.new(:group) if group.nil? details = ["name: #{group.name}", "id: #{group.id}"] diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb index 580db7c5dd5..d6e4f2872e3 100644 --- a/spec/lib/guardian_spec.rb +++ b/spec/lib/guardian_spec.rb @@ -813,7 +813,7 @@ RSpec.describe Guardian do expect(Guardian.new(user).can_see_deleted_post?(post)).to be_falsey end - it "returns false if not ther person who deleted it" do + it "returns false if not the person who deleted it" do post.update!(deleted_by: another_user) expect(Guardian.new(user).can_see_deleted_post?(post)).to be_falsey end @@ -4195,7 +4195,7 @@ RSpec.describe Guardian do expect(guardian.is_category_group_moderator?(plain_category)).to eq(false) expect(guardian.is_category_group_moderator?(plain_category)).to eq(false) - # edge case ... site setting disabled while guardian instansiated (can help with test cases) + # edge case ... site setting disabled while guardian instantiated (can help with test cases) SiteSetting.enable_category_group_moderation = false expect(guardian.is_category_group_moderator?(category)).to eq(false) end