Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-2847' into Tier4-Kings-PR-03-05-2024

Author: glanujnehra

app/code/Magento/MediaStorage/Model/File/Uploader.php

@@ -205,7 +205,9 @@ protected function _validateFile()
         parent::_validateFile();
 
         if (!$this->getImageValidator()->isValid($this->_file['tmp_name'])) {
-            throw new ValidationException(__('File validation failed.'));
+            throw new ValidationException(
+                __('File validation failed. Check Image Processing Settings in the Store Configuration.')
+            );
         }
     }
 

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

@@ -2,24 +2,31 @@ Synchronize,Synchronize
 "Synchronizing %1 to %2","Synchronizing %1 to %2"
 Synchronizing...,Synchronizing...
 "The timeout limit for response from synchronize process was reached.","The timeout limit for response from synchronize process was reached."
-"File %1 does not exist","File %1 does not exist"
+"The ""%1"" file doesn't exist. Verify the file and try again.","The ""%1"" file doesn't exist. Verify the file and try again."
 "File %1 is not readable","File %1 is not readable"
 "File System","File System"
-Database,Database
+"Database (Deprecated)","Database (Deprecated)"
+"Sorry, something went wrong during image resize. Please see log for details.","Sorry, something went wrong during image resize. Please see log for details."
 "database ""%1""","database ""%1"""
 "Parent directory does not exist: %1","Parent directory does not exist: %1"
 "File system","File system"
 "Unable to save file ""%1"" at ""%2""","Unable to save file ""%1"" at ""%2"""
 "Wrong file info format","Wrong file info format"
+"The file you uploaded has no extension.","The file you uploaded has no extension."
+"The source file moving process failed.","The source file moving process failed."
+"File validation failed. Check Image Processing Settings in the Store Configuration.","File validation failed. Check Image Processing Settings in the Store Configuration."
 "Path ""%value%"" is protected and cannot be used.","Path ""%value%"" is protected and cannot be used."
 "Path ""%value%"" is not available and cannot be used.","Path ""%value%"" is not available and cannot be used."
-"Path ""%value%"" may not include parent directory traversal (""../"", "".."").","Path ""%value%"" may not include parent directory traversal (""../"", "".."")."
+"Path ""%value%"" may not include parent directory traversal (""../"", ""..\").","Path ""%value%"" may not include parent directory traversal (""../"", ""..\")."
 "Please set available and/or protected paths list(s) before validation.","Please set available and/or protected paths list(s) before validation."
 "File with an extension ""%value%"" is protected and cannot be uploaded","File with an extension ""%value%"" is protected and cannot be uploaded"
 "Unable to create directory: %1","Unable to create directory: %1"
 "Unable to save file: %1","Unable to save file: %1"
+"Cannot resize image ""%1"" - original image not found","Cannot resize image ""%1"" - original image not found"
+"Cannot resize images - product images not found","Cannot resize images - product images not found"
+"Image resize: %1","Image resize: %1"
 "Storage Configuration for Media","Storage Configuration for Media"
 "Media Storage","Media Storage"
 "Select Media Database","Select Media Database"
-"After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location. Media will not be available in the new location until the synchronization process is complete."
+"After selecting a new media storage location, press the Synchronize button to transfer all media to that location and then ""Save Config"". Media will not be available in the new location until the synchronization process is complete.","After selecting a new media storage location, press the Synchronize button to transfer all media to that location and then ""Save Config"". Media will not be available in the new location until the synchronization process is complete."
 "Environment Update Time","Environment Update Time"

dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/ThemeControllerTest.php

@@ -63,7 +63,7 @@ public function testUploadFaviconAction()
             $output = $this->getResponse()->getBody();
             if (!in_array('imagick', get_loaded_extensions()) || $this->imageAdapter == 'GD2') {
                 $this->assertStringContainsString(
-                    '{"error":"File validation failed."',
+                    '{"error":"File validation failed. Check Image Processing Settings in the Store Configuration."',
                     $output
                 );
             } else {