Fix for #23 - jsi18n.

jazzband · Nov 19, 2012 · 2a830bf · 2a830bf
1 parent a29b13b
commit 2a830bf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/newsletter/admin.py b/newsletter/admin.py
@@ -446,7 +446,14 @@ def get_urls(self):
                 name=self._view_name('import')),
             url(r'^import/confirm/$',
                 self._wrap(self.subscribers_import_confirm),
-                name=self._view_name('import_confirm'))
+                name=self._view_name('import_confirm')),
+
+            # Translated JS strings - these should be app-wide but are
+            # only used in this part of the admin. For now, leave them here.
+            url(r'^jsi18n/$',
+                'django.views.i18n.javascript_catalog',
+                {'packages': ('newsletter',)},
+                name='newsletter_js18n')
         )
 
         return my_urls + urls

diff --git a/newsletter/templates/admin/newsletter/submission/change_form.html b/newsletter/templates/admin/newsletter/submission/change_form.html
@@ -3,7 +3,7 @@
 
 {% block extrahead %}
 {{ block.super }}
-<script src="../../jsi18n/" type="text/javascript"></script>
+<script src="{% url admin:newsletter_js18n %}" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}newsletter/admin/js/subscriber_lookup.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}newsletter/admin/js/submit_interface.js" type="text/javascript"></script>
 {% endblock %}

diff --git a/newsletter/urls.py b/newsletter/urls.py
@@ -4,11 +4,12 @@
 
 
 urlpatterns = patterns('newsletter.views',
+    # Newsletter list and detail view
     surl('^$', 'newsletter_list', name='newsletter_list'),
-
     surl('^<newsletter_slug:s>/$',
         'newsletter_detail', name='newsletter_detail'),
 
+    # Action request views
     surl('^<newsletter_slug:s>/subscribe/$', 'subscribe_request',
         name='newsletter_subscribe_request'),
     surl('^<newsletter_slug:s>/subscribe/confirm/$', 'subscribe_request',
@@ -20,13 +21,15 @@
     surl('^<newsletter_slug:s>/unsubscribe/confirm/$', 'unsubscribe_request',
         kwargs={'confirm': True}, name='newsletter_unsubscribe_confirm'),
 
+    # Action confirmation views
     surl('^<newsletter_slug:s>/subscription/<email=[-_a-zA-Z0-9@\.\+~]+>/'
          '<action:s>/activate/<activation_code:s>/$',
         'update_subscription', name='newsletter_update_activate'),
     surl('^<newsletter_slug:s>/subscription/<email=[-_a-zA-Z0-9@\.\+~]+>/'
          '<action:s>/activate/$',
         'update_subscription', name='newsletter_update'),
 
+    # Archive views
     surl('^<newsletter_slug:s>/archive/<year:Y>/<month:m>/<day:d>/<slug:s>/$',
         'archive_detail', name='newsletter_archive_detail'),
     surl('^<newsletter_slug:s>/archive/$',