From a975698726721488ab14c5f6a03b517f2a690f00 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 27 Dec 2017 11:56:25 +0200
Subject: [PATCH] magento/magento2#5550: Incorrect language on swatch error
---
app/code/Magento/Swatches/Model/Plugin/EavAttribute.php | 2 +-
.../Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php | 2 +-
app/code/Magento/Swatches/i18n/en_US.csv | 2 +-
app/code/Magento/Ui/i18n/en_US.csv | 2 +-
lib/web/i18n/en_US.csv | 2 +-
lib/web/mage/validation.js | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
index 599406f4552..d3904f058dc 100644
--- a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
+++ b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -432,7 +432,7 @@ class EavAttribute
$options = $attribute->getData('optiontext');
}
if ($options && !$this->isOptionsValid($options, $attribute)) {
- throw new InputException(__('Admin is a required field in the each row'));
+ throw new InputException(__('Admin is a required field in each row'));
}
return true;
}
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
index 258347887ff..31a45ddb284 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
@@ -191,7 +191,7 @@ class EavAttributeTest extends \PHPUnit\Framework\TestCase
/**
* @expectedException \Magento\Framework\Exception\InputException
- * @expectedExceptionMessage Admin is a required field in the each row
+ * @expectedExceptionMessage Admin is a required field in each row
*/
public function testBeforeSaveWithFailedValidation()
{
diff --git a/app/code/Magento/Swatches/i18n/en_US.csv b/app/code/Magento/Swatches/i18n/en_US.csv
index 3ea4977a753..00874d76111 100644
--- a/app/code/Magento/Swatches/i18n/en_US.csv
+++ b/app/code/Magento/Swatches/i18n/en_US.csv
@@ -1,4 +1,4 @@
-"Admin is a required field in the each row","Admin is a required field in the each row"
+"Admin is a required field in each row","Admin is a required field in each row"
"Update Product Preview Image","Update Product Preview Image"
"Filtering by this attribute will update the product image on catalog page","Filtering by this attribute will update the product image on catalog page"
"Use Product Image for Swatch if Possible","Use Product Image for Swatch if Possible"
diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv
index 225d8338756..cff52a3fd6f 100644
--- a/app/code/Magento/Ui/i18n/en_US.csv
+++ b/app/code/Magento/Ui/i18n/en_US.csv
@@ -192,7 +192,7 @@ CSV,CSV
"Please enter a valid value from list","Please enter a valid value from list"
"Please enter valid SKU key.","Please enter valid SKU key."
"Please enter a valid number.","Please enter a valid number."
-"Admin is a required field in the each row.","Admin is a required field in the each row."
+"Admin is a required field in each row.","Admin is a required field in each row."
"Please fix this field.","Please fix this field."
"Please enter a valid date (ISO).","Please enter a valid date (ISO)."
"Please enter only digits.","Please enter only digits."
diff --git a/lib/web/i18n/en_US.csv b/lib/web/i18n/en_US.csv
index 5c63a191420..4acc62aa6dc 100644
--- a/lib/web/i18n/en_US.csv
+++ b/lib/web/i18n/en_US.csv
@@ -95,7 +95,7 @@ Submit,Submit
"Please enter valid SKU key.","Please enter valid SKU key."
"Please enter a valid number.","Please enter a valid number."
"This is required field","This is required field"
-"Admin is a required field in the each row.","Admin is a required field in the each row."
+"Admin is a required field in each row.","Admin is a required field in each row."
"Password cannot be the same as email address.","Password cannot be the same as email address."
"Please fix this field.","Please fix this field."
"Please enter a valid email address.","Please enter a valid email address."
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index fee88826be7..2b5aaff8385 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1550,15 +1550,15 @@
],
'required-text-swatch-entry': [
tableSingleValidation,
- $.mage.__('Admin is a required field in the each row.')
+ $.mage.__('Admin is a required field in each row.')
],
'required-visual-swatch-entry': [
tableSingleValidation,
- $.mage.__('Admin is a required field in the each row.')
+ $.mage.__('Admin is a required field in each row.')
],
'required-dropdown-attribute-entry': [
tableSingleValidation,
- $.mage.__('Admin is a required field in the each row.')
+ $.mage.__('Admin is a required field in each row.')
],
'validate-item-quantity': [
function (value, element, params) {
--
GitLab