http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84604
Revision: 84604
Author: catrope
Date: 2011-03-23 16:45:11 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
1.17wmf1: MFT r83494, r84454, r84464, r84543, r84574. Did not merge the i18n
part of r83494 (removing a message) because it caused conflicts
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser.php
branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser_body.php
branches/wmf/1.17wmf1/includes/ChangeTags.php
branches/wmf/1.17wmf1/languages/Names.php
branches/wmf/1.17wmf1/languages/messages/MessagesLtg.php
Property Changed:
----------------
branches/wmf/1.17wmf1/languages/Names.php
Modified: branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser.php 2011-03-23
16:38:17 UTC (rev 84603)
+++ branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser.php 2011-03-23
16:45:11 UTC (rev 84604)
@@ -28,10 +28,9 @@
$wgExtensionAliasesFiles['Renameuser'] = $dir . 'Renameuser.alias.php';
/**
- * The maximum number of edits a user can have and still be allowed renaming,
- * set it to 0 to disable the limit.
+ * Users with more than this number of edits will have their rename operation
+ * deferred via the job queue.
*/
-define( 'RENAMEUSER_CONTRIBLIMIT', 25000 );
define( 'RENAMEUSER_CONTRIBJOB', 5000 );
# Add a new log type
Modified: branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser_body.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser_body.php
2011-03-23 16:38:17 UTC (rev 84603)
+++ branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser_body.php
2011-03-23 16:45:11 UTC (rev 84604)
@@ -63,8 +63,7 @@
wfRunHooks( 'RenameUserWarning', array( $oun, $nun,
&$warnings ) );
}
- $wgOut->addHTML( "
- <!-- Current contributions limit is " .
RENAMEUSER_CONTRIBLIMIT . " -->" .
+ $wgOut->addHTML(
Xml::openElement( 'form', array( 'method' => 'post',
'action' => $this->getTitle()->getLocalUrl(), 'id' => 'renameuser' ) ) .
Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', null, wfMsg( 'renameuser' ) ) .
@@ -251,20 +250,6 @@
// Always get the edits count, it will be used for the log
message
$contribs = User::edits( $uid );
- // Check edit count
- if ( !$wgUser->isAllowed( 'siteadmin' ) ) {
- if ( RENAMEUSER_CONTRIBLIMIT != 0 && $contribs >
RENAMEUSER_CONTRIBLIMIT ) {
- $wgOut->addWikiText( "<div class=\"errorbox\">"
.
- wfMsg( 'renameusererrortoomany',
- $oldusername->getText(),
- $wgLang->formatNum( $contribs ),
- $wgLang->formatNum(
RENAMEUSER_CONTRIBLIMIT )
- )
- . "</div>" );
- return;
- }
- }
-
// Give other affected extensions a chance to validate or abort
if ( !wfRunHooks( 'RenameUserAbort', array( $uid,
$oldusername->getText(), $newusername->getText() ) ) ) {
return;
Modified: branches/wmf/1.17wmf1/includes/ChangeTags.php
===================================================================
--- branches/wmf/1.17wmf1/includes/ChangeTags.php 2011-03-23 16:38:17 UTC
(rev 84603)
+++ branches/wmf/1.17wmf1/includes/ChangeTags.php 2011-03-23 16:45:11 UTC
(rev 84604)
@@ -169,7 +169,7 @@
$html = implode( ' ', $data );
$html .= "\n" . Xml::element( 'input', array( 'type' =>
'submit', 'value' => wfMsg( 'tag-filter-submit' ) ) );
- $html .= "\n" . Html::hidden( 'title', $wgTitle->
getPrefixedText() );
+ $html .= "\n" . Html::hidden( 'title',
$wgTitle->getPrefixedText() );
$html = Xml::tags( 'form', array( 'action' =>
$wgTitle->getLocalURL(), 'method' => 'get' ), $html );
return $html;
Modified: branches/wmf/1.17wmf1/languages/Names.php
===================================================================
--- branches/wmf/1.17wmf1/languages/Names.php 2011-03-23 16:38:17 UTC (rev
84603)
+++ branches/wmf/1.17wmf1/languages/Names.php 2011-03-23 16:45:11 UTC (rev
84604)
@@ -150,7 +150,7 @@
'ka' => 'ქართული', # Georgian
'kaa' => 'Qaraqalpaqsha', # Karakalpak
'kab' => 'Taqbaylit', # Kabyle
- 'kbd' => 'къэбэрдеибзэ/qabardjajəbza', # Kabardian (multiple scripts -
defaults to Cyrillic)
+ 'kbd' => 'Къэбэрдеибзэ / Qabardjajəbza', # Kabardian (multiple
scripts - defaults to Cyrillic)
'kbd-cyrl' => 'къэбэрдеибзэ', # Kabardian (Cyrillic)
'kg' => 'Kongo', # Kongo, (FIXME!) should probaly be KiKongo or
KiKoongo
'ki' => 'Gĩkũyũ', # Gikuyu
Property changes on: branches/wmf/1.17wmf1/languages/Names.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/languages/Names.php:51646
/branches/new-installer/phase3/languages/Names.php:43664-66004
/branches/sqlite/languages/Names.php:58211-58321
/branches/wmf/1.16wmf4/languages/Names.php:67177,69199,76243,77266
/branches/wmf-deployment/languages/Names.php:60970
/trunk/phase3/languages/Names.php:78808,79166,79746,79894,79896,83212
+ /branches/REL1_15/phase3/languages/Names.php:51646
/branches/new-installer/phase3/languages/Names.php:43664-66004
/branches/sqlite/languages/Names.php:58211-58321
/branches/wmf/1.16wmf4/languages/Names.php:67177,69199,76243,77266
/branches/wmf-deployment/languages/Names.php:60970
/trunk/phase3/languages/Names.php:78808,79166,79746,79894,79896,83212,84464,84543,84574
Modified: branches/wmf/1.17wmf1/languages/messages/MessagesLtg.php
===================================================================
--- branches/wmf/1.17wmf1/languages/messages/MessagesLtg.php 2011-03-23
16:38:17 UTC (rev 84603)
+++ branches/wmf/1.17wmf1/languages/messages/MessagesLtg.php 2011-03-23
16:45:11 UTC (rev 84604)
@@ -10,6 +10,25 @@
* @author Dark Eagle
* @author Jureits
*/
+
+$namespaceNames = array(
+ NS_MEDIA => 'Medeja',
+ NS_SPECIAL => 'Seviškuo',
+ NS_TALK => 'Sprīža',
+ NS_USER => 'Lītuotuojs',
+ NS_USER_TALK => 'Sprīža_ap_lītuotuoju',
+ NS_PROJECT_TALK => 'Sprīža_ap_{{GRAMMAR:accusative|$1}}',
+ NS_FILE => 'Fails',
+ NS_FILE_TALK => 'Sprīža_ap_failu',
+ NS_MEDIAWIKI => 'MediaWiki',
+ NS_MEDIAWIKI_TALK => 'Sprīža_ap_MediaWiki',
+ NS_TEMPLATE => 'Taiss',
+ NS_TEMPLATE_TALK => 'Sprīža_ap_taisu',
+ NS_HELP => 'Paleigs',
+ NS_HELP_TALK => 'Sprīža_ap_paleigu',
+ NS_CATEGORY => 'Kategoreja',
+ NS_CATEGORY_TALK => 'Sprīža_ap_kategoreju',
+);
$fallback = 'lv';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
