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

wagtail/contrib/redirects/templates/wagtailredirects/import_summary.html

@@ -8,7 +8,7 @@
     <section id="summary" class="nice-padding">
         <p class="help-block help-warning">
             {% icon name='warning' %}
-            {% blocktrans trimmed with total=import_summary.total successes=import_summary.successes errors=import_summary.errors_count %}Found {{ total }} redirects, created {{ successes }} and found {{ errors }} errors.{% endblocktrans %}
+            {% blocktrans trimmed with total=import_summary.total|intcomma successes=import_summary.successes|intcomma errors=import_summary.errors_count|intcomma %}Found {{ total }} redirects, created {{ successes }} and found {{ errors }} errors.{% endblocktrans %}
         </p>
 
         <table class="listing">

wagtail/contrib/redirects/tests/test_redirects.py

@@ -7,6 +7,7 @@ from django.urls import reverse
 from openpyxl.reader.excel import load_workbook
 
 from wagtail.admin.admin_url_finder import AdminURLFinder
+from wagtail.contrib.frontend_cache.tests import PURGED_URLS
 from wagtail.contrib.redirects import models
 from wagtail.log_actions import registry as log_registry
 from wagtail.models import Page, Site
@@ -652,12 +653,10 @@ class TestRedirectsIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase)
         self.assertEqual(response.context["query_string"], "Aaargh")
 
     def test_pagination(self):
-        # page numbers in range should be accepted
-        response = self.get({"p": 1})
-        self.assertEqual(response.status_code, 200)
-        # page numbers out of range should return 404
-        response = self.get({"p": 9999})
-        self.assertEqual(response.status_code, 404)
+        pages = ["0", "1", "-1", "9999", "Not a page"]
+        for page in pages:
+            response = self.get({"p": page})
+            self.assertEqual(response.status_code, 200)
 
     def test_default_ordering(self):
         for i in range(0, 10):
@@ -776,11 +775,19 @@ class TestRedirectsIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase)
         self.assertEqual(len(csv_data), 10)
 
 
+@override_settings(
+    WAGTAILFRONTENDCACHE={
+        "dummy": {
+            "BACKEND": "wagtail.contrib.frontend_cache.tests.MockBackend",
+        },
+    },
+)
 class TestRedirectsAddView(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
 
     def setUp(self):
         self.login()
+        PURGED_URLS.clear()
 
     def get(self, params={}):
         return self.client.get(reverse("wagtailredirects:add"), params)
@@ -817,6 +824,8 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         log_entry = log_registry.get_logs_for_instance(redirect).first()
         self.assertEqual(log_entry.action, "wagtail.create")
 
+        self.assertEqual(PURGED_URLS, {"http://localhost/test"})
+
     def test_add_with_site(self):
         localhost = Site.objects.get(hostname="localhost")
         response = self.post(
@@ -837,6 +846,8 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         self.assertEqual(redirects.first().redirect_link, "http://www.test.com/")
         self.assertEqual(redirects.first().site, localhost)
 
+        self.assertEqual(PURGED_URLS, {"http://localhost/test"})
+
     def test_add_validation_error(self):
         response = self.post(
             {
@@ -849,6 +860,7 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(PURGED_URLS, set())
 
     def test_cannot_add_duplicate_with_no_site(self):
         models.Redirect.objects.create(
@@ -865,6 +877,7 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(PURGED_URLS, set())
 
     def test_cannot_add_duplicate_on_same_site(self):
         localhost = Site.objects.get(hostname="localhost")
@@ -882,6 +895,7 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(PURGED_URLS, set())
 
     def test_can_reuse_path_on_other_site(self):
         localhost = Site.objects.get(hostname="localhost")
@@ -909,6 +923,8 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         redirects = models.Redirect.objects.filter(redirect_link="http://www.test.com/")
         self.assertEqual(redirects.count(), 1)
 
+        self.assertEqual(PURGED_URLS, redirects.get().old_links())
+
     def test_add_long_redirect(self):
         response = self.post(
             {
@@ -931,7 +947,16 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         )
         self.assertIsNone(redirects.first().site)
 
+        self.assertEqual(PURGED_URLS, redirects.get().old_links())
+
 
+@override_settings(
+    WAGTAILFRONTENDCACHE={
+        "dummy": {
+            "BACKEND": "wagtail.contrib.frontend_cache.tests.MockBackend",
+        },
+    },
+)
 class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     def setUp(self):
         # Create a redirect to edit
@@ -943,6 +968,8 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         # Login
         self.user = self.login()
 
+        PURGED_URLS.clear()
+
     def get(self, params={}, redirect_id=None):
         return self.client.get(
             reverse("wagtailredirects:edit", args=(redirect_id or self.redirect.id,)),
@@ -995,6 +1022,8 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         )
         self.assertIsNone(redirects.first().site)
 
+        self.assertEqual(PURGED_URLS, {"http://localhost/test"})
+
     def test_edit_with_site(self):
         localhost = Site.objects.get(hostname="localhost")
 
@@ -1017,6 +1046,7 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
             redirects.first().redirect_link, "http://www.test.com/ive-been-edited"
         )
         self.assertEqual(redirects.first().site, localhost)
+        self.assertEqual(PURGED_URLS, {"http://localhost/test"})
 
     def test_edit_validation_error(self):
         response = self.post(
@@ -1030,6 +1060,7 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(PURGED_URLS, set())
 
     def test_edit_duplicate(self):
         models.Redirect.objects.create(
@@ -1046,6 +1077,7 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
 
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
+        self.assertEqual(PURGED_URLS, set())
 
     def test_get_with_no_permission(self, redirect_id=None):
         self.user.is_superuser = False
@@ -1081,6 +1113,13 @@ class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
         self.assertTemplateUsed(response, "wagtailredirects/edit.html")
 
 
+@override_settings(
+    WAGTAILFRONTENDCACHE={
+        "dummy": {
+            "BACKEND": "wagtail.contrib.frontend_cache.tests.MockBackend",
+        },
+    },
+)
 class TestRedirectsDeleteView(WagtailTestUtils, TestCase):
     def setUp(self):
         # Create a redirect to edit
@@ -1092,6 +1131,8 @@ class TestRedirectsDeleteView(WagtailTestUtils, TestCase):
         # Login
         self.login()
 
+        PURGED_URLS.clear()
+
     def get(self, params={}, redirect_id=None):
         return self.client.get(
             reverse("wagtailredirects:delete", args=(redirect_id or self.redirect.id,)),
@@ -1120,3 +1161,5 @@ class TestRedirectsDeleteView(WagtailTestUtils, TestCase):
         # Check that the redirect was deleted
         redirects = models.Redirect.objects.filter(old_path="/test")
         self.assertEqual(redirects.count(), 0)
+
+        self.assertEqual(PURGED_URLS, {"http://localhost/test"})

wagtail/contrib/redirects/tests/test_signal_handlers.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.test import TestCase, override_settings
 
+from wagtail.contrib.frontend_cache.tests import PURGED_URLS
 from wagtail.contrib.redirects.models import Redirect
 from wagtail.coreutils import get_dummy_request
 from wagtail.models import Page, Site
@@ -11,7 +12,14 @@ from wagtail.test.utils import WagtailTestUtils
 User = get_user_model()
 
 
-@override_settings(WAGTAILREDIRECTS_AUTO_CREATE=True)
+@override_settings(
+    WAGTAILREDIRECTS_AUTO_CREATE=True,
+    WAGTAILFRONTENDCACHE={
+        "dummy": {
+            "BACKEND": "wagtail.contrib.frontend_cache.tests.MockBackend",
+        },
+    },
+)
 class TestAutocreateRedirects(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
 
@@ -25,6 +33,8 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
         self.event_index = EventIndex.objects.get()
         self.other_page = Page.objects.get(url_path="/home/about-us/")
 
+        PURGED_URLS.clear()
+
     def trigger_page_slug_changed_signal(self, page):
         page.slug += "-extra"
         with self.captureOnCommitCallbacks(execute=True):
@@ -76,9 +86,20 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
             # the automatically_created flag should have been set to True
             self.assertTrue(r.automatically_created)
 
+        self.assertEqual(
+            PURGED_URLS,
+            {
+                "http://localhost/events/saint-patrick/pointless-suffix",
+                "http://localhost/events/final-event",
+                "http://localhost/events/christmas",
+                "http://localhost/events",
+            },
+        )
+
     def test_no_redirects_created_when_page_is_root_for_all_sites_it_belongs_to(self):
         self.trigger_page_slug_changed_signal(self.home_page)
         self.assertFalse(Redirect.objects.exists())
+        self.assertEqual(len(PURGED_URLS), 0)
 
     def test_handling_of_existing_redirects(self):
         # the page we'll be triggering the change for here is...
@@ -131,6 +152,16 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
             ).exists()
         )
 
+        self.assertEqual(
+            PURGED_URLS,
+            {
+                "http://localhost/events/saint-patrick/pointless-suffix",
+                "http://localhost/events/final-event",
+                "http://localhost/events/christmas",
+                "http://localhost/events",
+            },
+        )
+
     def test_redirect_creation_for_custom_route_paths(self):
         # Add a page that has overridden get_route_paths()
         homepage = Page.objects.get(id=2)
@@ -165,6 +196,14 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
                 ),
             ],
         )
+        self.assertEqual(
+            PURGED_URLS,
+            {
+                "http://localhost/routable-page",
+                "http://localhost/routable-page/not-a-valid-route",
+                "http://localhost/routable-page/render-method-test",
+            },
+        )
 
     def test_no_redirects_created_when_pages_are_moved_to_a_different_site(self):
         # Add a new home page
@@ -187,8 +226,10 @@ class TestAutocreateRedirects(WagtailTestUtils, TestCase):
 
         # No redirects should have been created
         self.assertFalse(Redirect.objects.exists())
+        self.assertEqual(len(PURGED_URLS), 0)
 
     @override_settings(WAGTAILREDIRECTS_AUTO_CREATE=False)
     def test_no_redirects_created_if_disabled(self):
         self.trigger_page_slug_changed_signal(self.event_index)
         self.assertFalse(Redirect.objects.exists())
+        self.assertEqual(len(PURGED_URLS), 0)

wagtail/contrib/redirects/views.py

@@ -1,5 +1,4 @@
 import os
-from typing import List
 
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
 from django.db import transaction
@@ -18,6 +17,7 @@ from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.ui.tables import Column, StatusTagColumn, TitleColumn
 from wagtail.admin.views import generic
 from wagtail.admin.widgets.button import Button
+from wagtail.contrib.frontend_cache.utils import PurgeBatch, purge_urls_from_cache
 from wagtail.contrib.redirects import models
 from wagtail.contrib.redirects.filters import RedirectsReportFilterSet
 from wagtail.contrib.redirects.forms import (
@@ -36,6 +36,7 @@ from wagtail.contrib.redirects.utils import (
     write_to_file_storage,
 )
 from wagtail.log_actions import log
+from wagtail.models import Site
 
 permission_checker = PermissionPolicyChecker(permission_policy)
 
@@ -77,7 +78,6 @@ class IndexView(generic.IndexView):
     paginate_by = 20
     page_title = gettext_lazy("Redirects")
     search_fields = ["old_path", "redirect_page__url_path", "redirect_link"]
-    _show_breadcrumbs = True
     columns = [
         TitleColumn(
             "old_path",
@@ -123,7 +123,7 @@ class IndexView(generic.IndexView):
         return super().get_base_queryset().select_related("redirect_page", "site")
 
     @cached_property
-    def header_more_buttons(self) -> List[Button]:
+    def header_more_buttons(self) -> list[Button]:
         buttons = super().header_more_buttons.copy()
         buttons.append(
             Button(
@@ -154,6 +154,20 @@ class EditView(generic.EditView):
             "redirect_title": self.object.title
         }
 
+    def save_instance(self):
+        purger = PurgeBatch()
+
+        root_paths = Site.get_site_root_paths()
+        purger.add_urls(self.object.old_links(root_paths))
+
+        instance = super().save_instance()
+
+        purger.add_urls(self.object.old_links(root_paths))
+
+        purger.purge()
+
+        return instance
+
 
 @permission_checker.require("delete")
 def delete(request, redirect_id):
@@ -168,6 +182,9 @@ def delete(request, redirect_id):
         with transaction.atomic():
             log(instance=theredirect, action="wagtail.delete")
             theredirect.delete()
+
+        purge_urls_from_cache(theredirect.old_links())
+
         messages.success(
             request,
             _("Redirect '%(redirect_title)s' deleted.")
@@ -193,6 +210,8 @@ def add(request):
                 theredirect = form.save()
                 log(instance=theredirect, action="wagtail.create")
 
+            purge_urls_from_cache(theredirect.old_links())
+
             messages.success(
                 request,
                 _("Redirect '%(redirect_title)s' added.")
@@ -217,6 +236,11 @@ def add(request):
         "wagtailredirects/add.html",
         {
             "form": form,
+            # 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,
+            "media": form.media,
         },
     )
 

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://app.transifex.com/torchbox/wagtail/language/"
@@ -18,9 +18,6 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Save"
-msgstr "Stoor"
-
 msgid "Move up"
 msgstr "Skyf op"
 

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

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: ROGER MICHAEL ASHLEY ALLEN <rogermaallen@gmail.com>, 2015\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"
@@ -53,9 +53,6 @@ msgstr "إضافة ترويج البحث"
 msgid "Add search pick"
 msgstr "أضف البحث المحتار"
 
-msgid "Save"
-msgstr "احفظ"
-
 #, python-format
 msgid "Delete %(query)s"
 msgstr "حذف %(query)s"

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Azerbaijani (Azerbaijan) (http://app.transifex.com/torchbox/"
@@ -18,9 +18,6 @@ msgstr ""
 "Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Save"
-msgstr "Yadda saxla"
-
 msgid "Delete"
 msgstr "Silmək"
 

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

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: Tatsiana Tsygan <art.tatsiana@gmail.com>, 2018,2020\n"
 "Language-Team: Belarusian (http://app.transifex.com/torchbox/wagtail/"
@@ -57,9 +57,6 @@ msgstr "Дадаць пошукавае прасоўванне"
 msgid "Add search pick"
 msgstr "Дадаць пошуковую падборку"
 
-msgid "Save"
-msgstr "Захаваць"
-
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Выдаліць %(query)s"

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

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: Lyuboslav  Petrov <petrov.lyuboslav@gmail.com>, 2014\n"
 "Language-Team: Bulgarian (http://app.transifex.com/torchbox/wagtail/language/"
@@ -22,9 +22,6 @@ msgstr ""
 msgid "Search term(s)/phrase"
 msgstr "Дума/Фраза за търсене"
 
-msgid "Save"
-msgstr "Запази"
-
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Изтрий %(query)s"

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

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali (http://app.transifex.com/torchbox/wagtail/language/"
@@ -18,9 +18,6 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Save"
-msgstr "সংরক্ষণ"
-
 msgid "Delete"
 msgstr "মুছে ফেলুন "
 

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

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: Roger Pons <rogerpons@gmail.com>, 2017,2020,2023-2024\n"
 "Language-Team: Catalan (http://app.transifex.com/torchbox/wagtail/language/"
@@ -103,9 +103,6 @@ msgstr ""
 "d'usuari. Per ajudar-vos, podeu triar entre termes de cerca que han estat "
 "populars entre els usuaris del vostre lloc.</p>"
 
-msgid "Save"
-msgstr "Desa"
-
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Esborra %(query)s"

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

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\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: 2015-08-26 14:04+0000\n"
 "Last-Translator: Mirek Zvolský <zvolsky@seznam.cz>, 2020\n"
 "Language-Team: Czech (http://app.transifex.com/torchbox/wagtail/language/"
@@ -58,9 +58,6 @@ msgstr "Přidat upřednostněné hledání"
 msgid "Add search pick"
 msgstr "Přidat volbu hledání"
 
-msgid "Save"
-msgstr "Uložit"
-
 #, python-format
 msgid "Delete %(query)s"
 msgstr "Smazat %(query)s"

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"
+"POT-Creation-Date: 2024-10-21 17:53+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,8 +80,28 @@ msgstr "Ychwanegwch hyrwyddo chwilio"
 msgid "Add search pick"
 msgstr "Ychwanegu dewis chwilio"
 
-msgid "Save"
-msgstr "Cadw"
+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>"
 
 #, python-format
 msgid "Delete %(query)s"
@@ -88,9 +132,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 +155,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 +176,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"