MAGETWO-36131: Update Content in Magento 2 by Modules - part 3

Dmytro Vilchynskyi · Dmytro Vilchynskyi · commit 034a475c68b8 · 2015-06-23T13:41:41.000+03:00
- fixes after CR
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -180,15 +180,15 @@
             <group id="translate_inline" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Translate Inline</label>
                 <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Enabled for Frontend</label>
+                    <label>Enabled for Storefront</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Translate</backend_model>
                 </field>
                 <field id="active_admin" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enabled for Admin</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Translate</backend_model>
-                    <comment>Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.</comment>
+                    <comment>Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.</comment>
                 </field>
             </group>
             <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -509,10 +509,10 @@
                     <comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
                 </field>
                 <field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Use Secure URLs in Frontend</label>
+                    <label>Use Secure URLs on Storefront</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
-                    <comment>Enter https protocol to use Secure URLs in Frontend.</comment>
+                    <comment>Enter https protocol to use Secure URLs on Storefront.</comment>
                 </field>
                 <field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Use Secure URLs in Admin</label>
@@ -552,7 +552,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="use_frontend_sid" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Use SID on Frontend</label>
+                    <label>Use SID on Storefront</label>
                     <comment>Allows customers to stay logged in when switching between different stores.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
diff --git a/app/code/Magento/Captcha/etc/adminhtml/system.xml b/app/code/Magento/Captcha/etc/adminhtml/system.xml
@@ -82,7 +82,7 @@
             <group id="captcha" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>CAPTCHA</label>
                 <field id="enable" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Enable CAPTCHA on Frontend</label>
+                    <label>Enable CAPTCHA on Storefront</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="font" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="0">
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -35,7 +35,7 @@
                 </field>
             </group>
             <group id="frontend" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Frontend</label>
+                <label>Storefront</label>
                 <field id="list_mode" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>List Mode</label>
                     <source_model>Magento\Catalog\Model\Config\Source\ListMode</source_model>
diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
@@ -32,7 +32,7 @@
                     <validate>validate-number</validate>
                 </field>
                 <field id="display_product_stock_status" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Display products availability in stock in the frontend</label>
+                    <label>Display products availability in stock on Storefront.</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
diff --git a/app/code/Magento/Cms/Setup/InstallData.php b/app/code/Magento/Cms/Setup/InstallData.php
@@ -107,7 +107,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
     <div class="message info">
         <span>
             Please replace this text with you Privacy Policy.
-            Please add any additional cookies your website uses below (e.g., Google Analytics)
+            Please add any additional cookies your website uses below (e.g. Google Analytics).
         </span>
     </div>
     <p>
@@ -258,7 +258,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
             </tr>
             <tr>
                 <th>FRONTEND</th>
-                <td>You sesssion ID on the server.</td>
+                <td>You session ID on the server.</td>
             </tr>
             <tr>
                 <th>GUEST-VIEW</th>
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -249,7 +249,7 @@ public function execute()
                 // @codingStandardsIgnoreStart
                 $this->messageManager->addSuccess(
                     __(
-                        'Account confirmation is required. Please check your email for the confirmation link. To resend the confirmation email please <a href="%1">click here</a>.',
+                        'You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.',
                         $email
                     )
                 );
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -82,8 +82,8 @@
                     <backend_model>Magento\Customer\Model\Config\Backend\CreateAccount\DisableAutoGroupAssignDefault</backend_model>
                 </field>
                 <field id="vat_frontend_visibility" translate="label" type="select" sortOrder="58" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Show VAT Number on Frontend</label>
-                    <comment>To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.</comment>
+                    <label>Show VAT Number on Storefront</label>
+                    <comment>To show VAT number on Storefront, set "Show VAT Number on Storefront" option to Yes.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="email_domain" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -153,7 +153,7 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary" title="<?php echo __('Create account') ?>"><span><?php echo __('Create account') ?></span></button>
+            <button type="submit" class="action submit primary" title="<?php echo __('Create an Account') ?>"><span><?php echo __('Create an Account') ?></span></button>
         </div>
         <div class="secondary">
             <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo __('Back') ?></span></a>
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Form.php b/app/code/Magento/GoogleOptimizer/Helper/Form.php
@@ -35,7 +35,7 @@ public function addGoogleoptimizerFields(DataForm $form, ModelCode $experimentCo
                 'value' => $experimentCodeModel ? $experimentCodeModel->getExperimentScript() : '',
                 'class' => 'textarea googleoptimizer',
                 'required' => false,
-                'note' => __('Note: Experiment code should be added to the original page only.')
+                'note' => __('Experiment code should be added to the original page only.')
             ]
         );
 
diff --git a/app/code/Magento/GoogleOptimizer/Test/Unit/Helper/FormTest.php b/app/code/Magento/GoogleOptimizer/Test/Unit/Helper/FormTest.php
@@ -118,7 +118,7 @@ protected function _prepareFormMock($experimentCode, $experimentCodeId)
                 'value' => $experimentCode,
                 'class' => 'textarea googleoptimizer',
                 'required' => false,
-                'note' => 'Note: Experiment code should be added to the original page only.'
+                'note' => 'Experiment code should be added to the original page only.'
             ]
         );
 
diff --git a/app/code/Magento/Msrp/etc/adminhtml/system.xml b/app/code/Magento/Msrp/etc/adminhtml/system.xml
@@ -14,7 +14,7 @@
                     <label>Enable MAP</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning!</strong> Enabling MAP by default will hide all product prices on the front end.]]>
+                        <![CDATA[<strong style="color:red">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.]]>
                     </comment>
                 </field>
                 <field id="display_price_type" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
diff --git a/app/code/Magento/Persistent/etc/adminhtml/system.xml b/app/code/Magento/Persistent/etc/adminhtml/system.xml
@@ -40,7 +40,7 @@
                     </depends>
                 </field>
                 <field id="logout_clear" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Clear Persistence on Log Out</label>
+                    <label>Clear Persistence on Sign Out</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
                         <field id="enabled">1</field>
diff --git a/app/code/Magento/Review/Setup/InstallSchema.php b/app/code/Magento/Review/Setup/InstallSchema.php
@@ -390,7 +390,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                 null,
                 ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Rating Position On Frontend'
+                'Rating Position On Storefront'
             )
             ->addColumn(
                 'is_active',
@@ -460,7 +460,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                 null,
                 ['unsigned' => true, 'nullable' => false, 'default' => 0],
-                'Ration option position on frontend'
+                'Ration option position on Storefront'
             )
             ->addIndex(
                 $installer->getIdxName('rating_option', ['rating_id']),
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -30,7 +30,7 @@
             </div>
         </div>
         <div class="field find required">
-            <label class="label" for="quick-search-type-id"><span><?php echo __('Find Order By:') ?></span></label>
+            <label class="label" for="quick-search-type-id"><span><?php echo __('Find Order By') ?></span></label>
 
             <div class="control">
                 <select name="oar_type" id="quick-search-type-id" class="select">
diff --git a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
@@ -18,7 +18,7 @@
                   class="form form-orders-search" name="guest_post">
                 <fieldset class="fieldset">
                     <div class="field find required">
-                        <label class="label"><span><?php echo __('Find Order By:') ?></span></label>
+                        <label class="label"><span><?php echo __('Find Order By') ?></span></label>
 
                         <div class="control">
                             <select name="oar_type" id="quick-search-type-id" class="select" title="">
diff --git a/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php b/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php
@@ -15,8 +15,8 @@ class Strategy implements \Magento\Framework\Option\ArrayInterface
     public function toOptionArray()
     {
         return [
-            ['label' => __('Dictionary (Translation on frontend side)'), 'value' => Config::DICTIONARY_STRATEGY],
-            ['label' => __('Embedded (Translation on backend side)'), 'value' => Config::EMBEDDED_STRATEGY]
+            ['label' => __('Dictionary (Translation on Storefront side)'), 'value' => Config::DICTIONARY_STRATEGY],
+            ['label' => __('Embedded (Translation on Admin side)'), 'value' => Config::EMBEDDED_STRATEGY]
         ];
     }
 }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php
@@ -35,8 +35,8 @@ protected function setUp()
     public function testToOptionArray()
     {
         $expected = [
-            ['label' => 'Dictionary (Translation on frontend side)', 'value' => Config::DICTIONARY_STRATEGY],
-            ['label' => 'Embedded (Translation on backend side)', 'value' => Config::EMBEDDED_STRATEGY]
+            ['label' => 'Dictionary (Translation on Storefront side)', 'value' => Config::DICTIONARY_STRATEGY],
+            ['label' => 'Embedded (Translation on Admin side)', 'value' => Config::EMBEDDED_STRATEGY]
         ];
         $this->assertEquals($expected, $this->model->toOptionArray());
     }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CancelCreatedOrderTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\CancelCreatedOrderTest">
         <variation name="CancelCreatedOrderTestVariation1">
-            <data name="description" xsi:type="string">cancel order and check status on the frontend</data>
+            <data name="description" xsi:type="string">cancel order and check status on storefront</data>
             <data name="order/dataSet" xsi:type="string">default</data>
             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default,catalogProductSimple::default</data>
             <data name="status" xsi:type="string">Canceled</data>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/HoldCreatedOrderTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\HoldCreatedOrderTest">
         <variation name="HoldCreatedOrderTestVariation1">
-            <data name="description" xsi:type="string">hold order and check status on the front in my account</data>
+            <data name="description" xsi:type="string">hold order and check status in my account on storefront</data>
             <data name="order/dataSet" xsi:type="string">default</data>
             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default,catalogProductSimple::default</data>
             <data name="orderButtonsUnavailable" xsi:type="string">Invoice,Cancel,Reorder,Ship,Edit</data>

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public function execute()`
`249`	`249`	`// @codingStandardsIgnoreStart`
`250`	`250`	`$this->messageManager->addSuccess(`
`251`	`251`	`__(`
`252`		`- 'Account confirmation is required. Please check your email for the confirmation link. To resend the confirmation email please <a href="%1">click here</a>.',`
	`252`	`+ 'You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.',`
`253`	`253`	`$email`
`254`	`254`	`)`
`255`	`255`	`);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function addGoogleoptimizerFields(DataForm $form, ModelCode $experimentCo`
`35`	`35`	`'value' => $experimentCodeModel ? $experimentCodeModel->getExperimentScript() : '',`
`36`	`36`	`'class' => 'textarea googleoptimizer',`
`37`	`37`	`'required' => false,`
`38`		`- 'note' => __('Note: Experiment code should be added to the original page only.')`
	`38`	`+ 'note' => __('Experiment code should be added to the original page only.')`
`39`	`39`	`]`
`40`	`40`	`);`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ protected function _prepareFormMock($experimentCode, $experimentCodeId)`
`118`	`118`	`'value' => $experimentCode,`
`119`	`119`	`'class' => 'textarea googleoptimizer',`
`120`	`120`	`'required' => false,`
`121`		`- 'note' => 'Note: Experiment code should be added to the original page only.'`
	`121`	`+ 'note' => 'Experiment code should be added to the original page only.'`
`122`	`122`	`]`
`123`	`123`	`);`
`124`	`124`