diff --git a/metager/app/Models/parserSkripte/Bing.php b/metager/app/Models/parserSkripte/Bing.php index b6b5d031aadd1a5b96dd32d1d4fa3b4039cfd762..6c3a6a2c1b11d0ac5b7e65bff45c9fb6bf32ee5e 100644 --- a/metager/app/Models/parserSkripte/Bing.php +++ b/metager/app/Models/parserSkripte/Bing.php @@ -4,7 +4,6 @@ namespace app\Models\parserSkripte; use App\Models\Searchengine; use Log; -use LaravelLocalization; class Bing extends Searchengine { @@ -13,20 +12,6 @@ class Bing extends Searchengine public function __construct($name, \stdClass $engine, \App\MetaGer $metager) { parent::__construct($name, $engine, $metager); - - if (LaravelLocalization::getCurrentLocale() === 'en') { - $langFile = $metager->getLanguageFile(); - $langFile = json_decode(file_get_contents($langFile)); - $acceptLanguage = $metager->request->headers->all(); - if (!empty($acceptLanguage["accept-language"]) && is_array($acceptLanguage["accept-language"]) && sizeof($acceptLanguage["accept-language"]) > 0) { - $acceptLanguage = $acceptLanguage['accept-language'][0]; - foreach ($langFile->filter->{'parameter-filter'}->language->sumas->bing->values as $key => $value) { - if (stripos($acceptLanguage, "en") === 0 && stripos($acceptLanguage, $value) === 0) { - $this->engine->{"get-parameter"}->mkt = $value; - } - } - } - } } public function loadResults($result) diff --git a/metager/app/Models/parserSkripte/Overture.php b/metager/app/Models/parserSkripte/Overture.php index c4f9f15d8ba6fcc1f41e17961da0a50e7d28bc13..0af308ff13cc1b0c5a8aa2a2bef4a3497ad1f1f2 100644 --- a/metager/app/Models/parserSkripte/Overture.php +++ b/metager/app/Models/parserSkripte/Overture.php @@ -14,32 +14,12 @@ class Overture extends Searchengine { parent::__construct($name, $engine, $metager); - $this->checkLanguage(); - # We need some Affil-Data for the advertisements $this->getString = $this->generateGetString($this->query); $this->getString .= $this->getOvertureAffilData($metager->getUrl()); $this->updateHash(); } - private function checkLanguage() - { - if (LaravelLocalization::getCurrentLocale() === 'en') { - $supported_default_languages = [ - "en_US" => "us", - "en_GB" => "gb", - "en_IE" => "ie", - "en_AU" => "us", # we don't get results for AU - "en_NZ" => "us", # we don't get results for NZ - ]; - $preferred_language = request()->getPreferredLanguage(\array_keys($supported_default_languages)); - - if (\array_key_exists($preferred_language, $supported_default_languages)) { - $this->engine->{"get-parameter"}->mkt = $supported_default_languages[$preferred_language]; - } - } - } - public function loadResults($result) { $result = preg_replace("/\r\n/si", "", $result);