bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Transmit current autonym via ResourceLoader instead of config var

Browse Source 
This avoids loading of wgULSCurrentAutonym in every HTML page.

Change-Id: I8f3a28e3b46f41926bcbe54ace493a33f9ba4566
This commit is contained in:
Fomafix
2024-10-07 10:38:15 +00:00
committed by jenkins-bot
parent aa5fe16a88
commit a0df9be678
3 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extension.json
View File

@@ -228,7 +228,12 @@
"js/ext.uls.launch.js", "js/ext.uls.launch.js",
"js/ext.uls.actions.menu.js", "js/ext.uls.actions.menu.js",
"js/ext.uls.actions.menu.item.js", "js/ext.uls.actions.menu.item.js",
"js/ext.uls.actions.menu.items.registry.js" "js/ext.uls.actions.menu.items.registry.js",
{
"name": "data.json",
"callback": "UniversalLanguageSelector\\Hooks::getModuleData",
"versionCallback": "UniversalLanguageSelector\\Hooks::getModuleDataSummary"
}
], ],
"styles": [ "styles": [
"css/ext.uls.interface.less", "css/ext.uls.interface.less",

32
includes/Hooks.php
View File

@@ -32,8 +32,10 @@ use MediaWiki\Hook\MakeGlobalVariablesScriptHook;
use MediaWiki\Hook\UserGetLanguageObjectHook; use MediaWiki\Hook\UserGetLanguageObjectHook;
use MediaWiki\Html\Html; use MediaWiki\Html\Html;
use MediaWiki\Languages\LanguageNameUtils; use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\MediaWikiServices;
use MediaWiki\Output\OutputPage; use MediaWiki\Output\OutputPage;
use MediaWiki\Preferences\Hook\GetPreferencesHook; use MediaWiki\Preferences\Hook\GetPreferencesHook;
use MediaWiki\ResourceLoader\Context;
use MediaWiki\ResourceLoader\Hook\ResourceLoaderGetConfigVarsHook; use MediaWiki\ResourceLoader\Hook\ResourceLoaderGetConfigVarsHook;
use MediaWiki\Skins\Hook\SkinAfterPortletHook; use MediaWiki\Skins\Hook\SkinAfterPortletHook;
use MediaWiki\User\User; use MediaWiki\User\User;
@@ -448,13 +450,9 @@ class Hooks implements
$vars['wgULSBabelLanguages'] = array_keys( $userLanguageInfo ); $vars['wgULSBabelLanguages'] = array_keys( $userLanguageInfo );
} }
// An optimization to avoid loading all of uls.data just to get the autonym
$langCode = $out->getLanguage()->getCode();
$vars['wgULSCurrentAutonym'] = $this->languageNameUtils->getLanguageName( $langCode );
$setLangCode = $this->getSetLang( $out ); $setLangCode = $this->getSetLang( $out );
if ( $setLangCode ) { if ( $setLangCode ) {
$vars['wgULSCurrentLangCode'] = $langCode; $vars['wgULSCurrentLangCode'] = $out->getLanguage()->getCode();
$vars['wgULSSetLangCode'] = $setLangCode; $vars['wgULSSetLangCode'] = $setLangCode;
$vars['wgULSSetLangName'] = $this->languageNameUtils->getLanguageName( $setLangCode ); $vars['wgULSSetLangName'] = $this->languageNameUtils->getLanguageName( $setLangCode );
} }
@@ -582,4 +580,28 @@ class Hooks implements
return null; return null;
} }
/**
* @param Context $context
* @param Config $config
* @return array
*/
public static function getModuleData( Context $context, Config $config ): array {
$languageNameUtils = MediaWikiServices::getInstance()->getLanguageNameUtils();
return [
'currentAutonym' => $languageNameUtils->getLanguageName( $context->getLanguage() ),
];
}
/**
* @param Context $context
* @param Config $config
* @return array
*/
public static function getModuleDataSummary( Context $context, Config $config ): array {
return [
'currentAutonym' => $context->getLanguage(),
];
}
} }

2
resources/js/ext.uls.interface.js
View File

@@ -505,7 +505,7 @@
previousLanguage = mw.storage.get( 'uls-previous-language-code' ); previousLanguage = mw.storage.get( 'uls-previous-language-code' );
currentLanguage = mw.config.get( 'wgUserLanguage' ); currentLanguage = mw.config.get( 'wgUserLanguage' );
previousAutonym = mw.storage.get( 'uls-previous-language-autonym' ); previousAutonym = mw.storage.get( 'uls-previous-language-autonym' );
currentAutonym = mw.config.get( 'wgULSCurrentAutonym' ); currentAutonym = require( '../data.json' ).currentAutonym;
// If storage is empty, i.e. first visit, then store the current language // If storage is empty, i.e. first visit, then store the current language
// immediately so that we know when it changes. // immediately so that we know when it changes.