X-Git-Url: https://git.mdrn.pl/fnpdjango.git/blobdiff_plain/7b2a81536977bb13b68ada3e5a281e35b24e0bfd..c4311d82afc1bb44566c6e612b09c4ecad1af643:/fnpdjango/templatetags/fnp_lang.py

diff --git a/fnpdjango/templatetags/fnp_lang.py b/fnpdjango/templatetags/fnp_lang.py
index 006faec..dd6c339 100644
--- a/fnpdjango/templatetags/fnp_lang.py
+++ b/fnpdjango/templatetags/fnp_lang.py
@@ -1,5 +1,10 @@
 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
@@ -36,9 +41,9 @@ def get_here_url(request, lang):
             match = resolve(request.get_full_path())
         except Resolver404:
             match = resolve('/')
-        view = match.url_name
+        view = match.func
         if view is None:
-            view = match.func
+            view = match.url_name
         if lang is None:
             lang = translation.get_language()
         with translation.override(lang):