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

Revision: 73638
Author:   tomasz
Date:     2010-09-23 20:12:42 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
Syncing to head of trunk at r73633

Modified Paths:
--------------
    branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.body.php
    branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.i18n.php
    branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.php

Added Paths:
-----------
    branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.alias.php

Property Changed:
----------------
    branches/wmf/1.16wmf4/extensions/VariablePage/


Property changes on: branches/wmf/1.16wmf4/extensions/VariablePage
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/wmf-deployment/extensions/VariablePage:60970
/trunk/extensions/VariablePage:72938-73122,73134-73142,73145-73148,73150-73620
/trunk/extensions/VariablePage/VariablePage:72939-72940
/trunk/phase3/extensions/VariablePage:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
   + /branches/wmf-deployment/extensions/VariablePage:60970
/trunk/extensions/VariablePage:72938-73122,73134-73142,73145-73148,73150-73620,73622-73633
/trunk/extensions/VariablePage/VariablePage:72939-72940
/trunk/phase3/extensions/VariablePage:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816

Copied: branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.alias.php 
(from rev 73633, trunk/extensions/VariablePage/VariablePage.alias.php)
===================================================================
--- branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.alias.php        
                        (rev 0)
+++ branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.alias.php        
2010-09-23 20:12:42 UTC (rev 73638)
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Aliases for special pages of VariablePage extension.
+ *
+ * @file
+ */
+
+$specialPageAliases = array();
+
+/** English
+ * @author Nike
+ */
+$specialPageAliases['en'] = array(
+       'VariablePage' => array( 'VariablePage' ),
+);

Modified: branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.body.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.body.php 
2010-09-23 20:03:26 UTC (rev 73637)
+++ branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.body.php 
2010-09-23 20:12:42 UTC (rev 73638)
@@ -11,7 +11,7 @@
                }
        }
 
-       public function execute() {
+       public function execute( $par ) {
                global $wgOut, $wgRequest;
                global $wgVariablePagePossibilities;
 
@@ -51,7 +51,7 @@
                 * We use a # larger than 100 to increase 'randomness'
                 */
                $random_number = mt_rand( 0, 100*100 );
-               $offset = 0;  
+               $offset = 0;
 
                foreach ( $page_possibilities as $url => $probability ) {
                        $offset += $probability * 100;

Modified: branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.i18n.php 
2010-09-23 20:03:26 UTC (rev 73637)
+++ branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.i18n.php 
2010-09-23 20:12:42 UTC (rev 73638)
@@ -29,6 +29,8 @@
  * @author Kghbln
  */
 $messages['de'] = array(
+       'variablepage' => 'VariablePage',
+       'variablepage-navlink_text' => 'Spenden',
        'variablepage-desc' => 'Ermöglicht ressourcenschonende variable 
Weiterleitungen von Wikiseiten',
 );
 
@@ -43,6 +45,8 @@
  * @author Toliño
  */
 $messages['gl'] = array(
+       'variablepage' => 'Páxina variable',
+       'variablepage-navlink_text' => 'Doar',
        'variablepage-desc' => 'Redirección lixeira de páxina variable',
 );
 
@@ -85,6 +89,8 @@
  * @author Bjankuloski06
  */
 $messages['mk'] = array(
+       'variablepage' => 'ПроменливаСтраница',
+       'variablepage-navlink_text' => 'Донирајте',
        'variablepage-desc' => 'Леко променливо пренасочување на страници',
 );
 
@@ -92,6 +98,8 @@
  * @author Siebrand
  */
 $messages['nl'] = array(
+       'variablepage' => 'Variabele pagina',
+       'variablepage-navlink_text' => 'Donaties',
        'variablepage-desc' => "Lichtgewicht variabele doorverwijzing voor 
pagina's",
 );
 
@@ -99,6 +107,8 @@
  * @author Sp5uhe
  */
 $messages['pl'] = array(
+       'variablepage' => 'Zmienna strona',
+       'variablepage-navlink_text' => 'Darowizny',
        'variablepage-desc' => 'Prosta strona przekierowująca losowo',
 );
 
@@ -106,6 +116,8 @@
  * @author Dragonòt
  */
 $messages['pms'] = array(
+       'variablepage' => 'PàginaVariabla',
+       'variablepage-navlink_text' => 'Doné',
        'variablepage-desc' => 'Rediression ëd pàgina variàbila ëd peis linger',
 );
 
@@ -113,6 +125,8 @@
  * @author Hamilton Abreu
  */
 $messages['pt'] = array(
+       'variablepage' => 'Página Variável',
+       'variablepage-navlink_text' => 'Donativo',
        'variablepage-desc' => 'Redireccionamento ligeiro de páginas variáveis',
 );
 
@@ -120,6 +134,8 @@
  * @author Giro720
  */
 $messages['pt-br'] = array(
+       'variablepage' => 'VariablePage',
+       'variablepage-navlink_text' => 'Doar',
        'variablepage-desc' => 'Redirecionamento ligeiro de páginas variáveis',
 );
 
@@ -127,6 +143,8 @@
  * @author Александр Сигачёв
  */
 $messages['ru'] = array(
+       'variablepage' => 'ПеременнаяСтраница',
+       'variablepage-navlink_text' => 'Пожертвовать',
        'variablepage-desc' => 'Простое перенаправление на различные страницы',
 );
 

Modified: branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.php      
2010-09-23 20:03:26 UTC (rev 73637)
+++ branches/wmf/1.16wmf4/extensions/VariablePage/VariablePage.php      
2010-09-23 20:12:42 UTC (rev 73638)
@@ -12,7 +12,7 @@
        exit( 1 );
 }
 
-$wgExtensionCredits[ 'VariablePage' ][] = array(
+$wgExtensionCredits['specialpage'][] = array(
        'path' => __FILE__,
        'name' => 'VariablePage',
        'version' => '0.1',
@@ -66,6 +66,7 @@
 
 $wgAutoloadClasses[ 'SpecialVariablePage' ] = $dir . 'VariablePage.body.php';
 $wgExtensionMessagesFiles[ 'VariablePage' ] = $dir . 'VariablePage.i18n.php';
+$wgExtensionAliasesFiles[ 'VariablePage' ] = $dir . 'VariablePage.alias.php';
 $wgSpecialPages[ 'VariablePage' ] = 'SpecialVariablePage';
 $wgSpecialPageGroups[ 'VariablePage' ] = 'contribution';
 
@@ -78,10 +79,10 @@
 
        // make sure that we should be showing a sidebar link
        if ( $wgVariablePageShowSidebarLink ) {
-               $url = Title::makeTitle( NS_SPECIAL, wfMsg( 'variablepage' ) 
)->getLocalUrl();
+               $title = SpecialPage::getTitleFor( 'VariablePage' );
                $bar['navigation'][] = array(
                        'text' => wfMsg( 'variablepage-navlink_text' ),
-                       'href' => wfAppendQuery( $url, 
$wgVariablePageSidebarLinkQuery ),
+                       'href' => $title->getLocalUrl( 
$wgVariablePageSidebarLinkQuery ),
                        'id' => 'n-variablepage',
                        'active' => true,
                );



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to