When determining language from HTTP_ACCEPT_LANGUAGE, also try base la…

…nguage only (#1402) Fixes Safari sending the language code always with a locale (e.g. it-it or fr-fr)
getgrav · Apr 4, 2017 · d338d79 · d338d79
1 parent 459b7c4
commit d338d79
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#bugfix)
     * Fixed a bad method signature causing warning when running tests on `GPMTest` object
+    * When determining language from `HTTP_ACCEPT_LANGUAGE`, also try base language only
 
 # v1.2.0
 ## 03/31/2017

diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php
@@ -203,6 +203,15 @@ public function setActiveFromUri($uri)
                         }
                     }
 
+                    // repeat if not found, try base language only - fixes Safari sending the language code always
+                    // with a locale (e.g. it-it or fr-fr)
+                    foreach ($preferred as $lang) {
+                        $lang = substr($lang, 0, 2);
+                        if ($this->validate($lang)) {
+                            $this->active = $lang;
+                            break;
+                        }
+                    }
                 }
             }
         }