feat: cms.views - set request language according to request.LANGUAGE_CODE

cms/cache/page.py

@@ -1,5 +1,6 @@
 import hashlib
 from datetime import timedelta
+from importlib import import_module
 
 from django.conf import settings
 from django.utils.cache import (
@@ -17,13 +18,34 @@
 from cms.utils.conf import get_cms_setting
 from cms.utils.helpers import get_timezone_name
 
+# during python load phase, resolve custom cache key extra getter from settings into function
+_page_cache_key_extra = None
+if hasattr(settings, "CMS_PAGE_CACHE_KEY_EXTRA"):
+ try:
+ mod_path, met = settings.CMS_PAGE_CACHE_KEY_EXTRA.rsplit('.', 1)
+
+ mod = import_module(mod_path)
+ _page_cache_key_extra = getattr(mod, met)
+ except ImportError:
+ pass
+
 
 def _page_cache_key(request):
+ """
+ Wrapper function to resolve if custom page cache key extra getter was provided
+ """
+ page_cache_key = _default_page_cache_key(request)
+ if _page_cache_key_extra is not None:
+ page_cache_key += _page_cache_key_extra(request)
+ return page_cache_key
+
+
+def _default_page_cache_key(request):
  # sha1 key of current path
  cache_key = "%s:%d:%s" % (
  get_cms_setting("CACHE_PREFIX"),
  settings.SITE_ID,
- hashlib.sha1(iri_to_uri(request.get_full_path()).encode('utf-8')).hexdigest()
+ hashlib.sha1(iri_to_uri(request.get_full_path()).encode('utf-8')).hexdigest(),
  )
  if settings.USE_TZ:
  cache_key += '.%s' % get_timezone_name()

cms/cache/placeholder.py

@@ -16,14 +16,37 @@
 The vary-on header-names are also stored with the version. This enables us to
 check for cache hits without re-computing placeholder.get_vary_cache_on().
 """
 import hashlib
 import time
 
+from importlib import import_module
+
+from django.conf import settings
 from django.utils.timezone import now
 
 from cms.utils.conf import get_cms_setting
 from cms.utils.helpers import get_header_name, get_timezone_name
 
+# during python load phase, resolve custom cache key extra getter from settings into function
+_placeholder_cache_key_extra = None
+if hasattr(settings, "CMS_PLACEHOLDER_CACHE_KEY_EXTRA"):
+ try:
+ mod_path, met = settings.CMS_PLACEHOLDER_CACHE_KEY_EXTRA.rsplit('.', 1)
+
+ mod = import_module(mod_path)
+ _placeholder_cache_key_extra = getattr(mod, met)
+ except ImportError:
+ pass
+
+def _get_placeholder_cache_key(placeholder, lang, site_id, request, soft=False):
+ """
+ Wrapper function to resolve if custom placeholder cache key extra getter was provided
+ """
+ placeholder_cache_key = _default_placeholder_cache_key(placeholder, lang, site_id, request, soft=False)
+ if _placeholder_cache_key_extra is not None:
+ placeholder_cache_key += _placeholder_cache_key_extra(placeholder, lang, site_id, request, soft=False)
+ return placeholder_cache_key
+
 
 def _get_placeholder_cache_version_key(placeholder, lang, site_id):
  """
@@ -85,7 +108,7 @@
  cache.set(key, (version, vary_on_list), duration)
 
 
-def _get_placeholder_cache_key(placeholder, lang, site_id, request, soft=False):
+def _default_placeholder_cache_key(placeholder, lang, site_id, request, soft=False):
  """
  Returns the fully-addressed cache key for the given placeholder and
  the request.

cms/page_rendering.py

@@ -62,12 +62,10 @@ def _handle_no_page(request):
  return HttpResponseRedirect(redirect_url)
 
  # add a $ to the end of the url (does not match on the cms anymore)
- resolve('%s$' % request.path)
+ return resolve('%s$' % request.path).func(request)
  except Resolver404 as e:
  # raise a django http 404 page
- exc = Http404(dict(path=request.path, tried=e.args[0]['tried']))
- raise exc
- raise Http404('CMS Page not found: %s' % request.path)
+ raise Http404(dict(path=request.path, tried=e.args[0]['tried']))
 
 
 def _handle_no_apphook(request):

cms/views.py

@@ -127,10 +127,11 @@ def details(request, slug):
  user_languages = get_public_languages(site_id=site.pk)
 
  request_language = None
- if is_language_prefix_patterns_used():
- request_language = get_language_from_request(request, check_path=True)
+ if hasattr(request, "LANGUAGE_CODE"):
+ # use language from middleware - usually django.middleware.locale.LocaleMiddleware
+ request_language = request.LANGUAGE_CODE
  if not request_language:
- request_language = get_default_language_for_site(get_current_site().pk)
+ request_language = get_default_language_for_site(site.pk)
 
  if not page.is_home and request_language not in user_languages:
  # The homepage is treated differently because

menus/menu_pool.py

@@ -107,12 +107,13 @@ def __init__(self, pool, request):
  # instance lives.
  self.menus = pool.get_registered_menus(for_rendering=True)
  self.request = request
+ self.site = Site.objects.get_current(request)
  self.request_language = None
- if is_language_prefix_patterns_used():
- self.request_language = get_language_from_request(request, check_path=True)
+ if hasattr(request, "LANGUAGE_CODE"):
+ # use language from middleware - usually django.middleware.locale.LocaleMiddleware
+ self.request_language = request.LANGUAGE_CODE
  if not self.request_language:
- self.request_language = get_default_language_for_site(get_current_site().pk)
- self.site = Site.objects.get_current(request)
+ self.request_language = get_default_language_for_site(self.site.pk)
  toolbar = getattr(request, "toolbar", None)
  self.edit_or_preview = toolbar.edit_mode_active or toolbar.preview_mode_active if toolbar else False