From 180bb9c6b90cf6bda9d88f07b07b869cf0d84497 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 5 Sep 2018 16:24:10 +0200 Subject: [PATCH 1/2] fixes #181 --- Message/Http/Request.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Message/Http/Request.php b/Message/Http/Request.php index 61114fd37..cd92dedc3 100644 --- a/Message/Http/Request.php +++ b/Message/Http/Request.php @@ -168,10 +168,15 @@ final class Request extends RequestAbstract return 'EN'; } - $lang = \explode(';', $_SERVER['HTTP_ACCEPT_LANGUAGE']); - $lang = \explode('-', $lang[0]); + $components = \explode(';', $_SERVER['HTTP_ACCEPT_LANGUAGE']); + + if (\stripos($components[0], ',') !== false) { + $locals = \explode(',', $components[]); + } + + $firstLocalComponents = \explode('-', $locals[]); - return $lang[0]; + return $firstLocalComponents[0]; } /** From ac1749a9bb9f97aceaa2741073ac07c01841692c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 5 Sep 2018 19:26:53 +0200 Subject: [PATCH 2/2] Index bug fix --- Message/Http/Request.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Message/Http/Request.php b/Message/Http/Request.php index cd92dedc3..15a74066c 100644 --- a/Message/Http/Request.php +++ b/Message/Http/Request.php @@ -171,10 +171,10 @@ final class Request extends RequestAbstract $components = \explode(';', $_SERVER['HTTP_ACCEPT_LANGUAGE']); if (\stripos($components[0], ',') !== false) { - $locals = \explode(',', $components[]); + $locals = \explode(',', $components[0]); } - $firstLocalComponents = \explode('-', $locals[]); + $firstLocalComponents = \explode('-', $locals[0]); return $firstLocalComponents[0]; }