diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php index c3570267..9fe71d95 100644 --- a/UniversalLanguageSelector.hooks.php +++ b/UniversalLanguageSelector.hooks.php @@ -104,10 +104,20 @@ class UniversalLanguageSelectorHooks { * Hook: ResourceLoaderGetConfigVars * @param $vars Array * @return bool - */ + */ public static function addConfig( &$vars ) { global $wgContLang; $vars['wgULSLanguages'] = Language::fetchLanguageNames( $wgContLang->getCode(), 'mwfile' ); return true; } + + /** + * Hook: MakeGlobalVariablesScript + * @param $vars Array + * @return bool + */ + public static function addVariables( &$vars, OutputPage $out ) { + $vars['wgULSAcceptLanguageList'] = array_keys( $out->getRequest()->getAcceptLang() ); + return true; + } } diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index da85f953..79904891 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -59,6 +59,7 @@ $wgHooks['BeforePageDisplay'][] = 'UniversalLanguageSelectorHooks::addModules'; $wgHooks['PersonalUrls'][] = 'UniversalLanguageSelectorHooks::addTrigger'; $wgHooks['ResourceLoaderTestModules'][] = 'UniversalLanguageSelectorHooks::addTestModules'; $wgHooks['ResourceLoaderGetConfigVars'][] = 'UniversalLanguageSelectorHooks::addConfig'; +$wgHooks['MakeGlobalVariablesScript'][] = 'UniversalLanguageSelectorHooks::addVariables'; $wgAPIModules['languagesearch'] = 'ApiLanguageSearch'; $wgHooks['UserGetLanguageObject'][] = 'UniversalLanguageSelectorHooks::getLanguage'; @@ -78,7 +79,7 @@ $wgResourceModules['ext.uls.init'] = array( $wgResourceModules['ext.uls.preferences'] = array( 'scripts' => 'resources/js/ext.uls.preferences.js', - 'localBasePath' => $dir, + 'localBasePath' => $dir, 'remoteExtPath' => 'UniversalLanguageSelector', 'dependencies' => array( 'mediawiki.user',