From f3f61fdbc9027dce9f9c999f5eca5f44a2506c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Sun, 5 Jan 2014 12:32:45 +0000 Subject: [PATCH] Prepare for composer Bug: 49121 Change-Id: I7b391cc856ca4526951db409173deb0f1b955c4b --- Resources.php | 3 +- UniversalLanguageSelector.php | 59 ++++++++++++++++++----------------- composer.json | 27 ++++++++++++++++ 3 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 composer.json diff --git a/Resources.php b/Resources.php index 723a3c87..46427214 100644 --- a/Resources.php +++ b/Resources.php @@ -3,7 +3,7 @@ * JavaScript and CSS resource definitions. * * @file - * @license GPL2+ + * @license GPL-2.0+ */ $resourcePaths = array( @@ -11,6 +11,7 @@ $resourcePaths = array( 'remoteExtPath' => 'UniversalLanguageSelector' ); +global $wgResourceModules; $wgResourceModules['ext.uls.languagenames'] = array( 'class' => 'ResourceLoaderULSModule' ); diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index 84584c9c..b98d9208 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -27,7 +27,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { */ define( 'ULS_VERSION', '2013-12-31' ); -$wgExtensionCredits['other'][] = array( +$GLOBALS['wgExtensionCredits']['other'][] = array( 'path' => __FILE__, 'name' => 'UniversalLanguageSelector', 'version' => ULS_VERSION, @@ -54,7 +54,7 @@ $wgExtensionCredits['other'][] = array( * * The service should return jsonp that uses the supplied callback parameter. */ -$wgULSGeoService = true; +$GLOBALS['wgULSGeoService'] = true; /** * Enable language selection, input methods and webfonts for everyone, unless @@ -64,14 +64,14 @@ $wgULSGeoService = true; * use of other extensions. Language changing via cookie or setlang query * parameter is not possible. */ -$wgULSEnable = true; +$GLOBALS['wgULSEnable'] = true; /** * Equivalent to $wgULSEnable for anonymous users only. * * Does not have any effect if $wgULSEnable is false. */ -$wgULSEnableAnon = true; +$GLOBALS['wgULSEnableAnon'] = true; /** * Allow anonymous users to change language with cookie and setlang @@ -85,7 +85,7 @@ $wgULSEnableAnon = true; * * @since 2013.04 */ -$wgULSAnonCanChangeLanguage = true; +$GLOBALS['wgULSAnonCanChangeLanguage'] = true; /** * Try to use preferred interface language for anonymous users. @@ -96,19 +96,19 @@ $wgULSAnonCanChangeLanguage = true; * Does not have any effect if any of $wgULSEnable, $wgULSEnableAnon * or $wgULSAnonCanChangeLanguage is set to false. */ -$wgULSLanguageDetection = true; +$GLOBALS['wgULSLanguageDetection'] = true; /** * Disable the input methods feature for all users by default. Can still * be enabled manually by the user. */ -$wgULSIMEEnabled = true; +$GLOBALS['wgULSIMEEnabled'] = true; /** * Set whether webfont support is loaded within the mobile interface (via the * MobileFrontend extension). */ -$wgULSMobileWebfontsEnabled = false; +$GLOBALS['wgULSMobileWebfontsEnabled'] = false; /** * The location and the form of the language selection trigger. @@ -120,21 +120,21 @@ $wgULSMobileWebfontsEnabled = false; * * @since 2013.04 */ -$wgULSPosition = 'personal'; +$GLOBALS['wgULSPosition'] = 'personal'; /** * Whether to use EventLogging. The EventLogging extension must be installed * if this option is enabled. * @since 2013.06 */ -$wgULSEventLogging = false; +$GLOBALS['wgULSEventLogging'] = false; /** * Array of jQuery selectors of elements on which IME should be enabled. * * @since 2013.11 */ -$wgULSImeSelectors = array( +$GLOBALS['wgULSImeSelectors'] = array( 'input:not([type])', 'input[type=text]', 'input[type=search]', @@ -147,7 +147,7 @@ $wgULSImeSelectors = array( * * @since 2013.07 */ -$wgULSNoImeSelectors = array( '#wpCaptchaWord', '.ve-ce-documentNode' ); +$GLOBALS['wgULSNoImeSelectors'] = array( '#wpCaptchaWord', '.ve-ce-documentNode' ); /** * Array of jQuery selectors of elements on which webfonts must not be applied. @@ -155,7 +155,7 @@ $wgULSNoImeSelectors = array( '#wpCaptchaWord', '.ve-ce-documentNode' ); * Autonym * @since 2013.09 */ -$wgULSNoWebfontsSelectors = array( '.autonym' ); +$GLOBALS['wgULSNoWebfontsSelectors'] = array( '.autonym' ); /** * Base path of ULS font repository. @@ -163,14 +163,14 @@ $wgULSNoWebfontsSelectors = array( '.autonym' ); * relative to $wgExtensionAssetsPath. * @since 2013.10 */ -$wgULSFontRepositoryBasePath = false; +$GLOBALS['wgULSFontRepositoryBasePath'] = false; // Internationalization -$wgExtensionMessagesFiles['UniversalLanguageSelector'] = +$GLOBALS['wgExtensionMessagesFiles']['UniversalLanguageSelector'] = __DIR__ . '/UniversalLanguageSelector.i18n.php'; // Register auto load for the page class -$wgAutoloadClasses += array( +$GLOBALS['wgAutoloadClasses'] += array( 'UniversalLanguageSelectorHooks' => __DIR__ . '/UniversalLanguageSelector.hooks.php', 'ResourceLoaderULSModule' => __DIR__ . '/includes/ResourceLoaderULSModule.php', 'ResourceLoaderULSJsonMessageModule' => @@ -181,22 +181,23 @@ $wgAutoloadClasses += array( 'LanguageNameSearch' => __DIR__ . '/data/LanguageNameSearch.php', ); -$wgHooks['BeforePageDisplay'][] = 'UniversalLanguageSelectorHooks::addModules'; -$wgHooks['PersonalUrls'][] = 'UniversalLanguageSelectorHooks::addPersonalBarTrigger'; -$wgHooks['ResourceLoaderTestModules'][] = 'UniversalLanguageSelectorHooks::addTestModules'; -$wgHooks['ResourceLoaderGetConfigVars'][] = 'UniversalLanguageSelectorHooks::addConfig'; -$wgHooks['MakeGlobalVariablesScript'][] = 'UniversalLanguageSelectorHooks::addVariables'; -$wgAPIModules['languagesearch'] = 'ApiLanguageSearch'; -$wgAPIModules['ulslocalization'] = 'ApiULSLocalization'; -$wgHooks['UserGetLanguageObject'][] = 'UniversalLanguageSelectorHooks::getLanguage'; -$wgHooks['SkinTemplateOutputPageBeforeExec'][] = +$GLOBALS['wgHooks']['BeforePageDisplay'][] = 'UniversalLanguageSelectorHooks::addModules'; +$GLOBALS['wgHooks']['PersonalUrls'][] = 'UniversalLanguageSelectorHooks::addPersonalBarTrigger'; +$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] = + 'UniversalLanguageSelectorHooks::addTestModules'; +$GLOBALS['wgHooks']['ResourceLoaderGetConfigVars'][] = 'UniversalLanguageSelectorHooks::addConfig'; +$GLOBALS['wgHooks']['MakeGlobalVariablesScript'][] = 'UniversalLanguageSelectorHooks::addVariables'; +$GLOBALS['wgAPIModules']['languagesearch'] = 'ApiLanguageSearch'; +$GLOBALS['wgAPIModules']['ulslocalization'] = 'ApiULSLocalization'; +$GLOBALS['wgHooks']['UserGetLanguageObject'][] = 'UniversalLanguageSelectorHooks::getLanguage'; +$GLOBALS['wgHooks']['SkinTemplateOutputPageBeforeExec'][] = 'UniversalLanguageSelectorHooks::onSkinTemplateOutputPageBeforeExec'; -$wgHooks['EnterMobileMode'][] = 'UniversalLanguageSelectorHooks::onEnterMobileMode'; +$GLOBALS['wgHooks']['EnterMobileMode'][] = 'UniversalLanguageSelectorHooks::onEnterMobileMode'; -$wgDefaultUserOptions['uls-preferences'] = ''; -$wgHooks['GetPreferences'][] = 'UniversalLanguageSelectorHooks::onGetPreferences'; +$GLOBALS['wgDefaultUserOptions']['uls-preferences'] = ''; +$GLOBALS['wgHooks']['GetPreferences'][] = 'UniversalLanguageSelectorHooks::onGetPreferences'; -$wgExtensionFunctions[] = function () { +$GLOBALS['wgExtensionFunctions'][] = function () { global $wgHooks, $wgResourceModules, $wgULSEventLogging, $wgULSGeoService; if ( $wgULSGeoService === true ) { diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..e32fefcf --- /dev/null +++ b/composer.json @@ -0,0 +1,27 @@ +{ + "name": "mediawiki/universal-language-selector", + "type": "mediawiki-extension", + "description": "The primary aim is to allow users to select a language and configure its support in an easy way. Main features are language selection, input methods and web fonts.", + "keywords": [ + "MediaWiki", + "Language selection", + "Input methods", + "Web fonts" + ], + "homepage": "https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector", + "license": [ "GPL-2.0+", "MIT" ], + "support": { + "issues": "https://bugzilla.wikimedia.org/", + "irc": "irc://irc.freenode.net/mediawiki-i18n", + }, + "require": { + "php": ">=5.3.0", + "composer/installers": ">=1.0.1" + }, + "suggest": { + "mediawiki/cldr": "Language names in all languages." + }, + "autoload": { + "files": ["UniversalLanguageSelector.php"] + } +}