Verified Commit 26676758 authored by Jess's avatar Jess
Browse files

Issue #3219472 by quietone, Abhishek_Singh, karishmaamin, longwave,... 

Issue #3219472 by quietone, Abhishek_Singh, karishmaamin, longwave, smustgrave, xjm: Fix spelling for words used once, beginning with 'e' -> 'i', inclusive

(cherry picked from commit 1d6b90e8)
parent 8749104b

core/lib/Drupal/Component/Utility/Unicode.php

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public static function check() { 
  }



  /**

   * Decodes UTF byte-order mark (BOM) into the encoding's name.

   * Decodes UTF byte-order mark (BOM) to the encoding name.

   *

   * @param string $data

   *   The data possibly containing a BOM. This can be the entire contents of

core/lib/Drupal/Core/Cache/DatabaseBackend.php

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ protected function prepareItem($cache, $allow_invalid) { 
    // Check expire time.

    $cache->valid = $cache->expire == Cache::PERMANENT || $cache->expire >= REQUEST_TIME;



    // Check if invalidateTags() has been called with any of the items's tags.

    // Check if invalidateTags() has been called with any of the item's tags.

    if (!$this->checksumProvider->isValid($cache->checksum, $cache->tags)) {

      $cache->valid = FALSE;

    }

core/lib/Drupal/Core/Render/BubbleableMetadata.php

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ public function addCacheableDependency($other_object) { 
   */

  public static function mergeAttachments(array $a, array $b) {

    // If both #attached arrays contain drupalSettings, then merge them

    // correctly; adding the same settings multiple times needs to behave

    // idempotently.

    // correctly; adding the same settings multiple times needs to be

    // idempotent.

    if (!empty($a['drupalSettings']) && !empty($b['drupalSettings'])) {

      $drupalSettings = NestedArray::mergeDeepArray([$a['drupalSettings'], $b['drupalSettings']], TRUE);

      // No need for re-merging them.

core/misc/cspell/dictionary.txt

+0 −19
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ dependees 
depenencies

deprioritize

derivedfrom

derp

desaturate

desaturated

desaturates
@@ -369,7 +368,6 @@ détruire 
editables

editunblock

eerste

egroe

egulias

eins

elbonia
@@ -421,8 +419,6 @@ favstar 
fcgi

fdiv

februar

fetchmode

fffffg

fichiers

fieldable

fieldapi
@@ -441,9 +437,7 @@ filestorage 
filesystems

filetransfer

filevalidationerror

filterprovider

findwith

firstcolumn

fixnull

flickr

flipfit
@@ -458,12 +452,10 @@ foobargorilla 
foobars

foofoo

foos

formatless

formattable

formvalidation

fouc

fourcol

fourthcolumn

fozzie

fqcn

fraîche
@@ -481,18 +473,14 @@ funic 
furchtbar

gabilondo

gato

getcode

getfile

gethttpclient

getlist

getmachine

getview

gids

giggabyte

gloop

gnumeric

goldfinger

gonner

googleapis

gotit

grandgrandchild
@@ -514,7 +502,6 @@ hashmarks 
hateoas

heke

heroless

herpderp

herro

heure

heures
@@ -529,11 +516,9 @@ hola 
hookname

hosters

hostnames

hreflangs

hrefs

htkey

htmlcorrector

htmlto

httpheader

httpkernel

httponly
@@ -554,13 +539,11 @@ imagecache 
imagecreatefrom

imagetest

imagetextalternative

inator

indexname

ingoa

inited

inno

insidekeyword

inspectable

instaclick

instantiator

interactable
@@ -1066,7 +1049,6 @@ scriptable 
scrollbars

searchdirs

sebe

secondcolumn

seld

selectbox

serviceform
@@ -1264,7 +1246,6 @@ themers 
themey

theseer

theseparator

thirdcolumn

threecol

tids

timecurrent

core/modules/block/migrations/d7_block.yml

+1 −0
Original line number Diff line number Diff line 
# cspell: ignore firstcolumn secondcolumn thirdcolumn fourthcolumn

id: d7_block

label: Blocks

# This configuration migration depends on the d7_custom_block content migration.