Commit Graph

1077 Commits

Author SHA1 Message Date
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 5676d5b068 Fixed #923 -- Made WSGI handler tolerant of no QUERY_STRING in os.environ. Thanks, michael.mcewan
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 18:41:29 +00:00
Georg Bauer 46c49a859a fixes #910, #918 and #922 - updated 'sk', 'ru' and 'zh_CN' translations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 17:04:35 +00:00
Adrian Holovaty 8128f440ee Fixed #903 -- Added login_url argument to user_passes_test view decorator. Didn't add it to login_required decorator because that would turn login_required into a callable decorator, which would break backwards compatibility.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 07:20:07 +00:00
Adrian Holovaty d058a8a104 Fixed bug in Python 2.3 example of user_passes_test decorator in docs/authentication.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 07:02:59 +00:00
Adrian Holovaty 37a0c110e2 Fixed #913 -- Made more helpful error for list_filter error. Thanks, Tom Tobin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 06:42:28 +00:00
Adrian Holovaty 5ad144b29e Added 'Error handling' section to docs/modpython.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-26 03:17:52 +00:00
Georg Bauer 733e5265fe updated all message files for the new_admin merge
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 23:25:59 +00:00
Adrian Holovaty f0fceb773d Merged mo/po files from new-admin branch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 21:20:38 +00:00
Adrian Holovaty 9dda4abee1 MERGED NEW-ADMIN BRANCH (except for po/mo files, which will come in a separate commit)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 21:20:09 +00:00
Jacob Kaplan-Moss 4fe5c9b7ee Fixed #906 - thanks, Esaj
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 15:00:14 +00:00
Adrian Holovaty 69f8840900 Fixed #882 -- Fixed bug when doing django-admin.py sqlclear with SQLite. Thanks, ye7cakf02
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 04:27:50 +00:00
Adrian Holovaty 3ddf250f91 Fixed #830 -- Added an AUTHORS file, which is inevitably incomplete
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 04:25:50 +00:00
Adrian Holovaty fe15c01a17 Fixed typo in docs/model-api.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 03:15:09 +00:00
Adrian Holovaty 807b406859 Added translation strings to django/core/meta/fields.py. Taken from new-admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 02:37:57 +00:00
Adrian Holovaty 9898c4ae02 Added translation strings to core/formfields.py. Taken from new-admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 02:32:37 +00:00
Adrian Holovaty c60e323e5d new-admin and trunk: Normalized spacing differences in bin/validate.py between trunk and new-admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 02:26:08 +00:00
Adrian Holovaty baba996254 Added translation strings to django/contrib/admin/views/decorators.py. Taken from new-admin
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 02:18:37 +00:00
Adrian Holovaty 473eabc447 Negligible spacing change in tests/othertests/templates.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 01:54:17 +00:00
Adrian Holovaty f57e22495f Tiny formatting changes to templatetags/i18n.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 01:03:58 +00:00
Adrian Holovaty 16da4e69c4 Converted django.contrib.admin.templatetags.adminmedia to use simple_tag decorator
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 01:00:52 +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
Georg Bauer 84eb80bbd7 and another little fix to the email sending stuff on password_reset - using Context works much better after importing it
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 00:20:13 +00:00
Georg Bauer ca683d8ca5 now really fixed the source formatting. brought to you by the magics of IRC-based pair programming
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-25 00:04:06 +00:00
Georg Bauer eff2a1fde2 just another small fix to the template_debug layout
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 23:35:28 +00:00
Georg Bauer 73766b1f88 fixed debug view for templates so it starts counting with 1
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 23:31:33 +00:00
Georg Bauer 798e6d5663 mail sending used Template.render, but passed only a dictionary, not a Context object
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 23:10:24 +00:00
Georg Bauer f0fbd43a57 small fix to the template_debug stuff, it was dropping last characters and didn't split the first line correctly
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 22:57:04 +00:00
Adrian Holovaty 18c7ed74e4 Fixed #896 -- Fixed error in filesystem serve view in Windows. Thanks, Petar Marić and nesh
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 22:41:05 +00:00
Adrian Holovaty 827ebe5368 Converted django/models/__init__.py to use unix newlines, not DOS
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 21:26:04 +00:00
Adrian Holovaty d922825156 Fixed #892 -- TemplateDoesNotExist errors now get a 'Template-loader postmortem' section on the pretty debug page. Thanks for the idea, David Ascher
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 21:15:51 +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
Georg Bauer c616d869ed fixes #898 - updated 'sk' translation. Additional a small fix in the 'de' translation (removed a "fuzzy").
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 18:31:49 +00:00
Georg Bauer 834e7d3482 fixed a typo in a trans template tag. Thx David Ascher (on IRC)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 18:30:31 +00:00
Jacob Kaplan-Moss f286461e2a Fixed small typo in User object; thanks David Ascher
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 05:20:27 +00:00
Adrian Holovaty 28fd32318f Updated django.utils.translation due to template changes from [1379]. From new-admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 03:32:26 +00:00
Georg Bauer eab4a22596 changed the linebreaks_iter function to use str.find instead of re.finditer, because the latter one has problems with Python 2.3
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-24 00:06:36 +00:00
Adrian Holovaty 140f4a6913 Added TEMPLATE_DEBUG to docs/settings.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 23:29:25 +00:00
Adrian Holovaty 39eac9bdff Added Wilson's HTML tweaks to the template error screen
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 23:15:52 +00:00
Adrian Holovaty 21f2d842fa Added Wilson's CSS tweaks to the template error screen
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 23:12:24 +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 cfc5786d03 Fixed missing {% load i18n %} tag in comments FREE_COMMENT_FORM template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 21:56:21 +00:00
Adrian Holovaty 08a494c40d Added better error handling for trailing periods in URLconf include()s
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 21:44:48 +00:00
Adrian Holovaty fce688cc74 Fixed #886 -- timesince utility now supports microseconds. Thanks, Aaron Swartz
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 21:13:00 +00:00
Georg Bauer 87e0c2a712 updated all message files for translation hooks from [1368]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 17:31:52 +00:00
Georg Bauer 0e1ae73ad7 another update for the german translations file
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 17:27:47 +00:00
Georg Bauer 8dc25efea8 updated message files for new translation targets (comments) and updated 'de' translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 17:14:54 +00:00
Adrian Holovaty 6303141fbb Applied translation strings from new-admin to contrib.admin.views.doc
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 17:02:38 +00:00
Georg Bauer 6d6d90ce33 made the message when locale/ or conf/locale/ could not be found a bit more clear
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1366 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 16:14:24 +00:00
Adrian Holovaty d215cbd63a Added translation strings to django.contrib.comments. Taken from new-admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2005-11-23 15:42:09 +00:00