diff --git a/app/assets/javascripts/initializers/initializePodcastPlayback.js b/app/assets/javascripts/initializers/initializePodcastPlayback.js index 3a046a889..91630e7b6 100644 --- a/app/assets/javascripts/initializers/initializePodcastPlayback.js +++ b/app/assets/javascripts/initializers/initializePodcastPlayback.js @@ -268,7 +268,7 @@ function initializePodcastPlayback() { setPlaying(true); resolve(); } else { - audio.currrentTime = currentState.currentTime; + audio.currentTime = currentState.currentTime; audio .play() .then(function () { diff --git a/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb b/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb index 866068185..8191604cb 100644 --- a/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb +++ b/app/assets/javascripts/utilities/buildCommentFormHTML.js.erb @@ -18,7 +18,7 @@ function buildCommentFormHTML(commentableId, commentableType, parentId) {
- +
diff --git a/app/assets/javascripts/utilities/buildCommentHTML.js.erb b/app/assets/javascripts/utilities/buildCommentHTML.js.erb index 3e9aba1c5..54cb2db52 100644 --- a/app/assets/javascripts/utilities/buildCommentHTML.js.erb +++ b/app/assets/javascripts/utilities/buildCommentHTML.js.erb @@ -1,6 +1,6 @@ function buildCommentHTML(comment) { var iconSmallOverflowHorizontal = ``; - var iconCollaspe = ``; + var iconCollapse = ``; var iconExpand = ``; var depthClass = ""; @@ -33,7 +33,7 @@ function buildCommentHTML(comment) {
- ${ iconCollaspe } + ${ iconCollapse } ${ iconExpand } diff --git a/app/assets/javascripts/utilities/showUserAlertModal.js b/app/assets/javascripts/utilities/showUserAlertModal.js index fe811a54c..614aaeede 100644 --- a/app/assets/javascripts/utilities/showUserAlertModal.js +++ b/app/assets/javascripts/utilities/showUserAlertModal.js @@ -82,14 +82,14 @@ function showModalAfterError({ }) { response .json() - .then(function parseError(errorReponse) { + .then(function parseError(errorResponse) { if (response.status === 429) { showRateLimitModal({ element, action_ing, action_past, timeframe }); } else { showUserAlertModal( `Error ${action_ing} ${element}`, `Your ${element} could not be ${action_past} due to an error: ` + - errorReponse.error, + errorResponse.error, 'OK', ); } diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb index 5c9780d28..87c9dc241 100644 --- a/app/controllers/admin/organizations_controller.rb +++ b/app/controllers/admin/organizations_controller.rb @@ -30,7 +30,7 @@ module Admin Credit.public_send(update_action, org, amount) add_note(org) - flash[:notice] = "Sucessfully updated credits" + flash[:notice] = "Successfully updated credits" redirect_to admin_organization_path(org) end diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb index c6b8b85f2..d8f4779c3 100644 --- a/app/controllers/articles_controller.rb +++ b/app/controllers/articles_controller.rb @@ -52,7 +52,7 @@ class ArticlesController < ApplicationController end def new - base_editor_assigments + base_editor_assignments @article, needs_authorization = Articles::Builder.call(@user, @tag, @prefill) @@ -216,7 +216,7 @@ class ArticlesController < ApplicationController private - def base_editor_assigments + def base_editor_assignments @user = current_user @version = @user.setting.editor_version if @user @organizations = @user&.organizations diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 7294f4ab1..c42d2e98b 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -50,7 +50,7 @@ class CommentsController < ApplicationController @comment.user_id = current_user.id authorize @comment - permit_commentor + permit_commenter if @comment.save checked_code_of_conduct = params[:checked_code_of_conduct].present? && !current_user.checked_code_of_conduct @@ -106,7 +106,7 @@ class CommentsController < ApplicationController @comment.user_id = moderator.id @comment.body_markdown = response_template.content authorize @comment - permit_commentor + permit_commenter if @comment.save Notification.send_new_comment_notifications_without_delay(@comment) @@ -312,7 +312,7 @@ class CommentsController < ApplicationController end end - def permit_commentor + def permit_commenter return unless user_blocked? raise ModerationUnauthorizedError, "Not allowed due to moderation action" diff --git a/app/javascript/Search/__tests__/SearchFormSync.test.jsx b/app/javascript/Search/__tests__/SearchFormSync.test.jsx index 428fcd27f..344541b51 100644 --- a/app/javascript/Search/__tests__/SearchFormSync.test.jsx +++ b/app/javascript/Search/__tests__/SearchFormSync.test.jsx @@ -17,7 +17,7 @@ describe('', () => { document.body.innerHTML = '
'; - setWindowLocation(`https://locahost:3000/`); + setWindowLocation(`https://localhost:3000/`); global.InstantClick = jest.fn(() => ({ on: jest.fn(), @@ -41,7 +41,7 @@ describe('', () => { const searchTerm = 'diphthong'; // simulates a search result returned which contains the server side rendered search form for mobile only. - setWindowLocation(`https://locahost:3000/search?q=${searchTerm}`); + setWindowLocation(`https://localhost:3000/search?q=${searchTerm}`); fireEvent( window, @@ -72,7 +72,7 @@ describe('', () => { const searchTerm = 'diphthong'; // simulates a search result returned which contains the server side rendered search form for mobile only. - setWindowLocation(`https://locahost:3000/search?q=${searchTerm}`); + setWindowLocation(`https://localhost:3000/search?q=${searchTerm}`); fireEvent( window, @@ -91,7 +91,7 @@ describe('', () => { const searchTerm2 = 'diphthong2'; // simulates a search result returned which contains the server side rendered search form for mobile only. - setWindowLocation(`https://locahost:3000/search?q=${searchTerm2}`); + setWindowLocation(`https://localhost:3000/search?q=${searchTerm2}`); const oldPortalContainer = document.getElementById( 'mobile-search-container', diff --git a/app/javascript/crayons/Buttons/__stories__/Buttons.mdx b/app/javascript/crayons/Buttons/__stories__/Buttons.mdx index 4ef137697..ca2fb29a2 100644 --- a/app/javascript/crayons/Buttons/__stories__/Buttons.mdx +++ b/app/javascript/crayons/Buttons/__stories__/Buttons.mdx @@ -29,7 +29,7 @@ Primary buttons should be used for the principal call to action on the page. Default variant is less prominent, and therefore can be used for less prominent actions. Default buttons are visually light (greyish) and you can have as many of them as you want (within common sense :D). -They can (but don't have to) be used in conjuction with a Primary button. In that case, default variant should be used for any remaining actions. +They can (but don't have to) be used in conjunction with a Primary button. In that case, default variant should be used for any remaining actions. ## Configuration diff --git a/app/javascript/crayons/CTAs/__stories__/CTAs.mdx b/app/javascript/crayons/CTAs/__stories__/CTAs.mdx index 1ab64905e..7427db1ff 100644 --- a/app/javascript/crayons/CTAs/__stories__/CTAs.mdx +++ b/app/javascript/crayons/CTAs/__stories__/CTAs.mdx @@ -16,7 +16,7 @@ Do not use `
- <%# The following tag_list field is overriden by the Tags JS component + <%# The following tag_list field is overridden by the Tags JS component from the listingForm. We keep this form field in place to facilitate SSR. By having the form field loaded on the DOM first with this view, we prevent the screen from "jumping" once the deferred JS is loaded diff --git a/app/views/pages/_privacy_text.html.erb b/app/views/pages/_privacy_text.html.erb index 3501e0245..ad9773afe 100644 --- a/app/views/pages/_privacy_text.html.erb +++ b/app/views/pages/_privacy_text.html.erb @@ -62,7 +62,7 @@

All registered members have the ability to disable advertisements — where reasonable — through their Settings page. For instance, it’s not feasible to disable certain advertisements in the form of recognition posts, site-wide contests, dedicated sponsorship page, etc.

Third Party Vendors

- We may share your account information with third parties in some circumstances, including: (1) with your consent; (2) to a service provider or partner who meets our data protection standards; (3) for survey or research purposes, after aggregation, anonymization, or pseudonomization; (4) when we have a good faith belief it is required by law, such as pursuant to a subpoena or other legal process; (5) when we have a good faith belief that doing so will help prevent imminent harm to someone. + We may share your account information with third parties in some circumstances, including: (1) with your consent; (2) to a service provider or partner who meets our data protection standards; (3) for survey or research purposes, after aggregation, anonymization, or pseudonymization; (4) when we have a good faith belief it is required by law, such as pursuant to a subpoena or other legal process; (5) when we have a good faith belief that doing so will help prevent imminent harm to someone.

Data Storage
diff --git a/app/views/users/confirm_destroy.html.erb b/app/views/users/confirm_destroy.html.erb index be9aa5df4..4ff7c7268 100644 --- a/app/views/users/confirm_destroy.html.erb +++ b/app/views/users/confirm_destroy.html.erb @@ -33,13 +33,13 @@

<%= t("views.settings.destroy.ghost_html", ghost: link_to("@ghost", "/ghost"), click: email_link(text: t("views.settings.destroy.click"), additional_info: { subject: "Request Account Deletion", body: @email_body })) %> diff --git a/bin/untranslated_erb b/bin/untranslated_erb index d341443f9..eb418c87c 100755 --- a/bin/untranslated_erb +++ b/bin/untranslated_erb @@ -4,7 +4,7 @@ require 'rails-html-sanitizer' class I18nExtractor ERB_TAG = /<%(.*?)%>/ HTML_TAG = /<[^>]*>|<\/[^>]*>|[^>]*\/>|\".+">|">|<\w+(.+|)|.+="(.+)|"/ - SEPERATOR = '_@@@_' + SEPARATOR = '_@@@_' SKIP_TAGS = [[/