From 9e06290b95f0207e26cd4424bafd41c6c125c87d Mon Sep 17 00:00:00 2001 From: muzaffaryousaf Date: Mon, 27 Apr 2015 15:12:22 +0500 Subject: [PATCH] Fixing the micro-sites naming issues for account settings page. TNL-2071 --- .../views/account_settings_factory.js | 20 +++++++++++++------ .../student_account/account_settings.html | 6 +++++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/lms/static/js/student_account/views/account_settings_factory.js b/lms/static/js/student_account/views/account_settings_factory.js index af46599688..ac2fd1cd6b 100644 --- a/lms/static/js/student_account/views/account_settings_factory.js +++ b/lms/static/js/student_account/views/account_settings_factory.js @@ -10,8 +10,9 @@ ], function (gettext, $, _, Backbone, Logger, FieldViews, UserAccountModel, UserPreferencesModel, AccountSettingsFieldViews, AccountSettingsView) { - return function (fieldsData, authData, userAccountsApiUrl, userPreferencesApiUrl, accountUserId) { + return function (fieldsData, authData, userAccountsApiUrl, userPreferencesApiUrl, accountUserId, platformName) { + var interpolate_text = window.interpolate_text; var accountSettingsElement = $('.wrapper-account-settings'); var userAccountModel = new UserAccountModel(); @@ -29,7 +30,9 @@ model: userAccountModel, title: gettext('Username'), valueAttribute: 'username', - helpMessage: gettext('The name that identifies you on the edX site. You cannot change your username.') + helpMessage: interpolate_text( + gettext('The name that identifies you on the {platformName} site. You cannot change your username.'), {platformName: platformName} + ) }) }, { @@ -37,7 +40,9 @@ model: userAccountModel, title: gettext('Full Name'), valueAttribute: 'name', - helpMessage: gettext('The name that appears on your edX certificates. Other learners never see your full name.') + helpMessage: interpolate_text( + gettext('The name that appears on your {platformName} certificates. Other learners never see your full name.'), {platformName: platformName} + ) }) }, { @@ -45,7 +50,9 @@ model: userAccountModel, title: gettext('Email Address'), valueAttribute: 'email', - helpMessage: gettext('The email address you use to sign in to edX. Communications from edX and your courses are sent to this address.') + 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} + ) }) }, { @@ -67,8 +74,9 @@ valueAttribute: 'pref-lang', required: true, refreshPageOnSave: true, - helpMessage: - gettext('The language used for the edX site. The site is currently available in a limited number of languages.'), + helpMessage: interpolate_text( + gettext('The language used for the {platformName} site. The site is currently available in a limited number of languages.'), {platformName: platformName} + ), options: fieldsData.language.options }) }, diff --git a/lms/templates/student_account/account_settings.html b/lms/templates/student_account/account_settings.html index d05a55ca69..7b3fed68bb 100644 --- a/lms/templates/student_account/account_settings.html +++ b/lms/templates/student_account/account_settings.html @@ -1,6 +1,8 @@ <%! import json %> <%! from django.core.urlresolvers import reverse %> +<%! from django.conf import settings %> <%! from django.utils.translation import ugettext as _ %> +<%! from microsite_configuration import microsite %> @@ -40,9 +42,11 @@ var fieldsData = ${ json.dumps(fields) }; var authData = ${ json.dumps(auth) }; + var platformName = ${ json.dumps(microsite.get_value('platform_name', settings.PLATFORM_NAME))}; setupAccountSettingsSection( - fieldsData, authData, '${user_accounts_api_url}', '${user_preferences_api_url}', ${user.id} + fieldsData, authData, '${user_accounts_api_url}', '${user_preferences_api_url}', ${user.id}, + platformName ); }); }).call(this, require || RequireJS.require);