Skip to content

[6.1] Refactor SiteApplication language detection #46549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 5 commits into from
Jan 23, 2026
Merged

[6.1] Refactor SiteApplication language detection #46549

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
246b913
Refactor SiteApplication language detection
joomdonation Dec 8, 2025
5ef954d
Remove default value
joomdonation Dec 12, 2025
f283c35
Merge branch '6.1-dev' into site-application-detect-language
tecpromotion Jan 9, 2026
09043dc
Apply suggestion from @HLeithner
HLeithner Jan 23, 2026
c493290
Merge branch '6.1-dev' into site-application-detect-language
HLeithner Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 43 additions & 37 deletions libraries/src/Application/SiteApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
use Joomla\CMS\Router\Route;
use Joomla\CMS\Router\SiteRouter;
use Joomla\CMS\Uri\Uri;
use Joomla\CMS\User\User;
use Joomla\DI\Container;
use Joomla\Input\Input;
use Joomla\Registry\Registry;
Expand Down Expand Up @@ -571,65 +572,70 @@ protected function initialiseApp($options = [])
}

if (empty($options['language'])) {
// Detect the specified language
$lang = $this->input->getString('language', null);
$options['language'] = $this->detectLanguage($user);
}

// Make sure that the user's language exists
if ($lang && LanguageHelper::exists($lang)) {
// One last check to make sure we have something
if (!LanguageHelper::exists($options['language'])) {
$lang = $this->config->get('language', 'en-GB');

if (LanguageHelper::exists($lang)) {
$options['language'] = $lang;
} else {
// As a last ditch fail to english
$options['language'] = 'en-GB';
}
}

if (empty($options['language']) && $this->getLanguageFilter()) {
// Finish initialisation
parent::initialiseApp($options);
}

/**
* Detect the language to use for the application
*
* @param User $user The user object
*
* @return string The detected language
*
* @since __DEPLOY_VERSION__
*/
private function detectLanguage(User $user): string
{
// Detect language from input
$lang = $this->input->getString('language');

if ($lang && LanguageHelper::exists($lang)) {
return $lang;
}

if ($this->getLanguageFilter()) {
// Detect cookie language
$lang = $this->input->cookie->get(md5($this->get('secret') . 'language'), null, 'string');

// Make sure that the user's language exists
if ($lang && LanguageHelper::exists($lang)) {
$options['language'] = $lang;
return $lang;
}
}

if (empty($options['language'])) {
// Detect user language
$lang = $user->getParam('language');
// Detect user language
$lang = $user->getParam('language');

// Make sure that the user's language exists
if ($lang && LanguageHelper::exists($lang)) {
$options['language'] = $lang;
}
if ($lang && LanguageHelper::exists($lang)) {
return $lang;
}

if (empty($options['language']) && $this->getDetectBrowser()) {
if ($this->getDetectBrowser()) {
// Detect browser language
$lang = LanguageHelper::detectLanguage();

// Make sure that the user's language exists
if ($lang && LanguageHelper::exists($lang)) {
$options['language'] = $lang;
return $lang;
}
}

if (empty($options['language'])) {
// Detect default language
$params = ComponentHelper::getParams('com_languages');
$options['language'] = $params->get('site', $this->get('language', 'en-GB'));
}

// One last check to make sure we have something
if (!LanguageHelper::exists($options['language'])) {
$lang = $this->config->get('language', 'en-GB');

if (LanguageHelper::exists($lang)) {
$options['language'] = $lang;
} else {
// As a last ditch fail to english
$options['language'] = 'en-GB';
}
}

// Finish initialisation
parent::initialiseApp($options);
// Use default language
return ComponentHelper::getParams('com_languages')->get('site', $this->get('language', 'en-GB'));
}

/**
Expand Down