ci: Merging 3.10.1 following release. (#7349)

django-cms · Jun 28, 2022 · 967a398 · 967a398
1 parent c412e97
commit 967a398
Show file tree

Hide file tree

Showing 36 changed files with 168 additions and 50 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -13,6 +13,33 @@ unreleased
 * Fix except block using list instead of tuple. (#7334)
 * Added cache ttl extension point.
 
+3.10.1 (2022-06-28)
+===================
+
+Bug Fixes:
+----------
+* Changelog titles for 3.10.x (#7347) (31f399535) -- Mark Walker
+* Request missing from test rendering (#7346) (eff54b0fd) -- Mark Walker
+* Changelog title for 3.10.1rc1 (#7345) (966a90fd2) -- Mark Walker
+* Revert change to the toolbar sites menu to use ``http`` protocol (#7332) (caddfe7f4) -- Mark Walker
+* Fixed ``AttributeError`` (#7288) when the current toolbar object doesn't define ``get_draft_url()`` (#7289) -- Marco Bonetti
+* Fix for django 2.2 in middleware [#7290] (#7293) -- Mark Walker
+* Update release script to start bringing support for macOS (#7294) -- Mark Walker
+* Fix release script version commit. (#7295) -- Mark Walker
+* Revert change to the toolbar sites menu to use ``http`` protocol. (#7331) -- Mark Walker
+
+Statistics:
+-----------
+
+This release includes 12 pull requests, and was created with the help of the following contributors (in alphabetical order):
+
+* Conrad (3 pull requests)
+* Florian Delizy (1 pull request)
+* Marco Bonetti (1 pull request)
+* Mark Walker (7 pull requests)
+
+Thanks to all contributors for their efforts!
+
 3.10.0 (2022-03-26)
 ===================
 
@@ -125,7 +152,7 @@ Bug Fixes:
 * Fix styles issues, caused by switching to the ``display: flex`` on the page tree renderer.
 * Fixed missing builtin arguments on main ``cms`` management command causing it to crash
 * Fixed template label nested translation
-* Fixed a bug where the fallback page title would be returned instead of the one from the current language
+* Fixed a bug where the fallback page title whould be returned instead of the one from the current language
 * Fixed an issue when running migrations on a multi database project
 * Fixes #7033: also check for Django 3.2, now that 3.9 supports it. (#7054) (02083f2dc) -- Marco Bonetti
 
@@ -226,7 +253,7 @@ Thanks to all contributors for their efforts!
 * Fixed an issue in ``wizards/create.html`` where the error message did not use the plural form
 * Improved documentation building
 * Updated the content for django CMS’s development community
-* Replaced all occurrences of ``force_text`` and ``smart_text`` against
+* Replaced all occurences of ``force_text`` and ``smart_text`` against
   ``force_str``and ``smart_str``.
 
 
@@ -764,7 +791,7 @@ Thanks to all contributors for their efforts!
 - Substantial improvements to the page tree and significant reduction of reloads
 - Update jsTree version to 3.2.1 with slight adaptions to the Pagetree
 - Documentation improvements
-- Improve the display and usability of the language menu, especially in cases
+- Improve the display and useability of the language menu, especially in cases
   where there are many languages.
 - Fix an issue relating to search fields in plugins
 - Fix an issue where the app-resolver would trigger locales into migrations

diff --git a/cms/__init__.py b/cms/__init__.py
@@ -1,6 +1,6 @@
 import django
 
-__version__ = '3.10.0'
+__version__ = '3.10.1'
 
 if django.VERSION < (3, 2):
     default_app_config = 'cms.apps.CMSConfig'
diff --git a/cms/locale/es/LC_MESSAGES/django.po b/cms/locale/es/LC_MESSAGES/django.po
@@ -37,15 +37,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:47+0000\n"
 "Last-Translator: Pier Jose Gotta Perez <piegope@protonmail.com>, 2020\n"
 "Language-Team: Spanish (http://www.transifex.com/divio/django-cms/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "All"
 msgstr "Todo"
@@ -946,6 +946,7 @@ msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrija el error de abajo."
 msgstr[1] "Por favor, corrija los errores de abajo."
+msgstr[2] "Por favor, corrija los errores de abajo."
 
 msgid "All permissions"
 msgstr "Todos los permisos"

diff --git a/cms/locale/es/LC_MESSAGES/djangojs.po b/cms/locale/es/LC_MESSAGES/djangojs.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:49+0000\n"
 "Last-Translator: e4db27214f7e7544f2022c647b585925_bb0e321, 2015\n"
 "Language-Team: Spanish (http://www.transifex.com/divio/django-cms/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "pathname"
 msgstr ""

diff --git a/cms/locale/fr/LC_MESSAGES/django.po b/cms/locale/fr/LC_MESSAGES/django.po
@@ -42,15 +42,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:47+0000\n"
 "Last-Translator: Robin Durner, 2022\n"
 "Language-Team: French (http://www.transifex.com/divio/django-cms/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "All"
 msgstr "Tout"
@@ -951,6 +951,7 @@ msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Veuillez corriger l'erreur suivante."
 msgstr[1] "Veuillez corriger les erreurs suivantes."
+msgstr[2] "Veuillez corriger les erreurs suivantes."
 
 msgid "All permissions"
 msgstr "Toutes les permissions"

diff --git a/cms/locale/fr/LC_MESSAGES/djangojs.po b/cms/locale/fr/LC_MESSAGES/djangojs.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:49+0000\n"
 "Last-Translator: Frigory33 <chironsylvain@orange.fr>, 2016\n"
 "Language-Team: French (http://www.transifex.com/divio/django-cms/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "pathname"
 msgstr ""

diff --git a/cms/locale/it/LC_MESSAGES/django.po b/cms/locale/it/LC_MESSAGES/django.po
@@ -27,15 +27,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:47+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>, 2013-2016,2019\n"
 "Language-Team: Italian (http://www.transifex.com/divio/django-cms/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "All"
 msgstr "Tutti"
@@ -936,6 +936,7 @@ msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Per favore correggi l'errore sottostante."
 msgstr[1] "Per favore correggi gli errori sottostanti."
+msgstr[2] "Per favore correggi gli errori sottostanti."
 
 msgid "All permissions"
 msgstr "Tutti i permessi"

diff --git a/cms/locale/it/LC_MESSAGES/djangojs.po b/cms/locale/it/LC_MESSAGES/djangojs.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:49+0000\n"
 "Last-Translator: yakky <i.spalletti@nephila.it>, 2015\n"
 "Language-Team: Italian (http://www.transifex.com/divio/django-cms/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "pathname"
 msgstr ""

diff --git a/cms/locale/pt/LC_MESSAGES/django.po b/cms/locale/pt/LC_MESSAGES/django.po
@@ -15,15 +15,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:47+0000\n"
 "Last-Translator: André Cruz <transifex@cabine.org>, 2018\n"
 "Language-Team: Portuguese (http://www.transifex.com/divio/django-cms/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "All"
 msgstr "Todos"
@@ -924,6 +924,7 @@ msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrija o erro abaixo."
 msgstr[1] "Por favor, corrija os erros abaixo."
+msgstr[2] "Por favor, corrija os erros abaixo."
 
 msgid "All permissions"
 msgstr "Todas as permissões"

diff --git a/cms/locale/pt/LC_MESSAGES/djangojs.po b/cms/locale/pt/LC_MESSAGES/djangojs.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:49+0000\n"
 "Last-Translator: Vítor Figueiró <vfigueiro@gmail.com>, 2012\n"
 "Language-Team: Portuguese (http://www.transifex.com/divio/django-cms/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "pathname"
 msgstr ""

diff --git a/cms/locale/pt_BR/LC_MESSAGES/django.po b/cms/locale/pt_BR/LC_MESSAGES/django.po
@@ -30,15 +30,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:47+0000\n"
 "Last-Translator: Welligton Miguel <miguelwelligton@gmail.com>, 2020\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/divio/django-cms/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "All"
 msgstr "Todos"
@@ -939,6 +939,7 @@ msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Por favor, corrija o erro abaixo."
 msgstr[1] "Por favor, corrija os erros abaixo."
+msgstr[2] "Por favor, corrija os erros abaixo."
 
 msgid "All permissions"
 msgstr "Todas as permissões"

diff --git a/cms/locale/pt_BR/LC_MESSAGES/djangojs.po b/cms/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:49+0000\n"
 "Last-Translator: Diego Ponci <dgo.ponciano@gmail.com>, 2016\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/divio/django-cms/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 msgid "pathname"
 msgstr ""

diff --git a/cms/locale/ru/LC_MESSAGES/django.po b/cms/locale/ru/LC_MESSAGES/django.po
@@ -12,6 +12,7 @@
 # Denis Darii <denis.darii@gmail.com>, 2011
 # Denis Darii <denis.darii@gmail.com>, 2011
 # Dimmus <dmitri.chudinov@gmail.com>, 2011
+# Dmitrii Kurskov, 2022
 # eXtractor <evg.kirov@gmail.com>, 2019
 # Gleb Chipiga <gleb.chipiga@gmail.com>, 2011
 # ha7y <maxvyaznikov@gmail.com>, 2014
@@ -38,9 +39,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django CMS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-26 17:28+0800\n"
+"POT-Creation-Date: 2022-05-31 20:29+0200\n"
 "PO-Revision-Date: 2010-11-30 06:47+0000\n"
-"Last-Translator: Kirill Artemenko <4322221@gmail.com>, 2021\n"
+"Last-Translator: Dmitrii Kurskov, 2022\n"
 "Language-Team: Russian (http://www.transifex.com/divio/django-cms/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -128,7 +129,7 @@ msgid "Language independent options"
 msgstr "Опции, независимые от языка"
 
 msgid "You entered an invalid URL."
-msgstr ""
+msgstr "Вы ввели неверный URL."
 
 #, python-format
 msgid "Please set the %(language)s slug before editing its advanced settings."
@@ -416,22 +417,22 @@ msgid ""
 msgstr "Это ссылка-синоним, вы можете отредактировать содержимое только на родительской странице  <a href=\"%(page_url)s?edit\" target=\"_parent\">%(page_title)s</a>."
 
 msgid "Getting started developer guide"
-msgstr ""
+msgstr "Руководство по началу работы для разработчиков"
 
 msgid "Documentation"
 msgstr "Документация"
 
 msgid "User guide"
-msgstr ""
+msgstr "Руководство пользователя"
 
 msgid "Support Forum"
-msgstr ""
+msgstr "Форум поддержки пользователей"
 
 msgid "Support Slack"
 msgstr ""
 
 msgid "What's new"
-msgstr ""
+msgstr "Что нового"
 
 msgid "Create"
 msgstr "Создать"
@@ -474,7 +475,7 @@ msgid "Language"
 msgstr "Язык"
 
 msgid "Help"
-msgstr ""
+msgstr "Помощь"
 
 msgid "Structure"
 msgstr "Структура"
@@ -551,7 +552,7 @@ msgid "Unpublish page"
 msgstr "Отменить публикацию"
 
 msgid "Publish page"
-msgstr ""
+msgstr "Опубликовать страницу"
 
 msgid "Are you sure you want to revert to live?"
 msgstr "Вы точно хотите вернуться к опубликованной версии?"
@@ -1026,7 +1027,7 @@ msgid "last change by"
 msgstr "последнее изменение сделано"
 
 msgid "last change on"
-msgstr ""
+msgstr "последнее изменение"
 
 msgid "meta"
 msgstr "Мета"
@@ -1599,10 +1600,10 @@ msgid "Add plugin to %(plugin_name)s"
 msgstr "Добавить плагин в %(plugin_name)s"
 
 msgid "Community forum"
-msgstr ""
+msgstr "Форум сообщества"
 
 msgid "Getting started"
-msgstr ""
+msgstr "Начало работы"
 
 msgid "Talk to us"
 msgstr ""

diff --git a/cms/static/cms/css/3.10.0/cms.base.css → cms/static/cms/css/3.10.1/cms.base.css b/cms/static/cms/css/3.10.0/cms.base.css → cms/static/cms/css/3.10.1/cms.base.css
diff --git a/cms/static/cms/css/3.10.0/cms.pagetree.css → cms/static/cms/css/3.10.1/cms.pagetree.css b/cms/static/cms/css/3.10.0/cms.pagetree.css → cms/static/cms/css/3.10.1/cms.pagetree.css