Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "language: Use property LanguageConverter::mUserVariant for optimisation"

Browse source
This commit is contained in:
jenkins-bot 2021-11-09 22:40:35 +00:00 committed by Gerrit Code Review
commit ef59b75ba1
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
includes/language/LanguageConverter.php
View file

@ -410,25 +410,28 @@ abstract class LanguageConverter implements ILanguageConverter {
return false;
}
$services = MediaWikiServices::getInstance();
if ( $user->isRegistered() ) {
// Get language variant preference from logged in users
if (
$this->getMainCode() ==
$services->getContentLanguage()->getCode()
) {
$optionName = 'variant';
if ( !$this->mUserVariant ) {
$services = MediaWikiServices::getInstance();
if ( $user->isRegistered() ) {
// Get language variant preference from logged in users
if (
$this->getMainCode() ==
$services->getContentLanguage()->getCode()
) {
$optionName = 'variant';
} else {
$optionName = 'variant-' . $this->getMainCode();
}
} else {
$optionName = 'variant-' . $this->getMainCode();
// figure out user lang without constructing wgLang to avoid
// infinite recursion
$optionName = 'language';
}
} else {
// figure out user lang without constructing wgLang to avoid
// infinite recursion
$optionName = 'language';
}
$ret = $services->getUserOptionsLookup()->getOption( $user, $optionName );
$ret = $services->getUserOptionsLookup()->getOption( $user, $optionName );
$this->mUserVariant = $this->validateVariant( $ret );
}
$this->mUserVariant = $this->validateVariant( $ret );
return $this->mUserVariant;
}