Correct spelling of 'Open edX', and pedantic typography in the copyri…

…ght footer
syed-awais-ali · Jun 29, 2017 · 01018ec · 01018ec
1 parent beba48a
commit 01018ec
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo
diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po
@@ -5724,11 +5724,11 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "© {org_name}.  All rights reserved except where noted.  EdX, Open edX and "
-"the edX and Open EdX logos are registered trademarks or trademarks of edX "
+"their respective logos are trademarks or registered trademarks of edX "
 "Inc."
 msgstr ""
 "© {org_name}.  Àll rïghts résérvéd éxçépt whéré nötéd.  ÉdX, Öpén édX änd "
-"thé édX änd Öpén ÉdX lögös äré régïstéréd trädémärks ör trädémärks öf édX "
+"théir réspéçtïvé lögös äré trädémärks ör régïstéréd trädémärks öf édX "
 "Ìnç. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ "
 "єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм"
 " νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα "
@@ -22144,12 +22144,12 @@ msgstr "édX Hömé Pägé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
 
 #: themes/edx.org/lms/templates/footer.html
 msgid ""
-"© 2012-{year} edX Inc.  All rights reserved except where noted.  EdX, Open "
-"edX and the edX and Open EdX logos are registered trademarks or trademarks "
+"© 2012–{year} 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."
 msgstr ""
-"© 2012-{year} édX Ìnç.  Àll rïghts résérvéd éxçépt whéré nötéd.  ÉdX, Öpén "
-"édX änd thé édX änd Öpén ÉdX lögös äré régïstéréd trädémärks ör trädémärks "
+"© 2012–{year} édX Ìnç.  Àll rïghts résérvéd éxçépt whéré nötéd.  ÉdX, Öpén "
+"édX änd thé édX änd Öpén édX lögös äré régïstéréd trädémärks ör trädémärks "
 "öf édX Ìnç. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ "
 "∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ "
 "мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ "

diff --git a/lms/djangoapps/branding/api.py b/lms/djangoapps/branding/api.py
@@ -118,8 +118,8 @@ def _footer_copyright():
         # Translators: 'EdX', '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 the edX and Open EdX logos are registered trademarks "
-        u"or trademarks of edX Inc."
+        u"EdX, Open edX and their respective logos are trademarks "
+        u"or registered trademarks of edX Inc."
     ).format(org_name=configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME))
 
 

diff --git a/lms/djangoapps/branding/tests/test_api.py b/lms/djangoapps/branding/tests/test_api.py
@@ -48,8 +48,10 @@ class TestFooter(TestCase):
     def test_get_footer(self):
         actual_footer = get_footer(is_secure=True)
         expected_footer = {
-            'copyright': '\xa9 \xe9dX.  All rights reserved except where noted.  EdX, Open edX and the edX and Open'
-                         ' EdX logos are registered trademarks or trademarks of edX Inc.',
+            'copyright':
+                '\xa9 \xe9dX.  All rights reserved except where noted.  '
+                'EdX, Open edX and their respective logos '
+                'are trademarks or registered trademarks of edX Inc.',
             'navigation_links': [
                 {'url': 'https://edx.org/about-us', 'name': 'about', 'title': 'About'},
                 {'url': 'https://edx.org/enterprise', 'name': 'enterprise', 'title': '\xe9dX for Business'},

diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py
@@ -215,8 +215,7 @@ def footer(request):
                 "image": "http://example.com/openedx.png"
             },
             "logo_image": "http://example.com/static/images/logo.png",
-            "copyright": "EdX, Open edX, and the edX and Open edX logos are \
-                registered trademarks or trademarks of edX Inc."
+            "copyright": "EdX, Open edX and their respective logos are trademarks or registered trademarks of edX Inc."
         }
 
 
@@ -226,7 +225,7 @@ def footer(request):
         Accepts: text/html
 
 
-    Example: Including the footer with the "Powered by OpenEdX" logo
+    Example: Including the footer with the "Powered by Open edX" logo
 
         GET /api/branding/v1/footer?show-openedx-logo=1
         Accepts: text/html

diff --git a/lms/templates/footer.html b/lms/templates/footer.html
@@ -64,9 +64,9 @@
     </div>
 
     ## Please leave this link and use one of the logos provided
-    ## The OpenEdX link may be hidden when this view is served
+    ## The Open edX link may be hidden when this view is served
     ## through an API to partner sites (such as marketing sites or blogs),
-    ## which are not technically powered by OpenEdX.
+    ## which are not technically powered by Open edX.
     % if not hide_openedx_link:
     <div class="footer-about-openedx">
       <p>

diff --git a/themes/edx.org/lms/templates/footer.html b/themes/edx.org/lms/templates/footer.html
@@ -50,17 +50,19 @@ <h2 class="sr footer-about-title">${_("About edX")}</h2>
               <%include file="${static.get_template_path('widgets/footer-language-selector.html')}"/>
           % endif
 
+          ## \u00A9 is the copyright symbol.
+          ## \u2013 is the en-dash. It looks like a year, but it isn't.
           <p class="copyright">${_(
-          u"\u00A9 2012-{year} edX Inc.  All rights reserved except where noted.  "
-          u"EdX, Open edX and the edX and Open EdX logos are registered trademarks "
+          u"\u00A9 2012\u2013{year} edX Inc.  All rights reserved except where noted.  "
+          u"EdX, Open edX and the edX and Open edX logos are registered trademarks "
           u"or trademarks of edX Inc."
           ).format(year=datetime.datetime.now().year)}
           ${u" | {icp}".format(icp=getattr(settings,'ICP_LICENSE')) if getattr(settings,'ICP_LICENSE',False) else ""}
 	  </p>
 
-          ## The OpenEdX link may be hidden when this view is served
+          ## The Open edX link may be hidden when this view is served
           ## through an API to partner sites (such as marketing sites or blogs),
-          ## which are not technically powered by OpenEdX.
+          ## which are not technically powered by Open edX.
           % if not hide_openedx_link:
           <div class="openedx-link">
             <a href="${footer['openedx_link']['url']}" title="${footer['openedx_link']['title']}">