Skip to content

Commit 488f9db

Browse files
committed
MAGETWO-70761: Show values that are duplicate in attribute error msg #10213
- Fixes according to the test results
1 parent 67f080d commit 488f9db

File tree

6 files changed

+6
-4
lines changed

6 files changed

+6
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,4 +716,5 @@ Disable,Disable
716716
none,none
717717
Overview,Overview
718718
Details,Details
719+
"The value of Admin must be unique.", "The value of Admin must be unique."
719720
"The value of Admin must be unique. (%1)", "The value of Admin must be unique. (%1)"

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $stores = $block->getStoresSortedBySortOrder();
101101
},
102102
"Magento_Catalog/catalog/product/attribute/unique-validate": {
103103
"element": "required-dropdown-attribute-unique",
104-
"message": "<?= $block->escapeHtml(__("The value of Admin must be unique. (%1)")) ?>"
104+
"message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
105105
}
106106
}
107107
}

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/attribute/unique-validate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ define([
4545
});
4646

4747
if (!isValid) {
48-
msg = _config.message.replace('%1', duplicates.join(', '));
48+
msg = _config.message + ' (' + duplicates.join(', ') + ')';
4949
}
5050

5151
return isValid;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ Image,Image
3333
"Image Size","Image Size"
3434
"Example format: 200x300.","Example format: 200x300."
3535
"Image Position","Image Position"
36+
"The value of Admin must be unique.","The value of Admin must be unique."
3637
"The value of Admin must be unique. (%1)","The value of Admin must be unique. (%1)"
3738
Description,Description

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ $stores = $block->getStoresSortedBySortOrder();
108108
"Magento_Swatches/js/text": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?> ,
109109
"Magento_Catalog/catalog/product/attribute/unique-validate": {
110110
"element": "required-text-swatch-unique",
111-
"message": "<?= $block->escapeHtml(__("The value of Admin must be unique. (%1)")) ?>"
111+
"message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
112112
}
113113
}
114114
}

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ $stores = $block->getStoresSortedBySortOrder();
113113
"Magento_Swatches/js/visual": <?= /* @noEscape */ $block->getJsonConfig() ?> ,
114114
"Magento_Catalog/catalog/product/attribute/unique-validate": {
115115
"element": "required-visual-swatch-unique",
116-
"message": "<?= $block->escapeHtml(__("The value of Admin must be unique. (%1)")) ?>"
116+
"message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
117117
}
118118
}
119119
}

0 commit comments

Comments
 (0)