fnp
/
fnpdjango.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support for Django up to 2.2.
[fnpdjango.git]
/
fnpdjango
/
templatetags
/
fnp_lang.py
diff --git
a/fnpdjango/templatetags/fnp_lang.py
b/fnpdjango/templatetags/fnp_lang.py
index
5f7ac24
..
dd6c339
100644
(file)
--- a/
fnpdjango/templatetags/fnp_lang.py
+++ b/
fnpdjango/templatetags/fnp_lang.py
@@
-1,5
+1,10
@@
from django.conf import settings
from django.conf import settings
-from django.core.urlresolvers import resolve, reverse, Resolver404
+
+try:
+ from django.urls import resolve, reverse, Resolver404
+except ImportError:
+ from django.core.urlresolvers import resolve, reverse, Resolver404
+
from django import template
from django.utils import translation
from ..utils.views import get_current_object
from django import template
from django.utils import translation
from ..utils.views import get_current_object