From 964d89e11651a48e8c18c96d011ed5d9a9d97628 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 8 Feb 2010 21:06:47 -0600
Subject: Move /jsi18n/ back out of /admin/ app

This way we can skip the redirect to HTTPS on the real site that is not
necessary by any means, and it works out for the best.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/search.html | 2 +-
 urls.py                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/packages/search.html b/templates/packages/search.html
index 61d13bd7..e760788e 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -3,7 +3,7 @@
 {% block title %}Arch Linux - Package Search{% endblock %}
 {% block head %}
 <link rel="stylesheet" type="text/css" href="/media/admin_media/css/widgets.css" />
-<script type="text/javascript" src="/admin/jsi18n/"></script>
+<script type="text/javascript" src="/jsi18n/"></script>
 <script type="text/javascript" src="/media/admin_media/js/core.js"></script>
 {{search_form.media}}
 {% endblock %}
diff --git a/urls.py b/urls.py
index e0df2da2..77b7b569 100644
--- a/urls.py
+++ b/urls.py
@@ -109,6 +109,9 @@ urlpatterns = patterns('',
     (r'^moreforums/$', 'archweb.public.views.moreforums'),
     (r'^projects/$', 'archweb.public.views.projects'),
     (r'^opensearch/packages/$', 'archweb.packages.views.opensearch'),
+
+# Some django internals we use
+    (r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'),
 )
 
 if settings.DEBUG == True:
-- 
cgit v1.2.3-2-g168b