Skip to content

Commit 77fb6e5

Browse files
author
Oleksii Korshenko
authored
MAGETWO-86665: 5550: Incorrect language on swatch error #1117
2 parents 2a8a96a + dc7a5f6 commit 77fb6e5

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

app/code/Magento/Swatches/Model/Plugin/EavAttribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ protected function validateOptions(Attribute $attribute)
432432
$options = $attribute->getData('optiontext');
433433
}
434434
if ($options && !$this->isOptionsValid($options, $attribute)) {
435-
throw new InputException(__('Admin is a required field in the each row'));
435+
throw new InputException(__('Admin is a required field in each row'));
436436
}
437437
return true;
438438
}

app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public function testBeforeSaveTextSwatch()
191191

192192
/**
193193
* @expectedException \Magento\Framework\Exception\InputException
194-
* @expectedExceptionMessage Admin is a required field in the each row
194+
* @expectedExceptionMessage Admin is a required field in each row
195195
*/
196196
public function testBeforeSaveWithFailedValidation()
197197
{

app/code/Magento/Swatches/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"Admin is a required field in the each row","Admin is a required field in the each row"
1+
"Admin is a required field in each row","Admin is a required field in each row"
22
"Update Product Preview Image","Update Product Preview Image"
33
"Filtering by this attribute will update the product image on catalog page","Filtering by this attribute will update the product image on catalog page"
44
"Use Product Image for Swatch if Possible","Use Product Image for Swatch if Possible"

app/code/Magento/Ui/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ CSV,CSV
192192
"Please enter a valid value from list","Please enter a valid value from list"
193193
"Please enter valid SKU key.","Please enter valid SKU key."
194194
"Please enter a valid number.","Please enter a valid number."
195-
"Admin is a required field in the each row.","Admin is a required field in the each row."
195+
"Admin is a required field in each row.","Admin is a required field in each row."
196196
"Please fix this field.","Please fix this field."
197197
"Please enter a valid date (ISO).","Please enter a valid date (ISO)."
198198
"Please enter only digits.","Please enter only digits."

lib/web/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Submit,Submit
9595
"Please enter valid SKU key.","Please enter valid SKU key."
9696
"Please enter a valid number.","Please enter a valid number."
9797
"This is required field","This is required field"
98-
"Admin is a required field in the each row.","Admin is a required field in the each row."
98+
"Admin is a required field in each row.","Admin is a required field in each row."
9999
"Password cannot be the same as email address.","Password cannot be the same as email address."
100100
"Please fix this field.","Please fix this field."
101101
"Please enter a valid email address.","Please enter a valid email address."

lib/web/mage/validation.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,15 +1550,15 @@
15501550
],
15511551
'required-text-swatch-entry': [
15521552
tableSingleValidation,
1553-
$.mage.__('Admin is a required field in the each row.')
1553+
$.mage.__('Admin is a required field in each row.')
15541554
],
15551555
'required-visual-swatch-entry': [
15561556
tableSingleValidation,
1557-
$.mage.__('Admin is a required field in the each row.')
1557+
$.mage.__('Admin is a required field in each row.')
15581558
],
15591559
'required-dropdown-attribute-entry': [
15601560
tableSingleValidation,
1561-
$.mage.__('Admin is a required field in the each row.')
1561+
$.mage.__('Admin is a required field in each row.')
15621562
],
15631563
'validate-item-quantity': [
15641564
function (value, element, params) {

0 commit comments

Comments
 (0)