From 105d611cc955eb5b88de3efb84ae09b1d0c34795 Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@edx.org>
Date: Mon, 19 Oct 2015 14:52:46 -0400
Subject: [PATCH] Create distinct terms for gender, education sign up terms

---
 common/djangoapps/student/models.py                  |  6 +++---
 openedx/core/djangoapps/user_api/tests/test_views.py | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 18acaa2739..e64fce3df2 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -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,
diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py
index 335d900a62..f6042d13f2 100644
--- a/openedx/core/djangoapps/user_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/tests/test_views.py
@@ -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"},
                 ],
             }
         )