lang switcher set to main on 404

diff --git a/fnpdjango/templatetags/fnp_lang.py b/fnpdjango/templatetags/fnp_lang.py
index 7f08496..006faec 100755 (executable)
--- a/fnpdjango/templatetags/fnp_lang.py
+++ b/fnpdjango/templatetags/fnp_lang.py
@@ -35,17 +35,14 @@ def get_here_url(request, lang):
         try:
             match = resolve(request.get_full_path())
         except Resolver404:
         try:
             match = resolve(request.get_full_path())
         except Resolver404:

-            return None
+            match = resolve('/')

         view = match.url_name
         if view is None:
             view = match.func
         if lang is None:
             lang = translation.get_language()
         with translation.override(lang):
         view = match.url_name
         if view is None:
             view = match.func
         if lang is None:
             lang = translation.get_language()
         with translation.override(lang):

-            try:
-                url = reverse(view, args=match.args, kwargs=match.kwargs)
-            except Resolver404:
-                return None
+            url = reverse(view, args=match.args, kwargs=match.kwargs)

     return url
 
 
     return url