diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b4771aa7da..4b97ebab2c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -120,8 +120,9 @@ Changelog * Simplify page chooser views by converting to class-based views (Matt Westcott) * Add reference documentation and snippets usage guide for `RevisionMixin`, `DraftStateMixin`, and `PreviewableMixin` (Sage Abdullah) * Add "Translate" button within pages’ Actions dropdown when editing pages (Sage Abdullah) + * Add translated labels to the bulk actions tags and collections bulk update fields (Stefan Hammer) * Fix: Typo in `ResumeWorkflowActionFormatter` message (Stefan Hammer) - * Fix issue where `ModelAdmin` index listings with export list enabled would show buttons with an incorrect layout (Josh Woodcock) + * Fix: Issue where `ModelAdmin` index listings with export list enabled would show buttons with an incorrect layout (Josh Woodcock) * Fix: Throw a meaningful error when saving an image to an unrecognised image format (Christian Franke) * Fix: Remove extra padding for headers with breadcrumbs on mobile viewport (Steven Steinwand) * Fix: Ensure that custom document or image models support custom tag models (Matt Westcott) diff --git a/docs/releases/4.0.md b/docs/releases/4.0.md index 5c88be4822..259607ab5f 100644 --- a/docs/releases/4.0.md +++ b/docs/releases/4.0.md @@ -183,6 +183,7 @@ There are also many improvements to the documentation both under the hood and in * Simplify page chooser views by converting to class-based views (Matt Westcott) * Add reference documentation and snippets usage guide for `RevisionMixin`, `DraftStateMixin`, and `PreviewableMixin` (Sage Abdullah) * Add "Translate" button within pages’ Actions dropdown when editing pages (Sage Abdullah) + * Add translated labels to the bulk actions tags and collections bulk update fields (Stefan Hammer) ### Bug fixes diff --git a/wagtail/documents/views/bulk_actions/add_tags.py b/wagtail/documents/views/bulk_actions/add_tags.py index 697d6cd9a5..2ced639da1 100644 --- a/wagtail/documents/views/bulk_actions/add_tags.py +++ b/wagtail/documents/views/bulk_actions/add_tags.py @@ -7,7 +7,7 @@ from wagtail.documents.views.bulk_actions.document_bulk_action import DocumentBu class TagForm(forms.Form): - tags = forms.Field(widget=widgets.AdminTagWidget) + tags = forms.Field(label=_("Tags"), widget=widgets.AdminTagWidget) class AddTagsBulkAction(DocumentBulkAction): diff --git a/wagtail/documents/views/bulk_actions/add_to_collection.py b/wagtail/documents/views/bulk_actions/add_to_collection.py index a08d1ad034..6be756477a 100644 --- a/wagtail/documents/views/bulk_actions/add_to_collection.py +++ b/wagtail/documents/views/bulk_actions/add_to_collection.py @@ -10,9 +10,10 @@ class CollectionForm(forms.Form): user = kwargs.pop("user", None) super().__init__(*args, **kwargs) self.fields["collection"] = forms.ModelChoiceField( + label=_("Collection"), queryset=DocumentBulkAction.permission_policy.collections_user_has_permission_for( user, "add" - ) + ), ) diff --git a/wagtail/images/views/bulk_actions/add_tags.py b/wagtail/images/views/bulk_actions/add_tags.py index f1cbe21b31..aa723f454b 100644 --- a/wagtail/images/views/bulk_actions/add_tags.py +++ b/wagtail/images/views/bulk_actions/add_tags.py @@ -7,7 +7,7 @@ from wagtail.images.views.bulk_actions.image_bulk_action import ImageBulkAction class TagForm(forms.Form): - tags = forms.Field(widget=widgets.AdminTagWidget) + tags = forms.Field(label=_("Tags"), widget=widgets.AdminTagWidget) class AddTagsBulkAction(ImageBulkAction): diff --git a/wagtail/images/views/bulk_actions/add_to_collection.py b/wagtail/images/views/bulk_actions/add_to_collection.py index 0055aa5d7a..93655deb3b 100644 --- a/wagtail/images/views/bulk_actions/add_to_collection.py +++ b/wagtail/images/views/bulk_actions/add_to_collection.py @@ -10,9 +10,10 @@ class CollectionForm(forms.Form): user = kwargs.pop("user", None) super().__init__(*args, **kwargs) self.fields["collection"] = forms.ModelChoiceField( + label=_("Collection"), queryset=ImageBulkAction.permission_policy.collections_user_has_permission_for( user, "add" - ) + ), )