GH-139 Reuse existing fleet validation error message creator

mdziekon · May 26, 2022 · 9826ff9 · 9826ff9
1 parent 0d4bee1
commit 9826ff9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 44 deletions.
diff --git a/fleet1.php b/fleet1.php
@@ -98,28 +98,7 @@
 
     if (!$fleetArrayParsingResult['isValid']) {
         $firstValidationError = $fleetArrayParsingResult['errors'][0];
-
-        $errorMessage = null;
-        switch ($firstValidationError['errorCode']) {
-            case 'INVALID_SHIP_ID':
-                $errorMessage = $_Lang['fl1_BadShipGiven'];
-                break;
-            case 'SHIP_WITH_NO_ENGINE':
-                $errorMessage = $_Lang['fl1_CantSendUnflyable'];
-                break;
-            case 'INVALID_SHIP_COUNT':
-                $errorMessage = $_Lang['fleet_generic_errors_invalidshipcount'];
-                break;
-            case 'SHIP_COUNT_EXCEEDS_AVAILABLE':
-                $errorMessage = $_Lang['fl1_NoEnoughShips'];
-                break;
-            case 'NO_SHIPS':
-                $errorMessage = $_Lang['fl1_NoShipsGiven'];
-                break;
-            default:
-                $errorMessage = $_Lang['fleet_generic_errors_unknown'];
-                break;
-        }
+        $errorMessage = FlightControl\Utils\Errors\mapFleetArrayValidationErrorToReadableMessage($firstValidationError);
 
         message($errorMessage, $ErrorTitle, 'fleet.php', 3);
     }

diff --git a/fleet2.php b/fleet2.php
@@ -179,28 +179,7 @@
 
 if (!$fleetArrayParsingResult['isValid']) {
     $firstValidationError = $fleetArrayParsingResult['errors'][0];
-
-    $errorMessage = null;
-    switch ($firstValidationError['errorCode']) {
-        case 'INVALID_SHIP_ID':
-            $errorMessage = $_Lang['fl1_BadShipGiven'];
-            break;
-        case 'SHIP_WITH_NO_ENGINE':
-            $errorMessage = $_Lang['fl1_CantSendUnflyable'];
-            break;
-        case 'INVALID_SHIP_COUNT':
-            $errorMessage = $_Lang['fleet_generic_errors_invalidshipcount'];
-            break;
-        case 'SHIP_COUNT_EXCEEDS_AVAILABLE':
-            $errorMessage = $_Lang['fl1_NoEnoughShips'];
-            break;
-        case 'NO_SHIPS':
-            $errorMessage = $_Lang['fl1_NoShipsGiven'];
-            break;
-        default:
-            $errorMessage = $_Lang['fleet_generic_errors_unknown'];
-            break;
-    }
+    $errorMessage = FlightControl\Utils\Errors\mapFleetArrayValidationErrorToReadableMessage($firstValidationError);
 
     message($errorMessage, $ErrorTitle, 'fleet.php', 3);
 }