Commit Graph

36 Commits

Author SHA1 Message Date
Adrian Holovaty e296de5500 Changed resolve_variable to resolve integers and floats as integers and floats. Added ifequal unit tests. Refs #959
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-16 05:33:24 +00:00
Georg Bauer 3c4c6e0f96 fixes #1066 - yesno used the wrong way to do translations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-15 15:56:26 +00:00
Adrian Holovaty 7d0bcc5727 Fixed exception-handling bug in defaulttags SsiNode. Thanks, Henryk on IRC
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-12-09 03:30:07 +00:00
Adrian Holovaty e2e98aff6a Fixed #962 -- Gave filter-registration decorator a return statement. Thanks, Kieran
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-30 00:08:56 +00:00
Adrian Holovaty 29d1598cce Added a GOTCHA comment in django/core/template/init.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-29 05:53:05 +00:00
Adrian Holovaty 9e3efbecf8 Restored {% debug %} template tag, which was inadvertently removed in [1443]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-28 20:48:08 +00:00
Adrian Holovaty 8c3b41c3e9 Removed unnecessary load_template_source() function in django/core/template/loader.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 21:37:41 +00:00
Adrian Holovaty 3cf5d034db Fixed #931 -- Fixed unordered_list template filter
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 19:38:07 +00:00
Adrian Holovaty 2fb95f1de6 Changed template library system so that it looks for a module-level variable named 'register' rather than the first instance of template.Library it finds
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 16:43:56 +00:00
Adrian Holovaty fc102791d8 Fixed bug in [1443] -- slice filter was registered as 'slice_'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 01:55:55 +00:00
Georg Bauer 0e9081e6de loading of templates in includes now reraises the template loading exception instead of returning nothing
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 00:26:16 +00:00
Georg Bauer 53330a9274 unknown sources are now shown correctly as <unknown source> (before it was shown as a tag)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-27 00:01:11 +00:00
Adrian Holovaty c83fa94391 Fixed bug in [1443] -- Missing Context import in django.core.template.loader
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 23:11:19 +00:00
Adrian Holovaty adef71d2c4 Fixed bug in [1443] -- renamed compile_filters call to compile_filter
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 23:10:09 +00:00
Adrian Holovaty ac91a22ec2 Fixed bug in [1443] -- a decorator call was left in
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 23:07:09 +00:00
Adrian Holovaty 3ede006fc9 Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 22:46:31 +00:00
Adrian Holovaty c5e5c0fc35 Fixed #625 -- Added template-tag decorators simple_tag and inclusion_tag. Taken from new-admin. Thanks, rjwittams
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 00:54:40 +00:00
Adrian Holovaty 22746d32a5 Added a get_template_sources generator function to filesystem and app_directories template loaders, so template-loader debugger can hook into it. Refs #892.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 21:14:42 +00:00
Adrian Holovaty 5d863f1fbd Fixed #603 -- Added template debugging errors to pretty error-page output, if TEMPLATE_DEBUG setting is True. Also refactored FilterParser for a significant speed increase and changed the template_loader interface so that it returns information about the loader. Taken from new-admin. Thanks rjwittams and crew
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 23:10:17 +00:00
Adrian Holovaty bedf10a98d Fixed #598 -- Added {% include %} template tag. Added docs and unit tests. Thanks, rjwittams
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-22 05:44:04 +00:00
Adrian Holovaty 8a2d9fc2f4 Tiny logic tightening in core.template.loader -- taken from new-admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-22 05:11:14 +00:00
Georg Bauer 367ce0ce92 fixes #764 - the TokenParser now respects string parameters to filters that contain blanks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-12 21:45:01 +00:00
Adrian Holovaty e19c9ccfcb Reworded docstrings and settings documentation from [1068]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-06 22:22:02 +00:00
Jacob Kaplan-Moss 5cf8f68423 Merged i18n branch into the trunk! Fixes #65, and perhaps some others. NB: this means that the i18n branch is now obsolete and will be made read-only.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-04 04:59:46 +00:00
Jacob Kaplan-Moss 91a283583c Made floatformat filter not choke on non-floats
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-02 19:01:27 +00:00
Adrian Holovaty cee6faf43e Fixed #505 -- ssi template tag now displays a message instead of failing silently if DEBUG=True. Thanks, Manuzhai
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-01 01:11:36 +00:00
Adrian Holovaty b5a6ff5bdd Fixed #488 -- removetags template filter now removes tags without a space before the final slash
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-28 03:45:51 +00:00
Adrian Holovaty e0d2793b7b Fixed #687 -- Fixed bug in floatformat template filter and added unit tests. Thanks, Sune
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-25 01:44:14 +00:00
Adrian Holovaty cc3635d62f Fixed #663 -- app_directories template loader no longer assumes a dot in the app name. Thanks, Sune
git-svn-id: http://code.djangoproject.com/svn/django/trunk@985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-20 23:16:45 +00:00
Adrian Holovaty 57b4f231fd Fixed #583 -- Added app_directories template loader, which searches for templates in 'templates' directory in each INSTALLED_APPS package. It's turned off by default.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-17 02:37:50 +00:00
Adrian Holovaty e8fda9091a Fixed typo in filesystem template-loader error message
git-svn-id: http://code.djangoproject.com/svn/django/trunk@890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-17 02:18:28 +00:00
Adrian Holovaty dc3f6e4113 Changed internal variable names in django.core.template.loaders.eggs to be consistent with filesystem
git-svn-id: http://code.djangoproject.com/svn/django/trunk@889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-17 01:53:22 +00:00
Adrian Holovaty f575a4edaa Fixed small namespace bug in [867]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 22:29:13 +00:00
Adrian Holovaty 7aefff7833 Fixed #582 -- Added support for loading templates from Python eggs, and a TEMPLATE_LOADERS setting, which defines which loaders to use. Thanks, Sune
git-svn-id: http://code.djangoproject.com/svn/django/trunk@870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 22:22:12 +00:00
Adrian Holovaty 083b4f9001 Redid [865], which got lost in [867]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 20:12:16 +00:00
Adrian Holovaty f71f854628 Fixed #626 -- Moved template modules to django.core.template package. django.core.template_loader is deprecated, in favor of django.core.template.loader.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-10-14 20:10:13 +00:00