Merge forwardport of #11345 to 2.3-develop branch

Applied pull request patch https://github.com/magento/magento2/pull/11345.patch (created by @davidangel) based on commit(s): 1. dd6e5a3 2. 4092346 3. 84ff52b
magento · Jan 23, 2018 · 3e32140 · 3e32140
2 parents aad5ba6 + fde512e
commit 3e32140
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv
@@ -133,7 +133,7 @@ Block,Block
 "Enable Page","Enable Page"
 Content,Content
 "Content Heading","Content Heading"
-"Search Engine Optimisation","Search Engine Optimisation"
+"Search Engine Optimization","Search Engine Optimization"
 "Meta Title","Meta Title"
 "Meta Keywords","Meta Keywords"
 "Meta Description","Meta Description"

diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml
@@ -141,7 +141,7 @@
     <fieldset name="search_engine_optimisation" sortOrder="20">
         <settings>
             <collapsible>true</collapsible>
-            <label translate="true">Search Engine Optimisation</label>
+            <label translate="true">Search Engine Optimization</label>
         </settings>
         <field name="identifier" formElement="input">
             <argument name="data" xsi:type="array">

diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Edit/PageForm.xml
@@ -68,7 +68,7 @@
     </custom_design>
     <seo>
         <class>\Magento\Backend\Test\Block\Widget\Tab</class>
-        <selector>//div[div/strong/span[text()="Search Engine Optimisation"]]</selector>
+        <selector>//div[div/strong/span[text()="Search Engine Optimization"]]</selector>
         <strategy>xpath</strategy>
         <fields>
             <identifier />