From 1530124e01d22334351e0817e5b86390cd0f4b86 Mon Sep 17 00:00:00 2001 From: Jason Myatt Date: Tue, 14 May 2019 14:39:10 -0400 Subject: [PATCH] Update registration form text for GDPR --- openedx/core/djangoapps/user_api/api.py | 6 +++--- .../core/djangoapps/user_api/tests/test_views.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/openedx/core/djangoapps/user_api/api.py b/openedx/core/djangoapps/user_api/api.py index be91f97572..537b8e5491 100644 --- a/openedx/core/djangoapps/user_api/api.py +++ b/openedx/core/djangoapps/user_api/api.py @@ -825,10 +825,10 @@ class RegistrationFormFactory(object): pp_link = marketing_link("PRIVACY") label = Text(_( - u"By creating an account with {platform_name}, you agree \ - to abide by our {platform_name} \ + u"By creating an account, you agree to the \ {terms_of_service_link_start}{terms_of_service}{terms_of_service_link_end} \ - and agree to our {privacy_policy_link_start}Privacy Policy{privacy_policy_link_end}." + and you acknowledge that {platform_name} and each Member process your personal data in accordance \ + with the {privacy_policy_link_start}Privacy Policy{privacy_policy_link_end}." )).format( platform_name=configuration_helpers.get_value("PLATFORM_NAME", settings.PLATFORM_NAME), terms_of_service=terms_label, diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py index 5bfe5b0e86..e9df686053 100644 --- a/openedx/core/djangoapps/user_api/tests/test_views.py +++ b/openedx/core/djangoapps/user_api/tests/test_views.py @@ -1687,10 +1687,11 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase): self._assert_reg_field( {"honor_code": "required"}, { - "label": (u"By creating an account with {platform_name}, you agree {spacing}" - u"to abide by our {platform_name} {spacing}" + "label": (u"By creating an account, you agree to the {spacing}" u"{link_label} {spacing}" - u"and agree to our {link_label2}.").format( + u"and you acknowledge that {platform_name} and each Member process your " + u"personal data in accordance {spacing}" + u"with the {link_label2}.").format( platform_name=settings.PLATFORM_NAME, link_label=link_template.format(link_label=link_label), link_label2=link_template2.format(link_label=link_label2), @@ -1718,10 +1719,11 @@ class RegistrationViewTest(ThirdPartyAuthTestMixin, UserAPITestCase): self._assert_reg_field( {"honor_code": "required"}, { - "label": (u"By creating an account with {platform_name}, you agree {spacing}" - u"to abide by our {platform_name} {spacing}" + "label": (u"By creating an account, you agree to the {spacing}" u"{link_label} {spacing}" - u"and agree to our {link_label2}.").format( + u"and you acknowledge that {platform_name} and each Member process your " + u"personal data in accordance {spacing}" + u"with the {link_label2}.").format( platform_name=settings.PLATFORM_NAME, link_label=self.link_template.format(link_label=link_label), link_label2=link_template.format(link_label=link_label2),