diff options
author | Moritz Sichert <moritz.sichert@googlemail.com> | 2014-02-23 15:10:31 +0100 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2015-03-20 17:27:41 -0400 |
commit | 6bb2175ed65456dda2f8ba584f206ba4bbd43dbc (patch) | |
tree | 0d9ba74e7dd7178b663d7883de50ace2e9485287 /tests/view_tests/urls.py | |
parent | 556eb6770146f26a7f01f786034d8b3ec879ed05 (diff) | |
download | django-6bb2175ed65456dda2f8ba584f206ba4bbd43dbc.tar.gz |
Fixed #22106 -- Allowed using more than one instance of javascript_catalog per project.
Diffstat (limited to 'tests/view_tests/urls.py')
-rw-r--r-- | tests/view_tests/urls.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py index 061dd19751..1d34b1f934 100644 --- a/tests/view_tests/urls.py +++ b/tests/view_tests/urls.py @@ -38,6 +38,16 @@ js_info_dict_admin = { 'packages': ('django.contrib.admin', 'view_tests'), } +js_info_dict_app1 = { + 'domain': 'djangojs', + 'packages': ('view_tests.app1',), +} + +js_info_dict_app2 = { + 'domain': 'djangojs', + 'packages': ('view_tests.app2',), +} + js_info_dict_app5 = { 'domain': 'djangojs', 'packages': ('view_tests.app5',), @@ -64,12 +74,15 @@ urlpatterns = [ # i18n views url(r'^i18n/', include('django.conf.urls.i18n')), url(r'^jsi18n/$', i18n.javascript_catalog, js_info_dict), + url(r'^jsi18n/app1/$', i18n.javascript_catalog, js_info_dict_app1), + url(r'^jsi18n/app2/$', i18n.javascript_catalog, js_info_dict_app2), url(r'^jsi18n/app5/$', i18n.javascript_catalog, js_info_dict_app5), url(r'^jsi18n_english_translation/$', i18n.javascript_catalog, js_info_dict_english_translation), url(r'^jsi18n_multi_packages1/$', i18n.javascript_catalog, js_info_dict_multi_packages1), url(r'^jsi18n_multi_packages2/$', i18n.javascript_catalog, js_info_dict_multi_packages2), url(r'^jsi18n_admin/$', i18n.javascript_catalog, js_info_dict_admin), url(r'^jsi18n_template/$', views.jsi18n), + url(r'^jsi18n_multi_catalogs/$', views.jsi18n_multi_catalogs), # Static views url(r'^site_media/(?P<path>.*)$', static.serve, {'document_root': media_dir}), |