diff --git a/lms/djangoapps/branding/api.py b/lms/djangoapps/branding/api.py index 7adf42cab3..e1e67691bc 100644 --- a/lms/djangoapps/branding/api.py +++ b/lms/djangoapps/branding/api.py @@ -273,7 +273,7 @@ def _footer_more_info_links(): ("terms_of_service_and_honor_code", marketing_link("TOS_AND_HONOR"), _("Terms of Service & Honor Code")), ("privacy_policy", marketing_link("PRIVACY"), _("Privacy Policy")), ("accessibility_policy", marketing_link("ACCESSIBILITY"), _("Accessibility Policy")), - ("trademarks", marketing_link("TRADEMARKS"), _("Trademarks")), + ("trademarks", marketing_link("TRADEMARKS"), _("Trademark Policy")), ("sitemap", marketing_link("SITE_MAP"), _("Sitemap")), ] diff --git a/lms/djangoapps/branding/tests/test_api.py b/lms/djangoapps/branding/tests/test_api.py index b35ff78ada..9fd9439619 100644 --- a/lms/djangoapps/branding/tests/test_api.py +++ b/lms/djangoapps/branding/tests/test_api.py @@ -58,7 +58,7 @@ class TestFooter(TestCase): "TOS_AND_HONOR": "/edx-terms-service", "PRIVACY": "/edx-privacy-policy", "ACCESSIBILITY": "/accessibility", - "AFFILIATES": '/affiliates', + "AFFILIATES": '/affiliate-program', "MEDIA_KIT": "/media-kit", "ENTERPRISE": "/enterprise" }) @@ -85,7 +85,7 @@ class TestFooter(TestCase): 'business_links': [ {'url': 'https://edx.org/about-us', 'name': 'about', 'title': 'About'}, {'url': 'https://edx.org/enterprise', 'name': 'enterprise', 'title': '\xe9dX for Business'}, - {'url': 'https://edx.org/affiliates', 'name': 'affiliates', 'title': 'Affiliates'}, + {'url': 'https://edx.org/affiliate-program', 'name': 'affiliates', 'title': 'Affiliates'}, {'url': 'http://open.edx.org', 'name': 'openedx', 'title': 'Open edX'}, {'url': 'https://edx.org/careers', 'name': 'careers', 'title': 'Careers'}, {'url': 'https://edx.org/news-announcements', 'name': 'news', 'title': 'News'}, @@ -99,7 +99,7 @@ class TestFooter(TestCase): {'url': 'https://edx.org/accessibility', 'name': 'accessibility_policy', 'title': 'Accessibility Policy'}, - {'url': 'https://edx.org/trademarks', 'name': 'trademarks', 'title': 'Trademarks'}, + {'url': 'https://edx.org/trademarks', 'name': 'trademarks', 'title': 'Trademark Policy'}, {'url': 'https://edx.org/sitemap', 'name': 'sitemap', 'title': 'Sitemap'}, ], diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py index c61d6e48f1..73b838058f 100644 --- a/lms/envs/devstack_docker.py +++ b/lms/envs/devstack_docker.py @@ -49,10 +49,10 @@ MARKETING_SITE_ROOT = os.environ.get('MARKETING_SITE_ROOT', 'http://localhost:80 MKTG_URLS = { 'ABOUT': '/about', 'ACCESSIBILITY': '/accessibility', - 'AFFILIATES': '/affiliates', + 'AFFILIATES': '/affiliate-program', 'BLOG': '/blog', 'CAREERS': '/careers', - 'CONTACT': 'https://courses.edx.org/support/contact_us', + 'CONTACT': '/support/contact_us', 'COURSES': '/course', 'DONATE': '/donate', 'ENTERPRISE': '/enterprise', diff --git a/themes/edx.org/lms/templates/footer.html b/themes/edx.org/lms/templates/footer.html index b5e3f42f6f..4608d13365 100755 --- a/themes/edx.org/lms/templates/footer.html +++ b/themes/edx.org/lms/templates/footer.html @@ -134,7 +134,7 @@
${_( - u"EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. 粤ICP备17044299号-2. " + u"EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " )} ${u" | {icp}".format(icp=getattr(settings,'ICP_LICENSE')) if getattr(settings,'ICP_LICENSE',False) else ""}