Fixing the micro-sites naming issues for profile page.

TNL-2072

lms/djangoapps/student_profile/views.py

@@ -12,6 +12,8 @@ from django.views.decorators.http import require_http_methods
 from edxmako.shortcuts import render_to_response
 from student.models import User
 
+from microsite_configuration import microsite
+
 from django.utils.translation import ugettext as _
 
 
@@ -81,6 +83,7 @@ def learner_profile_context(logged_in_username, profile_username, user_is_staff)
             'own_profile': (logged_in_username == profile_username),
             'country_options': country_options,
             'language_options': settings.ALL_LANGUAGES,
+            'platform_name': microsite.get_value('platform_name', settings.PLATFORM_NAME),
         }
     }
 

lms/static/js/spec/student_account/account_settings_factory_spec.js

@@ -46,6 +46,13 @@ define(['backbone', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'j
                 ]
             };
 
+            var createAccountSettingsPage = function() {
+                var context = AccountSettingsPage(
+                    FIELDS_DATA, AUTH_DATA, Helpers.USER_ACCOUNTS_API_URL, Helpers.USER_PREFERENCES_API_URL, 'edX'
+                );
+                return context.accountSettingsView;
+            };
+
             var requests;
 
             beforeEach(function () {
@@ -61,10 +68,7 @@ define(['backbone', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'j
 
                 requests = AjaxHelpers.requests(this);
 
-                var context = AccountSettingsPage(
-                    FIELDS_DATA, AUTH_DATA, Helpers.USER_ACCOUNTS_API_URL, Helpers.USER_PREFERENCES_API_URL
-                );
-                var accountSettingsView = context.accountSettingsView;
+                var accountSettingsView = createAccountSettingsPage();
 
                 Helpers.expectLoadingIndicatorIsVisible(accountSettingsView, true);
                 Helpers.expectLoadingErrorIsVisible(accountSettingsView, false);
@@ -85,10 +89,7 @@ define(['backbone', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'j
 
                 requests = AjaxHelpers.requests(this);
 
-                var context = AccountSettingsPage(
-                    FIELDS_DATA, AUTH_DATA, Helpers.USER_ACCOUNTS_API_URL, Helpers.USER_PREFERENCES_API_URL
-                );
-                var accountSettingsView = context.accountSettingsView;
+                var accountSettingsView = createAccountSettingsPage();
 
                 Helpers.expectLoadingIndicatorIsVisible(accountSettingsView, true);
                 Helpers.expectLoadingErrorIsVisible(accountSettingsView, false);
@@ -117,10 +118,7 @@ define(['backbone', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'j
 
                 requests = AjaxHelpers.requests(this);
 
-                var context = AccountSettingsPage(
-                    FIELDS_DATA, AUTH_DATA, Helpers.USER_ACCOUNTS_API_URL, Helpers.USER_PREFERENCES_API_URL
-                );
-                var accountSettingsView = context.accountSettingsView;
+                var accountSettingsView = createAccountSettingsPage();
 
                 Helpers.expectLoadingIndicatorIsVisible(accountSettingsView, true);
                 Helpers.expectLoadingErrorIsVisible(accountSettingsView, false);
@@ -138,10 +136,7 @@ define(['backbone', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'j
 
                 requests = AjaxHelpers.requests(this);
 
-                var context = AccountSettingsPage(
-                    FIELDS_DATA, AUTH_DATA, Helpers.USER_ACCOUNTS_API_URL, Helpers.USER_PREFERENCES_API_URL
-                );
-                var accountSettingsView = context.accountSettingsView;
+                var accountSettingsView = createAccountSettingsPage();
 
                 AjaxHelpers.respondWithJson(requests, Helpers.createAccountSettingsData());
                 AjaxHelpers.respondWithJson(requests, Helpers.createUserPreferencesData());

lms/static/js/spec/student_account/account_settings_fields_spec.js

@@ -82,7 +82,7 @@ define(['backbone', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'j
                 AjaxHelpers.respondWithError(requests, 500);
                 FieldViewsSpecHelpers.expectMessageContains(
                     view,
-                    "You must sign out of edX and sign back in before your language changes take effect."
+                    "You must sign out and sign back in before your language changes take effect."
                 );
             });
 

lms/static/js/spec/student_profile/learner_profile_factory_spec.js

@@ -40,7 +40,8 @@ define(['backbone', 'jquery', 'underscore', 'js/common_helpers/ajax_helpers', 'j
                     'profile_image_min_bytes': Helpers.IMAGE_MIN_BYTES,
                     'profile_image_upload_url': Helpers.IMAGE_UPLOAD_API_URL,
                     'profile_image_remove_url': Helpers.IMAGE_REMOVE_API_URL,
-                    'default_visibility': 'all_users'
+                    'default_visibility': 'all_users',
+                    'platform_name': 'edX'
                 });
             };
 

lms/static/js/student_account/views/account_settings_factory.js

@@ -12,7 +12,6 @@
 
         return function (fieldsData, authData, userAccountsApiUrl, userPreferencesApiUrl, accountUserId, platformName) {
 
-            var interpolate_text = window.interpolate_text;
             var accountSettingsElement = $('.wrapper-account-settings');
 
             var userAccountModel = new UserAccountModel();
@@ -31,7 +30,7 @@
                                 title: gettext('Username'),
                                 valueAttribute: 'username',
                                 helpMessage: interpolate_text(
-                                    gettext('The name that identifies you on the {platformName} site. You cannot change your username.'), {platformName: platformName}
+                                    gettext('The name that identifies you on the {platform_name} site. You cannot change your username.'), {platform_name: platformName}
                                 )
                             })
                         },
@@ -41,7 +40,7 @@
                                 title: gettext('Full Name'),
                                 valueAttribute: 'name',
                                 helpMessage: interpolate_text(
-                                    gettext('The name that appears on your {platformName} certificates. Other learners never see your full name.'), {platformName: platformName}
+                                    gettext('The name that appears on your {platform_name} certificates. Other learners never see your full name.'), {platform_name: platformName}
                                 )
                             })
                         },
@@ -51,7 +50,7 @@
                                 title: gettext('Email Address'),
                                 valueAttribute: 'email',
                                 helpMessage: interpolate_text(
-                                    gettext('The email address you use to sign in to {platformName}. Communications from {platformName} and your courses are sent to this address.'), {platformName: platformName}
+                                    gettext('The email address you use to sign in to {platform_name}. Communications from {platform_name} and your courses are sent to this address.'), {platform_name: platformName}
                                 )
                             })
                         },
@@ -75,7 +74,7 @@
                                 required: true,
                                 refreshPageOnSave: true,
                                 helpMessage: interpolate_text(
-                                    gettext('The language used for the {platformName} site. The site is currently available in a limited number of languages.'), {platformName: platformName}
+                                    gettext('The language used for the {platform_name} site. The site is currently available in a limited number of languages.'), {platform_name: platformName}
                                 ),
                                 options: fieldsData.language.options
                             })

lms/static/js/student_account/views/account_settings_fields.js

@@ -38,10 +38,7 @@
                     error: function () {
                         view.showNotificationMessage(
                             view.indicators.error +
-                            gettext(
-                                'You must sign out of edX and sign back in before your language ' +
-                                'changes take effect.'
-                            )
+                                gettext('You must sign out and sign back in before your language changes take effect.')
                         );
                     }
                 });

lms/static/js/student_profile/views/learner_profile_factory.js

@@ -40,7 +40,9 @@
                 required: true,
                 editable: 'always',
                 showMessages: false,
-                title: gettext('edX learners can see my:'),
+                title: interpolate_text(
+                    gettext('{platform_name} learners can see my:'), {platform_name: options.platform_name}
+                ),
                 valueAttribute: "account_privacy",
                 options: [
                     ['private', gettext('Limited Profile')],
@@ -101,7 +103,9 @@
                     editable: editable,
                     showMessages: false,
                     title: gettext('About me'),
-                    placeholderValue: gettext("Tell other edX learners a little about yourself: where you live, what your interests are, why you're taking courses on edX, or what you hope to learn."),
+                    placeholderValue: interpolate_text(
+                        gettext("Tell other {platform_name} learners a little about yourself: where you live, what your interests are, why you're taking courses on {platform_name}, or what you hope to learn."), {platform_name: options.platform_name}
+                    ),
                     valueAttribute: "bio",
                     helpMessage: ''
                 })