pkp#7512 Added Accept-Language header into the locale detection

jonasraoni · Jul 2, 2022 · 2c7dc7c · 2c7dc7c
1 parent 0fbea2d
commit 2c7dc7c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/classes/core/PKPRequest.inc.php b/classes/core/PKPRequest.inc.php
@@ -65,7 +65,6 @@ class PKPRequest
     /** @var string user agent */
     public $_userAgent;
 
-
     /**
      * get the router instance
      *
@@ -883,6 +882,16 @@ public function &_delegateToRouter($method)
         $returner = call_user_func_array($callable, $parameters);
         return $returner;
     }
+
+    /**
+     * Returns the preferred language.
+     *
+     * @param string[] $locales An array of ordered available locales
+     */
+    public function getPreferredLanguage(array $locales): ?string
+    {
+        return (new \Illuminate\Http\Request(server: $_SERVER))->getPreferredLanguage($locales);
+    }
 }
 
 if (!PKP_STRICT_MODE) {

diff --git a/classes/i18n/Locale.inc.php b/classes/i18n/Locale.inc.php
@@ -119,7 +119,8 @@ public function getLocale(): string
         $request = $this->_getRequest();
         $locale = $request->getUserVar('setLocale')
             ?: (SessionManager::hasSession() ? SessionManager::getManager()->getUserSession()->getSessionVar('currentLocale') : null)
-            ?: $request->getCookieVar('currentLocale');
+            ?: $request->getCookieVar('currentLocale')
+            ?: $request->getPreferredLanguage($this->_getSupportedLocales());
         $this->setLocale($locale);
         return $this->locale;
     }