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

LOC-73: Translate education/gender options in registration form.

Browse Source 
The education level and gender choices weren't being translated for
display on the combined login/registration form.
This commit is contained in:
Matjaz Gregoric
2015-10-15 08:21:25 +02:00
parent d26d03da82
commit 58e92b52ef
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -999,6 +999,32 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, ApiTestCase):
}
)
@mock.patch('openedx.core.djangoapps.user_api.views._')
def test_register_form_level_of_education_translations(self, fake_gettext):
fake_gettext.side_effect = lambda text: text + ' TRANSLATED'
self._assert_reg_field(
{"level_of_education": "optional"},
{
"name": "level_of_education",
"type": "select",
"required": False,
"label": "Highest level of education completed TRANSLATED",
"options": [
{"value": "", "name": "--", "default": True},
{"value": "p", "name": "Doctorate TRANSLATED"},
{"value": "m", "name": "Master's or professional degree TRANSLATED"},
{"value": "b", "name": "Bachelor's degree TRANSLATED"},
{"value": "a", "name": "Associate degree TRANSLATED"},
{"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"},
],
}
)
def test_register_form_gender(self):
self._assert_reg_field(
{"gender": "optional"},
@@ -1016,6 +1042,26 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, ApiTestCase):
}
)
@mock.patch('openedx.core.djangoapps.user_api.views._')
def test_register_form_gender_translations(self, fake_gettext):
fake_gettext.side_effect = lambda text: text + ' TRANSLATED'
self._assert_reg_field(
{"gender": "optional"},
{
"name": "gender",
"type": "select",
"required": False,
"label": "Gender TRANSLATED",
"options": [
{"value": "", "name": "--", "default": True},
{"value": "m", "name": "Male TRANSLATED"},
{"value": "f", "name": "Female TRANSLATED"},
{"value": "o", "name": "Other TRANSLATED"},
],
}
)
def test_register_form_year_of_birth(self):
this_year = datetime.datetime.now(UTC).year
year_options = (

8
openedx/core/djangoapps/user_api/views.py
View File

@@ -449,11 +449,13 @@ class RegistrationView(APIView):
# form used to select the user's highest completed level of education.
education_level_label = _(u"Highest level of education completed")
# The labels are marked for translation in UserProfile model definition.
options = [(name, _(label)) for name, label in UserProfile.LEVEL_OF_EDUCATION_CHOICES] # pylint: disable=translation-of-non-string
form_desc.add_field(
"level_of_education",
label=education_level_label,
field_type="select",
options=UserProfile.LEVEL_OF_EDUCATION_CHOICES,
options=options,
include_default_option=True,
required=required
)
@@ -472,11 +474,13 @@ class RegistrationView(APIView):
# form used to select the user's gender.
gender_label = _(u"Gender")
# The labels are marked for translation in UserProfile model definition.
options = [(name, _(label)) for name, label in UserProfile.GENDER_CHOICES] # pylint: disable=translation-of-non-string
form_desc.add_field(
"gender",
label=gender_label,
field_type="select",
options=UserProfile.GENDER_CHOICES,
options=options,
include_default_option=True,
required=required
)