wagtail 6.2.2__py3-none-any.whl → 6.3rc2__py3-none-any.whl

wagtail/contrib/search_promotions/locale/cy/LC_MESSAGES/django.po

@@ -5,13 +5,14 @@
 # Translators:
 # Philip Crisp, 2022
 # Philip Crisp, 2022
+# Philip Lindsay-Crisp, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
-"Last-Translator: Philip Crisp, 2022\n"
+"Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (http://app.transifex.com/torchbox/wagtail/language/"
 "cy/)\n"
 "MIME-Version: 1.0\n"
@@ -38,15 +39,38 @@ msgstr ""
 msgid "Please specify at least one recommendation for this search term."
 msgstr "Nodwch o leiaf un argymhelliad ar gyfer y term chwilio hwn."
 
+msgid "You must enter an external link text if you enter an external link URL."
+msgstr ""
+"Rhaid i chi nodi testun cyswllt allanol os ydych chi'n nodi URL cyswllt "
+"allanol."
+
+msgid "You must recommend a page OR an external link."
+msgstr "Rhaid i chi argymell tudalen NEU ddolen allanol."
+
+msgid "Please only select a page OR enter an external link."
+msgstr "Dewiswch dudalen yn unig NEU rhowch linc allanol."
+
 msgid "Query Daily Hits"
 msgstr "Ymholiad Trawiadau Dyddiol"
 
 msgid "page"
 msgstr "tudalen"
 
+msgid "Choose an internal page for this promotion"
+msgstr "Dewisiwch tudalen mewnol i'r hyrwyddiad hwn"
+
+msgid "External link URL"
+msgstr "Link URL allanol"
+
+msgid "Alternatively, use an external link for this promotion"
+msgstr "Fel arall, defnyddiwch linc allanol ar gyfer yr hyrwyddiad hwn"
+
 msgid "description"
 msgstr "disgrifiad"
 
+msgid "Applies to internal page or external link"
+msgstr "Yn berthnasol i dudalen fewnol neu linc allanol"
+
 msgid "search promotion"
 msgstr "hyrwyddo chwilio"
 
@@ -56,6 +80,29 @@ msgstr "Ychwanegwch hyrwyddo chwilio"
 msgid "Add search pick"
 msgstr "Ychwanegu dewis chwilio"
 
+msgid ""
+"<p>Promoted search results are a means of recommending specific pages or "
+"external links that might not organically come high up in search results. E."
+"g recommending your primary donation page to a user searching with the less "
+"common term \"<em>giving</em>\".</p>"
+msgstr ""
+"<p>Mae canlyniadau chwilio a hyrwyddir yn fodd o argymell tudalennau penodol "
+"neu ddolenni allanol na fyddant efallai'n dod yn uchel yn organig mewn "
+"canlyniadau chwilio. E.e. argymell eich tudalen rhoddion cynradd i "
+"ddefnyddiwr sy'n chwilio gyda'r term llai cyffredin \"<em>rhoi</em>\".</p>"
+
+msgid ""
+"<p>The \"Search term(s)/phrase\" field below must contain the full and exact "
+"search for which you wish to provide recommended results, <em>including</em> "
+"any misspellings/user error. To help, you can choose from search terms that "
+"have been popular with users of your site.</p>"
+msgstr ""
+"<p>Rhaid i'r maes \"Term(au)/ymadrodd chwilio\" isod gynnwys y chwiliad "
+"llawn ac union yr hoffech ddarparu canlyniadau a argymhellir ar ei gyfer, "
+"<em>yn cynwys</em> unrhyw gamsillafiadau/gwall defnyddiwr. I helpu, gallwch "
+"ddewis o dermau chwilio sydd wedi bod yn boblogaidd gyda defnyddwyr eich "
+"gwefan.</p>"
+
 msgid "Save"
 msgstr "Cadw"
 
@@ -88,9 +135,15 @@ msgstr "Symyd i fyny"
 msgid "Move down"
 msgstr "Symyd i lawr"
 
+msgid "Recommended search result"
+msgstr "Canlyniad chwilio a argymhellir"
+
 msgid "Promoted search results"
 msgstr "Canlyniad chwilio wedi'i hyrwyddo"
 
+msgid "Add a recommended result"
+msgstr "Ychwanegu canlyniad a argymhellir"
+
 #, python-format
 msgid "Sorry, no promoted results match \"<em>%(query_string)s</em>\""
 msgstr ""
@@ -105,6 +158,9 @@ msgstr ""
 "Nid oes unrhyw ganlyniadau wedi'u hyrwyddo wedi'u creu. Pam ddim <a "
 "href=\"%(wagtailsearchpromotions_add_url)s\">ychwanegu un</a>?"
 
+msgid "No promoted results have been created."
+msgstr "Nid oes unrhyw ganlyniadau wedi'u hyrwyddo wedi'u creu."
+
 msgid "Popular search terms"
 msgstr "Termau chwilio poblogaidd"
 
@@ -123,6 +179,9 @@ msgstr "Dim chanfuwyd canlyniadau"
 msgid "Choose from popular search terms"
 msgstr "Dewiswch o dermau chwilio poblogaidd"
 
+msgid "External link"
+msgstr "Linc allanol"
+
 msgid "None"
 msgstr "Ddim"
 

wagtail/contrib/search_promotions/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+0100\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"
@@ -104,18 +104,12 @@ msgid ""
 "have been popular with users of your site.</p>"
 msgstr ""
 
-#: templates/wagtailsearchpromotions/add.html:29
-#: templates/wagtailsearchpromotions/edit.html:19
-msgid "Save"
-msgstr ""
-
 #: templates/wagtailsearchpromotions/confirm_delete.html:3
 #, python-format
 msgid "Delete %(query)s"
 msgstr ""
 
 #: templates/wagtailsearchpromotions/confirm_delete.html:5
-#: templates/wagtailsearchpromotions/edit.html:20
 #: templates/wagtailsearchpromotions/includes/searchpromotion_form.html:10
 msgid "Delete"
 msgstr ""
@@ -151,7 +145,7 @@ msgid "Recommended search result"
 msgstr ""
 
 #: templates/wagtailsearchpromotions/includes/searchpromotions_formset.html:4
-#: views.py:82 wagtail_hooks.py:36
+#: views.py:81 wagtail_hooks.py:36
 msgid "Promoted search results"
 msgstr ""
 
@@ -190,7 +184,7 @@ msgid "Terms"
 msgstr ""
 
 #: templates/wagtailsearchpromotions/queries/chooser/results.html:10
-#: views.py:59
+#: views.py:58
 msgid "Views (past week)"
 msgstr ""
 
@@ -214,40 +208,40 @@ msgstr ""
 msgid "Search Terms"
 msgstr ""
 
-#: views.py:43
+#: views.py:42
 msgid "Add new promoted result"
 msgstr ""
 
-#: views.py:47
+#: views.py:46
 msgid "Search term(s)"
 msgstr ""
 
-#: views.py:54
+#: views.py:53
 msgid "Promoted results"
 msgstr ""
 
-#: views.py:145
+#: views.py:144
 #, python-format
 msgid "Editor's picks for '%(query)s' created."
 msgstr ""
 
-#: views.py:149 views.py:209
+#: views.py:148 views.py:212
 msgid "Edit"
 msgstr ""
 
-#: views.py:167
+#: views.py:166
 msgid "Recommendations have not been created due to errors"
 msgstr ""
 
-#: views.py:205
+#: views.py:208
 #, python-format
 msgid "Editor's picks for '%(query)s' updated."
 msgstr ""
 
-#: views.py:225
+#: views.py:228
 msgid "Recommendations have not been saved due to errors"
 msgstr ""
 
-#: views.py:255
+#: views.py:267
 msgid "Editor's picks deleted."
 msgstr ""

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/add.html

@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/form.html" %}
 {% load i18n wagtailadmin_tags %}
 {% block titletag %}{% trans "Add search promotion" %}{% endblock %}
 {% block content %}
@@ -26,21 +26,18 @@
                 <li>
                     {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
                 </li>
-                <li><input type="submit" value="{% trans 'Save' %}" class="button" /></li>
             </ul>
+
+            {% block footer %}
+                {{ block.super }}
+            {% endblock %}
         </form>
     </div>
 {% endblock %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ form_media.css }}
-{% endblock %}
 {% block extra_js %}
     {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
     <script src="{% versioned_static 'wagtailsearchpromotions/js/query-chooser-modal.js' %}"></script>
-    {{ form_media.js }}
 
     <script type="text/javascript">
         {% include "wagtailsearchpromotions/includes/searchpromotions_formset.js" with formset=searchpicks_formset only %}

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/edit.html

@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/form.html" %}
 {% load i18n wagtailadmin_tags %}
 {% block titletag %}{% blocktrans trimmed with query=query.query_string %}Editing {{ query }}{% endblocktrans %}{% endblock %}
 {% block content %}
@@ -15,23 +15,28 @@
             <li>
                 {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
             </li>
-            <li>
-                <input type="submit" value="{% trans 'Save' %}" class="button" />
-                <a href="{% url 'wagtailsearchpromotions:delete' query.id %}" class="button no">{% trans "Delete" %}</a>
-            </li>
         </ul>
+
+        {% block footer %}
+            {{ block.super }}
+        {% endblock %}
     </form>
 {% endblock %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ form_media.css }}
+{% block extra_actions %}
+    {% comment %}
+        The view hasn't extended from generic EditView, so we cannot use the new
+        header buttons in the breadcrumbs for the Delete button. Instead, we'll
+        add a Delete button to the footer actions.
+    {% endcomment %}
+    {% if can_delete %}
+        <a href="{{ delete_url }}" class="button">{{ delete_item_label }}</a>
+    {% endif %}
 {% endblock %}
+
 {% block extra_js %}
     {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
     <script src="{% versioned_static 'wagtailsearchpromotions/js/query-chooser-modal.js' %}"></script>
-    {{ form_media.js }}
 
     <script type="text/javascript">
         {% include "wagtailsearchpromotions/includes/searchpromotions_formset.js" with formset=searchpicks_formset only  %}

wagtail/contrib/search_promotions/tests.py

@@ -241,7 +241,11 @@ class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
         )
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailsearchpromotions/index.html")
+
+        # Check that we got page one
+        self.assertEqual(response.context["page_obj"].number, 1)
 
     def test_pagination_out_of_range(self):
         self.make_search_picks()
@@ -251,7 +255,14 @@ class TestSearchPromotionsIndexView(WagtailTestUtils, TestCase):
         )
 
         # Check response
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailsearchpromotions/index.html")
+
+        # Check that we got the last page
+        self.assertEqual(
+            response.context["page_obj"].number,
+            response.context["paginator"].num_pages,
+        )
 
     def test_num_queries(self):
         url = reverse("wagtailsearchpromotions:index")

wagtail/contrib/search_promotions/views.py

@@ -36,7 +36,6 @@ class IndexView(generic.IndexView):
     permission_policy = ModelPermissionPolicy(SearchPromotion)
     index_url_name = "wagtailsearchpromotions:index"
     index_results_url_name = "wagtailsearchpromotions:index_results"
-    _show_breadcrumbs = True
     search_fields = ["query_string"]
     default_ordering = "query_string"
     add_url_name = "wagtailsearchpromotions:add"
@@ -178,7 +177,11 @@ def add(request):
         {
             "query_form": query_form,
             "searchpicks_formset": searchpicks_formset,
-            "form_media": query_form.media + searchpicks_formset.media,
+            "media": query_form.media + searchpicks_formset.media,
+            # Remove these when this view is refactored to a generic.CreateView subclass.
+            # Avoid defining new translatable strings.
+            "submit_button_label": generic.CreateView.submit_button_label,
+            "submit_button_active_label": generic.CreateView.submit_button_active_label,
         },
     )
 
@@ -237,7 +240,16 @@ def edit(request, query_id):
             "query_form": query_form,
             "searchpicks_formset": searchpicks_formset,
             "query": query,
-            "form_media": query_form.media + searchpicks_formset.media,
+            "media": query_form.media + searchpicks_formset.media,
+            # Remove these when this view is refactored to a generic.CreateView subclass.
+            # Avoid defining new translatable strings.
+            "submit_button_label": generic.EditView.submit_button_label,
+            "submit_button_active_label": generic.EditView.submit_button_active_label,
+            "can_delete": request.user.has_perm(
+                "wagtailsearchpromotions.delete_searchpromotion"
+            ),
+            "delete_url": reverse("wagtailsearchpromotions:delete", args=(query.id,)),
+            "delete_item_label": generic.EditView.delete_item_label,
         },
     )
 

wagtail/contrib/settings/locale/cy/LC_MESSAGES/django.po

@@ -5,13 +5,14 @@
 # Translators:
 # Adam Hughes <adamhughes31@gmail.com>, 2017,2020
 # Matt Westcott <matthew@torchbox.com>, 2017
+# Philip Lindsay-Crisp, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2016-03-01 19:20+0000\n"
-"Last-Translator: Matt Westcott <matthew@torchbox.com>, 2017\n"
+"Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (http://app.transifex.com/torchbox/wagtail/language/"
 "cy/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +25,10 @@ msgstr ""
 msgid "default"
 msgstr "diofyn"
 
+#, python-format
+msgid "%(site_setting)s for %(site)s"
+msgstr "%(site_setting)s i %(site)s"
+
 msgid "Site"
 msgstr "Safle"
 

wagtail/contrib/settings/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+0100\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"
@@ -27,18 +27,10 @@ msgstr ""
 msgid "%(site_setting)s for %(site)s"
 msgstr ""
 
-#: templates/wagtailsettings/edit.html:9
+#: templates/wagtailsettings/edit.html:8
 msgid "Site"
 msgstr ""
 
-#: templates/wagtailsettings/edit.html:31
-msgid "Saving…"
-msgstr ""
-
-#: templates/wagtailsettings/edit.html:34
-msgid "Save"
-msgstr ""
-
 #: templates/wagtailsettings/index.html:3
 #: templates/wagtailsettings/index.html:7
 msgid "Settings"

wagtail/contrib/settings/templates/wagtailsettings/edit.html

@@ -1,50 +1,17 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/edit.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block content %}
-    {% fragment as editing_actions %}
-        {% if site_switcher %}
-            <form method="get" id="settings-site-switch" novalidate>
-                <label for="{{ site_switcher.site.id_for_label }}">
-                    {% trans "Site" %}:
-                </label>
-                {{ site_switcher.site }}
-            </form>
-        {% endif %}
-    {% endfragment %}
-    {% include "wagtailadmin/shared/header.html" with title=page_title icon=header_icon subtitle=page_subtitle merged=1 extra_actions=editing_actions only %}
-
-    <form action="{{ action_url }}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>
-        {% csrf_token %}
-
-        <div class="nice-padding">
-            {{ edit_handler.render_form_content }}
-        </div>
-
-        <footer class="footer">
-            <div class="actions footer__container w-flex">
-                <button
-                    type="submit"
-                    class="button button-longrunning w-flex-grow"
-                    data-controller="w-progress"
-                    data-action="w-progress#activate"
-                    data-w-progress-active-value="{% trans 'Saving…' %}"
-                >
-                    {% icon name="spinner" %}
-                    <em data-w-progress-target="label">{% trans 'Save' %}</em>
-                </button>
-            </div>
-        </footer>
-    </form>
-
+{% block before_form %}
+    {% if site_switcher %}
+        <form class="w-mb-8" method="get" id="settings-site-switch" novalidate>
+            <label for="{{ site_switcher.site.id_for_label }}">
+                {% trans "Site" %}:
+            </label>
+            {{ site_switcher.site }}
+        </form>
+    {% endif %}
 {% endblock %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ media.css }}
-{% endblock %}
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ media.js }}
+{% block form_content %}
+    {{ edit_handler.render_form_content }}
 {% endblock %}

wagtail/contrib/simple_translation/locale/cy/LC_MESSAGES/django.po

@@ -6,6 +6,7 @@
 # Translators:
 # Philip Crisp, 2022
 # Loic Teixeira, 2022
+# Philip Lindsay-Crisp, 2024
 #
 #, fuzzy
 msgid ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2021-04-21 08:38+0000\n"
-"Last-Translator: Loic Teixeira, 2022\n"
+"Last-Translator: Philip Lindsay-Crisp, 2024\n"
 "Language-Team: Welsh (https://app.transifex.com/torchbox/teams/8009/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,6 +36,14 @@ msgstr "Locales"
 msgid "All child pages will be created."
 msgstr "Bydd holl dudalennau plentyn yn cael eu creu."
 
+#, python-format
+msgid "Include subtree (%(descendant_count)s page)"
+msgid_plural "Include subtree (%(descendant_count)s pages)"
+msgstr[0] "Cynnwys is-goeden (%(descendant_count)s tudalen)"
+msgstr[1] "Cynnwys is-goeden (%(descendant_count)s tudalennau)"
+msgstr[2] "Cynnwys is-goeden (%(descendant_count)s tudalennau)"
+msgstr[3] "Cynnwys is-goeden (%(descendant_count)s tudalennau)"
+
 msgid "A locale is disabled because a parent page is not translated."
 msgid_plural ""
 "Some locales are disabled because some parent pages are not translated."
@@ -58,6 +67,9 @@ msgstr[1] "Cyfieithwch y tudalennau rhiant."
 msgstr[2] "Cyfieithwch y tudalennau rhiant."
 msgstr[3] "Cyfieithwch y tudalennau rhiant."
 
+msgid "Can submit translations"
+msgstr "Yn gallu cyflwyno cyfieithiadau"
+
 msgid "Submit"
 msgstr "Cyflwyno"
 

wagtail/contrib/simple_translation/locale/dv/LC_MESSAGES/django.po

@@ -50,6 +50,9 @@ msgid_plural "Translate the parent pages."
 msgstr[0] "ބެލެނިވެރި ޞަފްޙާ ތަރުޖަމާ ކުރޭ"
 msgstr[1] "ބެލެނިވެރި ޞަފްޙާތައް ތަރުޖަމާ ކުރޭ"
 
+msgid "Can submit translations"
+msgstr "ތަރުޖަމާތައް ހުށަހެޅޭނެ"
+
 msgid "Submit"
 msgstr "ހުށައަޅާ"
 

wagtail/contrib/simple_translation/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-07 10:06+0100\n"
+"POT-Creation-Date: 2024-10-21 17:53+0100\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"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: views.py:22 wagtail_hooks.py:63 wagtail_hooks.py:80 wagtail_hooks.py:111
+#: views.py:22 wagtail_hooks.py:67 wagtail_hooks.py:85 wagtail_hooks.py:116
 msgid "Translate"
 msgstr ""
 
@@ -91,11 +91,11 @@ msgstr ""
 msgid "Successfully created %(locales)s for %(model_name)s '%(object)s'"
 msgstr ""
 
-#: wagtail_hooks.py:84
+#: wagtail_hooks.py:89
 msgid "Translate this page"
 msgstr ""
 
-#: wagtail_hooks.py:114
+#: wagtail_hooks.py:119
 #, python-format
 msgid "Translate '%(title)s'"
 msgstr ""

wagtail/contrib/simple_translation/locale/sl/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 # Translators:
 # andrej55 <andrej.marsetic@gmail.com>, 2022
 # Loic Teixeira, 2022
-# Andrej Marsetič, 2023
+# Andrej Marsetič, 2024
 #
 #, fuzzy
 msgid ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-07 10:06+0100\n"
 "PO-Revision-Date: 2021-04-21 08:38+0000\n"
-"Last-Translator: Andrej Marsetič, 2023\n"
+"Last-Translator: Andrej Marsetič, 2024\n"
 "Language-Team: Slovenian (https://app.transifex.com/torchbox/teams/8009/"
 "sl/)\n"
 "MIME-Version: 1.0\n"
@@ -64,6 +64,9 @@ msgstr[1] "Prevedite nadrejeni strani."
 msgstr[2] "Prevedite nadrejene strani."
 msgstr[3] "Prevedite nadrejene strani."
 
+msgid "Can submit translations"
+msgstr "Lahko predloži prevode"
+
 msgid "Submit"
 msgstr "Pošlji"