| Index: trunk/extensions/EducationProgram/actions/ViewCourseAction.php |
| — | — | @@ -18,10 +18,6 @@ |
| 19 | 19 | return 'viewcourse'; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | | - protected function getDescription() { |
| 23 | | - return wfMsg( 'viewcourse' ); |
| 24 | | - } |
| 25 | | - |
| 26 | 22 | /** |
| 27 | 23 | * |
| 28 | 24 | * |
| Index: trunk/extensions/EducationProgram/actions/EditOrgAction.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | protected function getDescription() { |
| 24 | | - return wfMsg( 'editorg' ); |
| | 24 | + return wfMsgHtml( $this->isNew() ? 'ep-addorg' : 'ep-editorg' ); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | protected function getItemClass() { |
| Index: trunk/extensions/EducationProgram/actions/EPViewAction.php |
| — | — | @@ -13,7 +13,11 @@ |
| 14 | 14 | * @author Jeroen De Dauw < jeroendedauw@gmail.com > |
| 15 | 15 | */ |
| 16 | 16 | abstract class EPViewAction extends FormlessAction { |
| 17 | | - |
| | 17 | + |
| | 18 | + protected function getDescription() { |
| | 19 | + return ''; |
| | 20 | + } |
| | 21 | + |
| 18 | 22 | /** |
| 19 | 23 | * Adds a navigation menu with the provided links. |
| 20 | 24 | * Links should be provided in an array with: |
| Index: trunk/extensions/EducationProgram/actions/CourseHistoryAction.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | protected function getDescription() { |
| 24 | | - return wfMsg( 'coursehistory' ); |
| | 24 | + return wfMsgHtml( 'coursehistory' ); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | protected function getItemClass() { |
| Index: trunk/extensions/EducationProgram/actions/ViewOrgAction.php |
| — | — | @@ -18,10 +18,6 @@ |
| 19 | 19 | return 'vieworg'; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | | - protected function getDescription() { |
| 23 | | - return wfMsg( 'vieworg' ); |
| 24 | | - } |
| 25 | | - |
| 26 | 22 | /** |
| 27 | 23 | * |
| 28 | 24 | * |
| Index: trunk/extensions/EducationProgram/actions/EditCourseAction.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | protected function getDescription() { |
| 24 | | - return wfMsg( 'editcourse' ); |
| | 24 | + return wfMsgHtml( $this->isNew() ? 'ep-addcourse' : 'ep-editcourse' ); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function onView() { |
| Index: trunk/extensions/EducationProgram/actions/OrgHistoryAction.php |
| — | — | @@ -20,7 +20,7 @@ |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | protected function getDescription() { |
| 24 | | - return wfMsg( 'orghistory' ); |
| | 24 | + return wfMsgHtml( 'orghistory' ); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | protected function getItemClass() { |
| Index: trunk/extensions/EducationProgram/actions/EPEditAction.php |
| — | — | @@ -77,6 +77,8 @@ |
| 78 | 78 | elseif ( $this->isNewPost() ) { |
| 79 | 79 | $this->showWarning( wfMessage( 'educationprogram-' . strtolower( $this->getName() ) . '-exists-already' ) ); |
| 80 | 80 | } |
| | 81 | + |
| | 82 | + $this->getOutput()->setSubtitle( $this->getDescription() ); |
| 81 | 83 | |
| 82 | 84 | $this->item = $object; |
| 83 | 85 | $this->showForm(); |
| Index: trunk/extensions/EducationProgram/includes/EPLogFormatter.php |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | * |
| 21 | 21 | * @since 0.1 |
| 22 | 22 | * |
| 23 | | - * This is overriden to change the link text to only include the name of the object, |
| | 23 | + * This is overridden to change the link text to only include the name of the object, |
| 24 | 24 | * rather then the full name of it's page. |
| 25 | 25 | */ |
| 26 | 26 | protected function makePageLink( Title $title = null, $parameters = array() ) { |
| Index: trunk/extensions/EducationProgram/EducationProgram.i18n.php |
| — | — | @@ -233,11 +233,13 @@ |
| 234 | 234 | // Institution editing |
| 235 | 235 | 'editinstitution-text' => 'Enter the institution details below and click submit to save your changes.', |
| 236 | 236 | 'educationprogram-org-edit-name' => 'Institution name', |
| 237 | | - 'editinstitution-add-legend' => 'Add institution', |
| 238 | | - 'editinstitution-edit-legend' => 'Edit institution', |
| | 237 | + 'editorg-add-legend' => 'Add institution', |
| | 238 | + 'editorg-edit-legend' => 'Edit institution', |
| 239 | 239 | 'educationprogram-org-edit-city' => 'City', |
| 240 | 240 | 'educationprogram-org-edit-country' => 'Country', |
| 241 | 241 | 'educationprogram-org-submit' => 'Submit', |
| | 242 | + 'ep-addorg' => 'There is no institution with this name yet, but you can add it.', |
| | 243 | + 'ep-editorg' => 'You are editing an existing institution.', |
| 242 | 244 | |
| 243 | 245 | // Course editing |
| 244 | 246 | 'editcourse-add-legend' => 'Add course', |
| — | — | @@ -255,6 +257,8 @@ |
| 256 | 258 | 'ep-course-edit-term' => 'Academic term', |
| 257 | 259 | 'ep-course-edit-mc' => 'Master course', |
| 258 | 260 | 'ep-course-edit-lang' => 'Course language', |
| | 261 | + 'ep-addcourse' => 'There is no course with this name yet, but you can add it.', |
| | 262 | + 'ep-editcourse' => 'You are editing an existing course.', |
| 259 | 263 | |
| 260 | 264 | 'ep-course-invalid-org' => 'This institution does not exist.', |
| 261 | 265 | 'ep-course-invalid-token' => 'The token needs to be at least contain $1 {{PLURAL:$1|character|characters}}.', |
| — | — | @@ -268,15 +272,15 @@ |
| 269 | 273 | 'ep-pager-delete-selected-fail' => 'Could not delete the selected {{PLURAL:$1|item|items}}.', |
| 270 | 274 | |
| 271 | 275 | // Institution viewing |
| 272 | | - 'ep-institution-none' => 'There is no institution with name "$1". See [[Special:Institution|here]] for a list of institutions.', |
| | 276 | + 'ep-institution-none' => 'There is no institution with name "$1". See [[Special:Institutions|here]] for a list of institutions.', |
| 273 | 277 | 'ep-institution-create' => 'There is no institution with name "$1" yet, but you can create it.', |
| 274 | 278 | 'ep-institution-title' => 'Institution: $1', |
| 275 | | - 'specialinstitution-summary-name' => 'Name', |
| 276 | | - 'specialinstitution-summary-city' => 'City', |
| 277 | | - 'specialinstitution-summary-country' => 'Country', |
| 278 | | - 'specialinstitution-summary-status' => 'Status', |
| 279 | | - 'specialinstitution-summary-courses' => 'Course count', |
| 280 | | - 'specialinstitution-summary-students' => 'Student count', |
| | 279 | + 'vieworgaction-summary-name' => 'Name', |
| | 280 | + 'vieworgaction-summary-city' => 'City', |
| | 281 | + 'vieworgaction-summary-country' => 'Country', |
| | 282 | + 'vieworgaction-summary-status' => 'Status', |
| | 283 | + 'vieworgaction-summary-courses' => 'Course count', |
| | 284 | + 'vieworgaction-summary-students' => 'Student count', |
| 281 | 285 | 'ep-institution-nav-edit' => 'Edit this institution', |
| 282 | 286 | 'ep-institution-add-course' => 'Add a course', |
| 283 | 287 | 'ep-institution-inactive' => 'Inactive', |
| — | — | @@ -288,14 +292,14 @@ |
| 289 | 293 | 'ep-course-students' => 'Students', |
| 290 | 294 | 'ep-course-none' => 'There is no course with id "$1". See [[Special:Courses|here]] for a list of courses.', |
| 291 | 295 | 'ep-course-create' => 'There is no course with id "$1", but you can create a new one.', |
| 292 | | - 'specialcourse-summary-org' => 'Institution', |
| 293 | | - 'specialcourse-summary-term' => 'Term', |
| 294 | | - 'specialcourse-summary-start' => 'Start', |
| 295 | | - 'specialcourse-summary-end' => 'End', |
| 296 | | - 'specialcourse-summary-students' => 'Student count', |
| 297 | | - 'specialcourse-summary-status' => 'Status', |
| | 296 | + 'viewcourseaction-summary-org' => 'Institution', |
| | 297 | + 'viewcourseaction-summary-term' => 'Term', |
| | 298 | + 'viewcourseaction-summary-start' => 'Start', |
| | 299 | + 'viewcourseaction-summary-end' => 'End', |
| | 300 | + 'viewcourseaction-summary-students' => 'Student count', |
| | 301 | + 'viewcourseaction-summary-status' => 'Status', |
| | 302 | + 'viewcourseaction-summary-token' => 'Enrollment token', |
| 298 | 303 | 'ep-course-description' => 'description', |
| 299 | | - 'specialcourse-summary-token' => 'Enrollment token', |
| 300 | 304 | 'ep-course-nav-edit' => 'Edit this course', |
| 301 | 305 | |
| 302 | 306 | // Special:Ambassador |