diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php index bb5205935a6423d99bd1493ede625cdb3a36b25f..cdff8a7d3e64763b5d205076215a7af9da6bfc86 100644 --- a/app/Http/Controllers/MetaGerSearch.php +++ b/app/Http/Controllers/MetaGerSearch.php @@ -89,11 +89,7 @@ class MetaGerSearch extends Controller # Wetter try { - if (App::isLocale('en')) { - $url = "http://api.openweathermap.org/data/2.5/weather?type=accurate&units=metric&lang=en&q=" . urlencode($q) . "&APPID=" . getenv("openweathermap"); - } else { - $url = "http://api.openweathermap.org/data/2.5/weather?type=accurate&units=metric&lang=de&q=" . urlencode($q) . "&APPID=" . getenv("openweathermap"); - } + $url = "http://api.openweathermap.org/data/2.5/weather?type=accurate&units=metric&lang=" . APP::getLocale() . "&q=" . urlencode($q) . "&APPID=" . getenv("openweathermap"); $result = json_decode($this->get($url), true); @@ -133,11 +129,7 @@ class MetaGerSearch extends Controller } # Wikipedia Quicktip - if (App::isLocale('en')) { - $url = "https://en.wikipedia.org/w/api.php?action=opensearch&search=" . urlencode($q) . "&limit=10&namespace=0&format=json&redirects=resolve"; - } else { - $url = "https://de.wikipedia.org/w/api.php?action=opensearch&search=" . urlencode($q) . "&limit=10&namespace=0&format=json&redirects=resolve"; - } + $url = "https://" . APP::getLocale() . ".wikipedia.org/w/api.php?action=opensearch&search=" . urlencode($q) . "&limit=10&namespace=0&format=json&redirects=resolve"; $decodedResponse = json_decode($this->get($url), true); if (isset($decodedResponse[1][0]) && isset($decodedResponse[2][0]) && isset($decodedResponse[3][0])) { $quicktip = []; diff --git a/resources/lang/es/results.php b/resources/lang/es/results.php index 21a7a5b7dfb7fec5278eba39400336af7917364d..19b9de885ef3fdfe83e4878c863afcbac5f44072 100644 --- a/resources/lang/es/results.php +++ b/resources/lang/es/results.php @@ -1,9 +1,9 @@ <?php return [ - "redirect" => "(con desviar)", - "weiter" => "Continuar", - "zurueck" => "Atrás", - "filter" => "Resultados filtraban: <strong>[:filter]</strong>. <a href=\":link\" target=\"_blank\">Desactivar filtro.</a>", - "filter.default" => "RecibÃs el interfaz del usuario en <strong>:langName</strong>, pero resultados en <strong>TODOS</strong> idiomas. Usan <a href=\"/settings\" target=\"_blank\">anpassen</a> para seleccionar una idioma para los resultados." -]; \ No newline at end of file + "redirect" => "(con desviar)", + "weiter" => "Continuar", + "zurueck" => "Atrás", + "filter" => "Resultados filtraban: <strong>[:filter]</strong>. <a href=\":link\" target=\"_blank\">Desactivar filtro.</a>", + "filter.default" => "RecibÃs el interfaz del usuario en <strong>:langName</strong>, pero resultados en <strong>TODOS</strong> idiomas. Usan <a href=\"/settings\" target=\"_blank\">adjustar</a> para seleccionar una idioma para los resultados.", +]; diff --git a/resources/views/quicktip.blade.php b/resources/views/quicktip.blade.php index e15b2b5cf4192ef71c3159ef4646943d30be4af9..94fd287dac31cb3ef90c5b9b56d31464d96f11e1 100644 --- a/resources/views/quicktip.blade.php +++ b/resources/views/quicktip.blade.php @@ -61,21 +61,17 @@ </div> @endforeach <div class="quicktip"> - <details> - <summary> - <div class="media"> - <div class="media-body"> - <div> - @if( Request::input('lang') === "all") - {!! trans('results.filter.default', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native']]) !!} - @else - {!! trans('results.filter', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'], 'link' => base64_decode(Request::input('unfilteredLink','')), 'filter' => Request::input('lang')]) !!} - @endif - </div> - </div> + <div class="media"> + <div class="media-body"> + <div> + @if( Request::input('lang') === "all") + {!! trans('results.filter.default', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native']]) !!} + @else + {!! trans('results.filter', ['langName' => LaravelLocalization::getSupportedLocales()[LaravelLocalization::getCurrentLocale()]['native'], 'link' => base64_decode(Request::input('unfilteredLink','')), 'filter' => Request::input('lang')]) !!} + @endif </div> - </summary> - </details> + </div> + </div> </div> <script src="{{ elixir('js/quicktips.js') }}"></script> </body>