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.

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

Sync commits from upstream #2

Merged
merged 14 commits into from
Oct 29, 2024
Merged

Sync commits from upstream #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
aca4c60
Release v1.5.0
rixx Aug 6, 2024
0f76f37
Make template format consistent
rixx Sep 4, 2024
71af652
Fix page titles
rixx Sep 4, 2024
438468b
Fix page titles again
rixx Sep 4, 2024
78a39e2
Remove logs from pages
rixx Oct 7, 2024
00f6452
Fix hidden buttons
rixx Oct 7, 2024
3148af5
Fix missing create button
rixx Oct 7, 2024
2d64c18
Fix the last hidden button
rixx Oct 7, 2024
eaf4d40
Optimise imports
rixx Oct 9, 2024
cfb8ce7
Remove django-bootstrap4
rixx Oct 9, 2024
d239f6c
Render form errors correctly
rixx Oct 10, 2024
a9b80d9
Improve error display
rixx Oct 21, 2024
207b7c0
Update translations
rixx Oct 21, 2024
2f6cfbd
Release v1.6.0
rixx Oct 21, 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
2 changes: 1 addition & 1 deletion pretalx_pages/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.4.0"
__version__ = "1.6.0"
62 changes: 29 additions & 33 deletions pretalx_pages/locale/ar/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-10 00:11+0000\n"
"POT-Creation-Date: 2024-10-12 00:15+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

#: local/pretalx-pages/pretalx_pages/apps.py:12
#: local/pretalx-pages/pretalx_pages/signals.py:20
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:5
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:7
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:6
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:9
msgid "Pages"
msgstr ""

Expand All @@ -46,12 +46,12 @@ msgid ""
msgstr ""

#: local/pretalx-pages/pretalx_pages/models.py:30
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:28
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:30
msgid "Page title"
msgstr ""

#: local/pretalx-pages/pretalx_pages/models.py:32
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:20
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:19
msgid "Page content"
msgstr ""

Expand All @@ -73,77 +73,73 @@ msgstr ""

#: local/pretalx-pages/pretalx_pages/signals.py:53
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:5
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:7
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:8
msgid "Page"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:3
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:5
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:4
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:7
msgid "Delete a page"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:8
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:11
#, python-format
msgid "Are you sure you want to delete the page <strong>%(name)s</strong>?"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:13
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:17
msgid "Cancel"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:16
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:20
msgid "Delete"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:14
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:13
msgid "General information"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:31
msgid "Page history"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:11
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:13
msgid "You haven't created any pages yet."
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:17
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:21
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:19
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:23
msgid "Create a new page"
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:50
#: local/pretalx-pages/pretalx_pages/views.py:55
#: local/pretalx-pages/pretalx_pages/views.py:120
#: local/pretalx-pages/pretalx_pages/views.py:235
#: local/pretalx-pages/pretalx_pages/views.py:44
#: local/pretalx-pages/pretalx_pages/views.py:49
#: local/pretalx-pages/pretalx_pages/views.py:114
#: local/pretalx-pages/pretalx_pages/views.py:229
msgid "The requested page does not exist."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:69
#: local/pretalx-pages/pretalx_pages/views.py:63
msgid "The order of pages has been updated."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:100
#: local/pretalx-pages/pretalx_pages/views.py:94
msgid "You already have a page on that URL."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:107
#: local/pretalx-pages/pretalx_pages/views.py:101
msgid "URL form"
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:145
#: local/pretalx-pages/pretalx_pages/views.py:139
msgid "The selected page has been deleted."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:171
#: local/pretalx-pages/pretalx_pages/views.py:165
msgid "Your changes have been saved."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:183
#: local/pretalx-pages/pretalx_pages/views.py:220
#: local/pretalx-pages/pretalx_pages/views.py:177
#: local/pretalx-pages/pretalx_pages/views.py:214
msgid "We could not save your changes. See below for details."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:208
#: local/pretalx-pages/pretalx_pages/views.py:202
msgid "The new page has been created."
msgstr ""
59 changes: 28 additions & 31 deletions pretalx_pages/locale/ca/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-11-10 00:11+0000\n"
"POT-Creation-Date: 2024-10-12 00:15+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -17,10 +17,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: local/pretalx-pages/pretalx_pages/apps.py:12
#: local/pretalx-pages/pretalx_pages/signals.py:20
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:5
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:7
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:6
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:9
msgid "Pages"
msgstr ""

Expand All @@ -45,12 +46,12 @@ msgid ""
msgstr ""

#: local/pretalx-pages/pretalx_pages/models.py:30
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:28
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:30
msgid "Page title"
msgstr ""

#: local/pretalx-pages/pretalx_pages/models.py:32
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:20
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:19
msgid "Page content"
msgstr ""

Expand All @@ -72,77 +73,73 @@ msgstr ""

#: local/pretalx-pages/pretalx_pages/signals.py:53
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:5
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:7
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:8
msgid "Page"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:3
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:5
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:4
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:7
msgid "Delete a page"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:8
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:11
#, python-format
msgid "Are you sure you want to delete the page <strong>%(name)s</strong>?"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:13
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:17
msgid "Cancel"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:16
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/delete.html:20
msgid "Delete"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:14
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:13
msgid "General information"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/form.html:31
msgid "Page history"
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:11
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:13
msgid "You haven't created any pages yet."
msgstr ""

#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:17
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:21
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:19
#: local/pretalx-pages/pretalx_pages/templates/pretalx_pages/index.html:23
msgid "Create a new page"
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:50
#: local/pretalx-pages/pretalx_pages/views.py:55
#: local/pretalx-pages/pretalx_pages/views.py:120
#: local/pretalx-pages/pretalx_pages/views.py:235
#: local/pretalx-pages/pretalx_pages/views.py:44
#: local/pretalx-pages/pretalx_pages/views.py:49
#: local/pretalx-pages/pretalx_pages/views.py:114
#: local/pretalx-pages/pretalx_pages/views.py:229
msgid "The requested page does not exist."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:69
#: local/pretalx-pages/pretalx_pages/views.py:63
msgid "The order of pages has been updated."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:100
#: local/pretalx-pages/pretalx_pages/views.py:94
msgid "You already have a page on that URL."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:107
#: local/pretalx-pages/pretalx_pages/views.py:101
msgid "URL form"
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:145
#: local/pretalx-pages/pretalx_pages/views.py:139
msgid "The selected page has been deleted."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:171
#: local/pretalx-pages/pretalx_pages/views.py:165
msgid "Your changes have been saved."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:183
#: local/pretalx-pages/pretalx_pages/views.py:220
#: local/pretalx-pages/pretalx_pages/views.py:177
#: local/pretalx-pages/pretalx_pages/views.py:214
msgid "We could not save your changes. See below for details."
msgstr ""

#: local/pretalx-pages/pretalx_pages/views.py:208
#: local/pretalx-pages/pretalx_pages/views.py:202
msgid "The new page has been created."
msgstr ""
Loading
Loading