Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
105d611c
Commit
105d611c
authored
Oct 19, 2015
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create distinct terms for gender, education sign up terms
parent
5f528ddd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
common/djangoapps/student/models.py
+3
-3
openedx/core/djangoapps/user_api/tests/test_views.py
+6
-6
No files found.
common/djangoapps/student/models.py
View file @
105d611c
...
...
@@ -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
(
"No
ne
"
)),
(
'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
,
...
...
openedx/core/djangoapps/user_api/tests/test_views.py
View file @
105d611c
...
...
@@ -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"
:
"No
ne
"
},
{
"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"
:
"No
ne
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"
},
],
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment