From 0eecf8aaa57492a0bc575346a9341fc55328be9e Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Wed, 19 May 2021 03:09:50 +0200 Subject: [PATCH] Fix typo (#13087) --- .../javascripts/admin/addon/components/suspension-details.js | 2 +- config/locales/client.en.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/addon/components/suspension-details.js b/app/assets/javascripts/admin/addon/components/suspension-details.js index e99a7e1c5b8..fe931ae12e7 100644 --- a/app/assets/javascripts/admin/addon/components/suspension-details.js +++ b/app/assets/javascripts/admin/addon/components/suspension-details.js @@ -13,7 +13,7 @@ export default Component.extend({ reasonKeys: [ "not_listening_to_staff", "consuming_staff_time", - "combatative", + "combative", "in_wrong_place", "no_constructive_purpose", CUSTOM_REASON_KEY, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 5f6e18e5fde..9ecbdd6df41 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -4359,7 +4359,7 @@ en: yaml: text: "YAML" title: "Define theme settings in YAML format" - scss_color_variables_warning: "Using core SCSS color variables in themes is deprecated. Please use CSS custom properties instead. See this guide for more details." + scss_color_variables_warning: 'Using core SCSS color variables in themes is deprecated. Please use CSS custom properties instead. See this guide for more details.' scss_warning_inline: "Using core SCSS color variables in themes is deprecated." colors: select_base: @@ -4786,7 +4786,7 @@ en: suspend_reasons: not_listening_to_staff: "Would not listen to staff feedback" consuming_staff_time: "Consumed disproportionate amounts of staff time" - combatative: "Too combative" + combative: "Too combative" in_wrong_place: "In the wrong place" no_constructive_purpose: "No constructive purpose to their actions other than creating dissent within the community" custom: "Custom..."