Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20552 from edx/jmyatt/registration-form-gdpr-fix

Browse Source 
Update registration form text for GDPR
This commit is contained in:
Jason Myatt
2019-05-15 15:20:36 -04:00
committed by GitHub
parent 99bef9ecfa 1530124e01
commit ab8ffe6dac
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openedx/core/djangoapps/user_api/api.py
View File

@@ -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,

14
openedx/core/djangoapps/user_api/tests/test_views.py
View File

@@ -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),