https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114459

Revision: 114459
Author:   jeroendedauw
Date:     2012-03-23 22:05:16 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
added a bunch of qqq docs and fixed some wrong message args

Modified Paths:
--------------
    trunk/extensions/EducationProgram/EducationProgram.i18n.php
    trunk/extensions/EducationProgram/specials/SpecialMyCourses.php

Modified: trunk/extensions/EducationProgram/EducationProgram.i18n.php
===================================================================
--- trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-23 
21:37:32 UTC (rev 114458)
+++ trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-03-23 
22:05:16 UTC (rev 114459)
@@ -624,15 +624,14 @@
        'ep-mycourses-not-enrolled' => 'You are not enrolled in any course. A 
list of courses can be found [[Special:Courses|here]].',
        'ep-mycourses-no-such-course' => 'You are not enrolled in any course 
with name "$1". The courses you are enrolled in are listed below.',
     'ep-mycourses-nocourses-epstudent' => 'You are not enrolled in any 
[[Special:Courses|courses]].',
-       'ep-mycourses-enrollment' => 'Courses I am enrolled in',
        'ep-mycourses-login-first' => 'You need to login before you can view 
your courses.',
-       'ep-mycourses-courses-epoa' => '{{PLURAL:$1|Course|Courses}} I am 
{{GENDER:$1|Online Ambassador}} for',
-       'ep-mycourses-courses-epca' => '{{PLURAL:$1|Course|Courses}} I am 
{{GENDER:$1|Campus Ambassador}} for',
-       'ep-mycourses-courses-epinstructor' => '{{PLURAL:$1|Course|Courses}} I 
am {{GENDER:$1|Instructor}} for',
+       'ep-mycourses-courses-epoa' => '{{PLURAL:$1|Course|Courses}} I am 
{{GENDER:$2|Online Ambassador}} for',
+       'ep-mycourses-courses-epca' => '{{PLURAL:$1|Course|Courses}} I am 
{{GENDER:$2|Campus Ambassador}} for',
+       'ep-mycourses-courses-epinstructor' => '{{PLURAL:$1|Course|Courses}} I 
am {{GENDER:$2|Instructor}} for',
        'ep-mycourses-courses-epstudent' => '{{PLURAL:$1|Course|Courses}} I am 
enrolled in',
-       'ep-mycourses-nocourses-epca' => 'There are no courses for which you 
are Campus Ambassador yet.',
-       'ep-mycourses-nocourses-epoa' => 'There are no courses for which you 
are Online Ambassador for yet.',
-       'ep-mycourses-nocourses-epinstructor' => 'There are no courses for 
which you are Instructor for yet.',
+       'ep-mycourses-nocourses-epca' => 'There are no courses for which you 
are {{GENDER:$1|Campus Ambassador}} yet.',
+       'ep-mycourses-nocourses-epoa' => 'There are no courses for which you 
are {{GENDER:$1|Online Ambassador}} for yet.',
+       'ep-mycourses-nocourses-epinstructor' => 'There are no courses for 
which you are {{GENDER:$1|Instructor}} for yet.',
        'ep-mycourses-enrolledin' => 'You are currently enrolled in course $1 
at institution $2.',
        'ep-mycourses-course-org-links' => 'Course $1 at institution $2.',
        'ep-mycourses-articletable' => 'These are the articles you are working 
on and their reviewers:',
@@ -660,7 +659,7 @@
        'ep-instructor-add-button' => 'Add instructor',
        'ep-instructor-add-self-button' => 'Become {{GENDER:$1|instructor}}',
        'ep-instructor-add-text' => 'You are adding an instructor for course 
$1. Enter the username of the instructor and a brief description why this 
person is being added.',
-       'ep-instructor-add-self-text' => 'You are adding yourself as 
{{GENDER:$1|instructor}} for course $1. Please add a brief description why you 
are doing so.',
+       'ep-instructor-add-self-text' => 'You are adding yourself as 
{{GENDER:$2|instructor}} for course $1. Please add a brief description why you 
are doing so.',
        'ep-instructor-add-cancel-button' => 'Cancel',
        'ep-instructor-summary-input' => 'Summary:',
        'ep-instructor-name-input' => 'User name:',
@@ -688,7 +687,7 @@
        'ep-online-add-button' => 'Add Online Ambassador',
        'ep-online-add-self-button' => 'Become {{GENDER:$1|Online Ambassador}}',
        'ep-online-add-text' => 'You are adding an Online Ambassador for course 
$1. Enter the username of the Online Ambassador and a brief description why 
this person is being added.',
-       'ep-online-add-self-text' => 'You are adding yourself as 
{{GENDER:$1|Online Ambassador}} for course $1. Please add a brief description 
why you are doing so.',
+       'ep-online-add-self-text' => 'You are adding yourself as 
{{GENDER:$2|Online Ambassador}} for course $1. Please add a brief description 
why you are doing so.',
        'ep-online-add-cancel-button' => 'Cancel',
        'ep-online-summary-input' => 'Summary:',
        'ep-online-name-input' => 'User name:',
@@ -716,7 +715,7 @@
        'ep-campus-add-button' => 'Add Campus Ambassador',
        'ep-campus-add-self-button' => 'Become {{GENDER:$1|Campus Ambassador}}',
        'ep-campus-add-text' => 'You are adding a Campus Ambassador for course 
$1. Enter the username of the Campus Ambassador and a brief description why 
this person is being added.',
-       'ep-campus-add-self-text' => 'You are adding yourself as 
{{GENDER:$1|Campus Ambassador}} for course $1. Please add a brief description 
why you are doing so.',
+       'ep-campus-add-self-text' => 'You are adding yourself as 
{{GENDER:$2|Campus Ambassador}} for course $1. Please add a brief description 
why you are doing so.',
        'ep-campus-add-cancel-button' => 'Cancel',
        'ep-campus-summary-input' => 'Summary:',
        'ep-campus-name-input' => 'User name:',
@@ -1392,117 +1391,115 @@
        // Special:MyCourses
        'ep-mycourses-enrolled' => 'Success message shown after enrollment in 
success box at top of page. $1 is course name, $2 is institution name',
        'ep-mycourses-not-enrolled' => 'Shown when the user goes to their 
courses page while not enrolled in any',
+       'ep-mycourses-no-such-course' => 'Shown when the stutent tries to view 
their enrollment for course with name $1 while they are not enrolled in it.',
+       'ep-mycourses-nocourses-epstudent' => 'Shown on the MyCourses page when 
the student is not enrolled in any courses',
+       'ep-mycourses-login-first' => 'Shown when someone goes to MyCourses 
without being logged in. Links to the login page.',
+       'ep-mycourses-courses-epoa' => 'h2 section header. $1 is amount of 
courses. $2 is the name of the user',
+       'ep-mycourses-courses-epca' => 'h2 section header. $1 is amount of 
courses. $2 is the name of the user',
+       'ep-mycourses-courses-epinstructor' => 'h2 section header. $1 is amount 
of courses. $2 is the name of the user',
+       'ep-mycourses-courses-epstudent' => 'h2 section header. $1 is amount of 
courses. $2 is the name of the user',
+       'ep-mycourses-nocourses-epca' => 'Shown instead of a list if there are 
no courses for this user. $1 is the user name',
+       'ep-mycourses-nocourses-epoa' => 'Shown instead of a list if there are 
no courses for this user. $1 is the user name',
+       'ep-mycourses-nocourses-epinstructor' => 'Shown instead of a list if 
there are no courses for this user. $1 is the user name',
+       'ep-mycourses-enrolledin' => '$1 is course name. $2 is institution 
name',
+       'ep-mycourses-course-org-links' => '$1 is course name. $2 is 
institution name',
+       'ep-mycourses-articletable' => 'Mesage shown above a list of articles',
 
-       // ===================== TODO =====================
-
-       'ep-mycourses-no-such-course' => 'You are not enrolled in any course 
with name "$1". The courses you are enrolled in are listed below.',
-       'ep-mycourses-nocourses-epstudent' => 'You are not enrolled in any 
[[Special:Courses|courses]].',
-       'ep-mycourses-enrollment' => 'Courses I am enrolled in',
-       'ep-mycourses-login-first' => 'You need to login before you can view 
your courses.',
-       'ep-mycourses-courses-epoa' => '{{PLURAL:$1|Course|Courses}} I am 
{{GENDER:$1|Online Ambassador}} for',
-       'ep-mycourses-courses-epca' => '{{PLURAL:$1|Course|Courses}} I am 
{{GENDER:$1|Campus Ambassador}} for',
-       'ep-mycourses-courses-epinstructor' => '{{PLURAL:$1|Course|Courses}} I 
am {{GENDER:$1|Instructor}} for',
-       'ep-mycourses-courses-epstudent' => '{{PLURAL:$1|Course|Courses}} I am 
enrolled in',
-       'ep-mycourses-nocourses-epca' => 'There are no courses for which you 
are Campus Ambassador yet.',
-       'ep-mycourses-nocourses-epoa' => 'There are no courses for which you 
are Online Ambassador for yet.',
-       'ep-mycourses-nocourses-epinstructor' => 'There are no courses for 
which you are Instructor for yet.',
-       'ep-mycourses-enrolledin' => 'You are currently enrolled in course $1 
at institution $2.',
-       'ep-mycourses-course-org-links' => 'Course $1 at institution $2.',
-       'ep-mycourses-articletable' => 'These are the articles you are working 
on and their reviewers:',
-
        // ep.enlist instructor
-       'ep-instructor-remove-title' => 'Remove instructor from course',
-       'ep-instructor-remove-button' => 'Remove instructor',
-       'ep-instructor-removing' => 'Removing...',
-       'ep-instructor-removal-success' => 'This instructor has been 
successfully removed from this course.',
-       'ep-instructor-close-button' => 'Close',
-       'ep-instructor-remove-retry' => 'Retry',
-       'ep-instructor-remove-failed' => 'Something went wrong - could not 
remove the instructor from the course.',
-       'ep-instructor-cancel-button' => 'Cancel',
-       'ep-instructor-remove-text' => 'You are about to remove $2 (Username: 
$1) as {{GENDER:$1|instructor}} from course $3. Please enter a brief summary 
with the reason for this removal.',
-       'ep-instructor-adding' => 'Adding...',
-       'ep-instructor-addittion-success' => '$1 has been successfully added as 
{{GENDER:$1|instructor}} for course $2!',
-       'ep-instructor-addittion-self-success' => 'You have been successfully 
added as {{GENDER:$1|instructor}} for course $2!',
-       'ep-instructor-addittion-null' => '$1 has already been added as 
{{GENDER:$1|instructor}} to course $2',
-       'ep-instructor-addittion-invalid-user' => 'There is no user with name 
$1, so no one has been added to course $2',
-       'ep-instructor-add-close-button' => 'Close',
-       'ep-instructor-add-retry' => 'Retry',
-       'ep-instructor-addittion-failed' => 'Something went wrong - could not 
add the instructor to the course.',
-       'ep-instructor-add-title' => 'Add an instructor to the course',
-       'ep-instructor-add-self-title' => 'Become an {{GENDER:$1|instructor}} 
for this course',
-       'ep-instructor-add-button' => 'Add instructor',
-       'ep-instructor-add-self-button' => 'Become {{GENDER:$1|instructor}}',
-       'ep-instructor-add-text' => 'You are adding an instructor for course 
$1. Enter the username of the instructor and a brief description why this 
person is being added.',
-       'ep-instructor-add-self-text' => 'You are adding yourself as 
{{GENDER:$1|instructor}} for course $1. Please add a brief description why you 
are doing so.',
-       'ep-instructor-add-cancel-button' => 'Cancel',
-       'ep-instructor-summary-input' => 'Summary:',
-       'ep-instructor-name-input' => 'User name:',
+       'ep-instructor-remove-title' => 'Dialog title',
+       'ep-instructor-remove-button' => 'Remove button text',
+       'ep-instructor-removing' => 'Remove button text while removal is in 
progress',
+       'ep-instructor-removal-success' => 'Success message',
+       'ep-instructor-close-button' => 'Close button text',
+       'ep-instructor-remove-retry' => 'Retry button text',
+       'ep-instructor-remove-failed' => 'Error message',
+       'ep-instructor-cancel-button' => 'Cancel button text',
+       'ep-instructor-remove-text' => 'Notifies the user of what they are 
about to do. $1 is name of affected user, $2 is real name of this user, $3 is 
course name.',
+       'ep-instructor-adding' => 'Add button text while adittion is in 
progress',
+       'ep-instructor-addittion-success' => 'Sucess message. $1 is affected 
user name, $2 is course name.',
+       'ep-instructor-addittion-self-success' => 'Sucess message. $1 is 
affected user name, $2 is course name.',
+       'ep-instructor-addittion-null' => 'Error message. $1 is the (not) 
affected user name, $2 is course name.',
+       'ep-instructor-addittion-invalid-user' => 'Error message. $1 is the 
(not) affected user name, $2 is course name.',
+       'ep-instructor-add-close-button' => 'Close button text',
+       'ep-instructor-add-retry' => 'Retry button text',
+       'ep-instructor-addittion-failed' => 'Error message',
+       'ep-instructor-add-title' => 'Dialog title',
+       'ep-instructor-add-self-title' => 'Dialog title. $1 is current users 
name',
+       'ep-instructor-add-button' => 'Add button text',
+       'ep-instructor-add-self-button' => 'Add button text. $1 is current 
users name',
+       'ep-instructor-add-text' => 'Notifies the user of what they are doing. 
$1 is a course name',
+       'ep-instructor-add-self-text' => 'Notifies the user of what they are 
doing. $1 is a course name. $2 is the current users name',
+       'ep-instructor-add-cancel-button' => 'Cancel button text',
+       'ep-instructor-summary-input' => 'Text input label',
+       'ep-instructor-name-input' => 'Text input label',
 
        // ep.enlist online
-       'ep-online-remove-title' => 'Remove Online Ambassador from course',
-       'ep-online-remove-button' => 'Remove Online Ambassador',
-       'ep-online-removing' => 'Removing...',
-       'ep-online-removal-success' => 'This Online Ambassador has been 
successfully removed from this course.',
-       'ep-online-close-button' => 'Close',
-       'ep-online-remove-retry' => 'Retry',
-       'ep-online-remove-failed' => 'Something went wrong - could not remove 
the Online Ambassador from the course.',
-       'ep-online-cancel-button' => 'Cancel',
-       'ep-online-remove-text' => 'You are about to remove $2 (Username: $1) 
as {{GENDER:$1|Online Ambassador}} from course $3. Please enter a brief summary 
with the reason for this removal.',
-       'ep-online-adding' => 'Adding...',
-       'ep-online-addittion-success' => '$1 has been successfully added as 
{{GENDER:$1|Online Ambassador}} for course $2!',
-       'ep-online-addittion-self-success' => 'You have been successfully added 
as {{GENDER:$1|Online Ambassador}} for course $2!',
-       'ep-online-addittion-null' => '$1 has already been added as 
{{GENDER:$1|Online Ambassador}} to course $2',
-       'ep-online-addittion-invalid-user' => 'There is no user with name $1, 
so no one has been added to course $2',
-       'ep-online-add-close-button' => 'Close',
-       'ep-online-add-retry' => 'Retry',
-       'ep-online-addittion-failed' => 'Something went wrong - could not add 
the Online Ambassador to the course.',
-       'ep-online-add-title' => 'Add an Online Ambassador to the course',
-       'ep-online-add-self-title' => 'Become an {{GENDER:$1|Online 
Ambassador}} for this course',
-       'ep-online-add-button' => 'Add Online Ambassador',
-       'ep-online-add-self-button' => 'Become {{GENDER:$1|Online Ambassador}}',
-       'ep-online-add-text' => 'You are adding an Online Ambassador for course 
$1. Enter the username of the Online Ambassador and a brief description why 
this person is being added.',
-       'ep-online-add-self-text' => 'You are adding yourself as 
{{GENDER:$1|Online Ambassador}} for course $1. Please add a brief description 
why you are doing so.',
-       'ep-online-add-cancel-button' => 'Cancel',
-       'ep-online-summary-input' => 'Summary:',
-       'ep-online-name-input' => 'User name:',
+       'ep-online-remove-title' => 'Dialog title',
+       'ep-online-remove-button' => 'Remove button text',
+       'ep-online-removing' => 'Remove button text while removal is in 
progress',
+       'ep-online-removal-success' => 'Success message',
+       'ep-online-close-button' => 'Close button text',
+       'ep-online-remove-retry' => 'Retry button text',
+       'ep-online-remove-failed' => 'Error message',
+       'ep-online-cancel-button' => 'Cancel button text',
+       'ep-online-remove-text' => 'Notifies the user of what they are about to 
do. $1 is name of affected user, $2 is real name of this user, $3 is course 
name.',
+       'ep-online-adding' => 'Add button text while adittion is in progress',
+       'ep-online-addittion-success' => 'Sucess message. $1 is affected user 
name, $2 is course name.',
+       'ep-online-addittion-self-success' => 'Sucess message. $1 is affected 
user name, $2 is course name.',
+       'ep-online-addittion-null' => 'Error message. $1 is the (not) affected 
user name, $2 is course name.',
+       'ep-online-addittion-invalid-user' => 'Error message. $1 is the (not) 
affected user name, $2 is course name.',
+       'ep-online-add-close-button' => 'Close button text',
+       'ep-online-add-retry' => 'Retry button text',
+       'ep-online-addittion-failed' => 'Error message',
+       'ep-online-add-title' => 'Dialog title',
+       'ep-online-add-self-title' => 'Dialog title. $1 is current users name',
+       'ep-online-add-button' => 'Add button text',
+       'ep-online-add-self-button' => 'Add button text. $1 is current users 
name',
+       'ep-online-add-text' => 'Notifies the user of what they are doing. $1 
is a course name',
+       'ep-online-add-self-text' => 'Notifies the user of what they are doing. 
$1 is a course name. $2 is the current users name',
+       'ep-online-add-cancel-button' => 'Cancel button text',
+       'ep-online-summary-input' => 'Text input label',
+       'ep-online-name-input' => 'Text input label',
 
        // ep.enlist campus
-       'ep-campus-remove-title' => 'Remove Campus Ambassador from course',
-       'ep-campus-remove-button' => 'Remove Campus Ambassador',
-       'ep-campus-removing' => 'Removing...',
-       'ep-campus-removal-success' => 'This Campus Ambassador has been 
successfully removed from this course.',
-       'ep-campus-close-button' => 'Close',
-       'ep-campus-remove-retry' => 'Retry',
-       'ep-campus-remove-failed' => 'Something went wrong - could not remove 
the Campus Ambassador from the course.',
-       'ep-campus-cancel-button' => 'Cancel',
-       'ep-campus-remove-text' => 'You are about to remove $2 (Username: $1) 
as {{GENDER:$1|Campus Ambassador}} from course $3. Please enter a brief summary 
with the reason for this removal.',
-       'ep-campus-adding' => 'Adding...',
-       'ep-campus-addittion-success' => '$1 has been successfully added as 
{{GENDER:$1|Campus Ambassador}} for course $2!',
-       'ep-campus-addittion-self-success' => 'You have been successfully added 
as {{GENDER:$1|Campus Ambassador}} for course $2!',
-       'ep-campus-addittion-null' => '$1 has already been added as 
{{GENDER:$1|Campus Ambassador}} to course $2',
-       'ep-campus-addittion-invalid-user' => 'There is no user with name $1, 
so no one has been added to course $2',
-       'ep-campus-add-close-button' => 'Close',
-       'ep-campus-add-retry' => 'Retry',
-       'ep-campus-addittion-failed' => 'Something went wrong - could not add 
the Campus Ambassador to the course.',
-       'ep-campus-add-title' => 'Add a Campus Ambassador to the course',
-       'ep-campus-add-self-title' => 'Become an {{GENDER:$1|Campus 
Ambassador}} for this course',
-       'ep-campus-add-button' => 'Add Campus Ambassador',
-       'ep-campus-add-self-button' => 'Become {{GENDER:$1|Campus Ambassador}}',
-       'ep-campus-add-text' => 'You are adding a Campus Ambassador for course 
$1. Enter the username of the Campus Ambassador and a brief description why 
this person is being added.',
-       'ep-campus-add-self-text' => 'You are adding yourself as 
{{GENDER:$1|Campus Ambassador}} for course $1. Please add a brief description 
why you are doing so.',
-       'ep-campus-add-cancel-button' => 'Cancel',
-       'ep-campus-summary-input' => 'Summary:',
-       'ep-campus-name-input' => 'User name:',
+       'ep-campus-remove-title' => 'Dialog title',
+       'ep-campus-remove-button' => 'Remove button text',
+       'ep-campus-removing' => 'Remove button text while removal is in 
progress',
+       'ep-campus-removal-success' => 'Success message',
+       'ep-campus-close-button' => 'Close button text',
+       'ep-campus-remove-retry' => 'Retry button text',
+       'ep-campus-remove-failed' => 'Error message',
+       'ep-campus-cancel-button' => 'Cancel button text',
+       'ep-campus-remove-text' => 'Notifies the user of what they are about to 
do. $1 is name of affected user, $2 is real name of this user, $3 is course 
name.',
+       'ep-campus-adding' => 'Add button text while adittion is in progress',
+       'ep-campus-addittion-success' => 'Sucess message. $1 is affected user 
name, $2 is course name.',
+       'ep-campus-addittion-self-success' => 'Sucess message. $1 is affected 
user name, $2 is course name.',
+       'ep-campus-addittion-null' => 'Error message. $1 is the (not) affected 
user name, $2 is course name.',
+       'ep-campus-addittion-invalid-user' => 'Error message. $1 is the (not) 
affected user name, $2 is course name.',
+       'ep-campus-add-close-button' => 'Close button text',
+       'ep-campus-add-retry' => 'Retry button text',
+       'ep-campus-addittion-failed' => 'Error message',
+       'ep-campus-add-title' => 'Dialog title',
+       'ep-campus-add-self-title' => 'Dialog title. $1 is current users name',
+       'ep-campus-add-button' => 'Add button text',
+       'ep-campus-add-self-button' => 'Add button text. $1 is current users 
name',
+       'ep-campus-add-text' => 'Notifies the user of what they are doing. $1 
is a course name',
+       'ep-campus-add-self-text' => 'Notifies the user of what they are doing. 
$1 is a course name. $2 is the current users name',
+       'ep-campus-add-cancel-button' => 'Cancel button text',
+       'ep-campus-summary-input' => 'Text input label',
+       'ep-campus-name-input' => 'Text input label',
 
        // EPInstrucor
-       'ep-instructor-remove' => 'remove as instructor',
+       'ep-instructor-remove' => 'User tool link text',
 
        // EPCA
-       'ep-campus-remove' => 'remove as Campus Ambassador',
+       'ep-campus-remove' => 'User tool link text',
 
        // EPOA
-       'ep-online-remove' => 'remove as Online Ambassador',
+       'ep-online-remove' => 'User tool link text',
 
+       // TODO
+
        // API enlist
        'ep-enlist-invalid-user-args' => 'You need to either provide the 
username or the userid parameter',
        'ep-enlist-invalid-user' => 'The provided user id or name is not valid 
and can therefore not be associated as instrucor or ambassador with the 
specified course',

Modified: trunk/extensions/EducationProgram/specials/SpecialMyCourses.php
===================================================================
--- trunk/extensions/EducationProgram/specials/SpecialMyCourses.php     
2012-03-23 21:37:32 UTC (rev 114458)
+++ trunk/extensions/EducationProgram/specials/SpecialMyCourses.php     
2012-03-23 22:05:16 UTC (rev 114459)
@@ -170,7 +170,7 @@
                        }
                }
                elseif ( $isAllowed ) {
-                       $this->getOutput()->addWikiMsg( 
'ep-mycourses-nocourses-' . strtolower( $class ) );
+                       $this->getOutput()->addWikiMsg( 
'ep-mycourses-nocourses-' . strtolower( $class ), $this->getUser()->getName() );
                }
        }
 


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to