Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Merge back release 3.11.4 into develop #7646

Merged
merged 19 commits into from Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 76 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -2,6 +2,82 @@
Changelog
=========

3.11.4 (2023-09-06)
===================

Features:
---------
* Update dark mode switch to be compatible with Django 4.2 admin dark mode (#7549) (1106ae6d7) -- Fabian Braun

Bug Fixes:
----------
* Toolbar action button becomes hard to read in dark mode (c626022ba) -- Fabian Braun
* Backport v4.1.0rc4 fixes - Admin language and styling (#7630) (#7641) (90b72ebea) -- Fabian Braun
* diff-dom freezing on content refresh: #7460 (#7600) (d8e9c527e) -- Vinit Kumar
* Fixed RecursionError when extending templates (#7594) (c99f78759) -- mihalikv
* JS issues with running CMS under cypress (#7591) (ce4c29948) -- Vinit Kumar
* Mitigate performance hit due to deprecation warnings for v4.1 (#7587) (9908d7e70) -- Fabian Braun
* create page wizard fails with Asian page titles/unicode slugs (#7565) (0ab640ce3) -- Fabian Braun
* require Django >= 3.2 (#7562) (a77358b93) -- Fabian Braun
* respect pre-set (48353c2d6) -- Fabian Braun
* lint menus app (#7534) (927b60b47) -- Vinit Kumar
* remove curly bracket left behind on PR 7488 (#7529) (123f7df91) -- Corentin Bettiol

Statistics:
-----------

This release includes 46 pull requests, and was created with the help of the following contributors (in alphabetical order):

* ChengDaqi2023 (1 pull request)
* Corentin Bettiol (1 pull request)
* Fabian Braun (15 pull requests)
* Github Release Action (3 pull requests)
* Vinit Kumar (3 pull requests)
* caption (1 pull request)
* mihalikv (1 pull request)
* suryadev99 (1 pull request)

With the review help of the following contributors:

* Cage Johnson
* Christian Clauss
* Conrad
* Corentin Bettiol
* Danny Waser
* Dapo Adedire
* Fabian Braun
* Fabien MICHEL
* Florian Delizy
* G3RB3N
* Github Release Action
* Hussein Srour
* Ivo Branco
* Jasper
* Marco Bonetti
* Mark Walker
* Micah Denbraver
* Nihal
* Nihal Rahman
* Pankrat
* Patrick Mazulo
* Petr Klus
* Qijia Liu
* Shivan Sivakumaran
* Simon Krull
* Vinit Kumar
* code-review-doctor
* dependabot[bot]
* fsbraun
* jefe
* jillalberts
* pajowu
* ton77v
* viliam mihalik
* viliammihalik
* wesleysima

Thanks to all contributors for their efforts!

3.11.3 (2023-04-25)
===================

Expand Down
2 changes: 1 addition & 1 deletion cms/__init__.py
@@ -1,4 +1,4 @@
__version__ = '3.11.3'
__version__ = '3.11.4'

try:
import django
Expand Down
12 changes: 6 additions & 6 deletions cms/cms_toolbars.py
Expand Up @@ -48,12 +48,12 @@
SHORTCUTS_BREAK = 'Shortcuts Break'

DEFAULT_HELP_MENU_ITEMS = (
(gettext("Getting started developer guide"), 'https://docs.django-cms.org/en/latest/introduction/index.html'),
(gettext("Documentation"), 'https://docs.django-cms.org/en/latest/'),
(gettext("User guide"), 'https://docs.google.com/document/d/1f5eWyD_sxUSok436fSqDI0NHcpQ88CXQoDoQm9ZXb0s/'),
(gettext("Support Forum"), 'https://discourse.django-cms.org/'),
(gettext("Support Slack"), 'https://www.django-cms.org/slack'),
(gettext("What's new"), 'https://www.django-cms.org/en/blog/'),
(_("Getting started developer guide"), 'https://docs.django-cms.org/en/latest/introduction/index.html'),
(_("Documentation"), 'https://docs.django-cms.org/en/latest/'),
(_("User guide"), 'https://docs.google.com/document/d/1f5eWyD_sxUSok436fSqDI0NHcpQ88CXQoDoQm9ZXb0s/'),
(_("Support Forum"), 'https://discourse.django-cms.org/'),
(_("Support Slack"), 'https://www.django-cms.org/slack'),
(_("What's new"), 'https://www.django-cms.org/en/blog/'),
)


Expand Down
Binary file modified cms/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 8 additions & 5 deletions cms/locale/ar/LC_MESSAGES/django.po
Expand Up @@ -18,10 +18,10 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"POT-Creation-Date: 2023-09-05 17:55+0200\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\n"
"Language-Team: Arabic (http://www.transifex.com/divio/django-cms/language/ar/)\n"
"Language-Team: Arabic (http://app.transifex.com/divio/django-cms/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -65,9 +65,6 @@ msgstr "علامة الوصف التعريفية"
msgid "A description of the page used by search engines."
msgstr "شرح عن الصفحة تستخدمه محركات البحث."

msgid "Slug must not be empty."
msgstr "حقل الـ Slug يجب ان لا يكون فارغا"

msgid "Page type"
msgstr "نوع الصفحة"

Expand Down Expand Up @@ -574,6 +571,12 @@ msgstr "زوّد الصفحة الجديدة بعنوان."
msgid "Leave empty for automatic slug, or override as required."
msgstr "لعنوان تفرع تلقائي يُترك فارغاً ، أو تعاد صياغته حسب الطلب."

msgid "Cannot automatically create slug. Please provide one manually."
msgstr ""

msgid "Please provide a valid slug."
msgstr ""

msgid "You don't have the permissions required to add a page."
msgstr "ليس لديك الصلاحية لإضافة صفحة."

Expand Down
Binary file modified cms/locale/ca/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 8 additions & 5 deletions cms/locale/ca/LC_MESSAGES/django.po
Expand Up @@ -12,10 +12,10 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"POT-Creation-Date: 2023-09-05 17:55+0200\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\n"
"Language-Team: Catalan (http://www.transifex.com/divio/django-cms/language/ca/)\n"
"Language-Team: Catalan (http://app.transifex.com/divio/django-cms/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -59,9 +59,6 @@ msgstr "Meta tag de la descripció"
msgid "A description of the page used by search engines."
msgstr "Una llista de paraules clau separades per comes a vegades utilitzada pels motors de cerca."

msgid "Slug must not be empty."
msgstr "L'slug no pot estar en blanc."

msgid "Page type"
msgstr "Tipus de Pàgina"

Expand Down Expand Up @@ -568,6 +565,12 @@ msgstr "Introdueix un títol per la nova pàgina."
msgid "Leave empty for automatic slug, or override as required."
msgstr "Deixar en blanc per slug automàtic, o sobreescriure si s'escau."

msgid "Cannot automatically create slug. Please provide one manually."
msgstr ""

msgid "Please provide a valid slug."
msgstr ""

msgid "You don't have the permissions required to add a page."
msgstr ""

Expand Down
Binary file modified cms/locale/cs/LC_MESSAGES/django.mo
Binary file not shown.
17 changes: 10 additions & 7 deletions cms/locale/cs/LC_MESSAGES/django.po
Expand Up @@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Jiří Vírava <appukonrad@gmail.com>, 2012-2013
# Appukonrad <appukonrad@gmail.com>, 2012-2013
# Fabian Braun <fsbraun@gmx.de>, 2022
# Martin S. <marhac@seznam.cz>, 2018
# koren <honza@kekorenum.com>, 2015
# Jakub Dorňák <jakub.dornak@misli.cz>, 2020
# Jakub Dorňák <jakub.dornak@misli.cz>, 2013
# Jiří Vírava <appukonrad@gmail.com>, 2014-2015
# Appukonrad <appukonrad@gmail.com>, 2014-2015
# Joe Darkless <darkless69@gmail.com>, 2015
# koren <honza@kekorenum.com>, 2015
# Martin Koistinen <mkoistinen@gmail.com>, 2015
Expand All @@ -25,10 +25,10 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"POT-Creation-Date: 2023-09-05 17:55+0200\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\n"
"Language-Team: Czech (http://www.transifex.com/divio/django-cms/language/cs/)\n"
"Language-Team: Czech (http://app.transifex.com/divio/django-cms/language/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -72,9 +72,6 @@ msgstr "Meta tag Description (Popis)"
msgid "A description of the page used by search engines."
msgstr "Seznam klíčových slov oddělených čárkou, které mohou indexovat vyhledávače."

msgid "Slug must not be empty."
msgstr "Identifikátor nesmí být prázdný."

msgid "Page type"
msgstr "Typ stránky"

Expand Down Expand Up @@ -581,6 +578,12 @@ msgstr "Uveďte nadpis pro novou stránku."
msgid "Leave empty for automatic slug, or override as required."
msgstr "Ponechte prázdné pro automatické vyplnění slugu, nebo vyplňte dle potřeby."

msgid "Cannot automatically create slug. Please provide one manually."
msgstr ""

msgid "Please provide a valid slug."
msgstr ""

msgid "You don't have the permissions required to add a page."
msgstr "Nemáte oprávnění vytvářet stránky."

Expand Down
Binary file modified cms/locale/da/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 8 additions & 5 deletions cms/locale/da/LC_MESSAGES/django.po
Expand Up @@ -17,10 +17,10 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"POT-Creation-Date: 2023-09-05 17:55+0200\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\n"
"Language-Team: Danish (http://www.transifex.com/divio/django-cms/language/da/)\n"
"Language-Team: Danish (http://app.transifex.com/divio/django-cms/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -64,9 +64,6 @@ msgstr "Beskrivelse meta tag"
msgid "A description of the page used by search engines."
msgstr "En beskrivelse af siden til brug for søgemaskiner"

msgid "Slug must not be empty."
msgstr "Slug kan ikke være tom"

msgid "Page type"
msgstr "Sidetype"

Expand Down Expand Up @@ -573,6 +570,12 @@ msgstr ""
msgid "Leave empty for automatic slug, or override as required."
msgstr ""

msgid "Cannot automatically create slug. Please provide one manually."
msgstr ""

msgid "Please provide a valid slug."
msgstr ""

msgid "You don't have the permissions required to add a page."
msgstr ""

Expand Down
Binary file modified cms/locale/de/LC_MESSAGES/django.mo
Binary file not shown.
13 changes: 8 additions & 5 deletions cms/locale/de/LC_MESSAGES/django.po
Expand Up @@ -35,10 +35,10 @@ msgid ""
msgstr ""
"Project-Id-Version: django CMS\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-05 19:07+0100\n"
"POT-Creation-Date: 2023-09-05 17:55+0200\n"
"PO-Revision-Date: 2010-11-30 06:47+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2022\n"
"Language-Team: German (http://www.transifex.com/divio/django-cms/language/de/)\n"
"Language-Team: German (http://app.transifex.com/divio/django-cms/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -82,9 +82,6 @@ msgstr "\"Description\" Meta-Tag"
msgid "A description of the page used by search engines."
msgstr "Eine Beschreibung der Seite. Wird teilweise von Suchmaschinen genutzt."

msgid "Slug must not be empty."
msgstr "Slug darf nicht leer sein."

msgid "Page type"
msgstr "Seitentyp"

Expand Down Expand Up @@ -591,6 +588,12 @@ msgstr "Füge einen Titel für die neue Seite ein."
msgid "Leave empty for automatic slug, or override as required."
msgstr "Leer lassen um automatisch zu generieren, oder manuell überschreiben."

msgid "Cannot automatically create slug. Please provide one manually."
msgstr "Kann Slug nicht automatisch generieren. Bitte manuell eingeben."

msgid "Please provide a valid slug."
msgstr "Bitte geben Sie eine gültige Slug an."

msgid "You don't have the permissions required to add a page."
msgstr "Sie haben nicht die notwendigen Rechte um eine Seite hinzuzufügen."

Expand Down
Binary file modified cms/locale/de/LC_MESSAGES/djangojs.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion cms/locale/de/LC_MESSAGES/djangojs.po
Expand Up @@ -14,7 +14,7 @@ msgstr ""
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"PO-Revision-Date: 2010-11-30 06:49+0000\n"
"Last-Translator: Peter Wischer <peter.wischer@lwl.org>, 2022\n"
"Language-Team: German (http://www.transifex.com/divio/django-cms/language/de/)\n"
"Language-Team: German (http://app.transifex.com/divio/django-cms/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
11 changes: 7 additions & 4 deletions cms/locale/en/LC_MESSAGES/django.po
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"POT-Creation-Date: 2023-09-06 10:43+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -54,9 +54,6 @@ msgstr ""
msgid "A description of the page used by search engines."
msgstr ""

msgid "Slug must not be empty."
msgstr ""

msgid "Page type"
msgstr ""

Expand Down Expand Up @@ -563,6 +560,12 @@ msgstr ""
msgid "Leave empty for automatic slug, or override as required."
msgstr ""

msgid "Cannot automatically create slug. Please provide one manually."
msgstr ""

msgid "Please provide a valid slug."
msgstr ""

msgid "You don't have the permissions required to add a page."
msgstr ""

Expand Down
8 changes: 1 addition & 7 deletions cms/locale/en/LC_MESSAGES/djangojs.po
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-05 20:40+0100\n"
"POT-Creation-Date: 2023-09-06 10:43+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -18,11 +18,5 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgid "/"
msgstr ""

msgid ":"
msgstr ""

msgid "Are you sure you want to change tabs without saving the page first?"
msgstr ""
Binary file modified cms/locale/es/LC_MESSAGES/django.mo
Binary file not shown.