making datetimepicker aware of FIRST_DAY_OF_WEEK

pull/2134/head
Peter Quade 2016-01-18 18:28:30 +01:00 zatwierdzone przez Matt Westcott
rodzic 5270c14444
commit 5c0063f429
5 zmienionych plików z 24 dodań i 12 usunięć

Wyświetl plik

@ -5,6 +5,7 @@ Changelog
~~~~~~~~~~~~~~~~
* The `Document` model can now be overridden using the new `WAGTAILDOCS_DOCUMENT_MODEL` setting (Alex Gleason)
* Date/time pickers now respect the locale's 'first day of week' setting (Peter Quade)
* Fix: Custom page managers no longer raise an error when used on an abstract model
* Fix: Wagtail's migrations are now all reversible (benjaoming)
* Fix: Deleting a page content type now preserves existing pages as basic Page instances, to prevent tree corruption

Wyświetl plik

@ -97,6 +97,7 @@ Contributors
* Alexander Bogushov
* Aarni Koskela
* alexpilot11
* Peter Quade
Translators

Wyświetl plik

@ -19,6 +19,9 @@ The `Document` model can now be overridden using the new `WAGTAILDOCS_DOCUMENT_M
Minor features
~~~~~~~~~~~~~~
* Date/time pickers now respect the locale's 'first day of week' setting (Peter Quade)
Bug fixes
~~~~~~~~~

Wyświetl plik

@ -71,9 +71,9 @@ function insertRichTextDeleteControl(elem) {
});
}
function initDateChooser(id) {
function initDateChooser(id, opts) {
if (window.dateTimePickerTranslations) {
$('#' + id).datetimepicker({
$('#' + id).datetimepicker($.extend({
closeOnDateSelect: true,
timepicker: false,
scrollInput:false,
@ -82,13 +82,13 @@ function initDateChooser(id) {
lang: window.dateTimePickerTranslations
},
lang: 'lang'
});
}, opts || {}));
} else {
$('#' + id).datetimepicker({
$('#' + id).datetimepicker($.extend({
timepicker: false,
scrollInput:false,
format: 'Y-m-d'
});
}, opts || {}));
}
}
@ -112,9 +112,9 @@ function initTimeChooser(id) {
}
}
function initDateTimeChooser(id) {
function initDateTimeChooser(id, opts) {
if (window.dateTimePickerTranslations) {
$('#' + id).datetimepicker({
$('#' + id).datetimepicker($.extend({
closeOnDateSelect: true,
format: 'Y-m-d H:i',
scrollInput:false,
@ -122,11 +122,11 @@ function initDateTimeChooser(id) {
lang: window.dateTimePickerTranslations
},
language: 'lang'
});
}, opts || {}));
} else {
$('#' + id).datetimepicker({
$('#' + id).datetimepicker($.extend({
format: 'Y-m-d H:i'
});
}, opts || {}));
}
}

Wyświetl plik

@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
import json
from django.utils.formats import get_format
from django.core.urlresolvers import reverse
from django.forms import widgets
from django.contrib.contenttypes.models import ContentType
@ -36,7 +37,10 @@ class AdminDateInput(WidgetWithScript, widgets.DateInput):
super(AdminDateInput, self).__init__(attrs=attrs, format=format)
def render_js_init(self, id_, name, value):
return 'initDateChooser({0});'.format(json.dumps(id_))
return 'initDateChooser({0}, {1});'.format(
json.dumps(id_),
json.dumps({'dayOfWeekStart': get_format('FIRST_DAY_OF_WEEK')})
)
class AdminTimeInput(WidgetWithScript, widgets.TimeInput):
@ -52,7 +56,10 @@ class AdminDateTimeInput(WidgetWithScript, widgets.DateTimeInput):
super(AdminDateTimeInput, self).__init__(attrs=attrs, format=format)
def render_js_init(self, id_, name, value):
return 'initDateTimeChooser({0});'.format(json.dumps(id_))
return 'initDateTimeChooser({0}, {1});'.format(
json.dumps(id_),
json.dumps({'dayOfWeekStart': get_format('FIRST_DAY_OF_WEEK')})
)
class AdminTagWidget(WidgetWithScript, TagWidget):