diff --git a/lms/djangoapps/student_account/test/test_views.py b/lms/djangoapps/student_account/test/test_views.py index 06afcd5246..ae1566eef5 100644 --- a/lms/djangoapps/student_account/test/test_views.py +++ b/lms/djangoapps/student_account/test/test_views.py @@ -682,12 +682,16 @@ class StudentAccountLoginAndRegistrationTest(ThirdPartyAuthTestMixin, UrlResetMi else: self.assertContains(response, text=enterprise_sidebar_div_id) welcome_message = settings.ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE - expected_message = welcome_message.format( - start_bold=u'', - end_bold=u'', - line_break=u'
', + expected_message = Text(welcome_message).format( + start_bold=HTML(''), + end_bold=HTML(''), + line_break=HTML('
'), enterprise_name=ec_name, - platform_name=settings.PLATFORM_NAME + platform_name=settings.PLATFORM_NAME, + privacy_policy_link_start=HTML("").format( + pp_url=settings.MKTG_URLS.get('PRIVACY', 'https://www.edx.org/edx-privacy-policy') + ), + privacy_policy_link_end=HTML(""), ) self.assertContains(response, expected_message) if logo_url: diff --git a/lms/envs/common.py b/lms/envs/common.py index 8a1b384f85..43ae005e7b 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3348,11 +3348,11 @@ ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE = 512 # Enterprise logo image size limit i ENTERPRISE_PLATFORM_WELCOME_TEMPLATE = _(u'Welcome to {platform_name}.') ENTERPRISE_SPECIFIC_BRANDED_WELCOME_TEMPLATE = _( - u'{start_bold}{enterprise_name}{end_bold} has partnered with {start_bold}' - '{platform_name}{end_bold} to offer you always available, high-quality learning ' - 'programs to help you advance your knowledge and your career. ' - '{line_break}Please continue with registration, or log in if you are an existing user, ' - 'and press continue to start learning.' + 'You have left the {start_bold}{enterprise_name}{end_bold} website and are now on the {platform_name} site. ' + '{enterprise_name} has partnered with {platform_name} to offer you high-quality, always available learning ' + 'programs to help you advance your knowledge and career. ' + '{line_break}Please note that {platform_name} has a different {privacy_policy_link_start}Privacy Policy' + '{privacy_policy_link_end} from {enterprise_name}.' ) ENTERPRISE_TAGLINE = '' ENTERPRISE_EXCLUDED_REGISTRATION_FIELDS = { diff --git a/openedx/features/enterprise_support/utils.py b/openedx/features/enterprise_support/utils.py index 9ba7714114..9f9c0cda8a 100644 --- a/openedx/features/enterprise_support/utils.py +++ b/openedx/features/enterprise_support/utils.py @@ -95,7 +95,11 @@ def get_enterprise_sidebar_context(enterprise_customer): end_bold=HTML(''), line_break=HTML('
'), enterprise_name=enterprise_customer['name'], - platform_name=platform_name + platform_name=platform_name, + privacy_policy_link_start=HTML("").format( + pp_url=settings.MKTG_URLS.get('PRIVACY', 'https://www.edx.org/edx-privacy-policy') + ), + privacy_policy_link_end=HTML(""), ) platform_welcome_template = configuration_helpers.get_value(