Fix various typos (#17621)
Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`
This commit is contained in:
		@@ -6,7 +6,7 @@ export const CircularProgress = ({ size, strokeWidth }) => {
 | 
			
		||||
  const radius  = (size - strokeWidth) / 2;
 | 
			
		||||
 | 
			
		||||
  return (
 | 
			
		||||
    <svg width={size} heigh={size} viewBox={viewBox} className='circular-progress' role='progressbar'>
 | 
			
		||||
    <svg width={size} height={size} viewBox={viewBox} className='circular-progress' role='progressbar'>
 | 
			
		||||
      <circle
 | 
			
		||||
        fill='none'
 | 
			
		||||
        cx={size / 2}
 | 
			
		||||
 
 | 
			
		||||
@@ -90,7 +90,7 @@ Object.keys(emojiIndex.emojis).forEach(key => {
 | 
			
		||||
  let { short_names, search, unified } = emojiMartData.emojis[key];
 | 
			
		||||
 | 
			
		||||
  if (short_names[0] !== key) {
 | 
			
		||||
    throw new Error('The compresser expects the first short_code to be the ' +
 | 
			
		||||
    throw new Error('The compressor expects the first short_code to be the ' +
 | 
			
		||||
      'key. It may need to be rewritten if the emoji change such that this ' +
 | 
			
		||||
      'is no longer the case.');
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -491,7 +491,7 @@ class FeedManager
 | 
			
		||||
      end
 | 
			
		||||
    else
 | 
			
		||||
      # A reblog may reach earlier than the original status because of the
 | 
			
		||||
      # delay of the worker deliverying the original status, the late addition
 | 
			
		||||
      # delay of the worker delivering the original status, the late addition
 | 
			
		||||
      # by merging timelines, and other reasons.
 | 
			
		||||
      # If such a reblog already exists, just do not re-insert it into the feed.
 | 
			
		||||
      return false unless redis.zscore(reblog_key, status.id).nil?
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
 | 
			
		||||
class FetchLinkCardService < BaseService
 | 
			
		||||
  URL_PATTERN = %r{
 | 
			
		||||
    (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]})                                                                #   $1 preceeding chars
 | 
			
		||||
    (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]})                                                                #   $1 preceding chars
 | 
			
		||||
    (                                                                                                                           #   $2 URL
 | 
			
		||||
      (https?:\/\/)                                                                                                             #   $3 Protocol (required)
 | 
			
		||||
      (#{Twitter::TwitterText::Regex[:valid_domain]})                                                                           #   $4 Domain(s)
 | 
			
		||||
 
 | 
			
		||||
@@ -71,7 +71,7 @@ class NotifyService < BaseService
 | 
			
		||||
    message? && @notification.target_status.direct_visibility?
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  # Returns true if the sender has been mentionned by the recipient up the thread
 | 
			
		||||
  # Returns true if the sender has been mentioned by the recipient up the thread
 | 
			
		||||
  def response_to_recipient?
 | 
			
		||||
    return false if @notification.target_status.in_reply_to_id.nil?
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
# in the Links header per default.
 | 
			
		||||
 | 
			
		||||
# In our case, that will bloat headers too much and potentially cause
 | 
			
		||||
# issues with reverse proxies. Furhermore, we don't need those links,
 | 
			
		||||
# issues with reverse proxies. Furthermore, we don't need those links,
 | 
			
		||||
# as we already output them as HTML link tags.
 | 
			
		||||
 | 
			
		||||
Rails.application.config.action_view.preload_links_header = false
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ class FixReblogsInFeeds < ActiveRecord::Migration[5.1]
 | 
			
		||||
    # feed, with an entry in a reblog tracking zset (where the score
 | 
			
		||||
    # is once again set to the reblogging status' ID, and the value
 | 
			
		||||
    # is set to the reblogged status' ID). This is safe for Redis'
 | 
			
		||||
    # float coersion because in this reblog tracking zset, we only
 | 
			
		||||
    # float conversion because in this reblog tracking zset, we only
 | 
			
		||||
    # need the rebloggging status' ID to be able to stop tracking
 | 
			
		||||
    # entries after they have gotten too far down the feed, which
 | 
			
		||||
    # does not require an exact value.
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
 | 
			
		||||
          user.update(otp_required_for_login: true)
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        it 'redirects to two factor authentciation methods list page' do
 | 
			
		||||
        it 'redirects to two factor authentication methods list page' do
 | 
			
		||||
          get :show
 | 
			
		||||
 | 
			
		||||
          expect(response).to redirect_to settings_two_factor_authentication_methods_path
 | 
			
		||||
 
 | 
			
		||||
@@ -29,7 +29,7 @@ RSpec.describe Web::PushSubscription, type: :model do
 | 
			
		||||
      context "when notification is a #{type}" do
 | 
			
		||||
        let(:notification_type) { type }
 | 
			
		||||
 | 
			
		||||
        it "returns boolean corresonding to alert setting" do
 | 
			
		||||
        it "returns boolean corresponding to alert setting" do
 | 
			
		||||
          expect(subject.pushable?(notification)).to eq data[:alerts][type]
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
 
 | 
			
		||||
@@ -66,7 +66,7 @@ RSpec.describe BlockDomainService, type: :service do
 | 
			
		||||
      expect(Account.find_remote('badguy', 'evil.org').silenced_at).to_not eq DomainBlock.find_by(domain: 'evil.org').created_at
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'leaves the domains status and attachements, but clears media' do
 | 
			
		||||
    it 'leaves the domains status and attachments, but clears media' do
 | 
			
		||||
      expect { bad_status1.reload }.not_to raise_error
 | 
			
		||||
      expect { bad_status2.reload }.not_to raise_error
 | 
			
		||||
      expect { bad_attachment.reload }.not_to raise_error
 | 
			
		||||
 
 | 
			
		||||
@@ -13,7 +13,7 @@ RSpec.describe ClearDomainMediaService, type: :service do
 | 
			
		||||
      subject.call(DomainBlock.create!(domain: 'evil.org', severity: :silence, reject_media: true))
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'leaves the domains status and attachements, but clears media' do
 | 
			
		||||
    it 'leaves the domains status and attachments, but clears media' do
 | 
			
		||||
      expect { bad_status1.reload }.not_to raise_error
 | 
			
		||||
      expect { bad_status2.reload }.not_to raise_error
 | 
			
		||||
      expect { bad_attachment.reload }.not_to raise_error
 | 
			
		||||
 
 | 
			
		||||
@@ -90,7 +90,7 @@ RSpec.describe DeleteAccountService, type: :service do
 | 
			
		||||
      let!(:account) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
 | 
			
		||||
      let!(:local_follower) { Fabricate(:account) }
 | 
			
		||||
 | 
			
		||||
      it 'sends a reject follow to follwer inboxes' do
 | 
			
		||||
      it 'sends a reject follow to follower inboxes' do
 | 
			
		||||
        subject.call
 | 
			
		||||
        expect(a_request(:post, account.inbox_url)).to have_been_made.once
 | 
			
		||||
      end
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@ RSpec.describe UnreservedUsernameValidator, type: :validator do
 | 
			
		||||
      context 'reserved_username?' do
 | 
			
		||||
        let(:reserved_username) { true }
 | 
			
		||||
 | 
			
		||||
        it 'calls erros.add' do
 | 
			
		||||
        it 'calls errors.add' do
 | 
			
		||||
          expect(errors).to have_received(:add).with(:username, :reserved)
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
@@ -35,7 +35,7 @@ RSpec.describe UnreservedUsernameValidator, type: :validator do
 | 
			
		||||
      context '!reserved_username?' do
 | 
			
		||||
        let(:reserved_username) { false }
 | 
			
		||||
 | 
			
		||||
        it 'not calls erros.add' do
 | 
			
		||||
        it 'not calls errors.add' do
 | 
			
		||||
          expect(errors).not_to have_received(:add).with(:username, any_args)
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user