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

Merge pull request #6805 from edx/sarina/legal-update-footer-text

Browse Source 
Update Footer Copyright Notice as per Legal OPEN-444
This commit is contained in:
Sarina Canelake
2015-01-30 14:09:38 -05:00
parent 0a0d306b6a 2fd7657e0f
commit ef8b95b98e
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,15 @@
<div class="wrapper-footer wrapper">
<footer class="primary" role="contentinfo">
<div class="colophon">
<p>&copy; ${settings.COPYRIGHT_YEAR} <a href="${marketing_link('ROOT')}" rel="external">${settings.PLATFORM_NAME}</a>. ${ _("All rights reserved.")}</p>
<p>&copy; ${settings.COPYRIGHT_YEAR} <a href="${marketing_link('ROOT')}" rel="external">${settings.PLATFORM_NAME}</a>.</p>
## 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(
link_start=u"<a href='https://www.edx.org/'>",
link_end=u"</a>"
)}
</p>
</div>
<nav class="nav-peripheral">

17
lms/templates/footer-edx-new.html
View File

@@ -30,12 +30,17 @@
</div>
<div class="footer-about-copyright">
## Translators: '&copy;' is an HTML character code for the copyright symbol. Please don't remove or change it.
<p>${_("&copy; {copyright_year} {platform_name}, some rights reserved").format(
platform_name=settings.PLATFORM_NAME,
copyright_year=settings.COPYRIGHT_YEAR
)}
</p>
## Using "edX Inc." explicitly here for copyright purposes (settings.PLATFORM_NAME is just "edX", and this footer is only used on edx.org)
<p>&copy; ${settings.COPYRIGHT_YEAR} edX Inc.</p>
## 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', 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(
link_start=u"<a href='https://www.edx.org/'>",
link_end=u"</a>"
)}
</p>
</div>
<div class="footer-about-links">

14
lms/templates/footer.html
View File

@@ -51,11 +51,15 @@
</p>
</div>
## Translators: '&copy;' is an HTML character code for the copyright symbol. Please don't remove or change it.
<p class="copyright">${_("&copy; {copyright_year} {platform_name}, some rights reserved").format(
platform_name=settings.PLATFORM_NAME,
copyright_year=settings.COPYRIGHT_YEAR
)}
<p class="copyright">&copy; ${settings.COPYRIGHT_YEAR} ${settings.PLATFORM_NAME}.</p>
## 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(
link_start=u"<a href='https://www.edx.org/'>",
link_end=u"</a>"
)}
</p>
<nav class="nav-legal">
<ul>