Update on function negotiateLanguage (#389)

* Update on function negotiateLanguage When testing the negotiateLanguage i found out that the browser never found a match, that was because this function was only checking the supportedLocales array keys. for example, my locale key is "pt" but my browser was negociating "pt-PT". * Update LanguageNegotiator.php * Update LanguageNegotiator.php * Update LanguageNegotiator.php
mcamara · Dec 31, 2016 · a51fafa · a51fafa
1 parent b4b9976
commit a51fafa
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/Mcamara/LaravelLocalization/LanguageNegotiator.php b/src/Mcamara/LaravelLocalization/LanguageNegotiator.php
@@ -57,6 +57,13 @@ public function negotiateLanguage()
             if (!empty($this->supportedLanguages[$key])) {
                 return $key;
             }
+
+            // Search for acceptable locale by 'regional' => 'af_ZA' or 'lang' => 'af-ZA' match.
+            foreach ( $this->supportedLanguages as $key_supported => $locale ) {
+                if ( (isset($locale['regional']) && $locale['regional'] == $key) || (isset($locale['lang']) && $locale['lang'] == $key) ) {
+                    return $key_supported;
+                }
+            }
         }
         // If any (i.e. "*") is acceptable, return the first supported format
         if (isset($matches['*'])) {