Fix myriad of errors when testing against 4.2

menus/menu_pool.py

@@ -105,9 +105,10 @@ def __init__(self, pool, request):
         # instance lives.
         self.menus = pool.get_registered_menus(for_rendering=True)
         self.request = request
+        self.request_language = None
         if is_language_prefix_patterns_used():
             self.request_language = get_language_from_request(request, check_path=True)
-        else:
+        if self.request_language is None:
             self.request_language = get_default_language_for_site(get_current_site().pk)
         self.site = Site.objects.get_current(request)