p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,607 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

15 Commits

Author SHA1 Message Date
Jannis Leidel 578a31fea3 Fixed #15921 -- Refined naturaltime filter added in r16071 to use timesince and timeuntil filters as fallbacks instead of date filter. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-17 10:16:12 +00:00
Jannis Leidel 9ad005ec1c Updated humanize tests to use the FixedOffset timezone from the utils and removed a bit code smell while I'm here. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-17 10:15:58 +00:00
Jannis Leidel b0d274dbd5 Added missing future imports missed in r16167. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 19:49:06 +00:00
Jannis Leidel 8f3e1c1c63 Fixed #6392 -- Made django.contrib.humanize template tags locale aware. Thanks, Dave McLain. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 13:29:58 +00:00
Jannis Leidel e744fec8f9 Fixed #11321 -- Handle timezones correctly in conjunction with naturalday filter. Thanks, aarond10 and seocam. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-22 12:02:55 +00:00
Jannis Leidel ea248f0107 Fixed #12771 -- Added naturaltime filter to humanize contrib app. Thanks, phinpho, djansoft and xtrqt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-22 12:02:47 +00:00
Jannis Leidel 3cf8502d35 Fixed #4976 -- Stopped humanize template tags to raise a TypeError if passed a value of ``None``. Thanks, Simon G. and Adam Vandenberg. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 15:07:43 +00:00
Russell Keith-Magee 121d2e3678 Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:55:17 +00:00
Adrian Holovaty 8b9cf79ff6 Fixed #11783 -- ordinal template tag now catches TypeError. Thanks, realpolitik and punteney 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-10 21:37:20 +00:00
Malcolm Tredinnick 356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 12:58:53 +00:00
Malcolm Tredinnick 14b5e074ba Fixed #3311 -- Added naturalday filter to contrib.humanize. Thanks, Jyrki Pulliainen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 08:50:08 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Adrian Holovaty 018ece8dc8 Negligible formatting change to humanize tests.py (from [4880]) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-01 05:23:08 +00:00
Malcolm Tredinnick 04c155fd06 Fixed #3017 -- Added tests for humanize filter. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-31 11:45:24 +00:00
Jacob Kaplan-Moss a0157da26f Fixed #3518: Added unit tests for the humanize filters. Major thanks to Jyrki Pulliainen for the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-25 16:09:30 +00:00