MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: Changed error messages into translatable strings

pull/5559/head
mokaddem 2020-01-27 12:47:15 +01:00
parent 13499737a5
commit 0f6990421b
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/ServersController.php
View File

@ -156,7 +156,7 @@ class ServersController extends AppController
try {
$event = $this->Server->previewEvent($serverId, $eventId);
} catch (NotFoundException $e) {
throw new NotFoundException("Event '$eventId' not found.");
throw new NotFoundException(__("Event '$eventId' not found."));
} catch (Exception $e) {
$this->Flash->error(__('Download failed.') . ' ' . $e->getMessage());
$this->redirect(array('action' => 'previewIndex', $serverId));

12
app/Model/Server.php
View File

@ -5771,7 +5771,7 @@ class Server extends AppModel
'conditions' => array('Server.id' => $serverId),
));
if ($server === null) {
throw new Exception("Server with ID '$serverId' not found.");
throw new Exception(__("Server with ID '$serverId' not found."));
}
if (!$HttpSocket) {
@ -5783,23 +5783,23 @@ class Server extends AppModel
$response = $HttpSocket->get($uri, array(), $request);
if ($response === false) {
throw new Exception("Could not reach '$uri'.");
throw new Exception(__("Could not reach '$uri'."));
} else if ($response->code == 404) { // intentional !=
throw new NotFoundException("Fetching the '$uri' failed with HTTP error 404: Not Found");
throw new NotFoundException(__("Fetching the '$uri' failed with HTTP error 404: Not Found"));
} else if ($response->code == 405) { // intentional !=
$responseText = json_decode($response->body, true);
if ($responseText !== null) {
throw new Exception("Fetching the '$uri' failed with HTTP error {$response->code}: {$responseText['message']}");
throw new Exception(sprintf(__("Fetching the '$uri' failed with HTTP error %s: %s"), $response->code, $responseText['message']));
}
}
if ($response->code != 200) { // intentional !=
throw new Exception("Fetching the '$uri' failed with HTTP error {$response->code}: {$response->reasonPhrase}");
throw new Exception(sprintf(__("Fetching the '$uri' failed with HTTP error %s: %s"), $response->code, $response->reasonPhrase));
}
$data = json_decode($response->body, true);
if ($data === null) {
throw new Exception('Could not parse JSON: ' . json_last_error_msg(), json_last_error());
throw new Exception(__('Could not parse JSON: ') . json_last_error_msg(), json_last_error());
}
return array($data, $response);