0
0
mirror of https://github.com/django/django.git synced 2024-11-30 07:06:18 +01:00
Commit Graph

200 Commits

Author SHA1 Message Date
Ramiro Morales
f6e38f3800 Fixed #5494, #10765, #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime.
This is slightly backward-incompatible (could result in changed final translations for literals appearing multiple times in different .po files but with different translations).

Translations are now read in the following order (from lower to higher priority):

For the 'django' gettext domain:

 * Django translations
 * INSTALLED_APPS apps translations (with the ones listed first having higher priority)
 * settings/project path translations (deprecated, see below)
 * LOCALE_PATHS translations (with the ones listed first having higher priority)

For the 'djangojs' gettext domain:

 * Python modules whose names are passed to the javascript_catalog view
 * LOCALE_PATHS translations (with the ones listed first having higher priority, previously they weren't included)

Also, automatic loading of translations from the 'locale' subdir of the settings/project path is now deprecated.

Thanks to vanschelven, vbmendes and an anonymous user for reporting issues, to vanschelven, Claude Paroz and an anonymous contributor for their initial work on fixes and to Jannis  Leidel and Claude for review and discussion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 18:48:40 +00:00
Luke Plant
a0585e99bf Added note to 1.2.5 release notes about ModelAdmin.lookup_allowed change
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 15:47:40 +00:00
Carl Meyer
8151c0431e Copied in-development 1.2.5 release notes to trunk.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 08:10:54 +00:00
Carl Meyer
00e7a571c5 Fixed #6456 - Excised FileField file deletion to avoid data loss. Thanks to durdinator for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 07:46:19 +00:00
Ramiro Morales
f81d4ba5b3 Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 15:42:24 +00:00
Luke Plant
42c31f6bf0 Rationalised CompatCookie/SimpleCookie into single SimpleCookie class with all fixes.
Since upstream Python has fixed the encoding bug (see
http://bugs.python.org/issue9824), we don't want a separate class for this
bug fix, or several layers for the different fixes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 20:35:46 +00:00
Timo Graham
a757b5b8ca Fixed #15133 - Some markup issues in the docs; thanks Aryeh Leib Taurog for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-22 12:43:50 +00:00
Russell Keith-Magee
b31a1b9926 Refs #14661 -- Clarified the handling of initial data injected via custom SQL.
This is BACKWARDS INCOMPATIBLE CHANGE for anyone relying on SQL-injected initial data in a test case.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:43:01 +00:00
Chris Beaven
faa4a98f27 Change the lack of supports_inactive_user on an auth backend to a
!PendingDeprecationWarning (refs #14249), fixing some bad links in the
1.3 release docs and a typo.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 08:31:14 +00:00
Luke Plant
7b8c38250c Fixed #15057 - documented change in [14992]
Thanks to Tai Lee for the patch.

Refs #15025, #7153

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 13:47:21 +00:00
Jannis Leidel
544ab30ed7 Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:33:11 +00:00
Timo Graham
ec539599f7 Fixed #14980 - Add 1.2.4 release notes to trunk. thanks Gary Wilson for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:37:10 +00:00
Alex Gaynor
c00c377e54 Fixed #14593 -- change this warning to be a PendingDeprecationWarning. Also converted the Czech localflavor tests to be unittests. We have always been at war with doctests. Thanks to Idan Gazit.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 07:41:26 +00:00
James Bennett
95b96b1962 Add note about security changes in 1.3 beta release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15039 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 04:03:28 +00:00
James Bennett
5ed6e7a4d5 Refactor the choices for localflavor's USStateField, and add new US postal code support. Fixes #14937 and #9022, refs #10308 and #8425.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 02:56:31 +00:00
Justin Bronn
5fddfda559 Fixed #13788 -- GEOSGeometry.transform no longer silently no-ops when GDAL isn't available. Thanks, Rob Coup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 17:43:30 +00:00
Karen Tracey
b1f6a4d66f Fixed #10154: Allow combining F expressions with timedelta values.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 03:34:04 +00:00
Justin Bronn
b6ab88c34a Fixed #14439 -- Improved documentation for running the GeoDjango test suite.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 00:21:35 +00:00
Jannis Leidel
745c255a19 Fixed #14249 -- Added support for inactive users to the auth backend system. Thanks, Harro van der Klauw.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 19:18:12 +00:00
Russell Keith-Magee
b3d2091681 Fixed #12816 -- Added a render() shortcut.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 17:18:41 +00:00
Russell Keith-Magee
673e6fc7fb Fixed #11675 -- Added support for the PyLibMC cache library. In order to support this, and clean up some other 1.3 caching additions, this patch also includes some changes to the way caches are defined. This means you can now have multiple caches, in the same way you have multiple databases. A huge thanks to Jacob Burch for the work on the PyLibMC backend, and to Jannis for his work on the cache definition changes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:19:19 +00:00
Russell Keith-Magee
5219bc9f84 We're not going to have an alpha-2, so use those notes as the starting point for the beta notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 15:02:13 +00:00
Russell Keith-Magee
416ef9aad8 Added a brief release note about the addition of CC's to EmailMessage (introduced in r14000).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 15:01:45 +00:00
Russell Keith-Magee
314fabc930 Fixed #14908 -- Added a 'takes_context' argument to simple_tag. Thanks to Julien Phalip for driving the issue and providing the final patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 15:00:50 +00:00
Jannis Leidel
a03a8adb3e Fixed #14268 -- Start the deprecation of the reset and sqlreset management command. Thanks, Carl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:58:25 +00:00
Timo Graham
f0753ef211 Fixed #14875 - moved mention of email_re in 1.2 release notes from features deprecated to backwards incompatible changes. thanks galund for the report and elbarto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 13:29:47 +00:00
Russell Keith-Magee
e0dcd7666a Fixed #12815 -- Added TemplateResponse, a lazy-evaluated Response class. Thanks to Simon Willison for the original idea, and to Mikhail Korobov and Ivan Sagalaev for their assistance, including the draft patch from Mikhail.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-07 13:57:01 +00:00
Russell Keith-Magee
29c4a578af Fixed #10863 -- Added HTML support to mail_managers() and mail_admins(), and used this to provide more and prettier detail in error emails. Thanks to boxed for the suggestion, and to Rob Hudson and Brodie Rao for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 14:21:51 +00:00
Jannis Leidel
cc64fb5c4b Fixed #8342 -- Removed code from the admin that assumed that you can't login with an email address (nixed by r12634). Also refactored login code slightly to be DRY by using more of auth app's forms and views.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:44:35 +00:00
Timo Graham
676c28ce8c Fixed #14790 - Fix reST in 1.0 porting guide - thanks adamv.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 17:49:43 +00:00
Russell Keith-Magee
78be884ea7 Fixed #3304 -- Added support for HTTPOnly cookies. Thanks to arvin for the suggestion, and rodolfo for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:30:50 +00:00
Russell Keith-Magee
cbd90455a0 Clarified the text describing the deprecation status of mod_python. Thanks to mattmcc and Tai Lee for pointing out the ambiguity.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 12:13:18 +00:00
Gabriel Hurley
d8c471b840 Various nominal corrections for grammatical consistency, typos, and crossref targets.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 06:08:38 +00:00
Honza Král
dc334a2ba8 Fixed #3400 -- Support for lookup separator with list_filter admin option. Thanks to DrMeers and vitek_pliska for the patch!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 19:29:15 +00:00
Honza Král
65b380e74a Fixed #11418 -- formset.cleaned_data no longer raises AttributeError when is_valid is True. Thanks mlavin!
This also introduces a slightly backwards-incompatible change in
FormSet's behavior, see the release docs for details.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 17:27:01 +00:00
Russell Keith-Magee
7ff5580d95 Fixed #14389, #9666 -- Started the migration path to make the first argument to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 06:22:28 +00:00
Russell Keith-Magee
99d247f4cb Fixed #13795 -- Added a site-wide cache prefix and cache versioning. Thanks to bruth for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 15:39:35 +00:00
Luke Plant
9712f4c7a4 Corrected link in release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 01:29:25 +00:00
Jannis Leidel
17b329ae08 Fixed #10004 and #12320 -- Enabled the makemessages management command to collect comments for translators that start with the "Translators" keyword. Thanks for the report and patches, martinb and Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:37:33 +00:00
Jannis Leidel
33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings.
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:26 +00:00
Alex Gaynor
5b4c6fd5e4 Fixed #14706 -- corrected a stray backtick in the docs. Thanks to Adam for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 01:57:23 +00:00
Jannis Leidel
3b29fe353b Added release notes for potential alpha-2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-13 18:42:11 +00:00
James Bennett
bd83177c70 Correct a typo in [14541].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 16:35:40 +00:00
James Bennett
dc0accb5a3 Better description in the release notes of what's going on with the PasswordInput change.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 16:12:38 +00:00
Jannis Leidel
216fdfab61 Added note about the addition of the django.contrib.staticfiles app. Thanks to Florian Apolloner for reminding me about it and providing a patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:43:04 +00:00
Gabriel Hurley
b0590110c7 Turns out that "unintended paragraph break" was actually missing the end of the sentence. Now the paragraph is a complete thought. Fixed in 1.3 alpha release notes and 1.3 notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 08:22:58 +00:00
Gabriel Hurley
75a64d7a22 Small corrections to 1.3-alpha release notes (an unintended paragraph break, bad link, stray backtick, etc.).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 08:01:03 +00:00
James Bennett
0b25176ed8 Add 1.3 alpha notes to release-notes index.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 07:21:07 +00:00
James Bennett
6a403c4676 Remove the 1.3 paragraph from the alpha notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 07:20:31 +00:00
James Bennett
264711ef7a Correct a typo in the 1.3 alpha release notes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 07:14:28 +00:00