Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-04-12 15:47:34 +02:00
Code Issues Packages Projects Releases Activity

use lang query to change to default lang

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2026-03-12 15:36:15 -06:00
parent 6a700f9bfd
commit 9fbbd3c28e
1 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
system/src/Grav/Common/Language/Language.php
View File

@@ -240,6 +240,26 @@ class Language
// if languages set
if ($this->enabled()) {
// Check for explicit language override via ?lang= query parameter.
// This allows switching to any language (including the default language
// when include_default_lang is false and the URL has no language prefix).
$requestedLang = $_GET['lang'] ?? null;
if ($requestedLang) {
$requestedLang = strtolower($requestedLang);
if (in_array($requestedLang, $this->languages, true)) {
$this->setActive($requestedLang);
// Store in session.
if (isset($this->grav['session']) && $this->grav['session']->isStarted()
&& $this->config->get('system.languages.session_store_active', true)
) {
$this->grav['session']->active_language = $this->active;
}
return $uri;
}
}
// Try setting language from prefix of URL (/en/blah/blah).
if (preg_match($regex, $uri, $matches)) {
$this->lang_in_url = true;
@@ -254,36 +274,22 @@ class Language
$this->grav['session']->active_language = $this->active;
}
} else {
if ($this->config->get('system.languages.include_default_lang') === false) {
// When include_default_lang is false, the default language has no URL prefix.
// A URL without a language prefix IS the default language explicitly.
$this->setActive($this->getDefault());
// Try getting language from the session, else no active.
if (isset($this->grav['session']) && $this->grav['session']->isStarted() &&
$this->config->get('system.languages.session_store_active', true)) {
$this->setActive($this->grav['session']->active_language ?: null);
}
// if still null, try from http_accept_language header
if ($this->active === null &&
$this->config->get('system.languages.http_accept_language') &&
$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? false) {
$negotiator = new LanguageNegotiator();
$best_language = $negotiator->getBest($accept, $this->languages);
// Store in session if language is different.
if (isset($this->grav['session']) && $this->grav['session']->isStarted()
&& $this->config->get('system.languages.session_store_active', true)
&& $this->grav['session']->active_language != $this->active
) {
$this->grav['session']->active_language = $this->active;
}
} else {
// Try getting language from the session, else no active.
if (isset($this->grav['session']) && $this->grav['session']->isStarted() &&
$this->config->get('system.languages.session_store_active', true)) {
$this->setActive($this->grav['session']->active_language ?: null);
}
// if still null, try from http_accept_language header
if ($this->active === null &&
$this->config->get('system.languages.http_accept_language') &&
$accept = $_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? false) {
$negotiator = new LanguageNegotiator();
$best_language = $negotiator->getBest($accept, $this->languages);
if ($best_language instanceof AcceptLanguage) {
$this->setActive($best_language->getType());
} else {
$this->setActive($this->getDefault());
}
if ($best_language instanceof AcceptLanguage) {
$this->setActive($best_language->getType());
} else {
$this->setActive($this->getDefault());
}
}
}