diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 50d8aa4499..0feb6cb7f3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -17,6 +17,7 @@ Changelog * Added `form_fields_exclude` property to ModelAdmin views (Matheus Bratfisch) * User creation / edit form now enforces password validators set in `AUTH_PASSWORD_VALIDATORS` (Bertrand Bordage) * Fix: Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif) + * Fix: "File" field label on image edit form is now translated (Stein Strindhaug) * Fix: Unreliable preview is now reliable by always opening in a new window (Kjartan Sverrisson) * Fix: Fixed placement of `{{ block.super }}` in `snippets/type_index.html` (LB (Ben Johnston)) * Fix: Optimised database queries on group edit page (Ashia Zawaduk) diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst index dd8f9212fc..d53ec6cd35 100644 --- a/docs/releases/1.10.rst +++ b/docs/releases/1.10.rst @@ -31,6 +31,7 @@ Bug fixes ~~~~~~~~~ * Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif) + * "File" field label on image edit form is now translated (Stein Strindhaug) * Unreliable preview is now reliable by always opening in a new window (Kjartan Sverrisson) * Fixed placement of ``{{ block.super }}`` in ``snippets/type_index.html`` (LB (Ben Johnston)) * Optimised database queries on group edit page (Ashia Zawaduk) diff --git a/wagtail/wagtailimages/forms.py b/wagtail/wagtailimages/forms.py index 5fcb5d8218..fe4276c34c 100644 --- a/wagtail/wagtailimages/forms.py +++ b/wagtail/wagtailimages/forms.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals from django import forms from django.forms.models import modelform_factory +from django.utils.text import capfirst from django.utils.translation import ugettext as _ from wagtail.wagtailadmin import widgets @@ -17,7 +18,7 @@ from wagtail.wagtailimages.permissions import permission_policy as images_permis def formfield_for_dbfield(db_field, **kwargs): # Check if this is the file field if db_field.name == 'file': - return WagtailImageField(**kwargs) + return WagtailImageField(label=capfirst(db_field.verbose_name), **kwargs) # For all other fields, just call its formfield() method. return db_field.formfield(**kwargs)