chore: Merge back release/build for 3.11.6 (#7923)

* [3.11.6 release process] Bumped version to 3.11.6

* [3.11.6 release process] compilemessages

* [3.11.6 release process] compiling new static files

* [3.11.6 release process] updating latest docs

* Update CHANGELOG.rst

* Update 3.11.6.rst

* Update publish-to-live-pypi.yml

* Update publish-to-test-pypi.yml

* Adjust branches

* Update .github/workflows/publish-to-test-pypi.yml

Co-authored-by: Mark Walker <mark@django-cms.org>

* Update .github/workflows/publish-to-test-pypi.yml

Co-authored-by: Mark Walker <mark@django-cms.org>

* Update environment name in publish-to-test-pypi.yml

---------

Co-authored-by: Github Release Action <info@django-cms.org>
Co-authored-by: Mark Walker <mark@django-cms.org>

.github/workflows/publish-to-live-pypi.yml

@@ -9,10 +9,15 @@ jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to pypi
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/django-cms
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.12
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.12'
 
@@ -34,6 +39,3 @@ jobs:
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/publish-to-test-pypi.yml

@@ -3,17 +3,22 @@ name: Publish Python 🐍 distributions 📦 to TestPyPI
 on:
   push:
     branches:
-      - 'develop'
-      - 'release/**'
+      - release/*
+      - deveop-4
 
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to TestPyPI
     runs-on: ubuntu-latest
+    environment:
+      name: test
+      url: https://test.pypi.org/p/django-cms
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.12
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.12'
 
@@ -35,7 +40,5 @@ jobs:
     - name: Publish distribution 📦 to Test PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        user: __token__
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
         repository_url: https://test.pypi.org/legacy/
         skip_existing: true

CHANGELOG.rst

@@ -2,6 +2,28 @@
 Changelog
 =========
 
+3.11.6 (2024-05-17)
+===================
+
+* feat: Toolbar direction set based on toolbar language (back port of #7902) by @skhawy in https://github.com/django-cms/django-cms/pull/7914
+* feat: Add RTL support to pagetree by @sakhawy in https://github.com/django-cms/django-cms/pull/7842
+* fix: Add `--fix-paths` option to `./manage.py cms fix-tree` by @fsbraun in https://github.com/django-cms/django-cms/pull/7744
+* fix: readable messages in dark-mode by @fsbraun in https://github.com/django-cms/django-cms/pull/7739
+* fix: Patch Toolbar Middleware Response by @jimlind in https://github.com/django-cms/django-cms/pull/7856
+* fix: also use key-length of 200 for the actual cache-key of placeholders by @wfehr in https://github.com/django-cms/django-cms/pull/7910
+
+Statistics:
+-----------
+
+This release includes 4 pull requests, and was created with the help of the following contributors (in alphabetical order):
+
+* Moe (2 pull requests)
+* Fabian Braun (2 pull requests)
+* Jim Lind (1 pull request)
+* FWehr (1 pull request)
+
+Thanks to all contributors for their efforts!
+
 3.11.5 (2024-01-26)
 ===================
 

cms/__init__.py

@@ -1 +1 @@
-__version__ = '3.11.5'
+__version__ = '3.11.6'

cms/locale/ar/LC_MESSAGES/django.po

@@ -555,11 +555,11 @@ msgstr "حدد صفحة صحيحة"
 msgid ""
 "Page %(conflict_page)s has the same url '%(url)s' as current page "
 "\"%(instance)s\"."
-msgstr ""
+msgstr "الصفحة %(conflict_page)s تمتلك نفس رابط '%(url)s' صفحة حالية \"%(instance)s\"."
 
 #, python-format
 msgid "Page %(conflict_page)s has the same url '%(url)s' as current page."
-msgstr ""
+msgstr "الصفحة %(conflict_page)s تمتلك نفس رابط '%(url)s' صفحة حالية."
 
 msgid ""
 "Optional. If supplied, will be automatically added within a new text plugin."
@@ -572,10 +572,10 @@ msgid "Leave empty for automatic slug, or override as required."
 msgstr "لعنوان تفرع تلقائي يُترك فارغاً ، أو تعاد صياغته حسب الطلب."
 
 msgid "Cannot automatically create slug. Please provide one manually."
-msgstr ""
+msgstr "لا يمكن إنشاء الصيغة تلقائياً. يرجى تزويدها يدوياً."
 
 msgid "Please provide a valid slug."
-msgstr ""
+msgstr "يرجى تزويد صيغة صحيحة"
 
 msgid "You don't have the permissions required to add a page."
 msgstr "ليس لديك الصلاحية لإضافة صفحة."
@@ -1011,7 +1011,7 @@ msgid "last change by"
 msgstr "آخر تعديل من قبل"
 
 msgid "last change on"
-msgstr ""
+msgstr "آخر تعديل بتاريخ"
 
 msgid "meta"
 msgstr "تعريفية"
@@ -1087,7 +1087,7 @@ msgid ""
 "                            <br>\n"
 "                            <a href=\"%(add_url)s\" class=\"addlink\">Add %(object)s</a> now.\n"
 "                        "
-msgstr ""
+msgstr "\n<em>لا يوجد %(object)s حتى الآن.</em>\n<br>\n<a href=\"%(add_url)s\" class=\"addlink\">أضف %(object)s</a> الآن."
 
 msgid "Copy options"
 msgstr "خيارات النسخ"
@@ -1265,10 +1265,10 @@ msgid "Shortcuts"
 msgstr "اختصارات"
 
 msgid "The page was changed in the meantime, reloading..."
-msgstr ""
+msgstr "تم تعديل الصفحة في هذه الأثناء، جاري إعادة التحميل..."
 
 msgid "CMS-wide Shortcuts"
-msgstr ""
+msgstr "إختصارات نطاق نظام إدارة المحتوى."
 
 msgid "Bring up this help dialog"
 msgstr "أحضر مربع حوار المساعدة هذا إلى الأعلى"
@@ -1386,7 +1386,7 @@ msgid ""
 "                    you linked the <code>static/cms</code> folder to your\n"
 "                    static files.</p>\n"
 "            "
-msgstr ""
+msgstr "\n<p class=\"cms-welcome-notes\">في حال لم تر شعار ن.إ.م جانغو في الأعلى، تأكد\n أنك قمت بربط مجلد <code>static/cms</code> مع ملفاتك\nالثابتة.</p>"
 
 msgid ""
 "\n"
@@ -1395,7 +1395,7 @@ msgid ""
 "                        haven't added any pages yet.\n"
 "                    </p>\n"
 "                "
-msgstr ""
+msgstr "\n<p class=\"cms-welcome-notes\">كونك ترى هذه الرسالة هذا يعني أن لديك\n<code>DEBUG = True</code> داخل ملف إعدادات جانغو الخاص بك\nولم تقم بإضافة أي صفحات بعد.\n</p>"
 
 msgid "Welcome to django CMS"
 msgstr "أهلاً بك في نظام إدارة محتوى جانقو"
@@ -1504,7 +1504,7 @@ msgid "Sample App"
 msgstr "عينة تطبيق"
 
 msgid "Sample App with config"
-msgstr ""
+msgstr "عينة تطبيق مع تهيئة"
 
 msgid "Sample App with excluded permissions"
 msgstr "عينة تطبيق بصلاحيات محجوبة"

cms/locale/hr/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Aleks Acimovic, 2022
+# Aleks Acimovic, 2022,2024
 # Damir <damir.arbula@gmail.com>, 2013-2015,2018
 # Dino Ilic <dino.ilic@gmail.com>, 2017
 # Fabian Braun <fsbraun@gmx.de>, 2022
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \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"
+"Last-Translator: Aleks Acimovic, 2022,2024\n"
 "Language-Team: Croatian (http://app.transifex.com/divio/django-cms/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -567,10 +567,10 @@ msgid "Leave empty for automatic slug, or override as required."
 msgstr "Ostavite prazno za automatski slug ili upišite slug."
 
 msgid "Cannot automatically create slug. Please provide one manually."
-msgstr ""
+msgstr "Nemoguće je automatski kreirati slug. Molimo upišite ga ručno."
 
 msgid "Please provide a valid slug."
-msgstr ""
+msgstr "Molimo upišite ispravan slug."
 
 msgid "You don't have the permissions required to add a page."
 msgstr "Nemate ovlasti dodati stranicu."
@@ -1070,7 +1070,7 @@ msgid "View"
 msgstr "Pogled"
 
 msgid "Menu"
-msgstr "Izborni"
+msgstr "Izbornik"
 
 #, python-format
 msgid ""
@@ -1260,7 +1260,7 @@ msgid "The page was changed in the meantime, reloading..."
 msgstr "Stranica je u međuvremenu promijenjena, ponovno učitavam..."
 
 msgid "CMS-wide Shortcuts"
-msgstr ""
+msgstr "Prečaci CMS-a"
 
 msgid "Bring up this help dialog"
 msgstr "Prikaži ovaj dijalog za pomoć"
@@ -1281,7 +1281,7 @@ msgid "Focus on Toolbar"
 msgstr "Fokusiraj na toolbar"
 
 msgid "Structureboard"
-msgstr ""
+msgstr "Strukturna ploča"
 
 msgid "Focus on placeholders"
 msgstr "Fokusiraj na placholdere"
@@ -1582,7 +1582,7 @@ msgid "Getting started"
 msgstr "Kako započeti"
 
 msgid "Talk to us"
-msgstr ""
+msgstr "Kontaktirajte nas"
 
 msgid "CMS - your user account was created."
 msgstr "CMS - Vaš korisnički račun je kreiran."

cms/locale/it/LC_MESSAGES/django.po

@@ -19,6 +19,7 @@
 # Marco Barberis <mbarberis@gmail.com>, 2011
 # mbi0 <marco@cruncher.ch>, 2013
 # mbi0 <marco@cruncher.ch>, 2013
+# Raffaella Suardini, 2024
 # Saverio <saverio.brancaccio@gmail.com>, 2014
 # Stefano Brentegani <sbrentegani@gmail.com>, 2013-2014
 # Stefano Brentegani <sbrentegani@gmail.com>, 2011
@@ -31,7 +32,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-09-05 17:55+0200\n"
 "PO-Revision-Date: 2010-11-30 06:47+0000\n"
-"Last-Translator: Leonardo Cavallucci, 2023\n"
+"Last-Translator: Raffaella Suardini, 2024\n"
 "Language-Team: Italian (http://app.transifex.com/divio/django-cms/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -583,10 +584,10 @@ msgid "Leave empty for automatic slug, or override as required."
 msgstr "Lascia vuoto per slug automatico, o inserisci a seconda delle necessità."
 
 msgid "Cannot automatically create slug. Please provide one manually."
-msgstr ""
+msgstr "Impossibile creare automaticamente uno slug. Forniscine uno manualmente."
 
 msgid "Please provide a valid slug."
-msgstr ""
+msgstr "Fornisci uno slug valido."
 
 msgid "You don't have the permissions required to add a page."
 msgstr "Non hai i permessi necessari per aggiungere una pagina."