Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1073 Use django-copyright to avoid outdated copyright notice #1300

Merged
merged 2 commits into from
May 27, 2015
Merged

Fixes #1073 Use django-copyright to avoid outdated copyright notice #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2674c35
Use django-copyright to avoid outdated copyright notice like Copyrigh…
philippeowagner May 27, 2015
a72373b
Fixed typo, 20010 => 2010
philippeowagner May 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion readthedocs/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@
'django_gravatar',
'rest_framework',
'corsheaders',

'copyright',

# Celery bits
'djcelery',

Expand Down Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions readthedocs/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}

{% load copyrighttags %}
<!DOCTYPE html>
<html>

Expand Down Expand Up @@ -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>.

Expand Down
1 change: 1 addition & 0 deletions requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down