Merge pull request #1300 from philippeowagner/master

Fixes #1073 Use django-copyright to avoid outdated copyright notice
readthedocs · May 27, 2015 · 3e82ac5 · 3e82ac5
2 parents 258bb1f + a72373b
commit 3e82ac5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
@@ -177,7 +177,8 @@
     'django_gravatar',
     'rest_framework',
     'corsheaders',
-
+    'copyright',
+
     # Celery bits
     'djcelery',
 
@@ -282,6 +283,8 @@
 
 GRAVATAR_DEFAULT_IMAGE = 'http://media.readthedocs.org/images/silhouette.png'
 
+COPY_START_YEAR = 2010
+
 LOG_FORMAT = "[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s"
 
 RESTRUCTUREDTEXT_FILTER_SETTINGS = {

diff --git a/readthedocs/templates/base.html b/readthedocs/templates/base.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-
+{% load copyrighttags %}
 <!DOCTYPE html>
 <html>
 
@@ -85,7 +85,7 @@
 
 
         {% block footer-content %}
-        <p>{% blocktrans with "<a href='http://ericholscher.com/'>Eric Holscher</a>" as eric and "<a href='http://charlesleifer.com/'>Charles Leifer<a>" as charles and "<a href='http://bobbygrace.info/'>Bobby Grace</a>" as bobby and "<a href='http://djangodash.com/'>Django Dash</a>" as djangodash %}Copyright 2010-2015. Created by {{ eric }}, {{ charles }}, and {{ bobby }} for the 2010 {{ djangodash }}.{% endblocktrans %}
+        <p>{% blocktrans with "<a href='http://ericholscher.com/'>Eric Holscher</a>" as eric and "<a href='http://charlesleifer.com/'>Charles Leifer<a>" as charles and "<a href='http://bobbygrace.info/'>Bobby Grace</a>" as bobby and "<a href='http://djangodash.com/'>Django Dash</a>" as djangodash %}Copyright {% getCopyrightYears %}. Created by {{ eric }}, {{ charles }}, and {{ bobby }} for the 2010 {{ djangodash }}.{% endblocktrans %}
         </p>
         <a href="https://github.com/rtfd/readthedocs.org">Github</a> | <a href="http://docs.readthedocs.org">{%  trans "Docs" %}</a>.
 

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -61,6 +61,7 @@ mock==1.0.1
 simplejson==2.3.0
 stripe==1.20.2
 factory-boy==2.4.1
+django-copyright==1.0.0
 
 # Docs
 sphinx-http-domain==0.2