diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py index c182ee34cd..c2fcdea354 100644 --- a/common/djangoapps/student/models.py +++ b/common/djangoapps/student/models.py @@ -29,6 +29,7 @@ from django.dispatch import receiver, Signal import django.dispatch from django.forms import ModelForm, forms from django.core.exceptions import ObjectDoesNotExist +from django.utils.translation import ugettext_noop from django_countries import CountryField from track import contexts from track.views import server_track @@ -189,7 +190,12 @@ class UserProfile(models.Model): this_year = datetime.now(UTC).year VALID_YEARS = range(this_year, this_year - 120, -1) year_of_birth = models.IntegerField(blank=True, null=True, db_index=True) - GENDER_CHOICES = (('m', 'Male'), ('f', 'Female'), ('o', 'Other')) + GENDER_CHOICES = ( + ('m', ugettext_noop('Male')), + ('f', ugettext_noop('Female')), + # Translators: 'Other' refers to the student's gender + ('o', ugettext_noop('Other')) + ) gender = models.CharField( blank=True, null=True, max_length=6, db_index=True, choices=GENDER_CHOICES ) @@ -199,15 +205,17 @@ class UserProfile(models.Model): # ('p_se', 'Doctorate in science or engineering'), # ('p_oth', 'Doctorate in another field'), LEVEL_OF_EDUCATION_CHOICES = ( - ('p', 'Doctorate'), - ('m', "Master's or professional degree"), - ('b', "Bachelor's degree"), - ('a', "Associate's degree"), - ('hs', "Secondary/high school"), - ('jhs', "Junior secondary/junior high/middle school"), - ('el', "Elementary/primary school"), - ('none', "None"), - ('other', "Other") + ('p', ugettext_noop('Doctorate')), + ('m', ugettext_noop("Master's or professional degree")), + ('b', ugettext_noop("Bachelor's degree")), + ('a', ugettext_noop("Associate's degree")), + ('hs', ugettext_noop("Secondary/high school")), + ('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")), + # Translators: 'Other' refers to the student's level of education + ('other', ugettext_noop("Other")) ) level_of_education = models.CharField( blank=True, null=True, max_length=6, db_index=True, diff --git a/lms/templates/register.html b/lms/templates/register.html index dfd5a6c726..e8c818f2a5 100644 --- a/lms/templates/register.html +++ b/lms/templates/register.html @@ -210,7 +210,7 @@ @@ -223,7 +223,7 @@ diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index 143e2e49d5..85c2732571 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -71,7 +71,7 @@ @@ -85,7 +85,7 @@