Use standard Nette error message for failed uploads

nepada · Jan 20, 2024 · 053cfa9 · 053cfa9
1 parent 7c23449
commit 053cfa9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/FileUploadControl/FileUploadControl.php b/src/FileUploadControl/FileUploadControl.php
@@ -112,7 +112,7 @@ public function loadHttpData(): void
             }
         }
         if ($uploadFailed) {
-            $this->addError('Upload error');
+            $this->addError(Nette\Forms\Validator::$messages[Nette\Forms\Controls\UploadControl::Valid]);
         }
     }
 
@@ -272,7 +272,7 @@ public function handleUpload(string $namespace): void
             }
 
             if ($fileUploadChunk instanceof FailedUpload) {
-                $responses[] = $this->createUploadErrorResponse($fileUploadChunk, $this->translate('Upload error'));
+                $responses[] = $this->createUploadErrorResponse($fileUploadChunk, $this->translate(Nette\Forms\Validator::$messages[Nette\Forms\Controls\UploadControl::Valid]));
                 continue;
             }
 
@@ -296,7 +296,7 @@ public function handleUpload(string $namespace): void
                 $fileUploadItem = $this->getStorage()->save($fileUploadChunk);
                 $responses[] = $this->createUploadSuccessResponse($fileUploadItem);
             } catch (StorageDoesNotExistException | UnableToSaveFileUploadException $exception) {
-                $responses[] = $this->createUploadErrorResponse($fileUploadChunk, $this->translate('Upload error'));
+                $responses[] = $this->createUploadErrorResponse($fileUploadChunk, $this->translate(Nette\Forms\Validator::$messages[Nette\Forms\Controls\UploadControl::Valid]));
             }
         }
 

diff --git a/tests/FileUploadControl/FileUploadControlValidationTest.phpt b/tests/FileUploadControl/FileUploadControlValidationTest.phpt
@@ -10,6 +10,7 @@ use NepadaTests\FileUploadControl\Fixtures\TestPresenter;
 use NepadaTests\FileUploadControl\Storage\InMemoryStorage;
 use NepadaTests\FileUploadControl\Storage\InMemoryStorageManager;
 use NepadaTests\TestCase;
+use Nette;
 use Nette\Application;
 use Nette\Application\Responses\JsonResponse;
 use Nette\Application\UI\Form;
@@ -32,6 +33,11 @@ require_once __DIR__ . '/../bootstrap.php';
 class FileUploadControlValidationTest extends TestCase
 {
 
+    protected function setUp(): void
+    {
+        Nette\Forms\Validator::$messages[Nette\Forms\Controls\UploadControl::Valid] = 'Upload error';
+    }
+
     public function testSubmittedWithFailedUpload(): void
     {
         $storage = InMemoryStorage::createWithFiles();