8000 chore: Merge back release/4.1.x by fsbraun · Pull Request #7899 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

chore: Merge back release/4.1.x #7899

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.

Sign up for GitHub

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

Merged
merged 63 commits into from
May 1, 2024
Merged

chore: Merge back release/4.1.x #7899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2e31793
Merge pull request #7617 from fsbraun/develop-4
fsbraun Aug 7, 2023
318d417
Fix: modal.scss dark-mode compatibilitiy
fsbraun Aug 8, 2023
5232220
Add: Build all assets as part of the frontend test
fsbraun Aug 8, 2023
94cc9b0
fix: Better action feedback
fsbraun Aug 8, 2023
4c7939e
Merge pull request #7621 from fsbraun/fix/dart-sass
fsbraun Aug 8, 2023
4ab1f58
fix: Update _modal.scss
fsbraun Aug 8, 2023
fcc2f7a
fix: Remove publish/draft reference from grouper admin message
fsbraun Aug 8, 2023
e703659
Merge pull request #7622 from fsbraun/fix/grouper-message
fsbraun Aug 8, 2023
33fbdb1
fix ruff
fsbraun Aug 8, 2023
d79eddc
Add Django 4.2 support to release notes
fsbraun Aug 8, 2023
369f776
Fix transifex-pull-strings
fsbraun Aug 9, 2023
06ecf3a
fix: Update transifex source file (#7629)
fsbraun Aug 22, 2023
ac74c21
Fix: Open new plugin window in language of toolbar not of page (#7632)
fsbraun Aug 23, 2023
33f93d6
Fix: Broken page actions menu if CMS_PERMISSIONS is set
fsbraun Aug 24, 2023
d871d9f
Build: release 4.1.0rc4 (#7637)
fsbraun Aug 25, 2023
58ed512
fix: en locale in `release/4.1.x` (#7638)
fsbraun Aug 25, 2023
b3edda3
fix: en locale typo (#7639)
fsbraun Aug 25, 2023
121acf1
Merge branch 'develop-4' into release/4.1.x
fsbraun Aug 30, 2023
807a87b
fix: Remove `can_publish` permission from django CMS 4 core (#7635)
fsbraun Oct 16, 2023
8b323e7
Merge pull request #7718 from django-cms/develop-4
fsbraun Dec 11, 2023
5e9a71b
ci: Merge back 4.1.0.rc5 build into release/4.1.x (#7720)
fsbraun Dec 12, 2023
118f79f
Update setup.cfg
fsbraun Dec 12, 2023
3411b98
Remove py3.8 from setup.cfg
fsbraun Dec 12, 2023
737e86e
feat: add v4 docs to main branch (#7722)
fsbraun Dec 21, 2023
5c5359f
Update docs for frontend testing (#7726)
protoroto Dec 21, 2023
bb8a7ef
fix: Update make-release script to evaluate git diff-index exit codes
fsbraun Dec 22, 2023
b98b051
Update make-release to allow for empty messages commit
fsbraun Dec 22, 2023
e88032b
chore: Merge `release/build` into `release/4.1.x` (#7729)
fsbraun Dec 27, 2023
959200e
Apply suggestions from code review
fsbraun Dec 31, 2023
490dffa
fix: Incomplete command to create a virtual env in docs (#7735)
fsbraun Jan 4, 2024
cb0cff1
docs: Remove reference to rc5 from 01-install.rst
fsbraun Jan 4, 2024
01dc649
fix #7826
jrief Feb 28, 2024
6da9de8
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 7, 2024
ee2f469
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 18, 2024
1854ba4
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 19, 2024
6b78c89
Merge branch 'release/4.1.x' into develop-4
fsbraun Apr 19, 2024
566cbf4
Merge branch 'develop-4' of github.com:fsbraun/django-cms into develop-4
fsbraun Apr 19, 2024
513318c
Fix merge errors
fsbraun Apr 19, 2024
95e9afb
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 20, 2024
7f1ec98
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 23, 2024
6771f8b
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 23, 2024
f5409b8
Merge pull request #7886 from fsbraun/develop-4
fsbraun Apr 23, 2024
bb31ba9
feat: send post request if toolbar button has `cms-form-post-method` …
fsbraun Apr 24, 2024
358baf8
Fix eslint
fsbraun Apr 24, 2024
a999820
Merge pull request #7890 from fsbraun/fix/toolbar-post-button
fsbraun Apr 24, 2024
1d4f072
Merge branch 'django-cms:develop-4' into develop-4
fsbraun Apr 26, 2024
a4c6ccb
fix: structure board on the right for ltr
fsbraun Apr 26, 2024
4fd8210
Merge pull request #7891 from fsbraun/fix/rtl-bugs
fsbraun Apr 26, 2024
ccb2e8b
Fix: Placeholders must not block deletion of their source objects
fsbraun Apr 26, 2024
72459b0
Add some explanation
fsbraun Apr 26, 2024
fce9e6c
Merge pull request #7893 from fsbraun/fix/placeholder-deletion-bug
fsbraun Apr 26, 2024
27edafd
[4.1.1 release process] Building locales
Apr 26, 2024
50cbd71
[4.1.1 release process] Bumped version to 4.1.1
Apr 26, 2024
bf4177f
[4.1.1 release process] compilemessages
Apr 26, 2024
158f989
[4.1.1 release process] compiling new static files
Apr 26, 2024
2ff0855
[4.1.1 release process] updating latest docs
Apr 26, 2024
80fc1f0
Update CHANGELOG.rst
fsbraun Apr 27, 2024
a62d1e1
Update 4.1.1.rst
fsbraun Apr 27, 2024
1d82698
Update 4.1.1.rst
fsbraun Apr 27, 2024
245e23d
Update 4.1.1.rst
fsbraun Apr 27, 2024
6fb1416
Update CHANGELOG.rst
fsbraun Apr 30, 2024
fe795fb
Merge pull request #7894 from django-cms/release/build
fsbraun Apr 30, 2024
1050c4f
Merge branch 'develop-4' into release/4.1.x
fsbraun May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[4.1.1 release process] compilemessages
  • Loading branch information
Github Release Action committed Apr 26, 2024
commit bf4177fc97c394ff0d7c63d890f9459437eaf20a
Binary file modified cms/locale/ar/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
113 changes: 66 additions & 47 deletions cms/locale/ar/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
# Bashar Al-Abdulhadi, 2023
# Ali Khalel <ali.khalel@gmail.com>, 2023
# Fabian Braun <fsbraun@gmx.de>, 2023
# Mohammad Alsakhawy, 2024
# Jonas Obrist <ojiidotch@gmail.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: django-cms\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-23 12:21+0000\n"
"PO-Revision-Date: 2022-12-12 10:32+0000\n"
"Last-Translator: Fabian Braun <fsbraun@gmx.de>, 2023\n"
"Last-Translator: Mohammad Alsakhawy, 2024\n"
"Language-Team: Arabic (https://app.transifex.com/divio/teams/58664/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -74,7 +75,7 @@ msgid "Keep this field empty if standard path should be used."
msgstr "اترك هذا الحقل فارغ اذا أردت استخدام العنوان الإفتراضي"

msgid "Soft root"
msgstr ""
msgstr "سوفتـروت"

msgid "All ancestors will not be displayed in the navigation"
msgstr "لن يتم عرض الآباء في التصفح"
Expand All @@ -98,7 +99,7 @@ msgid "URL options"
msgstr "خيارات الرابط"

msgid "Menu options"
msgstr ""
msgstr "خيارات القائمة"

msgid "Application"
msgstr "التطبيق"
Expand Down Expand Up @@ -202,7 +203,7 @@ msgstr "موضع الملحق الأصل يجب أن يكون نفس الموض

#, python-format
msgid "Plugin position must be greater than %(position)d"
msgstr ""
msgstr "مكان الملحق يجب أن يكون أكبر من %(position)d"

msgid "Advanced Settings"
msgstr "خيارات متقدمة"
Expand All @@ -212,7 +213,7 @@ msgstr "هذه الصفحة غير مؤهله لتكون صفحة رئيسية."

#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح."

#, python-format
msgid "Cannot delete %(name)s"
Expand Down Expand Up @@ -264,26 +265,26 @@ msgid "You do not have permission to copy these plugins."
msgstr "ليس لديك الصلاحية لنسخ هذه الملحقات."

msgid "You do not have permission to delete this page"
msgstr ""
msgstr "ليس لديك الصلاحية لحذف هذه الصفحة"

#, python-format
msgid "Title and plugins with language %(language)s was deleted"
msgstr "تم حذف العنوان وملحقات اللغة %(language)s."

msgid "You do not have permission to change a page's navigation status"
msgstr ""
msgstr "ليس لديك الصلاحية لتعديل حالة تصفح هذه الصفحة"

msgid "You cannot change this page's navigation status"
msgstr ""
msgstr "لا تستطيع تغيير حالة تصفح هذه الصفحة"

msgid "Public content"
msgstr ""
msgstr "محتوى منشور"

msgid "Empty"
msgstr "فارغ"

msgid "Create Content"
msgstr ""
msgstr "إنشاء محتوى"

msgid "View restriction"
msgstr "قيد المشاهدة"
Expand Down Expand Up @@ -349,45 +350,48 @@ msgid "Page permissions management"
msgstr "إدارة حقوق الصفحة"

msgid "Actions"
msgstr ""
msgstr "الإجراءات"

msgid "Empty content"
msgstr ""
msgstr "محتوى فارغ"

#, python-format
msgid "%(object_name)s Properties"
msgstr ""
msgstr "خصائص %(object_name)s"

#, python-format
msgid "Add new %(object_name)s"
msgstr ""
msgstr "إضافة %(object_name)s جديدة"

msgid "Add content"
msgstr ""
msgstr "إضافة محتوى"

msgid ""
"Content for the current language has been changed. Click \"Cancel\" to "
"return to the form and save changes. Click \"OK\" to discard changes."
msgstr ""
"لقد تم تغيير المحتوى الخاص باللغة الحالية. إضغط \"إلغاء\" للرجوع إلى النموذج"
" وحفظ التغييرات. إضغط \"حسناً\" لتجاهل التغييرات."

#, python-format
msgid "Add %(language)s content"
msgstr ""
msgstr "إضافة محتوى بـ%(language)s"

msgid "Preview"
msgstr "عرض"

msgid "Settings"
msgstr ""
msgstr "إعدادات"

#, python-format
msgid ""
"Invalid language %(value)s. This form cannot be processed. Try changing "
"languages."
msgstr ""
"لغة غير صحيحة %(value)s. لا يمكن معالجة هذا النموذج. حاول تغيير اللغات."

msgid "<unspecified>"
msgstr ""
msgstr "<unspecified>"

#, python-format
msgid "No registered apphook \"%r\" found"
Expand Down Expand Up @@ -535,10 +539,12 @@ msgid ""
"Page %(conflict_page)s has the same url '%(url)s' as current page "
"\"%(instance)s\"."
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."
Expand All @@ -551,10 +557,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 "ليس لديك الصلاحية لإضافة صفحة."
Expand Down Expand Up @@ -623,7 +629,7 @@ msgid "in navigation"
msgstr "التصفح"

msgid "soft root"
msgstr "soft root"
msgstr "سوفتـروت"

msgid "id"
msgstr "id"
Expand Down Expand Up @@ -653,7 +659,7 @@ msgid "page"
msgstr "صفحة"

msgid "no limit set"
msgstr ""
msgstr "بدون حدود"

msgid "for logged in users only"
msgstr "للمستخدمين المسجلين فقط"
Expand Down Expand Up @@ -695,10 +701,10 @@ msgid "The template used to render the content."
msgstr "القالب المستعمل لعرض المحتوى."

msgid "page content"
msgstr ""
msgstr "محتوى الصفحة"

msgid "page contents"
msgstr ""
msgstr "محتويات الصفحة"

msgid "default"
msgstr "الإفتراضي"
Expand Down Expand Up @@ -870,55 +876,55 @@ msgid "There are no further settings for this plugin. Please press save."
msgstr "لا يوجد إعدادات اخرى لهذا الملحق. الرجاء الضغط على حفظ."

msgid "Moved"
msgstr ""
msgstr "حُرِّكَت"

msgid "Changed"
msgstr "معدل"

msgid "Deleted"
msgstr ""
msgstr "حُذِفَت"

msgid "Added Page Translation"
msgstr ""
msgstr "أُضِيفت ترجمة الصفحة"

msgid "Changed Page Translation"
msgstr ""
msgstr "عُدِلَت ترجمة الصفحة"

msgid "Deleted Page Translation"
msgstr ""
msgstr "حُذِفَت ترجمة الصفحة"

msgid "Added Plugin"
msgstr ""
msgstr "أُضيف الملحق"

msgid "Changed Plugin"
msgstr ""
msgstr "عُدِلَ الملحق"

msgid "Moved Plugin"
msgstr ""
msgstr "حُرِّكَ الملحق"

msgid "Deleted Plugin"
msgstr ""
msgstr "حُذف الملحق"

msgid "Cut Plugin"
msgstr ""
msgstr "قص الملحق"

msgid "Paste Plugin"
msgstr ""
msgstr "لصق الملحق"

msgid "Paste to Placeholder"
msgstr ""
msgstr "لصق إلى الموضع"

msgid "Added plugins to placeholder from clipboard"
msgstr ""
msgstr "تم إضافة الملحقات إلى الموضع من الحافظة"

msgid "Cleared Placeholder"
msgstr ""
msgstr "فُرِّغَت الحافظة"

msgid "Save"
msgstr "حفظ"

msgid "Some fields cannot be changed since they are read-only content."
msgstr ""
msgstr "لا يمكن تغيير بعض الحقول لأنهم محتوى للقراءة فقط."

#, python-format
msgid "Log in to administration <a href=\"%(login_url)s\">here</a>."
Expand All @@ -935,7 +941,7 @@ msgid "Password:"
msgstr "كلمة المرور:"

msgid "Add a page"
msgstr ""
msgstr "إضافة صفحة"

msgid "Change a page"
msgstr "غير صفحة"
Expand Down Expand Up @@ -1031,7 +1037,7 @@ msgid "last change by"
msgstr "آخر تعديل من قبل"

msgid "last change on"
msgstr ""
msgstr "آخر تعديل بتاريخ"

msgid "meta"
msgstr "تعريفية"
Expand Down Expand Up @@ -1105,6 +1111,10 @@ msgid ""
" <a href=\"%(add_url)s\" class=\"addlink\">Add %(object)s</a> now.\n"
" "
msgstr ""
"\n"
"<em>لا يوجد %(object)s بعد.</em>\n"
"<br>\n"
"<a href=\"%(add_url)s\" class=\"addlink\">أضف %(object)s</a> الآن."

msgid "Copy options"
msgstr "خيارات النسخ"
Expand Down Expand Up @@ -1151,7 +1161,7 @@ msgstr "لا يوجد معاينة لهذه الصفحة!"

msgid ""
"Potentially the attached apphook does not provide content for its root."
msgstr ""
msgstr "يحتمل أن معلّق التطبيق المرفق لا يقوم بتزويد محتوى لصفحته الأساسية."

msgid "It is being redirected to:"
msgstr "جاري إعادة توجيهها إلى:"
Expand Down Expand Up @@ -1263,10 +1273,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 "أحضر مربع حوار المساعدة هذا إلى الأعلى"
Expand Down Expand Up @@ -1385,6 +1395,10 @@ msgid ""
" static files.</p>\n"
" "
msgstr ""
"\n"
"<p class=\"cms-welcome-notes\">في حال لم تر شعار ن.إ.م جانغو في الأعلى، تأكد\n"
" أنك قمت بربط مجلد <code>static/cms</code> مع ملفاتك\n"
"الثابتة.</p>"

msgid ""
"\n"
Expand All @@ -1394,6 +1408,11 @@ msgid ""
" </p>\n"
" "
msgstr ""
"\n"
"<p class=\"cms-welcome-notes\">كونك ترى هذه الرسالة هذا يعني أن لديك\n"
"<code>DEBUG = True</code> داخل ملف إعدادات جانغو الخاص بك\n"
"ولم تقم بإضافة أي صفحات بعد.\n"
"</p>"

msgid "Welcome to django CMS"
msgstr "أهلاً بك في نظام إدارة محتوى جانقو"
Expand All @@ -1411,7 +1430,7 @@ msgid "Next"
msgstr "التالي"

msgid "Unknown"
msgstr ""
msgstr "مجهول"

#, python-format
msgid "Page not found on %(domain)s"
Expand Down Expand Up @@ -1494,7 +1513,7 @@ msgid "Sample App"
msgstr "عينة تطبيق"

msgid "Sample App with config"
msgstr ""
msgstr "عينة تطبيق مع تهيئة"

msgid "Sample App with excluded permissions"
msgstr "عينة تطبيق بصلاحيات محجوبة"
Expand Down
Binary file modified cms/locale/en/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
Binary file modified cms/locale/he/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions cms/locale/he/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: he\n"
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"

msgid "All"
msgstr ""
Expand Down Expand Up @@ -940,7 +940,6 @@ msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""

msgid "All permissions"
msgstr "כל ההרשאות"
Expand Down
Binary file modified cms/locale/he/LC_MESSAGES/djangojs.mo
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion cms/locale/he/LC_MESSAGES/djangojs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: he\n"
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: 2;\n"

msgid "/"
msgstr ""
Expand Down
Binary file modified cms/locale/hr/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
Loading
0