fnp
/
fnpdjango.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.4.4: Django 3.0 support, actions.export_as_csv_action added.
[fnpdjango.git]
/
fnpdjango
/
templatetags
/
fnp_lang.py
diff --git
a/fnpdjango/templatetags/fnp_lang.py
b/fnpdjango/templatetags/fnp_lang.py
index
006faec
..
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
@@
-36,9
+41,9
@@
def get_here_url(request, lang):
match = resolve(request.get_full_path())
except Resolver404:
match = resolve('/')
match = resolve(request.get_full_path())
except Resolver404:
match = resolve('/')
- view = match.
url_name
+ view = match.
func
if view is None:
if view is None:
- view = match.
func
+ view = match.
url_name
if lang is None:
lang = translation.get_language()
with translation.override(lang):
if lang is None:
lang = translation.get_language()
with translation.override(lang):