Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10257 from edx/sarina/update-profile-wording

Browse Source 
Create distinct terms for gender, education sign up terms
This commit is contained in:
Sarina Canelake
2015-10-20 20:06:14 -04:00
parent 970efb04d9 105d611cc9
commit 15d1aa3ad4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/djangoapps/student/models.py
View File

@@ -241,7 +241,7 @@ class UserProfile(models.Model):
('m', ugettext_noop('Male')),
('f', ugettext_noop('Female')),
# Translators: 'Other' refers to the student's gender
('o', ugettext_noop('Other'))
('o', ugettext_noop('Other/Prefer Not to Say'))
)
gender = models.CharField(
blank=True, null=True, max_length=6, db_index=True, choices=GENDER_CHOICES
@@ -260,9 +260,9 @@ class UserProfile(models.Model):
('jhs', ugettext_noop("Junior secondary/junior high/middle school")),
('el', ugettext_noop("Elementary/primary school")),
# Translators: 'None' refers to the student's level of education
('none', ugettext_noop("None")),
('none', ugettext_noop("No Formal Education")),
# Translators: 'Other' refers to the student's level of education
('other', ugettext_noop("Other"))
('other', ugettext_noop("Other Education"))
)
level_of_education = models.CharField(
blank=True, null=True, max_length=6, db_index=True,

12
openedx/core/djangoapps/user_api/tests/test_views.py
View File

@@ -1020,8 +1020,8 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, ApiTestCase):
{"value": "hs", "name": "Secondary/high school"},
{"value": "jhs", "name": "Junior secondary/junior high/middle school"},
{"value": "el", "name": "Elementary/primary school"},
{"value": "none", "name": "None"},
{"value": "other", "name": "Other"},
{"value": "none", "name": "No Formal Education"},
{"value": "other", "name": "Other Education"},
],
}
)
@@ -1046,8 +1046,8 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, ApiTestCase):
{"value": "hs", "name": "Secondary/high school TRANSLATED"},
{"value": "jhs", "name": "Junior secondary/junior high/middle school TRANSLATED"},
{"value": "el", "name": "Elementary/primary school TRANSLATED"},
{"value": "none", "name": "None TRANSLATED"},
{"value": "other", "name": "Other TRANSLATED"},
{"value": "none", "name": "No Formal Education TRANSLATED"},
{"value": "other", "name": "Other Education TRANSLATED"},
],
}
)
@@ -1064,7 +1064,7 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, ApiTestCase):
{"value": "", "name": "--", "default": True},
{"value": "m", "name": "Male"},
{"value": "f", "name": "Female"},
{"value": "o", "name": "Other"},
{"value": "o", "name": "Other/Prefer Not to Say"},
],
}
)
@@ -1084,7 +1084,7 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, ApiTestCase):
{"value": "", "name": "--", "default": True},
{"value": "m", "name": "Male TRANSLATED"},
{"value": "f", "name": "Female TRANSLATED"},
{"value": "o", "name": "Other TRANSLATED"},
{"value": "o", "name": "Other/Prefer Not to Say TRANSLATED"},
],
}
)