| Index: trunk/extensions/Farmer/Farmer.i18n.php |
| — | — | @@ -127,13 +127,7 @@ |
| 128 | 128 | 'farmer-extensions-register-name' => 'Name', |
| 129 | 129 | 'farmer-extensions-register-includefile' => 'Include file', |
| 130 | 130 | 'farmer-error-exists' => 'Cannot create wiki. It already exists: $1', |
| 131 | | - 'farmer-error-nodirconfig' => 'configDirectory not found:', |
| 132 | | - 'farmer-error-defnotset' => 'Default wiki must be set', |
| 133 | | - 'farmer-error-mapnotfound' => 'Function to map wiki name in farm not found:', |
| 134 | | - 'farmer-error-nofileconfwrite' => 'MediaWikiFarmer could not write the default wiki configuration file.', |
| 135 | | - 'farmer-error-funcnotcall' => 'Could not call function:', |
| 136 | 131 | 'farmer-error-noextwrite' => 'Unable to write out extension file:', |
| 137 | | - 'farmer-error-wikicorrupt' => 'Stored wiki is corrupt', |
| 138 | 132 | ); |
| 139 | 133 | |
| 140 | 134 | /** Message documentation (Message documentation) |
| Index: trunk/extensions/Farmer/MediaWikiFarmer.php |
| — | — | @@ -106,7 +106,7 @@ |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | if( !is_dir( $this->_configDirectory ) ){ |
| 110 | | - throw new MWException( wfMsgHtml( 'farmer-error-nodirconfig' ) . wfMsgHtml( 'word-separator' ) . $this->_configDirectory ); |
| | 110 | + throw new MWException( 'configDirectory not found: ' . $this->_configDirectory ); |
| 111 | 111 | } else { |
| 112 | 112 | if ( !is_dir( $this->_configDirectory . '/wikis/' ) ){ |
| 113 | 113 | mkdir( $this->_configDirectory . '/wikis' ); |
| — | — | @@ -132,7 +132,7 @@ |
| 133 | 133 | */ |
| 134 | 134 | public function run() { |
| 135 | 135 | if( !$this->_defaultWiki ) { |
| 136 | | - throw new MWException( wfMsgHtml( 'farmer-error-defnotset' ) ); |
| | 136 | + throw new MWException( 'Default wiki must be set' ); |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | // first we try to find the wiki name that was accessed by calling the appropriate function |
| — | — | @@ -153,7 +153,7 @@ |
| 154 | 154 | return $this->_doWiki( $wiki ); |
| 155 | 155 | |
| 156 | 156 | } else { |
| 157 | | - throw new MWException( wfMsgHtml('farmer-error-mapnotfound') . wfMsgHtml( 'word-separator' ) . print_r( $this->_matchFunction, true ) ); |
| | 157 | + throw new MWException( 'Function to map wiki name in farm not found: ' . print_r( $this->_matchFunction, true ) ); |
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | |
| — | — | @@ -177,7 +177,7 @@ |
| 178 | 178 | $wiki->save(); |
| 179 | 179 | |
| 180 | 180 | if( !$wiki->exists() ){ |
| 181 | | - throw new MWException( wfMsgHtml( 'farmer-error-nofileconfwrite' ) ); |
| | 181 | + throw new MWException( 'MediaWikiFarmer could not write the default wiki configuration file.' ); |
| 182 | 182 | } else { |
| 183 | 183 | $this->updateFarmList(); |
| 184 | 184 | $wiki->initialize(); |
| — | — | @@ -189,7 +189,7 @@ |
| 190 | 190 | if( is_callable( $this->_onUnknownWikiFunction ) ){ |
| 191 | 191 | call_user_func( $this->_onUnknownWikiFunction, $this, $wiki ); |
| 192 | 192 | } else { |
| 193 | | - throw new MWException( wfMsgHtml( 'farmer-error-funcnotcall' ) . wfMsgHtml( 'word-separator' ) . print_r( $this->_onUnknownFunction, true ) ); |
| | 193 | + throw new MWException( 'Could not call function: ' . print_r( $this->_onUnknownFunction, true ) ); |
| 194 | 194 | } |
| 195 | 195 | } |
| 196 | 196 | } else { |
| Index: trunk/extensions/Farmer/MediaWikiFarmer_Wiki.php |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | if( $obj instanceof MediaWikiFarmer_Wiki ){ |
| 75 | 75 | return $obj; |
| 76 | 76 | } else { |
| 77 | | - throw new MWException( wfMsgHtml( 'farmer-error-wikicorrupt' ) ); |
| | 77 | + throw new MWException( 'Stored wiki is corrupt.' ); |
| 78 | 78 | } |
| 79 | 79 | } else { |
| 80 | 80 | return new MediaWikiFarmer_Wiki( $wiki, $variables ); |