Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury

diff --git a/wolnelektury/templates/500.html b/wolnelektury/templates/500.html
index 964b905..117fbc2 100644 (file)
--- a/wolnelektury/templates/500.html
+++ b/wolnelektury/templates/500.html
@@ -13,9 +13,7 @@
 
 <a href="/"><img src="{{ STATIC_URL }}img/logo.png" /></a>
 <p class="haj" style="font-weight: bold">{% trans "Server error" %}</p>
-<p>
-{% trans "We are sorry for your inconvenience, but server error occured. We are working on fixing it as soon as possible. Meanwhile, please go to " %}<a href="/">{% trans "main page" %}</a>.
-</p>
+{% trans "<p>The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our <a href='http://nowoczesnapolska.org.pl'>blog</a>.</p> <p>Inform our <a href='mailto:fundacja@nowoczesnapolska.org.pl'>administrators</a> about the error.</p>" %}
 
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
 </script>

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index a7cd45f..b576a27 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -55,3 +55,5 @@ if 'rosetta' in settings.INSTALLED_APPS:
     urlpatterns += patterns('',
         url(r'^rosetta/', include('rosetta.urls')),
     )
+
+handler500 = 'views.server_error'

diff --git a/wolnelektury/views.py b/wolnelektury/views.py
new file mode 100644 (file)
index 0000000..be1ec99
--- /dev/null
+++ b/wolnelektury/views.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+from django.shortcuts import render_to_response
+from django.template import RequestContext
+
+def server_error(request):
+    return render_to_response('500.html', RequestContext(request))
+