From 9d14d4ad7427cfdb48f18bdc90c17a33a53995fb Mon Sep 17 00:00:00 2001 From: Lucas Moeskops Date: Thu, 24 Aug 2017 22:38:39 +0200 Subject: [PATCH] Fixed wrong argument for datetimechooser widget The argument for specifying the language of the DateTimeChooser is wrong, which makes it impossible to customise the language. Compare for reference the argument specification for the DateChooser and the TimeChooser :-) --- CHANGELOG.txt | 5 +++-- docs/releases/1.12.1.rst | 5 +++-- .../wagtailadmin/static_src/wagtailadmin/js/page-editor.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c795266b0..768381cc3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,8 +4,9 @@ Changelog 1.12.1 (xx.xx.20xx) - IN DEVELOPMENT ~~~~~~~~~~~~~~~~~~~ -* Fix: Prevent home page draft title from displaying as blank (Mikalai Radchuk, Matt Westcott) -* Fix: Fix regression on styling of preview button with more than one preview mode (Jack Paine) + * Fix: Prevent home page draft title from displaying as blank (Mikalai Radchuk, Matt Westcott) + * Fix: Fix regression on styling of preview button with more than one preview mode (Jack Paine) + * Fix: Enabled translations within date-time chooser widget (Lucas Moeskops) 1.12 LTS (21.08.2017) diff --git a/docs/releases/1.12.1.rst b/docs/releases/1.12.1.rst index d97f9baa3..4ba4f1996 100644 --- a/docs/releases/1.12.1.rst +++ b/docs/releases/1.12.1.rst @@ -13,5 +13,6 @@ What's new Bug fixes ~~~~~~~~~ -* Prevent home page draft title from displaying as blank (Mikalai Radchuk, Matt Westcott) -* Fix regression on styling of preview button with more than one preview mode (Jack Paine) + * Prevent home page draft title from displaying as blank (Mikalai Radchuk, Matt Westcott) + * Fix regression on styling of preview button with more than one preview mode (Jack Paine) + * Enabled translations within date-time chooser widget (Lucas Moeskops) diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js index 7d8055355..e0c63ff83 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js @@ -86,7 +86,7 @@ function initDateTimeChooser(id, opts) { i18n: { lang: window.dateTimePickerTranslations }, - language: 'lang', + lang: 'lang', onGenerate: hideCurrent }, opts || {})); } else {