| Index: trunk/extensions/Farmer/Farmer.i18n.php |
| — | — | @@ -100,14 +100,6 @@ |
| 101 | 101 | 'farmer-basic-permission-text' => 'Using the form below, it is possible to alter permissions for users of this wiki.', |
| 102 | 102 | 'farmer-basic-permission-visitor' => 'Permissions for every visitor', |
| 103 | 103 | 'farmer-basic-permission-visitor-text' => 'The following permissions will be applied to every person who visits this wiki', |
| 104 | | - 'farmer-basic-permission-view' => 'View all pages', |
| 105 | | - 'farmer-basic-permission-edit' => 'Edit all pages', |
| 106 | | - 'farmer-basic-permission-createpage' => 'Create new pages', |
| 107 | | - 'farmer-basic-permission-createtalk' => 'Create talk pages', |
| 108 | | - 'farmer-basic-permission-move' => 'Move pages', |
| 109 | | - 'farmer-basic-permission-upload' => 'Upload files', |
| 110 | | - 'farmer-basic-permission-reupload' => 'Re-upload files (overwrite existing upload)', |
| 111 | | - 'farmer-basic-permission-minoredit' => 'Allow minor edits', |
| 112 | 104 | 'farmer-yes' => 'Yes', |
| 113 | 105 | 'farmer-no' => 'No', |
| 114 | 106 | 'farmer-basic-permission-user' => 'Permissions for logged-in users', |
| Index: trunk/extensions/Farmer/Farmer.php |
| — | — | @@ -8,7 +8,6 @@ |
| 9 | 9 | * |
| 10 | 10 | * @todo Extension management on per-wiki basis |
| 11 | 11 | * @todo Upload prefix |
| 12 | | - * @todo Use MediaWiki messages |
| 13 | 12 | * |
| 14 | 13 | */ |
| 15 | 14 | |
| — | — | @@ -19,7 +18,7 @@ |
| 20 | 19 | 'url' => 'http://www.mediawiki.org/wiki/Extension:Farmer', |
| 21 | 20 | 'description' => 'Manage a MediaWiki farm', |
| 22 | 21 | 'descriptionmsg' => 'farmer-desc', |
| 23 | | - 'version' => '0.0.7', |
| | 22 | + 'version' => '0.0.8', |
| 24 | 23 | ); |
| 25 | 24 | |
| 26 | 25 | /** |
| Index: trunk/extensions/Farmer/SpecialFarmer.php |
| — | — | @@ -378,10 +378,10 @@ |
| 379 | 379 | $wgOut->addWikiMsg( 'farmer-basic-permission-visitor-text' ); |
| 380 | 380 | |
| 381 | 381 | $doArray = array( |
| 382 | | - array( 'read', wfMsg( 'farmer-basic-permission-view' ) ), |
| 383 | | - array( 'edit', wfMsg( 'farmer-basic-permission-edit' ) ), |
| 384 | | - array( 'createpage', wfMsg( 'farmer-basic-permission-createpage' ) ), |
| 385 | | - array( 'createtalk', wfMsg( 'farmer-basic-permission-createtalk' ) ) |
| | 382 | + array( 'read', wfMsg( 'right-read' ) ), |
| | 383 | + array( 'edit', wfMsg( 'right-edit' ) ), |
| | 384 | + array( 'createpage', wfMsg( 'right-createpage' ) ), |
| | 385 | + array( 'createtalk', wfMsg( 'right-createtalk' ) ) |
| 386 | 386 | ); |
| 387 | 387 | |
| 388 | 388 | foreach ( $doArray as $arr ) { |
| — | — | @@ -392,14 +392,14 @@ |
| 393 | 393 | $wgOut->addWikiMsg( 'farmer-basic-permission-user-text' ); |
| 394 | 394 | |
| 395 | 395 | $doArray = array( |
| 396 | | - array( 'read', wfMsg( 'farmer-basic-permission-view' ) ), |
| 397 | | - array( 'edit', wfMsg( 'farmer-basic-permission-edit' ) ), |
| 398 | | - array( 'createpage', wfMsg( 'farmer-basic-permission-createpage' ) ), |
| 399 | | - array( 'createtalk', wfMsg( 'farmer-basic-permission-createtalk' ) ), |
| 400 | | - array( 'move', wfMsg( 'farmer-basic-permission-move' ) ), |
| 401 | | - array( 'upload', wfMsg( 'farmer-basic-permission-upload' ) ), |
| 402 | | - array( 'reupload', wfMsg( 'farmer-basic-permission-reupload' ) ), |
| 403 | | - array( 'minoredit', wfMsg( 'farmer-basic-permission-minoredit' ) ) |
| | 396 | + array( 'read', wfMsg( 'right-read' ) ), |
| | 397 | + array( 'edit', wfMsg( 'right-edit' ) ), |
| | 398 | + array( 'createpage', wfMsg( 'right-createpage' ) ), |
| | 399 | + array( 'createtalk', wfMsg( 'right-createtalk' ) ), |
| | 400 | + array( 'move', wfMsg( 'right-move' ) ), |
| | 401 | + array( 'upload', wfMsg( 'right-upload' ) ), |
| | 402 | + array( 'reupload', wfMsg( 'right-reupload' ) ), |
| | 403 | + array( 'minoredit', wfMsg( 'right-minoredit' ) ) |
| 404 | 404 | ); |
| 405 | 405 | |
| 406 | 406 | foreach ( $doArray as $arr ) { |