Skip to content
Snippets Groups Projects
Commit ebc15f1a authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge branch '261-errors-entubersetzen' into 'development'

Die Fehlermeldungen werden jetzt wieder nur in Deutsch ausgegeben.

Closes #261

See merge request !435
parents a979bc94 321663f8
No related branches found
No related tags found
2 merge requests!442Development,!435Die Fehlermeldungen werden jetzt wieder nur in Deutsch ausgegeben.
......@@ -62,7 +62,7 @@ class MetaGer
$tmp = file_get_contents(config_path() . "/blacklistUrl.txt");
$this->urlsBlacklisted = explode("\n", $tmp);
} else {
Log::warning(trans('metaGer.blacklist.failed'));
Log::warning("Achtung: Eine, oder mehrere Blacklist Dateien, konnten nicht geöffnet werden");
}
# Parser Skripte einhängen
......@@ -498,7 +498,7 @@ class MetaGer
# Prüfe ob Parser vorhanden
if (!file_exists(app_path() . "/Models/parserSkripte/" . ucfirst($engine["package"]->__toString()) . ".php")) {
Log::error(trans('metaGer.engines.noParser', ['engine' => $engine["name"]]));
Log::error("Konnte " . $engine["name"] . " nicht abfragen, da kein Parser existiert");
continue;
}
......@@ -507,7 +507,7 @@ class MetaGer
try {
$tmp = new $path($engine, $this);
} catch (\ErrorException $e) {
Log::error(trans('metaGer.engines.cantQuery', ['engine' => $engine["name"], 'error' => var_dump($e)]));
Log::error("Konnte " . $engine["name"] . " nicht abfragen. " . var_dump($e));
continue;
}
......
<?php
return [
'blacklist.failed' => 'Achtung: Eine, oder mehrere Blacklist Dateien, konnten nicht geöffnet werden',
'results.failed' => 'Leider konnten wir zu Ihrer Sucheingabe keine passenden Ergebnisse finden.',
'settings.noneSelected' => 'Achtung: Sie haben in ihren Einstellungen keine Suchmaschine ausgewählt.',
'engines.noParser' => 'Konnte :engine nicht abfragen, da kein Parser existiert',
'engines.cantQuery' => 'Konnte :engine nicht abfragen. :errror',
'formdata.cantLoad' => 'Suma-File konnte nicht gefunden werden',
'formdata.noSearch' => 'Achtung: Sie haben keinen Suchbegriff eingegeben. Sie können ihre Suchbegriffe oben eingeben und es erneut versuchen.',
'formdata.dartEurope' => 'Hinweis: Sie haben Dart-Europe aktiviert. Die Suche kann deshalb länger dauern und die maximale Suchzeit wurde auf 10 Sekunden hochgesetzt.',
......
<?php
return [
"blacklist.failed" => "Attention: one or more blacklist files could not be opened",
"results.failed" => "Unfortunately we have no results for your search",
"settings.noneSelected" => "Attention: you did not choose any search engine",
"engines.noParser" => "Could not query :engine because of missing parser",
"engines.cantQuery" => "Could not query :engine :error",
"formdata.cantLoad" => "Could not find suma-file",
"formdata.noSearch" => "Attention: you did not type in any search word/s. Please type search words and try again",
"formdata.dartEurope" => "Hint: you have activated Dart-Europe. Therefore the response time might be longer and is set to 10 sec",
"formdata.hostBlacklist" => "Results of the following domains will not be shown: \":domain\"",
"formdata.stopwords" => "You have excluded results with the follwing words: \":stopwords\"",
"formdata.phrase" => "You are doing a string search: :phrase",
"sitesearch.failed" => "You intend to do a site search on :site. Unfortunately the choosen search engines do not support that. You can do a site search <a href=\":searchLink\">here</a> within the Web focus",
"sitesearch.success" => "You are doing a site search. Only resulte of the website <a href=\"http://:site\" target=\"_blank\">\":site\"</a> will be shown."
"results.failed" => "Unfortunately we have no results for your search",
"settings.noneSelected" => "Attention: you did not choose any search engine",
"formdata.cantLoad" => "Could not find suma-file",
"formdata.noSearch" => "Attention: you did not type in any search word/s. Please type search words and try again",
"formdata.dartEurope" => "Hint: you have activated Dart-Europe. Therefore the response time might be longer and is set to 10 sec",
"formdata.hostBlacklist" => "Results of the following domains will not be shown: \":domain\"",
"formdata.stopwords" => "You have excluded results with the follwing words: \":stopwords\"",
"formdata.phrase" => "You are doing a string search: :phrase",
"sitesearch.failed" => "You intend to do a site search on :site. Unfortunately the choosen search engines do not support that. You can do a site search <a href=\":searchLink\">here</a> within the Web focus",
"sitesearch.success" => "You are doing a site search. Only resulte of the website <a href=\"http://:site\" target=\"_blank\">\":site\"</a> will be shown.",
];
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment