Merge branch 'ACP2E-2503' of https://github.com/magento-l3/magento2ce into Tier4-PR-10-30-2023

Author: thiaramus

app/code/Magento/Config/Model/Config/Backend/Email/Sender.php

@@ -30,6 +30,12 @@ public function beforeSave()
             );
         }
 
+        if (str_contains($value, ":")) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('The sender name "%1" is not valid. The colon character is not allowed.', $value)
+            );
+        }
+
         if (strlen($value) > 255) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Maximum sender name length is 255. Please correct your settings.')

app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/SenderTest.php

@@ -51,6 +51,7 @@ public function beforeSaveDataProvider()
     {
         return [
             ['Mr. Real Name', 'Mr. Real Name'],
+            ['No colons:', false],
             [str_repeat('a', 256), false],
             [null, false],
             ['', false],

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

@@ -38,6 +38,7 @@ System,System
 "Sorry, the default display currency you selected is not available in allowed currencies.","Sorry, the default display currency you selected is not available in allowed currencies."
 "The ""%1"" email address is incorrect. Verify the email address and try again.","The ""%1"" email address is incorrect. Verify the email address and try again."
 "The sender name ""%1"" is not valid. Please use only visible characters and spaces.","The sender name ""%1"" is not valid. Please use only visible characters and spaces."
+"The sender name ""%1"" is not valid. The colon character is not allowed.","The sender name ""%1"" is not valid. The colon character is not allowed."
 "Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
 "The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
 "The base directory to upload file is not specified.","The base directory to upload file is not specified."

dev/tests/js/jasmine/tests/lib/mage/validation.test.js

@@ -371,25 +371,11 @@ define([
     describe('Testing validate-emailSender', function () {
         it('validate-emailSender', function () {
             expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, '')).toEqual(true);
+                .call($.validator.prototype, 'Sender Name')).toEqual(true);
             expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, null)).toEqual(true);
+                .call($.validator.prototype, 'Sender & Name')).toEqual(true);
             expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, undefined)).toEqual(true);
-            expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, '   ')).toEqual(true);
-            expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, '123@123.com')).toEqual(true);
-            expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, 'abc@124.en')).toEqual(true);
-            expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, 'abc@abc.commmmm')).toEqual(true);
-            expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, 'abc.abc.abc@abc.commmmm')).toEqual(true);
-            expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, 'abc.abc-abc@abc.commmmm')).toEqual(true);
-            expect($.validator.methods['validate-emailSender']
-                .call($.validator.prototype, 'abc.abc_abc@abc.commmmm')).toEqual(true);
+                .call($.validator.prototype, 'Sender: Name')).toEqual(false);
         });
     });
 

lib/web/i18n/en_US.csv

@@ -50,6 +50,7 @@ Submit,Submit
 "Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.","Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890."
 "Please enter a valid fax number (Ex: 123-456-7890).","Please enter a valid fax number (Ex: 123-456-7890)."
 "Please enter a valid email address (Ex: johndoe@domain.com).","Please enter a valid email address (Ex: johndoe@domain.com)."
+"Please use only visible characters and spaces. The colon character is not allowed.","Please use only visible characters and spaces. The colon character is not allowed." 
 "Please enter 6 or more characters. Leading and trailing spaces will be ignored.","Please enter 6 or more characters. Leading and trailing spaces will be ignored."
 "Please enter 7 or more characters, using both numeric and alphabetic.","Please enter 7 or more characters, using both numeric and alphabetic."
 "Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored.","Minimum length of this field must be equal or greater than %1 symbols. Leading and trailing spaces will be ignored."

lib/web/mage/validation.js

@@ -646,9 +646,9 @@ define([
         ],
         'validate-emailSender': [
             function (v) {
-                return $.mage.isEmptyNoTrim(v) || /^[\S ]+$/.test(v);
+                return $.mage.isEmptyNoTrim(v) || /^(?!.*:)[\S ]+$/.test(v);
             },
-            $.mage.__('Please enter a valid email address (Ex: johndoe@domain.com).')
+            $.mage.__('Please use only visible characters and spaces. The colon character is not allowed.')
         ],
         'validate-password': [
             function (v) {