Commit 6cb458b4 by Bertrand Marron

Translate gender and education level from user profile

parent 601b5a8c
...@@ -29,6 +29,7 @@ from django.dispatch import receiver, Signal ...@@ -29,6 +29,7 @@ from django.dispatch import receiver, Signal
import django.dispatch import django.dispatch
from django.forms import ModelForm, forms from django.forms import ModelForm, forms
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.utils.translation import ugettext_noop
from django_countries import CountryField from django_countries import CountryField
from track import contexts from track import contexts
from track.views import server_track from track.views import server_track
...@@ -189,7 +190,11 @@ class UserProfile(models.Model): ...@@ -189,7 +190,11 @@ class UserProfile(models.Model):
this_year = datetime.now(UTC).year this_year = datetime.now(UTC).year
VALID_YEARS = range(this_year, this_year - 120, -1) VALID_YEARS = range(this_year, this_year - 120, -1)
year_of_birth = models.IntegerField(blank=True, null=True, db_index=True) 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')),
('o', ugettext_noop('Other'))
)
gender = models.CharField( gender = models.CharField(
blank=True, null=True, max_length=6, db_index=True, choices=GENDER_CHOICES blank=True, null=True, max_length=6, db_index=True, choices=GENDER_CHOICES
) )
...@@ -199,15 +204,15 @@ class UserProfile(models.Model): ...@@ -199,15 +204,15 @@ class UserProfile(models.Model):
# ('p_se', 'Doctorate in science or engineering'), # ('p_se', 'Doctorate in science or engineering'),
# ('p_oth', 'Doctorate in another field'), # ('p_oth', 'Doctorate in another field'),
LEVEL_OF_EDUCATION_CHOICES = ( LEVEL_OF_EDUCATION_CHOICES = (
('p', 'Doctorate'), ('p', ugettext_noop('Doctorate')),
('m', "Master's or professional degree"), ('m', ugettext_noop("Master's or professional degree")),
('b', "Bachelor's degree"), ('b', ugettext_noop("Bachelor's degree")),
('a', "Associate's degree"), ('a', ugettext_noop("Associate's degree")),
('hs', "Secondary/high school"), ('hs', ugettext_noop("Secondary/high school")),
('jhs', "Junior secondary/junior high/middle school"), ('jhs', ugettext_noop("Junior secondary/junior high/middle school")),
('el', "Elementary/primary school"), ('el', ugettext_noop("Elementary/primary school")),
('none', "None"), ('none', ugettext_noop("None")),
('other', "Other") ('other', ugettext_noop("Other"))
) )
level_of_education = models.CharField( level_of_education = models.CharField(
blank=True, null=True, max_length=6, db_index=True, blank=True, null=True, max_length=6, db_index=True,
......
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<select id="education-level" name="level_of_education" ${'required aria-required="true"' if settings.REGISTRATION_EXTRA_FIELDS['level_of_education'] == 'required' else ''}> <select id="education-level" name="level_of_education" ${'required aria-required="true"' if settings.REGISTRATION_EXTRA_FIELDS['level_of_education'] == 'required' else ''}>
<option value="">--</option> <option value="">--</option>
%for code, ed_level in UserProfile.LEVEL_OF_EDUCATION_CHOICES: %for code, ed_level in UserProfile.LEVEL_OF_EDUCATION_CHOICES:
<option value="${code}">${ed_level}</option> <option value="${code}">${_(ed_level)}</option>
%endfor %endfor
</select> </select>
</div> </div>
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
<select id="gender" name="gender" ${'required aria-required="true"' if settings.REGISTRATION_EXTRA_FIELDS['gender'] == 'required' else ''}> <select id="gender" name="gender" ${'required aria-required="true"' if settings.REGISTRATION_EXTRA_FIELDS['gender'] == 'required' else ''}>
<option value="">--</option> <option value="">--</option>
%for code, gender in UserProfile.GENDER_CHOICES: %for code, gender in UserProfile.GENDER_CHOICES:
<option value="${code}">${gender}</option> <option value="${code}">${_(gender)}</option>
%endfor %endfor
</select> </select>
</div> </div>
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<select id="signup_ed_level" name="level_of_education"> <select id="signup_ed_level" name="level_of_education">
<option value="">--</option> <option value="">--</option>
%for code, ed_level in UserProfile.LEVEL_OF_EDUCATION_CHOICES: %for code, ed_level in UserProfile.LEVEL_OF_EDUCATION_CHOICES:
<option value="${code}">${ed_level}</option> <option value="${code}">${_(ed_level)}</option>
%endfor %endfor
</select> </select>
</div> </div>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<select id="signup_gender" name="gender"> <select id="signup_gender" name="gender">
<option value="">--</option> <option value="">--</option>
%for code, gender in UserProfile.GENDER_CHOICES: %for code, gender in UserProfile.GENDER_CHOICES:
<option value="${code}">${gender}</option> <option value="${code}">${_(gender)}</option>
%endfor %endfor
</select> </select>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment