Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/53400


Change subject: Make messaging consistent
......................................................................

Make messaging consistent

* Complete change from "ambassador" to "volunteer" in messages.
* Change "Ambassador[s]" to "Volunteer[s]" in displayed special page names.
* Use second-person singular when talking about the user, instead of first 
person singular.

Change-Id: I2b76b163dcb1d68216eadb397452714557b34c5c
---
M EducationProgram.i18n.alias.php
M EducationProgram.i18n.php
2 files changed, 22 insertions(+), 22 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/00/53400/1

diff --git a/EducationProgram.i18n.alias.php b/EducationProgram.i18n.alias.php
index 38c2ec3..e3d238d 100644
--- a/EducationProgram.i18n.alias.php
+++ b/EducationProgram.i18n.alias.php
@@ -25,10 +25,10 @@
        'EducationProgram' => array( 'EducationProgram', 'Education_Program' ),
        'Enroll' => array( 'Enroll' ),
        'Disenroll' => array( 'Disenroll' ),
-       'CampusAmbassadors' => array( 'CampusAmbassadors' ),
-       'OnlineAmbassadors' => array( 'OnlineAmbassadors' ),
-       'OnlineAmbassadorProfile' => array( 'OnlineAmbassadorProfile' ),
-       'CampusAmbassadorProfile' => array( 'CampusAmbassadorProfile' ),
+       'CampusAmbassadors' => array( 'CampusVolunteers',  'CampusAmbassadors' 
),
+       'OnlineAmbassadors' => array( 'OnlineVolunteers', 'OnlineAmbassadors' ),
+       'OnlineAmbassadorProfile' => array( 'OnlineVolunteerProfile', 
'OnlineAmbassadorProfile' ),
+       'CampusAmbassadorProfile' => array( 'CampusVolunteerProfile', 
'CampusAmbassadorProfile' ),
        'StudentActivity' => array( 'StudentActivity' ),
        'Articles' => array( 'Articles' ),
 );
@@ -316,4 +316,4 @@
        'Student' => array( '學生' ),
        'Students' => array( '學生們' ),
        'Courses' => array( '課程' ),
-);
\ No newline at end of file
+);
diff --git a/EducationProgram.i18n.php b/EducationProgram.i18n.php
index 101e648..1d0a3e6 100644
--- a/EducationProgram.i18n.php
+++ b/EducationProgram.i18n.php
@@ -57,9 +57,9 @@
        // Navigation links
        'ep-nav-orgs' => 'Institution list',
        'ep-nav-courses' => 'Courses list',
-       'ep-nav-mycourses' => 'My courses',
+       'ep-nav-mycourses' => 'Your courses',
        'ep-nav-students' => 'Student list',
-       'ep-nav-mentors' => 'Ambassador list',
+       'ep-nav-mentors' => 'Volunteer list',
        'ep-nav-cas' => 'Campus volunteers',
        'ep-nav-oas' => 'Online volunteers',
        'ep-nav-oaprofile' => 'Online volunteer profile',
@@ -84,8 +84,8 @@
        'log-description-institution' => 'Log of all changes to 
[[Special:Institutions|institutions]].',
        'log-description-course' => 'Log of all changes to 
[[Special:Courses|courses]].',
        'log-description-instructor' => 'Log of all changes to instructors.',
-       'log-description-online' => 'Log of all changes to Education Program 
[[Special:OnlineAmbassadors|Online volunteers]]',
-       'log-description-campus' => 'Log of all changes to Education Program 
[[Special:CampusAmbassadors|Campus volunteers]]',
+       'log-description-online' => 'Log of all changes to Education Program 
[[Special:OnlineVolunteers|Online volunteers]]',
+       'log-description-campus' => 'Log of all changes to Education Program 
[[Special:CampusVolunteers|Campus volunteers]]',
        'log-description-student' => 'Log of all changes to 
[[Special:Students|students]].',
 
        'logentry-institution-add' => '$1 {{GENDER:$2|created}} institution $3',
@@ -188,8 +188,8 @@
 
        // Special pages
        'specialpages-group-education' => 'Education',
-       'special-mycourses' => 'My courses',
-       'special-managecourses' => 'Manage my courses',
+       'special-mycourses' => 'Your courses',
+       'special-managecourses' => 'Manage your courses',
        'special-institutions' => 'Institutions',
        'special-student' => 'Student',
        'special-students' => 'Students',
@@ -218,8 +218,8 @@
        'ep-specialeducationprogram-summary-student-count' => 'Number of 
[[Special:Students|students]]',
        'ep-specialeducationprogram-summary-current-student-count' => 
'Currently enrolled students',
        'ep-specialeducationprogram-summary-instructor-count' => 'Number of 
instructors',
-       'ep-specialeducationprogram-summary-ca-count' => 'Number of 
[[Special:CampusAmbassadors|Campus volunteers]]',
-       'ep-specialeducationprogram-summary-oa-count' => 'Number of 
[[Special:OnlineAmbassadors|Online volunteers]]',
+       'ep-specialeducationprogram-summary-ca-count' => 'Number of 
[[Special:CampusVolunteers|Campus volunteers]]',
+       'ep-specialeducationprogram-summary-oa-count' => 'Number of 
[[Special:OnlineVolunteers|Online volunteers]]',
        'ep-educationprogram-by-term' => 'Totals per term',
        'ep-educationprogram-courses' => 'Number of courses',
        'ep-educationprogram-students' => 'Number of students',
@@ -629,7 +629,7 @@
        'ep-enroll-invalid-name' => 'The name needs to be at least contain $1 
{{PLURAL:$1|character|characters}}.',
        'ep-enroll-invalid-gender' => 'Please select one of these genders',
        'ep-enroll-add-token' => 'Enter your enrollment token',
-       'ep-enroll-add-token-doc' => 'In order to enroll for this course, you 
need a token provided by your instructor or one of the ambassadors for your 
course.',
+       'ep-enroll-add-token-doc' => 'In order to enroll for this course, you 
need a token provided by your instructor or one of the volunteers for your 
course.',
        'ep-enroll-token' => 'Enrollment token',
        'ep-enroll-submit-token' => 'Enroll with this token',
        'ep-enroll-course-passed' => 'This course has ended, so you can no 
longer enroll for it. See the [[Special:Courses|list of courses]].',
@@ -761,30 +761,30 @@
 
        // 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 instructor or ambassador with the 
specified course',
+       'ep-enlist-invalid-user' => 'The provided user id or name is not valid 
and can therefore not be associated as instructor or volunteer with the 
specified course',
        'ep-enlist-invalid-course' => 'There is no course with the provided ID',
 
        // Special:OnlineAmbassadorProfile
        'onlineambassadorprofile' => 'Online volunteer profile',
-       'onlineambassadorprofile-legend' => 'My Online volunteer profile',
-       'onlineambassadorprofile-text' => 'Your Online volunteer profile is 
what students get to see when they browse available ambassadors.',
+       'onlineambassadorprofile-legend' => 'Your Online volunteer profile',
+       'onlineambassadorprofile-text' => 'Your Online volunteer profile is 
what students get to see when they browse available volunteers.',
        'epoa-profile-bio' => 'Short bio',
        'epoa-profile-photo' => 'Profile photo',
        'epoa-profile-photo-help' => 'A picture of you that will be shown next 
to your bio. Enter the name of an image on Wikimedia Commons and a preview will 
appear. You can type the first few letters of the image name and then select 
your image from the suggestion list. If you do not have a picture of you on 
commons yet, [$1 go upload one]!',
        'epoa-profile-saved' => 'Your profile has been saved',
        'epoa-profile-invalid-bio' => 'Your bio needs to be at least contain $1 
{{PLURAL:$1|character|characters}}.',
-       'epoa-visible' => 'Publicly list me as Online volunteer',
+       'epoa-visible' => 'Publicly list you as Online volunteer',
 
        // Special:CampusAmbassadorProfile
        'campusambassadorprofile' => 'Campus volunteer profile',
-       'campusambassadorprofile-legend' => 'My Campus volunteer profile',
-       'campusambassadorprofile-text' => 'Your Campus volunteer profile is 
what students get to see when they browse available ambassadors.',
+       'campusambassadorprofile-legend' => 'Your Campus volunteer profile',
+       'campusambassadorprofile-text' => 'Your Campus volunteer profile is 
what students get to see when they browse available volunteers.',
        'epca-profile-bio' => 'Short bio',
        'epca-profile-photo' => 'Profile photo',
        'epca-profile-photo-help' => 'A picture of you that will be shown next 
to your bio. Enter the name of an image on Wikimedia Commons and a preview will 
appear. You can type the first few letters of the image name and then select 
your image from the suggestion list. If you do not have a picture of you on 
commons yet, [$1 go upload one]!',
        'epca-profile-saved' => 'Your profile has been saved',
        'epca-profile-invalid-bio' => 'Your bio needs to be at least contain $1 
{{PLURAL:$1|character|characters}}.',
-       'epca-visible' => 'Publicly list me as Campus volunteer',
+       'epca-visible' => 'Publicly list you as Campus volunteer',
 
        // Special:StudentActivity
        'ep-studentactivity-noresults' => 'There are no students that were 
active in the last $1.
@@ -841,7 +841,7 @@
        'educationprogram-desc' => '{{desc|name=Education 
Program|url=http://www.mediawiki.org/wiki/Extension:Education_Program}}',
        'ep-item-summary' => 'Table column header.
 {{Identical|Summary}}',
-       'ep-toplink' => 'Text of a link the the top menu (next to "My 
preferences")',
+       'ep-toplink' => 'Text of a link the the top menu (next to 
"Preferences")',
        'ep-org-course-delete-comment' => 'Success message. Parameters:
 * $1 - an institution name
 * $2 - a user provided comment',

-- 
To view, visit https://gerrit.wikimedia.org/r/53400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b76b163dcb1d68216eadb397452714557b34c5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>

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

Reply via email to