From f7024a4193d5d692d32ab51c1185ac4533d1487f 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 | 1 + docs/releases/1.13.rst | 1 + wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a91fc5bbe6..aaf0058735 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -10,6 +10,7 @@ Changelog * Fix: Inline panel first and last sorting arrows correctly hidden in non-default tabs (Matt Westcott) * Fix: `WAGTAILAPI_LIMIT_MAX` now accepts None to disable limiting (jcronyn) * Fix: In PostgreSQL, new default ordering when ranking of objects is the same (Bertrand Bordage) + * Fix: Enabled translations within date-time chooser widget (Lucas Moeskops) 1.12 LTS (21.08.2017) diff --git a/docs/releases/1.13.rst b/docs/releases/1.13.rst index fabe34af0d..2c4a15a814 100644 --- a/docs/releases/1.13.rst +++ b/docs/releases/1.13.rst @@ -25,6 +25,7 @@ Bug fixes * Inline panel first and last sorting arrows correctly hidden in non-default tabs (Matt Westcott) * ``WAGTAILAPI_LIMIT_MAX`` now accepts None to disable limiting (jcronyn) * In PostgreSQL, new default ordering when ranking of objects is the same (Bertrand Bordage) + * Enabled translations within date-time chooser widget (Lucas Moeskops) Upgrade considerations diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/page-editor.js index 5ca3a72bf0..cd1166d7d5 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 {