| Index: trunk/extensions/EducationProgram/specials/SpecialInstitutions.php |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | $org = EPOrg::has( array( 'name' => $this->subPage ) ); |
| 43 | 43 | |
| 44 | 44 | if ( $org === false ) { |
| 45 | | - $this->showError( 'ep-institutions-nosuchinstitution', $this->subPage ); |
| | 45 | + $this->showError( wfMessage( 'ep-institutions-nosuchinstitution', $this->subPage ) ); |
| 46 | 46 | $this->displayPage(); |
| 47 | 47 | } |
| 48 | 48 | else { |
| Index: trunk/extensions/EducationProgram/specials/SpecialEPPage.php |
| — | — | @@ -73,13 +73,11 @@ |
| 74 | 74 | * |
| 75 | 75 | * @since 0.1 |
| 76 | 76 | * |
| 77 | | - * @param string $message Message key |
| 78 | | - * @param array|string $args Message arguments |
| | 77 | + * @param Message $message |
| 79 | 78 | */ |
| 80 | | - protected function showError( $message, $args = array() ) { |
| 81 | | - $message = call_user_func_array( 'wfMsgExt', array_merge( array( $message ), (array)$args ) ); |
| | 79 | + protected function showError( Message $message ) { |
| 82 | 80 | $this->getOutput()->addHTML( |
| 83 | | - '<p class="visualClear errorbox">' . $message . '</p>' |
| | 81 | + '<p class="visualClear errorbox">' . $message->parse() . '</p>' |
| 84 | 82 | . '<hr style="display: block; clear: both; visibility: hidden;" />' |
| 85 | 83 | ); |
| 86 | 84 | } |
| — | — | @@ -89,13 +87,11 @@ |
| 90 | 88 | * |
| 91 | 89 | * @since 0.1 |
| 92 | 90 | * |
| 93 | | - * @param string $message Message key |
| 94 | | - * @param array|string $args Message arguments |
| | 91 | + * @param Message $message |
| 95 | 92 | */ |
| 96 | | - protected function showWarning( $message, $args = array() ) { |
| 97 | | - $message = call_user_func_array( 'wfMsgExt', array_merge( array( $message ), (array)$args ) ); |
| | 93 | + protected function showWarning( Message $message ) { |
| 98 | 94 | $this->getOutput()->addHTML( |
| 99 | | - '<p class="visualClear warningbox">' . $message . '</p>' |
| | 95 | + '<p class="visualClear warningbox">' . $message->parse() . '</p>' |
| 100 | 96 | . '<hr style="display: block; clear: both; visibility: hidden;" />' |
| 101 | 97 | ); |
| 102 | 98 | } |
| — | — | @@ -105,13 +101,11 @@ |
| 106 | 102 | * |
| 107 | 103 | * @since 0.1 |
| 108 | 104 | * |
| 109 | | - * @param string $message Message key |
| 110 | | - * @param array|string $args Message arguments |
| | 105 | + * @param Message $message |
| 111 | 106 | */ |
| 112 | | - protected function showSuccess( $message, $args = array() ) { |
| 113 | | - $message = call_user_func_array( 'wfMsgExt', array_merge( array( $message ), (array)$args ) ); |
| | 107 | + protected function showSuccess( Message $message ) { |
| 114 | 108 | $this->getOutput()->addHTML( |
| 115 | | - '<div class="successbox"><strong><p>' . $message . '</p></strong></div>' |
| | 109 | + '<div class="successbox"><strong><p>' . $message->parse() . '</p></strong></div>' |
| 116 | 110 | . '<hr style="display: block; clear: both; visibility: hidden;" />' |
| 117 | 111 | ); |
| 118 | 112 | } |
| Index: trunk/extensions/EducationProgram/specials/SpecialEPFormPage.php |
| — | — | @@ -110,7 +110,7 @@ |
| 111 | 111 | $object = new $c( $data, true ); |
| 112 | 112 | } |
| 113 | 113 | else { |
| 114 | | - $this->showWarning( 'educationprogram-' . strtolower( $this->getName() ) . '-exists-already' ); |
| | 114 | + $this->showWarning( wfMessage( 'educationprogram-' . strtolower( $this->getName() ) . '-exists-already' ) ); |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | else { |