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

Correct the trademark notices

Browse Source 
* edX should be lowercase everywhere

* Studio is not a trademark

* Our trademarks are all registered trademarks
This commit is contained in:
Ned Batchelder
2019-05-15 07:02:20 -04:00
parent 0b48665ad2
commit 09690ce667
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/templates/widgets/footer.html
View File

@@ -43,8 +43,8 @@ from cms.djangoapps.contentstore.config.waffle import waffle, ENABLE_ACCESSIBILI
<div class="footer-about-copyright">
## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
<p>
## 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"<a data-rel='edx.org' href='https://www.edx.org/'>",
link_end=u"</a>"
)}

8
lms/djangoapps/branding/api.py
View File

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

4
lms/djangoapps/branding/tests/test_api.py
View File

@@ -99,8 +99,8 @@ class TestFooter(TestCase):
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'},

2
lms/djangoapps/branding/views.py
View File

@@ -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."
}

8
themes/edx.org/lms/templates/certificates/_accomplishment-footer.html
View File

@@ -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
%>
<div class="wrapper-footer">
@@ -21,11 +21,11 @@ from openedx.core.djangolib.markup import HTML, Text
<span class="copyright">&copy;
<a href="http://www.edx.org">${_("edX Inc.")}</a>
</span>
${_("All rights reserved except where noted. edX, Open edX and the edX and Open edX logos are registered trademarks or trademarks of edX Inc.")}</p>
${_("All rights reserved except where noted. edX, Open edX and the edX and Open edX logos are registered trademarks of edX Inc.")}</p>
</div>
</div>
<div class="footer-app-related">
<a class="img-link" href="http://edx.org/about"><img class="logo-img logo-openedx" src="https://edxuploads.s3.amazonaws.com/certificate_template_assets/3/edx-openedx-logo-tag.png" alt="${_('Powered by Open edX')}" /></a>
</div>
</footer>
</div>
</div>

2
themes/edx.org/lms/templates/footer.html
View File

@@ -135,7 +135,7 @@
<br/>
${_(
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 ""}

4
themes/red-theme/lms/templates/footer.html
View File

@@ -67,8 +67,8 @@ from openedx.core.djangoapps.lang_pref.api import footer_language_selector_is_en
## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
<p class="copyright">
## 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"<a href='https://www.edx.org/'>",
link_end=u"</a>"
)}