Merge pull request #5515 from edx/renzo/language-backbone

Use Backbone for student account and profile JS.

common/djangoapps/lang_pref/api.py

@@ -69,13 +69,15 @@ def preferred_language(preferred_language_code):
     if preferred_language_code in settings.LANGUAGE_DICT:
         # If the user has indicated a preference for a valid
         # language, record their preferred language
-        preferred_language = settings.LANGUAGE_DICT[preferred_language_code]
+        pass
     elif active_language_code in settings.LANGUAGE_DICT:
         # Otherwise, set the language used in the current thread
         # as the preferred language
-        preferred_language = settings.LANGUAGE_DICT[active_language_code]
+        preferred_language_code = active_language_code
     else:
         # Otherwise, use the default language
-        preferred_language = settings.LANGUAGE_DICT[settings.LANGUAGE_CODE]
+        preferred_language_code = settings.LANGUAGE_CODE
 
-    return preferred_language
+    preferred_language = settings.LANGUAGE_DICT[preferred_language_code]
+
+    return Language(preferred_language_code, preferred_language)

common/djangoapps/lang_pref/tests/test_api.py

@@ -18,13 +18,13 @@ class LanguageApiTest(TestCase):
 
     def test_preferred_language(self):
         preferred_language = language_api.preferred_language('fr')
-        self.assertEqual(preferred_language, u'Français')
+        self.assertEqual(preferred_language, language_api.Language('fr', u'Français'))
 
     @ddt.data(*INVALID_LANGUAGE_CODES)
     def test_invalid_preferred_language(self, language_code):
         preferred_language = language_api.preferred_language(language_code)
-        self.assertEqual(preferred_language, u'English')
+        self.assertEqual(preferred_language, language_api.Language('en', u'English'))
 
     def test_no_preferred_language(self):
         preferred_language = language_api.preferred_language(None)
-        self.assertEqual(preferred_language, u'English')
+        self.assertEqual(preferred_language, language_api.Language('en', u'English'))

common/djangoapps/user_api/api/profile.py

@@ -6,6 +6,7 @@ email address.
 
 """
 
+
 from user_api.models import User, UserProfile, UserPreference
 from user_api.helpers import intercept_errors
 

common/djangoapps/user_api/tests/test_account_api.py

@@ -36,6 +36,8 @@ class AccountApiTest(TestCase):
         "@",
         "@domain.com",
         "test@no_extension",
+        u"fŕáńḱ@example.com",
+        u"frank@éxáḿṕĺé.ćőḿ",
 
         # Long email -- subtract the length of the @domain
         # except for one character (so we exceed the max length limit)