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

Merge "Make base font repository path configurable via $wgULSFontRepositoryBasePath"

Browse Source
This commit is contained in:
jenkins-bot
2013-10-17 16:04:02 +00:00
committed by Gerrit Code Review
parent 0deb96b0ee 03e40f7215
commit f2701cb353
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
UniversalLanguageSelector.hooks.php
View File

@@ -256,7 +256,8 @@ class UniversalLanguageSelectorHooks {
*/ */
public static function addConfig( &$vars ) { public static function addConfig( &$vars ) {
global $wgULSGeoService, $wgULSIMEEnabled, $wgULSPosition, $wgULSNoWebfontsSelectors, global $wgULSGeoService, $wgULSIMEEnabled, $wgULSPosition, $wgULSNoWebfontsSelectors,
$wgULSAnonCanChangeLanguage, $wgULSEventLogging, $wgULSNoImeSelectors; $wgULSAnonCanChangeLanguage, $wgULSEventLogging, $wgULSNoImeSelectors,
$wgULSFontRepositoryBasePath, $wgExtensionAssetsPath;
// Place constant stuff here (not depending on request context) // Place constant stuff here (not depending on request context)
if ( is_string( $wgULSGeoService ) ) { if ( is_string( $wgULSGeoService ) ) {
@@ -269,6 +270,13 @@ class UniversalLanguageSelectorHooks {
$vars['wgULSNoImeSelectors'] = $wgULSNoImeSelectors; $vars['wgULSNoImeSelectors'] = $wgULSNoImeSelectors;
$vars['wgULSNoWebfontsSelectors'] = $wgULSNoWebfontsSelectors; $vars['wgULSNoWebfontsSelectors'] = $wgULSNoWebfontsSelectors;
if ( is_string( $wgULSFontRepositoryBasePath ) ) {
$vars['wgULSFontRepositoryBasePath'] = $wgULSFontRepositoryBasePath;
} else {
$vars['wgULSFontRepositoryBasePath'] = $wgExtensionAssetsPath .
'/UniversalLanguageSelector/data/fontrepo/fonts/';
}
return true; return true;
} }

8
UniversalLanguageSelector.php
View File

@@ -137,6 +137,14 @@ $wgULSNoImeSelectors = array( '#wpCaptchaWord', '.ve-ce-documentNode' );
*/ */
$wgULSNoWebfontsSelectors = array( '#p-lang li > a' ); $wgULSNoWebfontsSelectors = array( '#p-lang li > a' );
/**
* Base path of ULS font repository.
* If not set, will be set to 'UniversalLanguageSelector/data/fontrepo/fonts/',
* relative to $wgExtensionAssetsPath.
* @since 2013.10
*/
$wgULSFontRepositoryBasePath = false;
// Internationalization // Internationalization
$wgExtensionMessagesFiles['UniversalLanguageSelector'] = $wgExtensionMessagesFiles['UniversalLanguageSelector'] =
__DIR__ . '/UniversalLanguageSelector.i18n.php'; __DIR__ . '/UniversalLanguageSelector.i18n.php';

3
resources/js/ext.uls.webfonts.js
View File

@@ -47,8 +47,7 @@
}; };
mediawikiFontRepository = $.webfonts.repository; mediawikiFontRepository = $.webfonts.repository;
mediawikiFontRepository.base = mw.config.get( 'wgExtensionAssetsPath' ) + mediawikiFontRepository.base = mw.config.get( 'wgULSFontRepositoryBasePath' );
'/UniversalLanguageSelector/data/fontrepo/fonts/';
mw.webfonts.setup = function () { mw.webfonts.setup = function () {
// Initialize webfonts // Initialize webfonts