Merge branch 'django-cms:master' into master

Author: fsbraun

.pre-commit-config.yaml

@@ -9,12 +9,12 @@ ci:
 
 repos:
     - repo: https://github.com/asottile/pyupgrade
-      rev: v3.15.0
+      rev: v3.15.2
       hooks:
           - id: pyupgrade
             args: ["--py37-plus"]
     - repo: https://github.com/adamchainz/django-upgrade
-      rev: "1.15.0"
+      rev: "1.16.0"
       hooks:
           - id: django-upgrade
             args: [--target-version, "2.2"]

djangocms_frontend/contrib/icon/models.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from djangocms_frontend.models import FrontendUIItem
 

djangocms_frontend/contrib/listgroup/models.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from ...models import FrontendUIItem
 

djangocms_frontend/contrib/media/models.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from djangocms_frontend.models import FrontendUIItem
 

djangocms_frontend/contrib/tabs/models.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from ...models import FrontendUIItem
 

djangocms_frontend/contrib/utilities/models.py

@@ -1,4 +1,4 @@
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from ...models import FrontendUIItem
 

djangocms_frontend/models.py

@@ -4,6 +4,7 @@
 from django.db import models
 from django.utils.html import conditional_escape, mark_safe
 from django.utils.translation import gettext
+from django.utils.translation import gettext_lazy as _
 
 from djangocms_frontend.fields import TagTypeField
 from djangocms_frontend.settings import FRAMEWORK_PLUGIN_INFO
@@ -43,7 +44,7 @@ class AbstractFrontendUIItem(CMSPlugin):
 
     class Meta:
         abstract = True
-        verbose_name = gettext("UI item")
+        verbose_name = _("UI item")
 
     ui_item = models.CharField(max_length=30)
     tag_type = TagTypeField(blank=True)
@@ -141,4 +142,4 @@ class FrontendUIItem(AbstractFrontendUIItem):
 
     """
     class Meta:
-        verbose_name = gettext("UI item")
+        verbose_name = _("UI item")

djangocms_frontend/templates/djangocms_frontend.html

@@ -15,7 +15,7 @@
                 <meta property="og:url" content="{{ request.build_absolute_uri|urlencode:"&?" }}"/>
             {% endblock canonical_url %}
             {% block fb_meta %}{% endblock fb_meta %}
-            <title>{% block title %}{% page_attribute "page_title" %}{% endblock %}</title>
+            <title>{% block title %}{{ request.current_page.get_page_title|striptags }}{% endblock %}</title>
             {% block base_css %}{% endblock %}
 {% endspaceless %}{% render_block 'css' %}{% spaceless %}
     {% block page_head %}{% endblock %}

tests/requirements/dj32_cms310.txt

@@ -2,3 +2,4 @@
 
 Django>=3.2,<3.3
 django-cms>=3.10, <3.11
+djangocms-text-ckeditor

tests/requirements/dj32_cms38.txt

@@ -3,3 +3,4 @@
 Django>=3.2,<3.3
 django-cms>=3.8,<3.9
 django-treebeard<4.5
+djangocms-text-ckeditor