| Index: branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser_body.php |
| — | — | @@ -63,8 +63,7 @@ |
| 64 | 64 | wfRunHooks( 'RenameUserWarning', array( $oun, $nun, &$warnings ) ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | | - $wgOut->addHTML( " |
| 68 | | - <!-- Current contributions limit is " . RENAMEUSER_CONTRIBLIMIT . " -->" . |
| | 67 | + $wgOut->addHTML( |
| 69 | 68 | Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl(), 'id' => 'renameuser' ) ) . |
| 70 | 69 | Xml::openElement( 'fieldset' ) . |
| 71 | 70 | Xml::element( 'legend', null, wfMsg( 'renameuser' ) ) . |
| — | — | @@ -251,20 +250,6 @@ |
| 252 | 251 | // Always get the edits count, it will be used for the log message |
| 253 | 252 | $contribs = User::edits( $uid ); |
| 254 | 253 | |
| 255 | | - // Check edit count |
| 256 | | - if ( !$wgUser->isAllowed( 'siteadmin' ) ) { |
| 257 | | - if ( RENAMEUSER_CONTRIBLIMIT != 0 && $contribs > RENAMEUSER_CONTRIBLIMIT ) { |
| 258 | | - $wgOut->addWikiText( "<div class=\"errorbox\">" . |
| 259 | | - wfMsg( 'renameusererrortoomany', |
| 260 | | - $oldusername->getText(), |
| 261 | | - $wgLang->formatNum( $contribs ), |
| 262 | | - $wgLang->formatNum( RENAMEUSER_CONTRIBLIMIT ) |
| 263 | | - ) |
| 264 | | - . "</div>" ); |
| 265 | | - return; |
| 266 | | - } |
| 267 | | - } |
| 268 | | - |
| 269 | 254 | // Give other affected extensions a chance to validate or abort |
| 270 | 255 | if ( !wfRunHooks( 'RenameUserAbort', array( $uid, $oldusername->getText(), $newusername->getText() ) ) ) { |
| 271 | 256 | return; |
| Index: branches/wmf/1.17wmf1/extensions/Renameuser/Renameuser.php |
| — | — | @@ -28,10 +28,9 @@ |
| 29 | 29 | $wgExtensionAliasesFiles['Renameuser'] = $dir . 'Renameuser.alias.php'; |
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | | - * The maximum number of edits a user can have and still be allowed renaming, |
| 33 | | - * set it to 0 to disable the limit. |
| | 32 | + * Users with more than this number of edits will have their rename operation |
| | 33 | + * deferred via the job queue. |
| 34 | 34 | */ |
| 35 | | -define( 'RENAMEUSER_CONTRIBLIMIT', 25000 ); |
| 36 | 35 | define( 'RENAMEUSER_CONTRIBJOB', 5000 ); |
| 37 | 36 | |
| 38 | 37 | # Add a new log type |
| Index: branches/wmf/1.17wmf1/includes/ChangeTags.php |
| — | — | @@ -169,7 +169,7 @@ |
| 170 | 170 | |
| 171 | 171 | $html = implode( ' ', $data ); |
| 172 | 172 | $html .= "\n" . Xml::element( 'input', array( 'type' => 'submit', 'value' => wfMsg( 'tag-filter-submit' ) ) ); |
| 173 | | - $html .= "\n" . Html::hidden( 'title', $wgTitle-> getPrefixedText() ); |
| | 173 | + $html .= "\n" . Html::hidden( 'title', $wgTitle->getPrefixedText() ); |
| 174 | 174 | $html = Xml::tags( 'form', array( 'action' => $wgTitle->getLocalURL(), 'method' => 'get' ), $html ); |
| 175 | 175 | |
| 176 | 176 | return $html; |
| Index: branches/wmf/1.17wmf1/languages/messages/MessagesLtg.php |
| — | — | @@ -10,6 +10,25 @@ |
| 11 | 11 | * @author Dark Eagle |
| 12 | 12 | * @author Jureits |
| 13 | 13 | */ |
| | 14 | + |
| | 15 | +$namespaceNames = array( |
| | 16 | + NS_MEDIA => 'Medeja', |
| | 17 | + NS_SPECIAL => 'Seviškuo', |
| | 18 | + NS_TALK => 'Sprīža', |
| | 19 | + NS_USER => 'Lītuotuojs', |
| | 20 | + NS_USER_TALK => 'Sprīža_ap_lītuotuoju', |
| | 21 | + NS_PROJECT_TALK => 'Sprīža_ap_{{GRAMMAR:accusative|$1}}', |
| | 22 | + NS_FILE => 'Fails', |
| | 23 | + NS_FILE_TALK => 'Sprīža_ap_failu', |
| | 24 | + NS_MEDIAWIKI => 'MediaWiki', |
| | 25 | + NS_MEDIAWIKI_TALK => 'Sprīža_ap_MediaWiki', |
| | 26 | + NS_TEMPLATE => 'Taiss', |
| | 27 | + NS_TEMPLATE_TALK => 'Sprīža_ap_taisu', |
| | 28 | + NS_HELP => 'Paleigs', |
| | 29 | + NS_HELP_TALK => 'Sprīža_ap_paleigu', |
| | 30 | + NS_CATEGORY => 'Kategoreja', |
| | 31 | + NS_CATEGORY_TALK => 'Sprīža_ap_kategoreju', |
| | 32 | +); |
| 14 | 33 | |
| 15 | 34 | $fallback = 'lv'; |
| 16 | 35 | |
| Index: branches/wmf/1.17wmf1/languages/Names.php |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | 'ka' => 'ქართული', # Georgian |
| 152 | 152 | 'kaa' => 'Qaraqalpaqsha', # Karakalpak |
| 153 | 153 | 'kab' => 'Taqbaylit', # Kabyle |
| 154 | | - 'kbd' => 'къэбэрдеибзэ/qabardjajəbza', # Kabardian (multiple scripts - defaults to Cyrillic) |
| | 154 | + 'kbd' => 'Къэбэрдеибзэ / Qabardjajəbza', # Kabardian (multiple scripts - defaults to Cyrillic) |
| 155 | 155 | 'kbd-cyrl' => 'къэбэрдеибзэ', # Kabardian (Cyrillic) |
| 156 | 156 | 'kg' => 'Kongo', # Kongo, (FIXME!) should probaly be KiKongo or KiKoongo |
| 157 | 157 | 'ki' => 'Gĩkũyũ', # Gikuyu |
| Property changes on: branches/wmf/1.17wmf1/languages/Names.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 158 | 158 | Merged /trunk/phase3/languages/Names.php:r84464,84543,84574 |