Commit Graph

92 Commits

Author SHA1 Message Date
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
Malcolm Tredinnick 284c6ba44b Fixed #4657 -- Fixed an error in an edge case of the urlizetrunc filter.
Thanks, SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-23 03:10:32 +00:00
Russell Keith-Magee 16269c4d0a Fixed #3523 -- Added list unpacking to for loops in templates. Thanks to SmileyChris and Honza Kral for their work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-08 11:58:03 +00:00
Jacob Kaplan-Moss f6491bf984 Fixed #4000 - changed documentation to note that filter arguments no longer need to be quoted (and added a test to that effect). Thanks, SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-06-07 18:18:44 +00:00
Malcolm Tredinnick 451cbfe894 Added a clarification that {#...#} is only for single-line comments.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-05-27 10:44:42 +00:00
Malcolm Tredinnick aae36cfc8e Fixed #4355 -- Clarified a confusing example in the use of the url template
tag. Based on a patch from Collin Grady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-05-26 09:43:32 +00:00
Russell Keith-Magee 83c4c53120 Fixed #4038 -- Added reference to django.contrib.webdesign in the template docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-16 11:26:07 +00:00
Russell Keith-Magee 49ae68925c Fixed #3956 -- Minor typo in template docs. Thanks, Nick Fishman.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-12 11:12:45 +00:00
Russell Keith-Magee 9191fa1f64 Fixed #3532 -- Made spaceless template tag remove all spaces, rather than preserving a single space. Thanks for the suggestion, ampaze@gmx.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-01 01:09:21 +00:00
Adrian Holovaty d22e39c10d Fixed #3799 -- Added django.contrib.webdesign and moved 'lorem' template tag into there
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-30 01:50:06 +00:00
Russell Keith-Magee 5f68a26ff4 Fixes #3799 -- Oops - ran last checkin from the wrong directory. Checked in the rest of the lorem templatetag implementation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-29 11:43:24 +00:00
Adrian Holovaty e2937ef6a0 Fixed #3814 -- Fixed HTML typo in docs/templates.txt regroup section. Thanks, djangorat@shitsoftware.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-27 22:30:59 +00:00
Adrian Holovaty 932928a1e2 Edited docs/templates.txt changes from [4830]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-27 19:02:32 +00:00
Jacob Kaplan-Moss 45f9217cbd Cleaned up the docs from [4830] a bit.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-27 17:30:57 +00:00
Jacob Kaplan-Moss d6fd9fb22b Fixed #3826: added a {% with %}. Thanks, SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-27 17:25:56 +00:00
James Bennett 1c13d05043 Remove notes about things added/removed in development version, since the development version is about to become 0.96
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-03-23 20:45:30 +00:00
Jacob Kaplan-Moss 28ad156f10 Fixed #3488: Added "b" option to date format filter. Thanks, Gary Wilson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-28 16:18:55 +00:00
Adrian Holovaty 5bed563edf Cleaned up docs/templates.txt 'url' tag documentation from [4494]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-13 06:13:06 +00:00
Malcolm Tredinnick 0fabbf8ce8 Fixed #2606 -- Added tag for working out the URL of a particular view function.
All work done by Ivan Sagalaev.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-13 04:24:58 +00:00
Adrian Holovaty b9677848f5 Small formatting tweaks to named-end-blocks change from [4489]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-12 17:13:08 +00:00
Malcolm Tredinnick a0c354ee4e Fixed #3351 -- Added optional naming of the block in "endblock" tags to ensure
correct nesting. Thanks for the patch, SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4489 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-12 00:22:22 +00:00
Malcolm Tredinnick 1aa1c4672c Added some documentation for truncatewords_html (added in [4468]).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-10 05:22:12 +00:00
Adrian Holovaty 8e54c49784 Fixed #3333 -- Docs now use relative links, not hard-coded djangoproject.com links. Thanks for the patch, SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-24 20:08:47 +00:00
Russell Keith-Magee c3f891210a Fixes #3176, #3004 -- Added an argument to the floatfilter to allow users to specify precision of floats, Thanks, Eric Floehr.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-01-03 05:29:34 +00:00
Adrian Holovaty 7cce717f34 Fixed typo in docs/templates.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-10 03:30:00 +00:00
Adrian Holovaty fdb3b738a8 Fixed typo in docs/templates.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 23:42:27 +00:00
Adrian Holovaty a84404c190 Formatting fixes from the past round of checkins
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 19:07:27 +00:00
Jacob Kaplan-Moss b1b4e8e7c4 Fixed #2800: the ifchanged tag now can optionally take paramaters to be checked for changing (instead of always using the content). Thanks, Wolfram Kriesing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-07 05:36:51 +00:00
Adrian Holovaty 48234a0925 Fixed #2961 -- Added 'opencomment' and 'closecomment' options to {% templatetag %} templatetag. Thanks for the patch, Jeong-Min Lee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-27 01:58:13 +00:00
Adrian Holovaty 60b46d72ac Fixed #648 -- Added comment syntax to template system: {# #}. Thanks for the patch, mccutchen@gmail.com and Hawkeye
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-10-24 21:30:38 +00:00
Malcolm Tredinnick fa8a1d252a Fixed #2845 -- Corrected a few spelling errors in the docs and changed a
couple of correctly spelt words to their North American counterparts for
consistency. Thanks, treborhudson@gmail.com


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-29 02:30:42 +00:00
Malcolm Tredinnick db6688a454 Added a note about not using ifequal and ifnotequal to compare against True,
False, None, etc.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-09-28 11:20:48 +00:00
Adrian Holovaty dbaf1219d5 Fixed #2580 -- Added missing </html> tag in docs/templates.txt examples. Thanks, jonathan-django@jmail.za.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-08-21 18:27:33 +00:00
Adrian Holovaty a369151091 Added note to docs/templates.txt about same logical operator
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-29 00:31:33 +00:00
Adrian Holovaty 8753a072f7 Small clarification to docs/templates.txt change from [3465]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-28 02:25:46 +00:00
Jacob Kaplan-Moss 847b1ed54e Fixed #1650: the {% extends %} tag now can extend a Template object passed into the context. Thanks, clelland@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-27 23:23:55 +00:00
Adrian Holovaty cb19acf6fb Changed masochistic to sadistic in docs/templates.txt. Thanks, hedronist
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 00:56:03 +00:00
Russell Keith-Magee b9d9351e85 Fixes #2202 -- Added ability to customize output of pluralize filter to handle irregular cases (walrus/walruses, cherry/cherries). Thanks to gid for the suggestion and the initial patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 06:18:39 +00:00
Malcolm Tredinnick 239adf83d3 Fixed #2053 -- added an optional comparison argument to the "timesince" filter.
Added a "timeuntil" filter that works analogously. Thanks, john@sneeu.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-21 06:56:08 +00:00
Malcolm Tredinnick 75a8a32f86 Fixed #2181 -- allow '{' and '}' to be escaped via {% templatetag ... %}.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-18 04:12:55 +00:00
Adrian Holovaty e5cd46d6d1 Fixed #2026 -- Added support for 'and' in template 'if' tags, added dozens of unit tests and updated docs. Thanks, ckknight
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 03:33:21 +00:00
Adrian Holovaty fb537e177d Added django.contrib.humanize, a set of template tags for adding a 'human touch' to data. They're documented in add_ons.txt.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-04 00:58:39 +00:00
Adrian Holovaty 75824ba82d Fixed more ReST errors in docs
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-02 01:59:39 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-05-02 01:31:56 +00:00
Adrian Holovaty f2aa710f13 Added note to docs/templates.txt about {% extends %} needing to be the first tag in the template. Thanks, Chris Chamberlin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-04-11 02:59:48 +00:00
Adrian Holovaty e4b48a8b92 Fixed #1058 -- Fixed typo in wordwrap filter documentation. Thanks, kieranholland.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-03-02 05:53:58 +00:00
Adrian Holovaty 186b5ccb34 Fixed #1365 -- Improved docs/templates.txt to note location of admin documentation site. Thanks, Joseph Heck
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-17 17:25:01 +00:00
Adrian Holovaty f732217c0a Added better docs for 'phone2numeric' template filter
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-13 15:33:25 +00:00
Adrian Holovaty e0c915ec39 Added TEMPLATE_STRING_IF_INVALID setting, which specifies what the template system should output in case of invalid variables. Default is empty string (to match current behavior)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-02-09 00:31:51 +00:00
Adrian Holovaty a07b704d8b Added 'Custom libraries and template inheritance' section to docs/templates.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-01-21 22:29:55 +00:00