From ff9ef9068b09d2c824f8304bdc55854ca6d60932 Mon Sep 17 00:00:00 2001
From: Florian Vogt <flori@vorlif.org>
Date: Sat, 11 Feb 2017 18:11:13 +0100
Subject: [PATCH] Mark wagtailforms-date-filter-placeholder for translation
---
CHANGELOG.txt | 1 +
CONTRIBUTORS.rst | 1 +
docs/releases/1.10.rst | 2 ++
wagtail/wagtailforms/forms.py | 4 ++--
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cd287cd308..2629fe0053 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Changelog
* Use minified versions of jQuery and jQuery UI in the admin. Total savings without compression 371 KB (Tom Dyson)
* Hooks can now specify the order in which they are run (Gagaro)
+ * Fix: Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif)
1.9 (xx.xx.xxxx) - IN DEVELOPMENT
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index b67cb61cf5..3163589da2 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -210,6 +210,7 @@ Contributors
* Martey Dodoo
* David Ray
* Alasdair Nicol
+* Vorlif
Translators
===========
diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst
index fc154d7c01..7379a85818 100644
--- a/docs/releases/1.10.rst
+++ b/docs/releases/1.10.rst
@@ -20,6 +20,8 @@ Other features
Bug fixes
~~~~~~~~~
+ * Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif)
+
Upgrade considerations
======================
diff --git a/wagtail/wagtailforms/forms.py b/wagtail/wagtailforms/forms.py
index 1782448919..305a3778dc 100644
--- a/wagtail/wagtailforms/forms.py
+++ b/wagtail/wagtailforms/forms.py
@@ -112,11 +112,11 @@ class FormBuilder(object):
class SelectDateForm(django.forms.Form):
date_from = django.forms.DateTimeField(
required=False,
- widget=django.forms.DateInput(attrs={'placeholder': 'Date from'})
+ widget=django.forms.DateInput(attrs={'placeholder': _('Date from')})
)
date_to = django.forms.DateTimeField(
required=False,
- widget=django.forms.DateInput(attrs={'placeholder': 'Date to'})
+ widget=django.forms.DateInput(attrs={'placeholder': _('Date to')})
)