From 09690ce6676ba4d7f3c5e9d783ab4e0a1e6b810a Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 15 May 2019 07:02:20 -0400 Subject: [PATCH] Correct the trademark notices * edX should be lowercase everywhere * Studio is not a trademark * Our trademarks are all registered trademarks --- cms/templates/widgets/footer.html | 4 ++-- lms/djangoapps/branding/api.py | 8 ++++---- lms/djangoapps/branding/tests/test_api.py | 4 ++-- lms/djangoapps/branding/views.py | 2 +- .../templates/certificates/_accomplishment-footer.html | 8 ++++---- themes/edx.org/lms/templates/footer.html | 2 +- themes/red-theme/lms/templates/footer.html | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html index 53a96538f2f4..3a94777c1fcf 100644 --- a/cms/templates/widgets/footer.html +++ b/cms/templates/widgets/footer.html @@ -43,8 +43,8 @@
## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.

- ## Translators: 'EdX', 'edX', 'Studio', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names. - ${_("EdX, Open edX, Studio, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format( + ## Translators: 'edX' and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names. + ${_("edX, Open edX, and the edX and Open edX logos are registered trademarks of {link_start}edX Inc.{link_end}").format( link_start=u"", link_end=u"" )} diff --git a/lms/djangoapps/branding/api.py b/lms/djangoapps/branding/api.py index 4309f048e3e2..45bd1f3fec52 100644 --- a/lms/djangoapps/branding/api.py +++ b/lms/djangoapps/branding/api.py @@ -125,11 +125,11 @@ def _footer_copyright(): """ return _( - # Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'. + # Translators: 'edX' and 'Open edX' are trademarks of 'edX Inc.'. # Please do not translate any of these trademarks and company names. u"\u00A9 {org_name}. All rights reserved except where noted. " - u"EdX, Open edX and their respective logos are trademarks " - u"or registered trademarks of edX Inc." + u"edX, Open edX and their respective logos are " + u"registered trademarks of edX Inc." ).format(org_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME)) @@ -142,7 +142,7 @@ def _footer_openedx_link(): Returns: dict """ - # Translators: 'Open edX' is a brand, please keep this untranslated. + # Translators: 'Open edX' is a trademark, please keep this untranslated. # See http://openedx.org for more information. title = _("Powered by Open edX") return { diff --git a/lms/djangoapps/branding/tests/test_api.py b/lms/djangoapps/branding/tests/test_api.py index 1cea4e99800c..b55bbd40dcc7 100644 --- a/lms/djangoapps/branding/tests/test_api.py +++ b/lms/djangoapps/branding/tests/test_api.py @@ -99,8 +99,8 @@ def test_get_footer(self): business_url = 'https://business.edx.org/?utm_campaign=edX.org+Referral&utm_source=edX.org&utm_medium=Footer' expected_footer = { 'copyright': '\xa9 \xe9dX. All rights reserved except where noted. ' - ' EdX, Open edX and their respective logos are ' - 'trademarks or registered trademarks of edX Inc.', + ' edX, Open edX and their respective logos are ' + 'registered trademarks of edX Inc.', 'navigation_links': [ {'url': 'https://edx.org/about-us', 'name': 'about', 'title': 'About'}, {'url': 'https://business.edx.org', 'name': 'enterprise', 'title': '\xe9dX for Business'}, diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py index 67735445c1ac..5d35aef24b31 100644 --- a/lms/djangoapps/branding/views.py +++ b/lms/djangoapps/branding/views.py @@ -207,7 +207,7 @@ def footer(request): "image": "http://example.com/openedx.png" }, "logo_image": "http://example.com/static/images/logo.png", - "copyright": "EdX, Open edX and their respective logos are trademarks or registered trademarks of edX Inc." + "copyright": "edX, Open edX and their respective logos are registered trademarks of edX Inc." } diff --git a/themes/edx.org/lms/templates/certificates/_accomplishment-footer.html b/themes/edx.org/lms/templates/certificates/_accomplishment-footer.html index fa2c1a1af193..0e5ce30b1f75 100644 --- a/themes/edx.org/lms/templates/certificates/_accomplishment-footer.html +++ b/themes/edx.org/lms/templates/certificates/_accomplishment-footer.html @@ -1,6 +1,6 @@ <%page expression_filter="h"/> -<%! -from django.utils.translation import ugettext as _ +<%! +from django.utils.translation import ugettext as _ from openedx.core.djangolib.markup import HTML, Text %>

@@ -21,11 +21,11 @@ © ${_("edX Inc.")} - ${_("All rights reserved except where noted. edX, Open edX and the edX and Open edX logos are registered trademarks or trademarks of edX Inc.")}

+ ${_("All rights reserved except where noted. edX, Open edX and the edX and Open edX logos are registered trademarks of edX Inc.")}

${_('Powered by Open edX')}
- \ No newline at end of file + diff --git a/themes/edx.org/lms/templates/footer.html b/themes/edx.org/lms/templates/footer.html index c9f7540ab67b..1339402bbc49 100755 --- a/themes/edx.org/lms/templates/footer.html +++ b/themes/edx.org/lms/templates/footer.html @@ -135,7 +135,7 @@

${_(u"Connect")}


${_( - u"EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. " + 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 ""} diff --git a/themes/red-theme/lms/templates/footer.html b/themes/red-theme/lms/templates/footer.html index 320478a155e0..61f53d409164 100755 --- a/themes/red-theme/lms/templates/footer.html +++ b/themes/red-theme/lms/templates/footer.html @@ -67,8 +67,8 @@ ## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.

- ## Translators: 'EdX', 'edX', and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names. - ${_("EdX, Open edX, and the edX and Open edX logos are registered trademarks or trademarks of {link_start}edX Inc.{link_end}").format( + ## Translators: 'edX' and 'Open edX' are trademarks of 'edX Inc.'. Please do not translate any of these trademarks and company names. + ${_("edX, Open edX, and the edX and Open edX logos are registered trademarks of {link_start}edX Inc.{link_end}").format( link_start=u"", link_end=u"" )}