8000 Fix locale · socketpy/django-jet@200ba40 · GitHub
[go: up one dir, main page]

Skip to content

Commit 200ba40

Browse files
committed
Fix locale
1 parent baae5f4 commit 200ba40

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

jet/dashboard/urls.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
from django.conf.urls import url
33

44
try:
5-
from django.views.i18n import javascript_catalog
6-
jsc_view = javascript_catalog
7-
except ImportError:
85
from django.views.i18n import JavaScriptCatalog
9-
jsc_view = JavaScriptCatalog.as_view()
6+
javascript_catalog = JavaScriptCatalog.as_view()
7+
except ImportError: # Django < 2.0
8+
from django.views.i18n import javascript_catalog
109

1110
from jet.dashboard import dashboard
1211
from jet.dashboard.views import update_dashboard_modules_view, add_user_dashboard_module_view, \
@@ -53,8 +52,8 @@
5352
),
5453
url(
5554
r'^jsi18n/$',
56-
jsc_view,
57-
{'packages': ('jet',)},
55+
javascript_catalog,
56+
{'packages': 'jet'},
5857
name='jsi18n'
5958
),
6059
]

jet/urls.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
from django.conf.urls import url
33

44
try:
5-
from django.views.i18n import javascript_catalog
6-
jsc_view = javascript_catalog
7-
except ImportError:
85
from django.views.i18n import JavaScriptCatalog
9-
jsc_view = JavaScriptCatalog.as_view()
6+
javascript_catalog = JavaScriptCatalog.as_view()
7+
except ImportError: # Django < 2.0
8+
from django.views.i18n import javascript_catalog
109

1110
from jet.views import add_bookmark_view, remove_bookmark_view, toggle_application_pin_view, model_lookup_view
1211

@@ -36,7 +35,8 @@
3635
),
3736
url(
3837
r'^jsi18n/$',
39-
jsc_view,
38+
javascript_catalog,
39+
{'packages': 'django.contrib.admin+jet'},
4040
name='jsi18n'
4141
),
4242
]

0 commit comments

Comments
 (0)
0