diff options
| author | akoskaaa <akos.hochrein@prezi.com> | 2016-04-03 18:53:11 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-04-06 10:41:58 -0400 |
| commit | ab2d34ba3fe95d0324d544ca2ca92c2bf0b533aa (patch) | |
| tree | 8b568a9255822c6289be435032abfe8173500804 /django/contrib | |
| parent | a6074e8908e36286de7e31f165be801df8ee1eab (diff) | |
Fixed #25856 -- Added %B support to Date.strftime.
This enables the admin to display the correct localized month name if %B
is used in the date format.
Diffstat (limited to 'django/contrib')
| -rw-r--r-- | django/contrib/admin/static/admin/js/calendar.js | 1 | ||||
| -rw-r--r-- | django/contrib/admin/static/admin/js/core.js | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/django/contrib/admin/static/admin/js/calendar.js b/django/contrib/admin/static/admin/js/calendar.js index 8432ebd1bf..57655602ee 100644 --- a/django/contrib/admin/static/admin/js/calendar.js +++ b/django/contrib/admin/static/admin/js/calendar.js @@ -204,4 +204,5 @@ depends on core.js for utility functions like removeChildren or quickElement } }; window.Calendar = Calendar; + window.CalendarNamespace = CalendarNamespace; })(); diff --git a/django/contrib/admin/static/admin/js/core.js b/django/contrib/admin/static/admin/js/core.js index a5164ccd47..edccdc0217 100644 --- a/django/contrib/admin/static/admin/js/core.js +++ b/django/contrib/admin/static/admin/js/core.js @@ -153,8 +153,15 @@ function findPosY(obj) { return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond(); }; + Date.prototype.getFullMonthName = function() { + return typeof window.CalendarNamespace === "undefined" + ? this.getTwoDigitMonth() + : window.CalendarNamespace.monthsOfYear[this.getMonth()]; + }; + Date.prototype.strftime = function(format) { var fields = { + B: this.getFullMonthName(), c: this.toString(), d: this.getTwoDigitDate(), H: this.getTwoDigitHour(), |