diff --git a/app/MetaGer.php b/app/MetaGer.php index 147894520fc3047f1e1b43b24349bc0856b24bc3..df4da2b0b9916789ce66fb91ce7f0657e0f6be4c 100644 --- a/app/MetaGer.php +++ b/app/MetaGer.php @@ -827,6 +827,7 @@ class MetaGer public function parseFormData(Request $request) { + $this->request = $request; # Sichert, dass der request in UTF-8 formatiert ist if ($request->input('encoding', '') !== "utf8") { # In früheren Versionen, als es den Encoding Parameter noch nicht gab, wurden die Daten in ISO-8859-1 übertragen @@ -874,6 +875,11 @@ class MetaGer if ($this->lang !== "de" && $this->lang !== "en" && $this->lang !== "all") { $this->lang = "all"; } + if ($this->lang !== 'all') { + # Warnung hinzufügen, dass die Ergebnisse gefiltert sind. + $this->warnings[] = trans('results.filter', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'], 'link' => $this->getUnFilteredLink()]); + } + $this->agent = new Agent(); $this->mobile = $this->agent->isMobile(); # Sprüche @@ -940,7 +946,6 @@ class MetaGer if ($this->out !== "html" && $this->out !== "json" && $this->out !== "results" && $this->out !== "results-with-style") { $this->out = "html"; } - $this->request = $request; } public function checkSpecialSearches(Request $request) @@ -1225,6 +1230,13 @@ class MetaGer return $link; } + public function getUnFilteredLink() + { + $requestData = $this->request->except(['lang']); + $link = action('MetaGerSearch@search', $requestData); + return $link; + } + # Komplexe Getter public function getHostCount($host) diff --git a/resources/lang/de/results.php b/resources/lang/de/results.php index 803e2af5f5fd497b7839856662074c650bf86795..50d44024c9f2a891c93d04d1f8181d7abff7f679 100644 --- a/resources/lang/de/results.php +++ b/resources/lang/de/results.php @@ -4,4 +4,5 @@ return [ 'redirect' => '(mit redirect)', 'weiter' => 'Weitersuchen', 'zurueck' => 'Zurück', + 'filter' => 'Die Suchergebnisse wurden gefiltert. Es werden nur Ergebnisse in folgender Sprache angezeigt: <strong>:langName</strong>. <a href=":link">Filter abschalten.</a>', ]; diff --git a/resources/lang/en/results.php b/resources/lang/en/results.php index 1e94a89e04451182ca1cc68fc14b5b05f476963d..3f0fdff19a2ed6b9f576bc0f1657f3ca197f23ac 100644 --- a/resources/lang/en/results.php +++ b/resources/lang/en/results.php @@ -4,4 +4,5 @@ return [ 'redirect' => '(with redirect)', 'weiter' => 'more', 'zurueck' => 'back', + 'filter' => 'The search results were filtered by language. Only search results in the following language will be displayed: <strong>:langName</strong>. <a href=":link">Disable this filter.</a>', ];