http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54817

Revision: 54817
Author:   siebrand
Date:     2009-08-11 22:07:24 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
* new style magic words support for MathStatFunctions
* add localisation support for MathStatFunctions magic in Translate
* bump version

Modified Paths:
--------------
    trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.magic.php
    trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.php
    trunk/extensions/MathStatFunctions/MathStatFunctions.php
    trunk/extensions/Translate/groups/mediawiki-defines.txt

Modified: trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.magic.php
===================================================================
--- trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.magic.php 
2009-08-11 22:01:32 UTC (rev 54816)
+++ trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.magic.php 
2009-08-11 22:07:24 UTC (rev 54817)
@@ -1,12 +1,11 @@
 <?php
+/**
+ * Magic word localization for the MathStatFunction extension
+*/
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-       die( 'This file is a MediaWiki extension, it is not a valid entry 
point' );
-}
+$magicWords = array();
 
-$wgMathStatFunctionsMagic = array();
-
-$wgMathStatFunctionsMagic['en'] = array(
+$magicWords['en'] = array(
        'const'         => array( 0, 'const' ),
        'median'        => array( 0, 'median' ),
        'mean'          => array( 0, 'mean' ),

Modified: trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.php
===================================================================
--- trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.php       
2009-08-11 22:01:32 UTC (rev 54816)
+++ trunk/extensions/MathStatFunctions/MathStatFunctions.i18n.php       
2009-08-11 22:07:24 UTC (rev 54817)
@@ -5,6 +5,8 @@
  * @addtogroup Extensions
 */
 
+require_once( dirname( __FILE__ ) . '/MathStatFunctions.i18n.magic.php' );
+
 $messages = array();
 
 $messages['en'] = array(

Modified: trunk/extensions/MathStatFunctions/MathStatFunctions.php
===================================================================
--- trunk/extensions/MathStatFunctions/MathStatFunctions.php    2009-08-11 
22:01:32 UTC (rev 54816)
+++ trunk/extensions/MathStatFunctions/MathStatFunctions.php    2009-08-11 
22:07:24 UTC (rev 54817)
@@ -7,7 +7,7 @@
 $wgExtensionCredits['parserhook'][] = array(
        'path' => __FILE__,
        'name' => 'MathStatFunctions',
-       'version' => '1.1',
+       'version' => '1.2',
        'author' => 'Carl Fürstenberg (AzaToth)',
        'description' => 'A collection of mathematical and statistical 
functions',
        'descriptionmsg' => 'msfunc_desc',
@@ -16,7 +16,6 @@
 
 $wgExtensionMessagesFiles['MathStatFunctions'] = dirname( __FILE__ ) . 
'/MathStatFunctions.i18n.php';
 $wgExtensionFunctions[] = 'wfSetupMathStatFunctions';
-$wgHooks['LanguageGetMagic'][]       = 'wfMathStatFunctionsLanguageGetMagic';
 
 /**
  * \brief Exception class identifying that ParserFunctions is not available
@@ -456,12 +455,3 @@
 
        return true;
 }
-
-function wfMathStatFunctionsLanguageGetMagic( &$magicWords, $langCode ) {
-       global $wgMathStatFunctionsMagic;
-       require_once( dirname(__FILE__) . '/MathStatFunctions.i18n.magic.php' );
-
-       if ( !in_array( $langCode, $wgMathStatFunctionsMagic ) ) $langCode = 
'en';
-       $magicWords = array_merge( $magicWords, 
$wgMathStatFunctionsMagic[$langCode] );
-       return true;
-}

Modified: trunk/extensions/Translate/groups/mediawiki-defines.txt
===================================================================
--- trunk/extensions/Translate/groups/mediawiki-defines.txt     2009-08-11 
22:01:32 UTC (rev 54816)
+++ trunk/extensions/Translate/groups/mediawiki-defines.txt     2009-08-11 
22:07:24 UTC (rev 54817)
@@ -550,9 +550,9 @@
 descmsg = maps_desc
 optional = maps_name
 
-Math Stat
-file = MathStatFunctions/MathStatFunctions.i18n.php
+Math Stat Functions
 descmsg = msfunc_desc
+magicfile = MathStatFunctions/MathStatFunctions.i18n.magic.php
 
 Media Functions
 



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to