diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4b956e367..f35176068 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -57,6 +57,7 @@ Changelog * Fix: `DraftailRichTextArea` is no longer treated as a hidden field by Django's form logic (Sergey Fedoseev) * Fix: Replace format() placeholders in translatable strings with % formatting (Matt Westcott) * Fix: Altering Django REST Framework's `DEFAULT_AUTHENTICATION_CLASSES` setting no longer breaks the page explorer menu and admin API (Matt Westcott) + * Fix: Regression - missing label for external link URL field in link chooser (Timothy Bautista) 2.6.3 (22.10.2019) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 1172cd315..2a156b76f 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -418,6 +418,7 @@ Contributors * ryanomor * Thijs Baaijen * Igor van Spengen +* Timothy Bautista Translators =========== diff --git a/docs/releases/2.7.rst b/docs/releases/2.7.rst index 34673dcfc..7e48690c5 100644 --- a/docs/releases/2.7.rst +++ b/docs/releases/2.7.rst @@ -78,6 +78,7 @@ Bug fixes * ``DraftailRichTextArea`` is no longer treated as a hidden field by Django's form logic (Sergey Fedoseev) * Replace format() placeholders in translatable strings with % formatting (Matt Westcott) * Altering Django REST Framework's ``DEFAULT_AUTHENTICATION_CLASSES`` setting no longer breaks the page explorer menu and admin API (Matt Westcott) + * Regression - missing label for external link URL field in link chooser (Timothy Bautista) Upgrade considerations diff --git a/wagtail/admin/forms/choosers.py b/wagtail/admin/forms/choosers.py index 411d133a5..1b5457b51 100644 --- a/wagtail/admin/forms/choosers.py +++ b/wagtail/admin/forms/choosers.py @@ -1,6 +1,7 @@ from django import forms from django.core import validators from django.forms.widgets import TextInput +from django.utils.translation import ugettext_lazy as _ class URLOrAbsolutePathValidator(validators.URLValidator): @@ -26,7 +27,7 @@ class URLOrAbsolutePathField(forms.URLField): class ExternalLinkChooserForm(forms.Form): - url = URLOrAbsolutePathField(required=True, label="") + url = URLOrAbsolutePathField(required=True, label=_("URL")) link_text = forms.CharField(required=False)