From 5936c020d8099e8d3f8a54df1f2ef6520296d938 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 6 Jun 2014 16:28:51 +0100 Subject: [PATCH] Added I18N to new datetime picker --- .../static/wagtailadmin/js/page-editor.js | 52 +++++++++++++++---- .../wagtailadmin/pages/_editor_js.html | 2 + .../shared/datetimepicker_translations.html | 29 +++++++++++ .../wagtailforms/index_submissions.html | 14 ++++- 4 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js index 0d6c4d51f..83024b732 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js @@ -54,23 +54,55 @@ function insertRichTextDeleteControl(elem) { } function initDateChooser(id) { - $('#' + id).datetimepicker({ - timepicker: false, - format: 'Y-m-d', - }); + if (window.dateTimePickerTranslations) { + $('#' + id).datetimepicker({ + timepicker: false, + format: 'Y-m-d', + i18n: { + lang: window.dateTimePickerTranslations + }, + lang: 'lang' + }); + } else { + $('#' + id).datetimepicker({ + timepicker: false, + format: 'Y-m-d', + }); + } } function initTimeChooser(id) { - $('#' + id).datetimepicker({ - datepicker: false, - format: 'H:i', - }); + if (window.dateTimePickerTranslations) { + $('#' + id).datetimepicker({ + datepicker: false, + format: 'H:i', + i18n: { + lang: window.dateTimePickerTranslations + }, + lang: 'lang' + }); + } else { + $('#' + id).datetimepicker({ + datepicker: false, + format: 'H:i', + }); + } } function initDateTimeChooser(id) { + if (window.dateTimePickerTranslations) { + $('#' + id).datetimepicker({ + format: 'Y-m-d H:i', + i18n: { + lang: window.dateTimePickerTranslations + }, + language: 'lang' + }); + } else { $('#' + id).datetimepicker({ - format: 'Y-m-d H:i', - }); + format: 'Y-m-d H:i', + }); + } } function initTagField(id, autocompleteUrl) { diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index b8334eae2..3ddb8c1f3 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -27,6 +27,8 @@ {% hook_output 'insert_editor_js' %} {% endcompress %} +{% include "wagtailadmin/shared/datetimepicker_translations.html" %} + {% comment %} Additional js from widgets media. Allows for custom widgets in admin panel. {% endcomment %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html new file mode 100644 index 000000000..cdbc98638 --- /dev/null +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/datetimepicker_translations.html @@ -0,0 +1,29 @@ +{% load i18n %} + + diff --git a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html index 9b5ca941f..ae9572295 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/index_submissions.html @@ -3,15 +3,25 @@ {% block titletag %}{% blocktrans with form_title=form_page.title|capfirst %}Submissions of {{ form_title }}{% endblocktrans %}{% endblock %} {% block bodyclass %}menu-snippets{% endblock %} {% block extra_js %} + {% include "wagtailadmin/shared/datetimepicker_translations.html" %} +