a89e02637b
Fixed #13567 -- Added a 'silent' argument to the cycle tag, so that you can declare a cycle without producing a value in the template. Thanks to anentropic for the suggestion and initial patch, and Łukasz Rekucki for the final patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 13:42:30 +00:00
89219a6829
Fixed a few more cases of the tests not properly restoring sys.path (follow up on [14429]).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 05:31:19 +00:00
d931f43b70
Fixed #14126 -- Fixed an issue with changes to the blocktrans tag introduced in r13967 related to multiple plural forms. Thanks, mark0978, svetlyak40wt and Ramiro.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-16 20:40:17 +00:00
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
1070c57b83
Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 12:20:07 +00:00
a64e96c227
Fixed #13568 -- Fixed the blocktrans tag to not raise a KeyError if the number of variables in the singular and the plural block differ. Thanks, deloide.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:02:01 +00:00
6fb4f6e299
Fixed #13765 - 'safe' parameter for urlencode filter
...
Thanks to KyleMac for the suggestion and SmileyChris for the patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 23:01:34 +00:00
720299053a
Modified the egg template loader tests; firstly to ensure that we are testing the new, non-deprecated interface; secondly to ensure that the old deprecated interface is also tested, but deprecation warnings are silenced.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 21:53:35 +00:00
7bb6abed12
Fixed #13702 -- Made sure to actually fall back to the l10n format strings provided in the settings, when disabled.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 19:40:44 +00:00
0b37d56481
Fixed #13475 - for tag raises an exception when trying to unpack a non-iterable item
...
Thanks to SmileyChris for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:30:46 +00:00
e64cdf7129
Fixed #11377 : the template join filter now correctly escapes the joiner, too.
...
Thanks, Stephen Kelly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03 15:42:39 +00:00
f40922609f
Fixed #11376 : added some extra tests for autoescaping subtleties.
...
Thanks, Stephen Kelly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03 15:34:59 +00:00
2e3fdc6326
Fixed #11288 : added some tests for the handling of number-like variables in templates.
...
Thanks, Stephen Kelly.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03 15:34:52 +00:00
8a6cb3d969
Fixed #13573 -- Corrected problem with template caching when template directories are provided. Thanks to lamby for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21 08:54:15 +00:00
fef0d25bdc
Fixed #13373 -- Ensured that {% if %} statements will short circuit template logic and not evaluate clauses that don't require evaluation. Thanks to Jerry Stratton for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 14:18:14 +00:00
a288f97a2a
Add file mistakenly left out of r12986. Refs #13334 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 20:36:00 +00:00
da36e32224
Fixed #13334 : Restored ability to load template tags from eggs. Again thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule, and Russ for review.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 19:57:09 +00:00
2cebe4395e
Refs #13167 -- Corrected a regression in the way non-existent variables are handled by {% if %} tags. Thanks to ohmi2 for pointing out the regression in 1.2, and Karen for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 13:56:38 +00:00
b579350cd1
Fixed #13275 -- Modified the parsing logic of the {% url %} tag to avoid catastrophic backtracking. Thanks to SmileyChris for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-10 07:35:31 +00:00
dafc077e4a
Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072 . Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30 12:44:30 +00:00
ed36a5f2ce
Fixed #12554 again: Corrected regression in silencing attribute lookups introduced in r12823, plus added a test for this so it doesn't regress again.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-22 19:08:04 +00:00
2403f581b3
Fixed #12554 : Silence exceptions that have specified silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 20:27:57 +00:00
80e744945c
Fixed #12787 : Correctly identify the template that does not exist when a template being extended includes another template that does not exist. Thanks to trigeek38 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 14:34:57 +00:00
beca4b8109
Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 07:22:20 +00:00
960af90279
Fixed #13058 - "smart if" template tag doesn't support "if not in ..." condition
...
Thanks to ramusus for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 23:25:37 +00:00
50e46c017e
Fixed #11461 : Ensured complete traceback is available on the debug page when an exception is encountered during template rendering, even when running on Python 2.6 or higher. Thanks Glenn.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 17:01:21 +00:00
f034c79cbc
Fixed #6510 -- Refactored the way child nodes are found in template nodes to avoid potential inconsistencies. Thanks to SmileyChris for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 07:42:51 +00:00
698410ab6f
Fixed #12992 : Adjusted the new template loader code so that the template
...
file name is correctly reported on the debug page when a template syntax
error is raised.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 23:05:35 +00:00
fd233f40d1
Fixed #12070 . Fixed a case where var._whatever wasn't raising a TemplateSyntaxError.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 18:50:57 +00:00
349827996b
Fixed #12072 -- Certain characters no longer break url tag. Thanks, Alexander Dutton.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 05:17:39 +00:00
c1d795df45
Clarified a comment from [11687].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 23:42:53 +00:00
49d6a82261
Fixed #11687 : the `add` filter is now less failsome when faced with things that can't be coerced to integers.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 23:34:33 +00:00
84f8213d74
Fixed #5972 - Allow the template filters to be used with the trans tag. Thanks for the initial patch, Dmitri Fedortchenko.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:43:28 +00:00
b459f5b7e3
Fixed #5971 - Fixed inconsistent behaviour of the TokenParser when parsing filters that follow constant strings or variables. Thanks Dmitri Fedortchenko, Adam Vandenberg and Ramiro Morales.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:42:57 +00:00
6cafd4b21f
Fixed #7876 - Improved template error message to include expected end tag. Thanks to Matthias Kestenholz for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:38:33 +00:00
0e5836dc07
Fixed #12613 -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:36:21 +00:00
12d3799dd2
Fixed #6587 -- Removed nasty __path__ hacking in templatetag loading. Thanks to Øyvind Satvik and Andrew Badr for their work on this patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-26 01:38:50 +00:00
44b9076bbe
Fixed #6262 -- Added a cached template loader, and modified existing template loaders and tag to be cacheable. Thanks to Mike Malone for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14 12:08:23 +00:00
f761802b22
Fixed #11972 : Corrected title filter handling of numbers followed by letters. Thanks schwank@gmail.com and Randy Barlow.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:20:32 +00:00
2c2f5aee4d
Implemented 'smart if' template tag, allowing filters and various operators to be used in the 'if' tag
...
Thanks to Chris Beaven for the initial patch, Fredrik Lundh for the basis
of the parser methodology and Russell Keith-Magee for code reviews.
There are some BACKWARDS INCOMPATIBILITIES in rare cases - in particular, if
you were using the keywords 'and', 'or' or 'not' as variable names within
the 'if' expression, which was previously allowed in some cases.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 22:40:36 +00:00
a2b46ca5fd
Fixed #11833 : name conflict in filter test.
...
Thanks steveire
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-10 16:35:23 +00:00
cbbe60c7fc
Fixed #11270 -- Modified cache template tag to prevent the creation of very long cache keys. Thanks to 235 for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 15:04:00 +00:00
8950a40cec
Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks to steveire for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-18 15:03:17 +00:00
50745cc31e
Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:45:28 +00:00
b1a5db37e6
Fixed #10369 -- Fixed auto-escaping inside "tran" and "blocktrans" tags.
...
Patch from Andrew Badr.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11 12:03:52 +00:00
be4a83c448
Fixed #9315 -- Handle spaces in URL tag arguments.
...
Thanks Natalia Bidart and Matías Bordese for most of this patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-10 04:13:27 +00:00
6d6bbb6d05
Fixed #9756 : the for tag no longer leaves the context stack unbalanced when dealing with an empty iterable. Thanks, seanl.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-07 22:02:34 +00:00
63143d5d9d
Fixed the test added for #9005 to use the e.args[0] instead of e.message. Exceptions didn't have 'message' before Python 2.5, and it was deprecated as of Python 2.6. args[0] works without error or DeprecationWarning from Python 2.3 through 2.6.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-04 19:34:52 +00:00
9828557731
Fixed #9520 : make the date filter fail silently for non-date values. Thanks, Andrew Badr and Eric Holscher.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-02 05:20:25 +00:00
751234bfd9
Fixed the test in [10351] to work reguardless of the test settings.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-02 01:40:56 +00:00
Russell Keith-Magee
Alex Gaynor
Jannis Leidel
Luke Plant
Jacob Kaplan-Moss
Karen Tracey
Joseph Kocherhans
Justin Bronn
Malcolm Tredinnick