From 7f663aeccf17a75d5fe3fee02d1ac577fdeb57f2 Mon Sep 17 00:00:00 2001 From: bphillips Date: Fri, 27 Nov 2015 14:08:08 -0500 Subject: Fixed #25820 -- Allowed whitespace in admin's calendar.js month/weekday names. This is useful for certain language translations. --- django/contrib/admin/static/admin/js/calendar.js | 27 +++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'django') diff --git a/django/contrib/admin/static/admin/js/calendar.js b/django/contrib/admin/static/admin/js/calendar.js index 1043dd61ef..75e7bce80c 100644 --- a/django/contrib/admin/static/admin/js/calendar.js +++ b/django/contrib/admin/static/admin/js/calendar.js @@ -1,4 +1,4 @@ -/*global gettext, get_format, quickElement, removeChildren*/ +/*global gettext, pgettext, get_format, quickElement, removeChildren*/ /* calendar.js - Calendar functions by Adrian Holovaty depends on core.js for utility functions like removeChildren or quickElement @@ -8,8 +8,29 @@ depends on core.js for utility functions like removeChildren or quickElement 'use strict'; // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions var CalendarNamespace = { - monthsOfYear: gettext('January February March April May June July August September October November December').split(' '), - daysOfWeek: gettext('S M T W T F S').split(' '), + monthsOfYear: [ + gettext('January'), + gettext('February'), + gettext('March'), + gettext('April'), + gettext('May'), + gettext('June'), + gettext('July'), + gettext('August'), + gettext('September'), + gettext('October'), + gettext('November'), + gettext('December') + ], + daysOfWeek: [ + pgettext('one letter Sunday', 'S'), + pgettext('one letter Monday', 'M'), + pgettext('one letter Tuesday', 'T'), + pgettext('one letter Wednesday', 'W'), + pgettext('one letter Thursday', 'T'), + pgettext('one letter Friday', 'F'), + pgettext('one letter Saturday', 'S') + ], firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')), isLeapYear: function(year) { return (((year % 4) === 0) && ((year % 100) !== 0 ) || ((year % 400) === 0)); -- cgit v1.3