aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Summers <matthew.summers@liquidustech.com>2010-11-19 15:07:51 -0600
committerMatthew Summers <matthew.summers@liquidustech.com>2010-11-19 15:07:51 -0600
commit3e477c6946e38dc10538133c3a9e951c7eb0918a (patch)
tree29ac64eacdb6bd5280362e2662966dad98d1f435
parentAdding in copy of gplv3 for compliance (diff)
parentFix log prefix. (diff)
downloadgentoo-ads-3e477c6946e38dc10538133c3a9e951c7eb0918a.tar.gz
gentoo-ads-3e477c6946e38dc10538133c3a9e951c7eb0918a.tar.bz2
gentoo-ads-3e477c6946e38dc10538133c3a9e951c7eb0918a.zip
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/gentoo-ads
-rw-r--r--gentoo_ads/ads/templates/404.html11
-rw-r--r--gentoo_ads/logging_setup.py2
2 files changed, 12 insertions, 1 deletions
diff --git a/gentoo_ads/ads/templates/404.html b/gentoo_ads/ads/templates/404.html
new file mode 100644
index 0000000..996398a
--- /dev/null
+++ b/gentoo_ads/ads/templates/404.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+
+{% block title %}{% trans 'Page not found' %}{% endblock %}
+
+{% block content %}
+
+<h2>{% trans 'Page not found' %}</h2>
+
+<p>{% trans "We're sorry, but the requested page could not be found." %}</p>
+
+{% endblock %}
diff --git a/gentoo_ads/logging_setup.py b/gentoo_ads/logging_setup.py
index 254ffa8..0a7db2b 100644
--- a/gentoo_ads/logging_setup.py
+++ b/gentoo_ads/logging_setup.py
@@ -9,7 +9,7 @@ SYS_LOG_ADDRESS = '/dev/log'
## Put in an identifying string like gentoo-ads
## This facilitates filtering with syslog
-AD_LOG_PREFIX = 'example-domain-ads'
+AD_LOG_PREFIX = 'gentoo-ads'
if not hasattr(logging, "set_up_done"):
logging.set_up_done=False