diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index df2ea016db76df9745d23963ac90891a5426845d..1dea07907664894d82507c2d2f56ac90f782811a 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -45,7 +45,7 @@ class MetaGerSearch extends Controller
->with('r', $redirect);
}
- public function quicktips(Request $request)
+ public function quicktips(Request $request, MetaGer $metager)
{
$q = $request->input('q', '');
@@ -95,20 +95,20 @@ class MetaGerSearch extends Controller
$url = "http://api.openweathermap.org/data/2.5/weather?type=accurate&units=metric&lang=de&q=" . urlencode($q) . "&APPID=" . getenv("openweathermap");
}
- $result = json_decode($this->get($url), true);
-
+ $result = json_decode($this->get($url), true);
+
$searchWords = explode(' ', $q);
- $within = false;
- foreach($searchWords as $word){
- if(stripos($result["name"], $word) !== false){
+ $within = false;
+ foreach ($searchWords as $word) {
+ if (stripos($result["name"], $word) !== false) {
$within = true;
}
}
- if($within){
+ if ($within) {
$weather = [];
$weather["title"] = "Wetter in " . $result["name"];
$weather["URL"] = "http://openweathermap.org/city/" . $result["id"];
-
+
$summary = '' . $result["main"]["temp"] . " °C, " . $result["weather"][0]["description"] . "";
$details = '
Temperatur | ' . $result["main"]["temp_min"] . " bis " . $result["main"]["temp_max"] . " °C |
";
$details .= "Druck | " . $result["main"]["pressure"] . " hPa |
";
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 58664c448c08e0e657074f6978535d8151f144cd..5d9fc8f975ae326aa64a8af2cada2186c9ad1a45 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -877,12 +877,6 @@ 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(), 'filter' => $this->lang]);
- } else {
- $this->warnings[] = trans('results.filter.default', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native']]);
- }
$this->agent = new Agent();
$this->mobile = $this->agent->isMobile();
@@ -1236,8 +1230,9 @@ class MetaGer
public function getUnFilteredLink()
{
- $requestData = $this->request->except(['lang']);
- $link = action('MetaGerSearch@search', $requestData);
+ $requestData = $this->request->except(['lang']);
+ $requestData['lang'] = "all";
+ $link = action('MetaGerSearch@search', $requestData);
return $link;
}
diff --git a/resources/lang/de/results.php b/resources/lang/de/results.php
index e6c87e75cc61895f98ad2e954ee7dddba1ff8dad..c9159d3851b2abd3069fceb91ea117aa9f00ec0d 100644
--- a/resources/lang/de/results.php
+++ b/resources/lang/de/results.php
@@ -4,6 +4,6 @@ return [
'redirect' => '(mit redirect)',
'weiter' => 'Weitersuchen',
'zurueck' => 'Zurück',
- 'filter' => 'Die Suchergebnisse wurden gefiltert: [:filter]. Filter abschalten.',
+ 'filter' => 'Die Suchergebnisse wurden gefiltert: [:filter]. Filter abschalten.',
'filter.default' => 'Sie erhalten die Benutzeroberfläche in :langName, aber Ergebnisse in ALLEN Sprachen. Für ausschließlich deutschsprachige Ergebnisse können Sie unter anpassen die "Sprache auswählen".',
];
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 4932f39175b9ceca8c516f0fb77e1f0962d03c7d..b09fc8e94bfd0d7daf3e417f6feab462898e35eb 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -56,7 +56,7 @@
@if( $metager->showQuicktips() )
-
+
@endif
@endsection
diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php
index 2a09d0ef3cafa763a10c98dc84128aa32608296b..ac02848a0b8755a3721eaa938ea6476d26305e5d 100644
--- a/resources/views/quicktip.blade.php
+++ b/resources/views/quicktip.blade.php
@@ -50,6 +50,23 @@
@endif
@endforeach
+