Compare commits

...

511 Commits

Author SHA1 Message Date
Luke Plant 8b5fc4ac00 [1.1.X] Removed example CSRF jQuery code from release notes, replacing with link to improved code in the CSRF docs
Backport of [15628] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 11:31:54 +00:00
Ramiro Morales 12fd6e1106 [1.1.X] Fixed #15306 -- Replaced 1.1.X implementation of admin changelist filtering security fix (r15031/r15033) with the one from trunk so another valid filter usage scenario (using model inheritance) is still possible. Thanks dbenamy for reporting this. Refs #15032.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-16 23:24:19 +00:00
Luke Plant 840314bde4 [1.1.X] Fixed #15284 - improved example jQuery code for adding X-CSRF-Token
Using the ajaxSend event is better than beforeSend, because the beforeSend
callback can have only one value, which makes it painful if it is needed by
multiple bits of javascript.

Thanks to LukeMaurer for report and initial patch.

Backport of [15515] from trunk.

This is backported to 1.1.X because it really belongs with security patch [15466]

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 23:49:18 +00:00
Russell Keith-Magee 99c529eec8 [1.1.X] [1.2.X] Fixed #15253 -- Added 1.1.3 release notes, and added sections to the 1.2.4 and 1.3 release notes about the December security announcement.
Backport of r15485 from trunk.

Backport of r15486 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-10 11:57:46 +00:00
Russell Keith-Magee b7a7cdc4fa [1.1.X] Fixed #15253, #15259 -- Added 1.1.4 release notes, added a section on CSRF changes to the 1.3 release notes, and corrected the example in the 1.2.5 release notes. Thanks to Gary Wilson and Mark Hellewell for the reports.
Backport of r15482 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-10 09:30:51 +00:00
James Bennett 24f2898b76 [1.1.X] Bump version number for impending security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 03:06:37 +00:00
Carl Meyer 1966786d2d [1.1.X] Fixed security issue in AdminFileWidget. Release and disclosure forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:48:48 +00:00
Alex Gaynor 570a32a047 [1.1.X] Fixed a security issue in the file session backend. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:14:24 +00:00
Alex Gaynor 408c5c873c [1.1.X] Fixed a security issue in the CSRF component. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:07:35 +00:00
Luke Plant 274bd67c13 [1.1.X] Fixed #15103 - SuspiciousOperation with limit_choices_to and raw_id_fields
Thanks to natrius for the report.

This patch also fixes some unicode bugs in affected code.

Backport of [15347] from trunk. Backported to 1.1.X because this was
a regression caused by a security fix backported to 1.1.X.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 15:32:25 +00:00
Ramiro Morales 703dc82256 [1.1.X] Fixed #14999 -- Ensure that filters on local fields are allowed, and aren't caught as a security problem. Thanks to medhat for the report.
Backport of r15139 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 20:45:01 +00:00
James Bennett cbbfe11328 [1.1.X] Update download_url for 1.1.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 04:12:42 +00:00
James Bennett 334654fdf1 [1.1.X] Bump to 1.1.3 for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:51:37 +00:00
Alex Gaynor 7f8dd9cbac [1.1.X] Fix a security issue in the auth system. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:47:58 +00:00
Alex Gaynor 17084839fd [1.1.X] Fix a security issue in the admin. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:47:38 +00:00
Russell Keith-Magee 934dc9e712 [1.1.X] Removed the 'under development' marker from the 1.1.2 release notes; a little too late, but better than never.
Backport of r13263 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 11:43:55 +00:00
James Bennett 5d6b2966af [1.1.X] This branch is now 1.1.3 pre-alpha.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 05:56:34 +00:00
James Bennett 4333ca52fb [1.1.X] Bump to 1.1.2.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 05:45:12 +00:00
Russell Keith-Magee f0774927e6 [1.1.X] Fixed #13532 -- Corrected and clarified examples in F() docs. Thanks to erw for the report and patch.
Backport of r13254 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 01:52:28 +00:00
Russell Keith-Magee c179bd5cfb [1.1.X] Fixed #13514 -- Corrected the process of loading multiple javascript translation catalogs. Thanks to jtiai for the report, to Ramiro Morales for working out the test case, and to Ramiro and Jannis for their help on the fix.
Backport of r13250 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-13 13:44:32 +00:00
Karen Tracey 2f8bb4ee31 [1.1.X] Fixed #13530: Corrected a handful of doc typos. Thanks Ramiro.
Merge of the applicable bits of r13247.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 23:00:57 +00:00
Karen Tracey 87fd4583c1 [1.1.X] Fixed doc markup error that resulted in no anchor tag for the model admin queryset method.
r13245 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 13:36:05 +00:00
Russell Keith-Magee 242c7f3940 [1.1.X] Fixed #13529 -- Corrected ModelAdmin example. Thanks to stephane@actinetwork.com for the report.
Backport of r13242 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 13:27:14 +00:00
Russell Keith-Magee 6f2a84409e [1.1.X] Fixed #12997 -- Corrected the module markup for QuerySet methods. Thanks to timo for the report.
Backport of r13235 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-11 14:18:01 +00:00
Russell Keith-Magee 08de7a32d9 [1.1.X] Fixed #11908 -- Clarified the role and usage of the ManagementForm in formsets. Thanks to timo for the draft patch.
Backport of r13222 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 14:17:16 +00:00
Russell Keith-Magee a0ea98e7a0 [1.1.X] Fixed #12001 -- Modified the example of form validation to use the form's error class, rather than assuming ErrorList. Thanks to Suor for the report, and timo for the patch.
Backport of r13221 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 14:16:04 +00:00
Russell Keith-Magee 45f5e0c980 [1.1.X] Fixed #12135 -- Clarified custom template tag example. Thanks to EvilDMP for the report, and timo for the patch.
Backport of r13220 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 14:14:41 +00:00
Russell Keith-Magee 61beb4549d [1.1.X] Refs #12288 -- Clarified that application names must be unique. Thanks to Piotr Czachur for the report.
Backport of r13219 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 14:13:39 +00:00
Russell Keith-Magee 9ca0a33029 [1.1.X] Fixed #12505 -- Clarified the use of the extra argument in formsets. Thanks to Andreas for the report, and timo for the draft patch.
Backport of r13218 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 14:12:25 +00:00
Russell Keith-Magee c51284f65a [1.1.X] Fixed #12621 -- Corrected grammar error in custom template tag docs. Thanks to beemzet for the report.
Backport of r13212 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 13:28:57 +00:00
Russell Keith-Magee b7b0ebb3ad [1.1.X] Fixed #12678 -- Corrected a few references to Queryset into QuerySet. Thanks to ChrisMorgan for the report, and timo for the patch.
Backport of r13211 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 13:27:53 +00:00
Russell Keith-Magee 5627b26377 [1.1.X] Fixed #12984 -- Corrected typo in signals docs. Thanks to kcharvey for the report.
Backport of r13210 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 13:26:47 +00:00
Russell Keith-Magee a858374828 [1.1.X] Fixed #13002 -- Corrected description of the default form base class in InlineModelAdmin classes. Thanks to stijn@typograaf.be for the report, and timo for the patch.
Backport of r13209 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 13:25:44 +00:00
Russell Keith-Magee 5a43a33161 [1.1.X] Fixed #13509 -- Modified the comment tests so that signal cleanup doesn't rely on garbage collection. Thanks to Alex Gaynor for the report and patch.
Backport of r13204 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 12:43:05 +00:00
Russell Keith-Magee 6bc070ba4c [1.1.X] Fixed #12229 -- Added documentation of the FieldFile methods that are exposed by FileField and ImageField. Thanks to Gabriel Hurley for the draft patch.
Backport of r13202 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 12:34:52 +00:00
Russell Keith-Magee 0765d4b597 [1.1.X] Fixed #13158 -- Clarified that OneToOneField is a better option for User profile classes. Thanks to hvdklauw for the report and patch.
Backport of r13197 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:44:25 +00:00
Russell Keith-Magee 45c409f3fd [1.1.X] Fixed #13329 -- Corrected markup problem with URL pattern in generic views docs. Thanks to LaundroMat for the report.
Backport of r13196 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13199 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:43:34 +00:00
Russell Keith-Magee b66d597cb4 [1.1.X] Fixed #13333 -- Corrected typo in whatsnew docs. Thanks to cicatrix1 for the report.
Backport of r13195 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:42:41 +00:00
Jannis Leidel 8099fec855 [1.1.X] Fixed #12892 - Fixed unicode related bug in a utility function of the admindocs app that prevented it to be used in non-English environments together with certain versions of docutils.
Backport from trunk, r13192

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:24:16 +00:00
Jannis Leidel 868cf8093c [1.1.X] Fixed #13168 - Corrected the alignment of the admin inline headers for rtl languages. Thanks for the report and patch, benc.
Backport from trunk, r13191

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:23:59 +00:00
Russell Keith-Magee f7215cec92 [1.1.X] Added exceptions reference page to the API reference index.
Backport of r13187 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 00:54:25 +00:00
Jannis Leidel 4a97875f6b [1.1.X] Fixed #13317 - Clarified documentation about how the blocktrans and trans template tags work with regard to variables. Thanks for the initial patch, Ramiro Morales.
Backport from trunk, r13184.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 13:57:03 +00:00
Russell Keith-Magee 9fb195fc67 [1.1.X] Fixed #6842 -- Added reference documentation on Django's exceptions. Thanks to timo for the patch.
Backport of r13180 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 07:47:14 +00:00
Russell Keith-Magee e10f546b21 [1.1.X] Fixed #6039 -- Modified Atom example to be standard compliant. Thanks to ion.morega@gmail.com for the report, and arien for the patch.
Backport of r13179 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 07:46:50 +00:00
Russell Keith-Magee c772e39d34 [1.1.X] Fixed #6752 -- Corrected the interaction of the safe template filter with other filters. Thanks to Rupe and Alex Gaynor for their work on the patch.
Backport of r13171 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 06:51:07 +00:00
Russell Keith-Magee 2ee73c2f4e [1.1.X] Fixed #10712 -- Added documentation for the queryset() method on ModelAdmin. Thanks to mrts for the report, and timo for the patch.
Backport of r13170 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 06:50:39 +00:00
Russell Keith-Magee 5d751026b5 [1.1.X] Fixed #11933 -- Corrected the naming of the cached_db session backend. Thanks to mb0@mb0.org for the report and Gabriel Hurley for the patch.
Backport of r13169 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 06:50:06 +00:00
Russell Keith-Magee 814268fb54 [1.1.X] Fixed #12040 -- Cleaned up the documentation describing how CurrentSiteManager works. Thanks to elpaso66 for the report, and Gabriel Hurley for the draft patch.
Backport of r13168 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 06:49:32 +00:00
Russell Keith-Magee 3b9a82714c [1.1.X] Fixed #12278 -- Corrected an example usage of string_concat. Thanks to loumz for the report, and timo for the patch.
Backport of r13167 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 06:49:00 +00:00
Russell Keith-Magee 5be6c7fc60 [1.1.X] Fixed #12412 -- Clarified the documentation around file handling by the test client. Thanks to Gabriel Hurley for the draft patch.
Backport of r13166 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 06:48:32 +00:00
Russell Keith-Magee 6df4ffd4f4 [1.1.X] Fixed #12997 -- Added markup for methods in the queryset docs. Thanks to Ramiro Morales for the patch.
Backport of r13162 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 05:52:38 +00:00
Russell Keith-Magee 3981355c5c [1.1.X] Fixed #13051 -- Corrected the documentation of URL namespacing to match the tested implementation behavior. Thanks to apollo13 for the report, and Gabriel Hurley for the patch.
Backport of r13161 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 05:51:57 +00:00
Russell Keith-Magee d529963113 [1.1.X] Fixed #13282 -- Clarified documentation around week_day filtering in querysets. Thanks to wangchun, Ramiro Morales and timo.
Backport of r13155 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 05:13:45 +00:00
Russell Keith-Magee 95693cc6dd [1.1.X] Fixed #13310 -- Documented the RESTRUCTUREDTEXT_FORMAT_SETTINGS setting. Thanks to Wraithan for the patch.
Backport of r13154 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 05:13:13 +00:00
Russell Keith-Magee e3389f9a20 [1.1.X] Fixed #13417 -- Clarified the use of the djangojs domain for translation. Thanks to stephaner for the report and initial patch, and Ramiro Morales for his additional markup.
Backport of r13147 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 04:34:13 +00:00
Russell Keith-Magee a1421336d7 [1.1.X] Fixed #13455 -- Clarified the interaction of values() and extra(). Thanks to Rupe for the report and draft text.
Backport of r13145 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 04:33:29 +00:00
Russell Keith-Magee 0711e1051d [1.1.X] Fixed #13497 -- Corrected various typos and markup problems in docs. Thanks to Ramiro Morales for the report and patch.
Backport of r13144 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 04:32:40 +00:00
Russell Keith-Magee 947c8ce3b4 [1.1.X] Fixed #13499 -- Corrected typo in l10n docs. Thanks to selwin for the report and patch.
Backport of r13143 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-09 04:31:49 +00:00
Luke Plant d5ed030228 [1.1.X] Added hyperlinks for builtin template tags and filters to code samples in docs.
Implemented in javascript because doing it 'properly' is pretty much impossible with Sphinx and Pygments.
  
Refs #12249

Backport of [13135] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-08 20:31:59 +00:00
Russell Keith-Magee e8e87e09b9 [1.1.X] Fixed #13484 -- Added some newly available targets to the documentation makefile. Thanks to Alex for the patch.
Backport of r13126 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-08 15:22:52 +00:00
Russell Keith-Magee 176f1c1c45 [1.1.X] Fixed #13336 -- Corrected an incorrect example of cache header usage. Thanks to dnjuls for the report, and claudep for the patch.
Backport of r13129 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-08 07:34:53 +00:00
Russell Keith-Magee e6167e54db [1.1.X] Fixed #13471 -- Added example of send_mass_mail usage. Thanks to gtaylor for the report and patch.
Backport of r13127 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-08 07:34:30 +00:00
Luke Plant 027ba077ac [1.1.X] Fixed typo and small formatting mistake in docs
Backport of [13118] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-07 01:01:16 +00:00
Russell Keith-Magee d034374ea8 [1.1.X] Fixed #8357 -- Clarified what constitutes activity when calculating session expiry. Thanks to timo for the patch.
Backport of r13113 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-06 01:36:42 +00:00
Russell Keith-Magee 760ed9987a [1.1.X] Fixed #12609 -- Updated FAQ on which version users should install. Thanks to shanx for the report.
Backport of r13109 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-06 01:26:39 +00:00
Russell Keith-Magee 1d7c4a96ab [1.1.X] Fixed #13420 -- Clarified grammar in the email docs. Thanks to Dominic Rodger for the report.
Backport of r13104 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-06 01:26:13 +00:00
Russell Keith-Magee 125ea947df [1.1.X] Fixed #13469 -- Cleaned up the test case from r13085, and added some cache cleanup that matters for Python 2.3. Thanks to Karen and Alex for their help.
Backport of r13095 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 14:55:04 +00:00
Karen Tracey e28c0edbee [1.1.X] Fixed some Python 2.3 incompatibilities in new tests.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 13:31:25 +00:00
Russell Keith-Magee c7fc8891b1 [1.1.X] Fixed #13467 -- Corrected Japanese translation for password reset emails. Thanks to cdeyoung for the report.
Backport of r13084 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 08:16:06 +00:00
Russell Keith-Magee bc9708735f [1.1.X] Fixed #13464 -- Reworked module_has_submodule to break the requirement for loader and finder to be the same class. Thanks to Alex Gaynor for the report and patch, and Brett Cannon for suggesting the approach.
Backport of r13082 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 08:15:34 +00:00
Karen Tracey a263d3b445 [1.1.X] Updated svnmerge metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 18:09:48 +00:00
Karen Tracey 5c5c25eba5 [1.1.X] Fixed #13099 - incorrect SQL for exclude() example
Thanks to istruble for the report. 

r12936 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 17:45:14 +00:00
Karen Tracey 820bcd0aa3 [1.1.X] Fixed #12688 -- Removed typo in manager docs. Thanks, orokusaki for the report and timo for the patch.
r12485 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 17:14:57 +00:00
Nicola Larosa 0265a81449 [1.1.X] Updated the Italian translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 06:42:52 +00:00
Nicola Larosa 9c14f23946 [1.1.X] Italian translation updated by makemessages, to be fixed
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 05:57:16 +00:00
Jannis Leidel 99a512300c [1.1.X] Fixed #13388 - Refined changes made in r12384 in the JavaScript i18n admin view.
Backport of r13069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-02 19:48:17 +00:00
Karen Tracey ef0e10cccf [1.1.X] Fixed #13453: Corrected typo in template syntax error message. Thanks jheasly.
r13061 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-01 02:32:45 +00:00
Russell Keith-Magee fe3b75e276 [1.1.X] Fixed #12851 -- Another attempt at fixing select_related() with inherited models, this time with only(). Thanks to phxx for the test case.
Backport of r13059 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 16:37:54 +00:00
Russell Keith-Magee 868acb3a6c [1.1.X] Fixed #13431 -- Corrected a unicode literal in select widgets. Thanks to gutworth for the report.
Backport of r13036 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 14:12:36 +00:00
Russell Keith-Magee 2eb832a7e6 [1.1.X] Fixed #12851 -- Corrected the loading of values when select_related() is used on inherited models. Thanks to phxx for the report and test case.
Backport of r13054 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 14:12:12 +00:00
Ian Kelly 6f4563aced [1.1.X] Fixed a bug preventing cursor variables from being passed as bind parameters in the oracle backend. Backport of r13042 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-28 17:15:11 +00:00
Karen Tracey 5f1ecdc51a Python 2.3 compatibility: Fixed a test to only run under 2.4+, since it fails due to a Ptyhon problem under 2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-27 15:01:54 +00:00
Karen Tracey 33f097e50b Python 2.3 compatibility: replaced rsplit with something that works on 2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-27 13:40:52 +00:00
Russell Keith-Magee a43464d67e [1.1.X] Fixed #13404 -- Reworked module_has_submodule() to allow it to work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help.
Backport of r13023 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-25 13:23:14 +00:00
Russell Keith-Magee 5226525736 [1.1.X] Fixed #13362 -- Disabled the test for bug #8245 under Python 2.3 due to differences in exception handling.
Backport of r13021 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-24 07:10:15 +00:00
Russell Keith-Magee 58c1a67ff1 [1.1.X] Fixed #11764 -- Added a missing set of parentheses in a call calculating the select_related tables. Thanks to aurelio for the report and original patch, and wogan for the updated patch.
Backport of r13019 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-23 14:30:29 +00:00
Karen Tracey c8576fa674 [1.1.X] Python 2.3 compatibility: we still need the special sets import here.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-22 00:00:19 +00:00
Russell Keith-Magee af48cad39e [1.1.X] Fixed #13396 -- Modified the SQLite introspection code to avoid a problem with unconsumed cursors on PyPy. Thanks to Alex Gaynor for the report and fix.
Backport of r13016 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-21 23:50:00 +00:00
Russell Keith-Magee 0e996983d5 [1.1.X] Fixed #13389 -- Ensured that the app_loading test clears out the app cache at the end of each test, so that it doesn't interact badly with flush and other introspected database commands. Thanks to Karen for the report, and Ramiro Morales for the debugging hints.
Backport of r13011 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-21 12:07:36 +00:00
Karen Tracey 1982c8b73e [1.1.X] Adjust the fr.py localflavor tests to account for r13007.
Merge of applicable part of r13008.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 20:43:17 +00:00
Russell Keith-Magee 2f6317f89c [1.1.X] Fixed #13387 -- Removed some duplicated departments in the French localflavor. Thanks to Pinaraf for the report.
Backport of r13006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 15:07:14 +00:00
Russell Keith-Magee 4807b02a83 [1.1.X] Fixed #13382 -- Modified a message used for testing purposes to allow test passes under PyPy. Thanks to Alex Gaynor for the report and patch.
Backport of r13003 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 12:22:10 +00:00
Russell Keith-Magee f282099832 [1.1.X] Fixed #13374 -- Corrected some more minor issues causing problems for PyPy. Thanks to Alex Gaynor for the report and patch.
Backport of r12998 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 11:57:04 +00:00
Justin Bronn be167b804d [1.1.X] Fixed #11810 -- Fixed typo and errors that prevented `modifiable` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504.
Backport of r12995 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 16:45:59 +00:00
Karen Tracey f6b6e0f1d9 [1.1.X] Fixed #13360: For Python2.3 compatbility, don't pass iterators to sorted.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 15:47:06 +00:00
Russell Keith-Magee e7ef1b220e [1.1.X] Fixed #13357 -- Minor changes to get Django running under PyPy. Thanks to Alex Gaynor for the patch.
Backport of r12991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 11:15:21 +00:00
Karen Tracey 534dc44dba [1.1.X] Fixed #9427: Allow for autodiscover to load admin modules from apps in eggs. Thanks clint and metzen.
r12989 (and r12192 as a side-effect) from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 23:18:33 +00:00
Karen Tracey 231e452f96 [1.1.X] Fixed #13345: Don't attempt to load the locale regressiontests subdirectory as a Django app. Thanks ramiro.
r12971 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 20:33:19 +00:00
Karen Tracey 8092d3b23f [1.1.X] Fixed #13353: Corrected a couple of tests that were dependent on dictionary ordering. Thanks Alex.
r12984 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 19:14:52 +00:00
Karen Tracey ce8367f1c8 [1.1.X] Fixed #13348: Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule.
r12982 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 18:49:37 +00:00
Russell Keith-Magee a56b232cb5 [1.1.X] Fixed #13184 -- Document the requirement that custom model fields using SubfieldBase should probably implement formfield. Thanks to Mark L. for the report, and to Joseph and Honza for the guidance on the solution.
Backport of r12979 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 14:37:06 +00:00
Karen Tracey a33c7673e4 [1.1.X] Fixed Python 2.4 incompatibility introduced in r12973.
r12947 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 21:27:21 +00:00
Karen Tracey ef6308db01 [1.1.X] Fixed #13335: Adjusted the r12950 fix to properly handle import errors resulting from nested calls to load_app.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 19:14:23 +00:00
Russell Keith-Magee 65a9d73069 [1.1.X] Fixed #13332 -- Corrected the cleanup code in the test client to avoid a refcounting problem with signal handlers. This is a fix for the benefit of PyPy's hybrid GC. Thanks to Alex Gaynor for the report and patch.
Backport of r12964 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:43:03 +00:00
Russell Keith-Magee cf08ea496e [1.1.X] Refs #13227 -- Partial backport of r12865; backported the changes to Where tree cloning logic to ensure that unclonable objects in a where() clause don't break querying.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:00:46 +00:00
Karen Tracey ee2b07c7fc [1.1.X] Added Pyton 2.3 compatibility import for use of set by some new tests.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 21:11:56 +00:00
Karen Tracey eca89ea9be [1.1.X] Fixed #12142 -- EmptyQuerySet.update() no longer updates all rows in the database
r12171 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 17:27:53 +00:00
Karen Tracey 4771790c68 [1.1.X] svnmerge.py metatdata housekeeping.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 17:00:07 +00:00
Brian Rosner f45e39ba8e Fixed #11957 -- exceptions in admin.py are no longer hidden after second request
Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.

Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.

Backport of r12956 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:55:45 +00:00
Russell Keith-Magee 38056e82d7 [1.1.X] Fixed #13309 -- Ensure that delete() deletes everything it should delete(). Thanks to craig.kimerer@gmail.com for the report
Backport of r12941 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:22:16 +00:00
Karen Tracey a67b35a0aa [1.1.X] Fixed #11711 -- clarified that ValuesQuerySets are not lists per se.
It rarely hurts to think of the returned result from a values() or
values_list() call as a list, but it's really an iterable and sometimes
the difference matters. 

r12743 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 13:28:46 +00:00
Karen Tracey 6dc0499fe7 [1.1.X] Fixed two small doc markup errors.
Partial merge of r12741 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 13:24:31 +00:00
Karen Tracey 46b9dd3048 [1.1.X] Fixed #11696: Changed app loading code so that it does not swallow import errors that used to be (prior to r10088) raised.
r12950 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 12:43:39 +00:00
Justin Bronn bf5d71f2a7 [1.1.X] Fixed #9437 -- Now close the connection after getting the PostGIS version during spatial backend initialization.
Backport of r12948 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 19:01:02 +00:00
Luke Plant b2ecfe845f [1.1.X] Fixed #13270 - typos in documentation
Thanks to cmbeelby for the report and patch

Backport of r12934 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 14:33:02 +00:00
Luke Plant 0819c291e7 Fixed test failure that was occurring since r12909
The tests were relying on being able to do
ManyToManyField("NameOfThisModel") instead of the only documented method for
recursive relationships, namely ManyToManyField("self").  The former stopped
working when the fix in r12909 was applied.

Backport of r12932 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 12:22:29 +00:00
Luke Plant c65dd48903 [1.1.X] Fixed #13035 - Incorrect documentation regarding admin and default managers
Thanks to rasca for report and gabrielhurley for patch.

Backport of r12930 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 11:59:37 +00:00
Luke Plant c3bc6481af [1.1.X] Fixed #13268 - 'ForeignKeyField' in topics/db/queries.txt
Thanks piquadrat for report and patch.

Backport of r12928 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 11:05:18 +00:00
Justin Bronn cd3370c3a7 [1.1.X] Fixed #13263 -- Corrected field name typo in queries documentation examples. Thanks, RicherPots for bug report and gabrielhurley for the patch.
Backport of r12926 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 16:00:31 +00:00
Justin Bronn b2627529e9 [1.1.X] Fixed #13271 -- Corrected a typo in the signals documentation. Thanks, chtito.
Backport of r12924 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:47:05 +00:00
Russell Keith-Magee 2e8f0a8f15 [1.1.X] Added file mistakenly ommitted from r12917
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:45:20 +00:00
Russell Keith-Magee dce7515bef [1.1.X] Fixed #13129 -- Corrected CSS on RTL layout when a changelist has admin actions and is filtered. Thanks to mksoft for the report and patch.
Backport of r12920 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 13:01:14 +00:00
Russell Keith-Magee 985c764a77 [1.1.X] Fixed #12260 -- Corrected CSS when using checkbox widgets on a ModelMultipleChoiceField in admin. Thanks to tiliv for the report and fix.
Backport of r12918 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:38:30 +00:00
Russell Keith-Magee c01735dee7 [1.1.X] Fixed #11949 -- Added a hook to allow ModelAdmin customization of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work.
Backport of r12916 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:08:45 +00:00
Russell Keith-Magee 0d6a776ccd [1.1.X] Fixed #12328 -- Corrected the handling of subqueries with ordering and slicing, especially when used in delete subqueries. Thanks to Walter Doekes for the report.
This fixes a feature that isn't available under MySQL and Oracle (Refs #10099).

Backport of r12912 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-04 17:17:46 +00:00
Russell Keith-Magee 17636ef999 [1.1.X] Fixed #12247 -- Corrected the way update queries are processed when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix.
Backport of r12910 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-03 11:47:46 +00:00
Russell Keith-Magee ac0aea8910 [1.1.X] Fixed #11956 -- Modified the handling of m2m relationships between subclasses. Thanks to nidi for the report, and astoneman for the suggestion on how to fix the problem.
Backport of r12908 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-02 15:52:58 +00:00
Justin Bronn adfeb96227 [1.1.X] Fixed #13256 -- `OGRGeometry` no longer raises an exception when compared to instances of different types. Thanks, ninowalker for the bug report.
Backport of r12905 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 16:57:23 +00:00
Russell Keith-Magee 33052458c5 [1.1.X] Fixed #13259 -- Ensure that multiple calls to message() don't corrupt any extra message headers. Thanks to canburak for the report, and Andi Albrecht for the fix.
Backport of r12901 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 15:25:54 +00:00
Justin Bronn fa114305cb [1.1.X] No longer use the deprecated GEOS C API function `GEOSGeomFromWKB_buf` when unpickling `GEOSGeometry` objects.
Backport of r12898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 18:58:19 +00:00
Russell Keith-Magee 7a7b9a0428 [1.1.X] Fixed #11916 -- Corrected handling of aggregation when there is a subquery provided in an extra(select=) clause. Thanks to jaklaassen@gmail.com for the report, and to tobias, paluh, Karen Tracey and Ian Kelly for their work on the fix.
Backport of r12896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 13:51:20 +00:00
Russell Keith-Magee f0fa0808ea [1.1.X] Fixed #13253 -- Updated the help message for dumpdata to indicate that individual models can be serialized. Thanks to arowla for the report.
Backport of r12893 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 11:34:32 +00:00
Brian Rosner 64e4ffc932 [1.1.X] Restored pre-r10062 behavior allowing None from formfield_callback to exclude itself from the form
Backported from r12891 from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 08:08:29 +00:00
Justin Bronn 2613872969 [1.1.X] Fixed #10594 -- `GeoQuerySet` measurment methods no longer crash on geometry fields with NULL values. Thanks, whiteinge for the bug report and yourcelf for the initial patch.
Backport of r12885 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 22:20:51 +00:00
Justin Bronn 8ef5daeb4f [1.1.X] Added another GDAL bug workaround for retrieving the correct coordinate dimension on geometry collections. Refs #12312.
Backport of r12883 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 21:58:48 +00:00
Justin Bronn 08d00942d0 [1.1.X] Fixed #11785 -- Clarified error message when the layer geometry type doesn't match the model field. Thanks, esizikov for bug report and initial patch.
Backport of r12880 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 18:34:09 +00:00
Justin Bronn ceb5261276 [1.1.X] Fixed #12312 -- Set the coordinate dimension on each component of geometry collections after transform (refines GDAL bug workaround introduced in r11629). Thanks, yourcelf for bug report.
Backport of r12878 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 17:36:25 +00:00
Justin Bronn e53de431f2 [1.1.X] `OGRGeomType` now recognizes 2.5D types, and removes need for unnecessary workaround in `Layer.geom_type`; corrected geometry type in test VRT file. Refs #11433.
Backport of r11739 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 16:48:38 +00:00
Justin Bronn 127d46e6a5 [1.1.X] Fixed a brittle test case that was failing on PostGIS versions < 1.4.
Backport of r11729 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 16:41:29 +00:00
Gary Wilson Jr 434b5d5cf6 [1.1.X] Fixed #13103 -- A bit of re-organization to the custom template `ModelAdmin` options documentation section to remove some duplication and fix some confusing wording.
Backport of r12868 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 21:17:23 +00:00
Jannis Leidel 5a6446b443 [1.1.X] Fixed #12778 - Added media handling abilities to admin inlines. Thanks for the patch, pmclanahan.
Backport from trunk, r12825.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 12:35:59 +00:00
Gary Wilson Jr 5fab617f50 [1.1.X] Fixed #13189 -- Fixed typo in code example, thanks to gabrielhurley for patch.
Backport of r12862 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 00:14:44 +00:00
Gary Wilson Jr 87e40f8daa [1.1.X] Fixed #13202 -- Documented required libraries for markup template tags, based on patch from steveed.
Backport of r12860 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 00:10:44 +00:00
Gary Wilson Jr 52e2e5cc96 [1.1.X] Removed out-of-date statement in markdown templatetags docstring (refs #1204).
Backport of r12858 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 23:56:56 +00:00
Russell Keith-Magee 7733895382 [1.1.X] Fixed #12594 -- Ensured that a meaningful exception is raised when the urlconf_module is None. Thanks to buriy for the report and patch.
Backport of r12854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 15:15:55 +00:00
Justin Bronn 917fb7c993 [1.1.X] Peform smarter version detection of GDAL so development versions are supported.
Backport of r12852 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 20:01:40 +00:00
Russell Keith-Magee 373daf5876 [1.1.X] Modified the delete test to clean up after itself properly, so that the proxy_model_inheritance test can run without requiring manual confirmation.
Backport of r12850 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 17:32:52 +00:00
Russell Keith-Magee 93b5edddce [1.1.X] Fixed #12766 -- Only set the psycopg1 client encoding when the connection is first created. This allows the custom_pk test to pass under psycopg1.
Backport of r12848 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 14:04:46 +00:00
Russell Keith-Magee b74e6c3557 [1.1.X] Fixed #12286 -- Modified the test case added in r12828 so that it passes under Postgres.
Backport of r12846 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 13:15:13 +00:00
Karen Tracey f0ed1ce683 [1.1.X] Fixed #13173: Made the admin_scripts tests pass when the running python executable has a space in its pathname. Thanks gabrielhurley.
r12842 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 18:56:37 +00:00
Russell Keith-Magee 21a1a21d0b [1.1.X] Fixed #13177 -- Corrected usage of firstof in admin templates. Thanks to nomulous for the report and patch.
Backport of r12840 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:55:00 +00:00
Russell Keith-Magee 6e60c8b7c0 [1.1.X] Fixed #13171 -- Corrected the field_subclassing unit test. Thanks to Gabriel Hurley for the report and patch.
Backport of r12838 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:21:14 +00:00
Russell Keith-Magee 752856530f [1.1.X] Fixed #12612 -- Corrected handling of parameter formatting in SQLite backend so that executemany raises exceptions when bad parameter counts are provided. Thanks to Niels <niels@pythonheads.nl> for the report, and Gabriel Hurley for the help narrowing down the problem.
Backport of r12836 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:08:31 +00:00
Karen Tracey ef41bd405e [1.1.X] Fixed #12554 again: Corrected regression in silencing attribute lookups introduced in r12824, plus added a test for this so it doesn't regress again.
r12834 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-22 19:16:31 +00:00
Karen Tracey c2267602cb [1.1.X] Fixed #12764: Avoid exceeding psycopg1 limits in the views tests.
r12832 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-22 13:29:26 +00:00
Karen Tracey 740c974541 [1.1.X] Fixed #12822: Don't copy the _aggregate_select_cache when cloning a query set,
as that can lead to incorrect SQL being generated for the query. Thanks to mat
for the report and test, tobias for the fix, and Alex for review. 

r12830 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 20:54:24 +00:00
Karen Tracey 3a55a2f42c [1.1.X] Fixed #12286: Ensure proxied model's table is created.
Thanks to telenieko for the report and flyingfred0 for test and fix.

Test is r12828 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 20:35:05 +00:00
Karen Tracey df010f0a1f [1.1.X] Fixed #12554: Silence exceptions that have specified silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin.
r12823 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 20:31:57 +00:00
Karen Tracey d5336b221c [1.1.X] Fixed #12239, again: Refined the original fix to avoid the test errors introduced. Thanks pmclanahan.
r12821 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 20:11:38 +00:00
Karen Tracey 8badb75876 [1.1.X] Fixed #12239: Fixed results of gte and lt queries when comparing floats to integer field values.
Thanks waverider, aroy, SmileyChris, and pmclanahan. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 18:04:10 +00:00
Russell Keith-Magee 4d00ac86ee [1.1.X] Fixed #12851 -- Corrected the interaction of defer() with select_related(). Thanks to ruosteinen for the report.
Backport of r12817 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 15:42:18 +00:00
Karen Tracey eb1c7b033d [1.1.X] Fixed #12707. Admin action messages are no longer displayed when submitting list_editable content. Thanks, copelco.
and 

Fixed #12962: Made admin delete action work again. Thanks ptone, skevy, mlavin and anyone else I've missed. 

r12525 and r12813 from trunk, together to avoid the regression introduced by r12525 alone.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 15:23:10 +00:00
Russell Keith-Magee 3213498681 [1.1.X] Fixed #12850 -- Ensured that constraint names are quoted when they are removed. Thanks to Tim Kersten for the report and patch.
Backport of r12811 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 12:30:40 +00:00
Justin Bronn 6943950dfd [1.1.X] Fixed `fieldlookup` docs cross-reference directive, and added it to the queryset reference. Refs #12930.
Backport of r12808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 05:04:54 +00:00
Russell Keith-Magee 9d5fb83b09 [1.1.X] Fixed #13152 -- Ensure the test client saves the session before writing the session key to the cookie, in case the session engine changes the session key.
Backport of r12806 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-19 05:43:32 +00:00
Karen Tracey 16850856f5 [1.1.X] Changed the comments post view code to avoid raising an exception if handed invalid data for the object pk. Thanks to Leo for the test.
r12800 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 22:45:42 +00:00
Gary Wilson Jr 58d72d4fee [1.1.X] Fixed #10361 -- Added documentation for ComboField and MultiValueField form fields, patch from timo.
Backport of r12798 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 21:03:11 +00:00
Karen Tracey e15c850f1b [1.1.X] Fixed #12105: Corrected handling of isnull=False lookups in admin. Thanks marcob, Travis Cline, gabrielhurley.
r12795 backport from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 19:08:49 +00:00
Russell Keith-Magee 9b85ef2895 [1.1.X] Added a transaction rollback needed to clean up after the test introduced by r12764.
Backport of r12788 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 13:00:24 +00:00
Russell Keith-Magee 322a50a3fc [1.1.X] Fixed #12339 -- Made content type deletion an interactive process to prevent accidentally cascade deleting content from a production database. Thanks to kcarnold for the report and patch.
Backport of r12782 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 09:59:38 +00:00
Russell Keith-Magee c64669a614 [1.1.X] Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report.
Backport of r12780 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 08:06:47 +00:00
Russell Keith-Magee d3ee5566b4 [1.1.X] Fixed #13108 -- Corrected an ambiguity in test data with the potential to cause test failures out of the box. Thanks to benreynwar for the report.
Backport of r12778 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 06:57:07 +00:00
Karen Tracey ef92f4fdd9 [1.1.X] Made a Python 2.3 compatibility test fix.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-14 20:30:18 +00:00
Karen Tracey 7d3846a7b8 [1.1.X] Revert r12763 until we figure out what's wrong with it on 1.1.X. Refs #13111.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-14 00:17:37 +00:00
Karen Tracey c94de07570 [1.1.X] Fixed #13107: Adjusted decimal_places validation to accept 0 as a valid value. Thanks to loewis for report.
r12774 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-13 22:15:09 +00:00
Russell Keith-Magee e969c2715f [1.1.X] Fixed #11801 -- Corrected form validation to ensure you can still get deleted_forms and ordered_forms when a form that is being deleted doesn't validate. Thanks to dantallis for the report and patch.
Backport of r12771 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 15:57:15 +00:00
Russell Keith-Magee 3f7fcdda71 [1.1.X] Fixed #12404 -- Improved model validation for CharField and DecimalField. Thanks to tiliv for the report, josh for the patch, and Leo for the tests.
Backport of r12768 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 15:24:28 +00:00
Russell Keith-Magee d1b889ec98 [1.1.X] Fixed #11891 -- Ensured that attributes of get_absolute_url are preserved through the metaclass. Thanks to nfg for the report and patch.
Backport of r12766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 14:45:56 +00:00
Russell Keith-Magee 1e1b57bfbe [1.1.X] Fixed #11900 -- Corrected an edge case of transaction handling in the commit_on_success decorator. Thanks to guettli for the report, and Gabriel Hurley for the initial test case.
Backport of r12764 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 14:27:31 +00:00
Russell Keith-Magee 9137c54353 [1.1.X] Fixed #13093 -- Updated some decorators and the decorator_from_middleware function to allow callable classes to be decorated. Thanks to Brian Neal for the report.
Backport of r12762 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 13:31:10 +00:00
Karen Tracey 705d6cce0f [1.1.X] Python 2.3 doesn't do decorators.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-11 14:14:07 +00:00
James Bennett 0b78ce8214 [1.1.X] Corrected a markup error in middleware docs. Backport of applicable bits of [12759] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-11 09:43:08 +00:00
James Bennett 47bdb67030 [1.1.X] Fixed #13084: Corrected typo in error-reporting docs. Backport of [12757] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-11 09:34:18 +00:00
Luke Plant 693dcd9013 [1.1.X] Fixed #12048 - MultiWidget does not define `__deepcopy__`
Thanks to powderflask for report, test case and initial patch.

Backport of [12739] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 22:59:02 +00:00
Karen Tracey 0a7ec91dc3 [1.1.X] Changed last_executed_query to avoid raising exceptions on non-utf8-encoded parameter data.
r12737 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 14:49:50 +00:00
Luke Plant 89c2639323 [1.1.X] Fixed #11183 - BaseForm init leaves pointers pointing back to base_fields
Thanks to margieroginski for the report

Backport of [12733] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 02:03:09 +00:00
Karen Tracey f13b17ad15 [1.1.X] Fixed #12689: Fixed admin validation to report an error on invalid exclude specification. Thanks for report to bparker and for patch with tests to ramiro.
r12734 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 00:52:38 +00:00
Karen Tracey 0cac2cbc2f [1.1.X] Updated svnmerge metadata to reflect changesets that have been and should not be merged.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 20:53:51 +00:00
Karen Tracey 75b10c9c15 [1.1.X] Fixed #12024: Changed admin code to avoid raising an exception when a field listed
in raw_id_fields has limit_choices_to specified as a Q object.

Tweaked a test to trigger the condition and verify the fix.

Finally, documented that limit_choices_to specified as a Q object has no effect
on the choices available for fields listed in raw_id_fields, and removed another
incorrect note that claimed limit_choices_to had no effect on inlines in the admin. 

r12728 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 18:41:26 +00:00
Karen Tracey 758123a1f9 [1.1.X] 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.
r12725 and r12726 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 17:11:14 +00:00
Karen Tracey 9bdfe1765f [1.1.X] Move the tests added for #12302 to where some other tests for debug page responses already existed.
r12723 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 15:23:52 +00:00
Luke Plant 55c71d3ed5 [1.1.X] Fixed #11940 - ModelForm evaluates callable default values on form class creation
Thanks to Harm Geerts for the report and initial patch.

Backport of [12721] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 15:13:08 +00:00
Luke Plant 6c507a5cd4 [1.1.X] Fixed #12240 - select_related doesn't work correctly when mixing nullable and non-nullable keys
Thanks to embe for report and Alex for fix.

Backport of 12719 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 12:59:50 +00:00
Karen Tracey 9b2ac2ad2d [1.1.X] Made a few Python 2.3 compatibility test fixes.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 04:37:45 +00:00
Russell Keith-Magee 1adc88f4b4 [1.1.X] Fixed #12097 -- Cleaned up the documentation for ModelChoiceField and MultipleModelChoiceField. Thanks to JasonYosinski for the patch.
Backport of r12712 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 03:27:12 +00:00
Russell Keith-Magee fdbf6c881b [1.1.X] Fixed #12114 -- Clarified the existence of the reverse relation _set in the tutorial. Thanks to panfist for the suggestion, and dwillis for the patch.
Backport of r12711 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 03:26:45 +00:00
Russell Keith-Magee ec6f705956 [1.1.X] Fixed #12811 -- Modified Tutorial 2 to indicate that the templating language will be covered later. Thanks to bac for the suggestion, and Gabriel Hurley for the draft text.
Backport of r12710 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 03:26:24 +00:00
Karen Tracey b86b38f618 [1.1.X] Fixed #6228: Changed common middleware to respect request-specific urlconf. Thanks trey, skevy, and mikexstudios.
r12704 and r12705 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 20:14:34 +00:00
Karen Tracey 90e12662b9 [1.1.X] snvmerge metadata housekeeping.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 17:15:21 +00:00
Russell Keith-Magee 24b969d28e [1.1.X] Fixed #12876 -- Corrected a problem with recursive relations under deepcopy. Thanks to elachuni for the patch.
Backport of r12700 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 07:18:46 +00:00
Joseph Kocherhans 72a659f8f8 [1.1.X] Fixed #12858. DateTime related widgets now handle custom formats properly in _has_changed. Backport of r12698 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 04:06:23 +00:00
Joseph Kocherhans e8c768910a [1.1.X] Fixed #12913. Fields with choices now respect show_hidden_initial as a keyword argument to formfield. Backport of r12696 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 01:52:48 +00:00
James Bennett 8a8366d2fa [1.1.X] Fixed #13048: Corrected typo in email documentation. Backport of [12694] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 00:52:11 +00:00
Joseph Kocherhans 55bcc8ac30 [1.1.X] Fixed #12734. Deferred fields will now be properly converted to python when accessed. Backport of r12579 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 19:17:29 +00:00
Karen Tracey daec734584 [1.1.X] Fixed #6918, #12791: If an email message has an encoding, actually use that encoding to encode body and headers. Thanks for patch with tests oyvind.
Backport of r12683 and r12688 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 16:07:05 +00:00
James Bennett b3c2ae9153 [1.1.X] Fixed #11680: Added a note in the error-reporting documentation about basic e-mail configuration. Backport of [12686] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 11:21:48 +00:00
Karen Tracey 215615ad58 [1.1.X] Fixed #12151: Ensured the comments code does not cause a server error when a request comes in for a comment specifying an invalid primary key value. Thanks thejaswi_puthraya.
r12681 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-05 20:21:28 +00:00
Karen Tracey b5a2f64cbb [1.1.X] Fixed #12083: Ensured generating debug 404 page won't raise a key error. Thanks pigletto.
r12679 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-05 18:58:47 +00:00
Karen Tracey 1fedc0b9eb [1.1.X] Made Python 2.3 compatibility fixes for some recent test additions.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-04 01:11:37 +00:00
Karen Tracey cc65ac9e2b [1.1.X] Fixed the files test to not care whether the names are reported as bytestrings or unicode. Refs #12898.
r12676 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 13:46:40 +00:00
James Bennett 1332b114cc [1.1.X] Fixed #12601: Documented the slug field in the forms module. Backport of [12673] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 09:02:53 +00:00
James Bennett 36e7739d9d [1.1.X] Fixed #12217: Documented the fact that serving flatpages from the flatpage middleware does not apply view middleware methods. Backport of [12671] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:52:51 +00:00
James Bennett 7adae30286 [1.1.X] Fixed #11889: Documented the fact that context processors will overwrite pre-existing context variables of the same names. Backport of [12669] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:44:22 +00:00
James Bennett bca50d20d3 [1.1.X] Fixed #11883: Documented how to set a custom template name on a flatpage. Backport of [12667] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:36:42 +00:00
James Bennett faa341e61b [1.1.X] Expanded the fix in [12663] to cover CSS declarations, which were also affected by the bug. Refs #12879. Backport of [12665] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:19:23 +00:00
James Bennett 1d12aa2cfe [1.1.X] Fixed #12879: Declaring the same JS file multiple times in a single Media instance now only includes that file once. Backport of [12663] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 08:03:47 +00:00
Karen Tracey c6e662cd6e [1.1.X] Fixed #12898: Reverted a change that assumed the file system encoding was utf8, and changed a test to demonstrate how that assumption corrupted uploaded non-ASCII file names on systems that don't use utf8 as their file system encoding (Windows for one, specifically). Thanks for the report to vrehak.
r12661 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 22:02:02 +00:00
Karen Tracey b50b3cf75c [1.1.X] Fixed #11522: Restored ability of http redirect responses to correctly handle redirect locations with non-ASCII chars.
r12659 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 19:41:39 +00:00
Jannis Leidel cea0374cc6 [1.1.X] Fixed Bosnian language code introduced in r12330.
Backport from r12657.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 17:11:02 +00:00
Russell Keith-Magee 755a0f6d96 [1.1.X] Fixed #6510 -- Refactored the way child nodes are found in template nodes to avoid potential inconsistencies. Thanks to SmileyChris for the patch.
Backport of r12654 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 07:47:41 +00:00
Karen Tracey a6225393c2 [1.1.X] Fixed #12946: Removed an invalid example of url tag usage from the docs.
r12652 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 04:06:21 +00:00
Karen Tracey 69fb5c25bd [1.1.X] Fixed #11710: Made a small test change to ensure utf-8 bytestrings in verbose_names don't cause a server error when the admin change log message is built. The necessary code fix was made for #12966 in r12627. Thanks Rupe.
r12650 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 03:32:49 +00:00
Karen Tracey 08a698ed46 [1.1.X] Fixed #11465: Ensure nonexistent pks enterd in an admin raw id field do not
cause a server error. Thanks for report and initial patch sacre@wp.pl. 

Backport of r12648 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 02:39:26 +00:00
Jacob Kaplan-Moss 5f70a72876 [1.1.X] Fixed a silly bug in [12644].
Backport of [12646].

Of course, this sort of thing *does* do wonders for my commit count.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 00:00:08 +00:00
Jacob Kaplan-Moss 60f4b7c4a9 [1.1.X] Fixed #1104: set `FormWizard.extra_context` in `__init__` to avoid context leakage.
Backport of [12644] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 23:26:44 +00:00
Jacob Kaplan-Moss 34a3b7b6fd [1.1.X] Fixed #5605: only lowercase the domain portion of an email address in `UserManager.create_user`.
Thanks, Leo.

Backport of [12641] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:32:55 +00:00
Jacob Kaplan-Moss ac72c8d1d3 [1.1.X] Fixed #10878, an error in the `Moderator` docstring.
Thanks, Travis Cline.

Backport of [12639] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:19:53 +00:00
Jacob Kaplan-Moss 7e1c67040c [1.1.X] Fixed #11012: don't needless convert cache values to unicode.
This means you can now successfully store binary blogs, such as compressed data,
in the cache.

Thanks to Matt Croydon for the final patch.

Backport of [12637] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:14:18 +00:00
Jacob Kaplan-Moss 6b94c64554 [1.1.X] Fixed #11457: tightened the security check for "next" redirects after logins.
The new behavior still disallows redirects to off-site URLs, but now allows
redirects of the form `/some/other/view?foo=http://...`.

Thanks to brutasse.

Backport of [12635] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:06:20 +00:00
Karen Tracey 5f3a53036d [1.1.X] Fixed #11791: Put hidden input elements in the change list inside td elements so they're valid HTML. Thanks panni and mlavin.
r12631 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 18:46:20 +00:00
Jannis Leidel f09eabfb90 [1.1.X] Fixed #12987 - Added a few versionadded directives to the docs. Thanks, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 14:41:11 +00:00
Jannis Leidel 4871b654b5 [1.1.X] Fixed #12966 - Force unicode of verbose labels in admin change messages.
Backport of r12627.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 14:36:45 +00:00
Karen Tracey 1b2b3b0dba [1.1.X] Fixed #12302: Modified force_unicode to avoid raising unicode errors when
handed exceptions with non-ASCII bytestring data and no working unicode method
under Python 2.6 and higher.

r12621 and r12622 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-28 15:29:14 +00:00
Karen Tracey e0679ef165 [1.1.X] Removed more stray tabs in Python files.
Applicable parts of r12616 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 16:37:32 +00:00
Karen Tracey aa8a98564c [1.1.X] Fixed #12981 -- Removed some stray tabs. Thanks to loewis for the report.
Backport of the applicable part of r12614 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 15:40:50 +00:00
Justin Bronn 499c715513 [1.1.X] Fixed #12608 -- No longer return inconsistent results when using values and values_list in conjunction with annotate. Thanks, Charlie Leifer.
Backport of r12505 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:11:58 +00:00
Jannis Leidel 7c23a5303c [1.1.X] 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.
Backport of r12471.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:00:42 +00:00
Jannis Leidel 079d9f3738 [1.1.X] Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs.
Backport of r12447.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:00:11 +00:00
Justin Bronn b698d7762b [1.1.X] Fixed #12585 -- Corrected typo in tutorial03. Thanks, fcsmith.
Backport of r12484 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 16:56:39 +00:00
Karen Tracey 14fbee6958 [1.1.X] Added force_unicode to a test (needed for Python 2.3 compatibility).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 16:40:37 +00:00
Russell Keith-Magee 121188e254 [1.1.X] Corrected an edge case introduced in r12602. Thanks to Ramiro Morales for the eagle eyes.
Backport of r12605 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 16:12:54 +00:00
Russell Keith-Magee 94054604e4 Corrected a versionchanged marker added in r12603.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 15:54:37 +00:00
Russell Keith-Magee b6bd766d88 [1.1.X] Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch.
Backport of r12602 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 15:38:50 +00:00
Karen Tracey 0c2d3ff7a1 [1.1.X] Python 2.3 compatibility: moved the fallback import for set to where set() is now used.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 14:24:08 +00:00
Russell Keith-Magee 3bda1f5bd3 [1.1.X] Fixed #6191, #11296 -- Modified the admin deletion confirmation page to use the same object collection scheme as the actual deletion. This ensures that all objects that may be deleted are actually deleted, and that cyclic display problems are avoided. Thanks to carljm for the patch.
Backport of r12598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 13:43:28 +00:00
Russell Keith-Magee a52f1dd95c [1.1.X] Fixed #11226 -- Corrected an validation edge case with m2m relations between two models with the same class name. Thanks to pkoch for the report, and to Ramiro Morales for the patch.
Backport of r12489 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 11:12:14 +00:00
Karen Tracey 6ca3154bcd [1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept into the 1.1.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 05:14:36 +00:00
Karen Tracey 6c031fbef7 [1.1.X] Removed a couple of changesets from the blocked list that shouldn't have been blocked.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-25 23:57:27 +00:00
Karen Tracey 5ac214b46a [1.1.X] Added a few more blocked changesets I missed earlier.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-25 20:32:47 +00:00
Karen Tracey f18cf31bbc [1.1.X] Updated svnmerge metadata to reflect changesets that have been and should not be merged.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-25 19:04:21 +00:00
Jannis Leidel 1a377a8d0c [1.1.X] Added note to the contributing docs about requiring gettext to run the makemessages tests.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-25 17:20:13 +00:00
Jannis Leidel b711400278 [1.1.X] Fixed #12910 - Only test extracting translation strings if xgettext can be found on PATH.
Backport from r12475.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-25 17:14:37 +00:00
Justin Bronn 231eb1d3ac [1.1.X] Fixed #12828 -- The table quoting function is now argument `get_geo_where_clause`.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 21:59:27 +00:00
Justin Bronn 49194df8c3 [1.1.X] Fixed #11353 -- `GeometryProxy` descriptor no longer chokes when accessed from a class rather than an instance, thanks yml and Tobu; removed unnecessary imports from `types` and cleaned up whitespace.
Backport of r12584 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 21:26:11 +00:00
Joseph Kocherhans 4006402570 [1.1.X.] Blocked a few more revisions via svnmerge.py.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 21:16:37 +00:00
Joseph Kocherhans 6bf75fd3f5 [1.1.X] Fixed #12119. Changed smart_split to stop splitting on whitespace in quotes. Backport of r12581 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 20:56:09 +00:00
Joseph Kocherhans 07f2d19269 [1.1.X] Fixed #12546. Objects with a __len__ that returns 0 can now be serialized. Thanks, casobn for the report and Alex Gaynor for the patch and tests. Backport of r12576 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 16:06:10 +00:00
Joseph Kocherhans 692d122ce2 [1.1.X] Fixed #12818. SQLite now properly quotes strings for date extraction and truncation. Backport of r12573 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 15:40:33 +00:00
Russell Keith-Magee 770b31e209 [1.1.X] Fixed #12102 -- Corrected an example in the docs that suggested that you use a relative path in your PYTHONPATH. Thanks to alexkon for the report.
Backport of r12570 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:52:49 +00:00
Russell Keith-Magee c1edfcd9ae [1.1.X] Fixed #11933 -- Added versionchanged marker for the cache_db session backend. Thanks to gabrielhurley for the report and patch.
Backport of r12569 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:52:21 +00:00
Joseph Kocherhans 18c800f1a3 [1.1.X] Fixed #12152. DoesNotExist and MultipleObjectsReturned now subclass their parent model's exceptions. Backport of r12567 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:42:03 +00:00
Russell Keith-Magee fbe455e1ac [1.1.X] Fixed #11782 -- Added some Sphinx metadata to the file uploads documentation. Thanks to timo for the patch.
Backport of r12562 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:07:25 +00:00
Russell Keith-Magee f7b415869c [1.1.X] Fixed #12538 -- Added a note that pickles aren't stable during version updates. Thanks to snow0x2d0 for the suggestion.
Backport of r12560 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:06:51 +00:00
Russell Keith-Magee d33fd127f8 [1.1.X] Fixed #12880 -- Added some missing sphinx directives for module references. Thanks to psagers for the report, and timo for the patch.
Backport of r12559 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:05:58 +00:00
Russell Keith-Magee ef7debf34b [1.1.X] Fixed #12951 -- Corrected README link for deployment. Thanks to carljm for the report.
Backport of r12558 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:05:18 +00:00
Joseph Kocherhans d75e23ce9b [1.1.X] Fixed #9336. Changed CheckboxInput to render 'True' and 'False' input strings as checked or not instead of as a value attribute. Backport of r12556 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 23:48:44 +00:00
Jacob Kaplan-Moss 778b7bcd19 [1.1.X] Fixed an unspecified ordering in the expression tests that could lead to a heisenbug.
Backport of [12553]

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 23:04:25 +00:00
Joseph Kocherhans 87bb1608bd [1.1.X] Blocked a few more changesets.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 21:12:14 +00:00
Joseph Kocherhans 860497c9b3 [1.1.x] Fixed #12878. Formset-wide errors are now rendered properly as html. Backport of r12548 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 21:09:27 +00:00
Joseph Kocherhans a1bff5f823 [1.1.X] Fixed #11681. Fixed display of non_field_errors and non_form_errors in the admin. Backport of r12541 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 19:00:50 +00:00
Joseph Kocherhans f48cf954f8 [1.1.X] Fixed #12070. Fixed a case where var._whatever wasn't raising a TemplateSyntaxError. Backport of r12539 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 18:53:42 +00:00
Joseph Kocherhans ae01b0c5cb [1.1.X] Fixed a few more spots related to #11859. Backport of r12537 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 18:40:07 +00:00
Joseph Kocherhans a599e50b07 [1.1.X] Fixed #11859. Allowed subclasses of tuple or list for choice options. Backport of r12535 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 17:32:07 +00:00
Joseph Kocherhans 6510822679 [1.1.X] Fixed #12561. InlineAdmin now respects can_delete=False. Backport of [12533] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 17:26:20 +00:00
Joseph Kocherhans c7117b103a [1.1.X] Blocked a couple of revisions that shouldn't be merged.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 15:27:36 +00:00
Joseph Kocherhans d23f2249ea [1.1.X] Fixed #12285. ModelForm raises a more informative error if it doesn't have a model class defined. Backport of [12526] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 15:12:29 +00:00
Justin Bronn c702e262ff [1.1.X] Fixed #12802 -- Specify the correct factory in the `InlineModelAdmin` docs. Thanks, rctay and unbracketed.
Backport of r12527 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 15:11:01 +00:00
Joseph Kocherhans fd0c365690 [1.1.X] Fixed #11860. Changed NullBooleanSelect's _has_changed method to repect differences between None and False. Backport of [12523] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 14:20:35 +00:00
Russell Keith-Magee cda48e9f0b [1.1.X] Fixed #12799 -- Added an extra newline to help with PDF generation of documentation. Thanks to Ivan Savov for the report.
Backport of r12518 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:30:49 +00:00
Russell Keith-Magee e771d15e2d [1.1.X] Fixed #12837 -- Clarified the naming strategy for m2m intermediate tables. Thanks to Ramiro Morales for the report and patch.
Backport of r12516 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:30:18 +00:00
Russell Keith-Magee 7c1671b480 [1.1.X] Fixed #12859 -- Clarified the documentation on using multiple tables with .update() calls. Thanks to dwillis for the report.
Backport of r12515 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:29:52 +00:00
Russell Keith-Magee b9d1c5d9f6 [1.1.X] Fixed #12925 -- Corrected typo in v1.1 release notes. Thanks to aruseni for the report.
Backport of r12513 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 13:29:18 +00:00
Justin Bronn 6a28f581c0 Fixed #12855 -- QuerySets? with extra where parameters now combine correctly. Thanks, Alex Gaynor.
Backport of r12502 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 05:59:04 +00:00
Joseph Kocherhans 16efc1a92e [1.1.X] Fixed #12820. Implemented other dict methods for MergeDict. Backport of [12498] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 00:08:03 +00:00
Jacob Kaplan-Moss bd79677e29 [1.1.X] Fixed #11687: the `add` filter is now less failsome when faced with things that can't be coerced to integers.
Backport of [12497] from trunk, although the fix here is slightly different to
avoid adding new behavior to a bugfix branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 23:41:29 +00:00
Joseph Kocherhans 8c4f16657f [1.1.X] Fixed #12570. Removed unused fields from GenericForeignKey. Backport of r12492 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 22:14:31 +00:00
Russell Keith-Magee 8b415e7299 [1.1.X] Fixed #7777 -- Added validation handling for NaN, Inf and -Inf in DecimalFields. Thanks to thebitguru for the patch.
Backport of r12490 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 15:02:45 +00:00
Jannis Leidel 9ee2d5c646 [1.1.X] Fixed #11714 - Document a few of the i18n function that can be used outside views and templates. Thanks, Jarek Zgoda and Ramiro Morales.
Backport or r12473.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:44:27 +00:00
Jannis Leidel 5059de200b [1.1.X] Fixed #12275 - Small fix in Sphinx templates.
Backport of r12467.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:44:05 +00:00
Jannis Leidel 4f1134898c [1.1.X] Fixed #12675 - Add the admin app to the project template settings.py for consistency with the urls.py. Thanks, stephanhoyer.
Backport of r12464.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:43:47 +00:00
Jannis Leidel 713bac952f [1.1.X] Fixed #12655 - diffsettings command now returns the diff instead of printing. Thanks, jobscry.
Backport of r12463.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:43:29 +00:00
Jannis Leidel 4261efdc67 [1.1.X] Fixed #12620 - Refer to better fieldname in defer docs. Thanks, dwillis.
Backport of r12462.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:43:10 +00:00
Jannis Leidel 71897bf300 [1.1.X] Fixed #12604 - Typo in 1.1 release docs.
Backport of r12461.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:42:51 +00:00
Jannis Leidel 49c116f14c [1.1.X] Fixed #12895 - Fixed typo in auth docs. Thanks Timo.
Backported from r12457.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 00:42:33 +00:00
Jannis Leidel 77192eb661 [1.1.X] Fixed #12716 - Typo in the admin change list template. Thanks, kbrownlees.
Backport of r12398 and r12448.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:52:33 +00:00
Jannis Leidel df1ad561b1 [1.1.X] Fixed #7720 - Fallback to the base language if the sub language given in the language cookie doesn't exist. Thanks, djoume and Ramiro Morales.
Backport of r12442.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:52:04 +00:00
Jannis Leidel 6a3c915933 [1.1.X] Fixed #4695 - Worked around a problem of xgettext ignoring some translation strings in JavaScript files. Thanks, Ramiro Morales.
Backport of r12441.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:51:43 +00:00
Jannis Leidel a1ecd073e6 [1.1.X] Fixed #11284 - Stop forcing the use of the djangojs domain when the ".js" file extension is passed to makemessages management command. Thanks, Ramiro Morales.
Backport of r12439.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:51:12 +00:00
Jannis Leidel a23edb643b [1.1.X] Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales.
Partial backport of r12440.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:50:47 +00:00
Jacob Kaplan-Moss 4384b164cc [1.1.X] Fixed (what I hope is) the last Python 2.4 incompatibility, this one in the httpwrappers tests.
Backport of [12436] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-15 02:18:15 +00:00
Jacob Kaplan-Moss 9f78e4692c [1.1.X] Fixed a couple Python 2.4 incompatibilities. Backport of [12434].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 20:33:32 +00:00
Jacob Kaplan-Moss a9879b1438 [1.1.X] Fixed #6054: work around PIL's installation brokeness by detecting either of the two ways it can end up being installed.
Backport of [12429] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:33:01 +00:00
Russell Keith-Magee 166405b2e4 [1.1.X] Fixed #11944 -- Improved exception handling for the filesizeformat filter. Thanks to rfk for the report and patch.
Backport of r12426 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:44:07 +00:00
Russell Keith-Magee f30a4b368c [1.1.X] Fixed #12613 -- Added Q and Z to the list of characters supported by the phone2numeric filter. Thanks to gabrielhurley for the report and patch.
Backport of r12425 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:43:33 +00:00
Russell Keith-Magee d751f2cade [1.1.X] Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch.
Backport of r12423 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:06:13 +00:00
Russell Keith-Magee 1d9bc59534 [1.1.X] Fixed #10976 -- Isolated contrib.auth tests so they will always pass, regardless of any local templates. Thanks to aarond10 for the report, and SmileyChris for turning that into a patch.
Backport of r12420 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:32:49 +00:00
Russell Keith-Magee bf11ab2b21 [1.1.X] Fixed #12011 -- Modified the test client to preserve the request scheme on a redirect. Thanks to tgardner for the report and patch.
Backport of r12419 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:32:01 +00:00
Russell Keith-Magee 0e9f1553e1 [1.1.X] Corrected merge of r12411 to 1.1.X branch (see r12415).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:23:11 +00:00
Russell Keith-Magee f764d7ffb1 [1.1.X] Fixed #11483 -- Modified db cache backend to use db backend functions for date conversion, avoiding problems under Jython. Thanks to Leo Soto for the report and patch.
Merge of r12411 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:12:38 +00:00
Russell Keith-Magee d4a34b5508 [1.1.X] Fixed #11623 -- Corrected table name quoting in db cache backend. Thanks to Fraser Nevett for the report and fix.
Backport of r12410 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:11:47 +00:00
Russell Keith-Magee a9282168f5 [1.1.X] Fixed #12189 -- Corrected rollback behavior in database cache backend. Thanks to Lakin Wecker for the report.
Backport of r12409 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:10:52 +00:00
Russell Keith-Magee 3792b2cd9f [1.1.X] Fixed #12399 -- Added handling for memcache timeouts longer than 30 days. Thanks to houdinihound for the report, and gciotta for the patch.
Backport of r12408 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-11 13:09:56 +00:00
Karen Tracey ad08f07722 [1.1.X] Fixed #11535: Corrected SQL generated for queries involving generic relations and ORed Q objects. Thanks to brianglass for report, tobias for fix and test, and Alex for review.
r12405 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 19:24:44 +00:00
Karen Tracey 750c889a74 [1.1.X] Update svnmerge metatdata to reflect changesets that should not be merged to 1.1.X and those that have already been applied.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10 17:43:05 +00:00
Jannis Leidel 01d4316874 [1.1.X] Fixed #3594 - Added ability to discard the language catalog in the JavaScript i18n view in case the selected language is English but no English translation catalog actual exists, e.g. due to being the language translated from. Thanks to msaelices, aryx and Ramiro Morales.
Backport of r12384.


Conflicts:

	tests/regressiontests/views/tests/i18n.py

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-05 01:54:22 +00:00
Karen Tracey 88bd40c551 [1.1.X] Corrected app_loading test so it does not generate a key error when TZ is not set in the environment (e.g., on Windows).
r12379 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-03 18:12:35 +00:00
James Bennett daeceafee6 [1.1.X] Fixed #12745: The maxlength -> max_length change happened in 2007, we can probably stop mentioning it in the tutorial now. Backport of [12362] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12363 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 11:53:55 +00:00
Karen Tracey 75146a3d7b [1.1.X] Really this time -- fixed #12721: Ensured objects with generic relations that use non-integer object ID fields can be deleted on PostgreSQL. Thanks much carljm for patch and Russ for review.
Remainder of r12353 from trunk, previous attempt only picked up the new tests.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-29 18:05:58 +00:00
Karen Tracey 4043521f53 [1.1.X] Fixed #12721: Ensured objects with generic relations that use non-integer object ID fields can be deleted on PostgreSQL. Thanks much carljm for patch and Russ for review.
r12353 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-29 18:02:35 +00:00
Ian Kelly ab75fd4786 [1.1.X] Fixed #4140: Documented the ORA-06552 error that can occur when a keyword is used as a field name in the Oracle notes. Backport of r12346 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 22:14:38 +00:00
Russell Keith-Magee 32b573d36b [1.1.X] Fixed #12720 -- Corrected handling of cookies in the TestClient. Thanks to James Henstridge for the report and patch.
Backport of r12343 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 14:47:42 +00:00
Russell Keith-Magee 6d02f50a8b [1.1.X] Fixed #12719 -- Added initial Albanian translation. Thanks to Besnik Bleta.
Backport of r12341 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 14:18:46 +00:00
Russell Keith-Magee 4a1be98aee [1.1.X] Fixed #8758 -- Corrected handling of tag creation in feeds when the URL contains a port number.
Partial backport of r12338 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 13:59:57 +00:00
Russell Keith-Magee 2777cd37a8 [1.1.X] Fixed #11973 -- Corrected some misleading documentation regarding the feed_copyright attribute on feeds.
Backport of a small part of r12338 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 13:51:00 +00:00
Russell Keith-Magee dcd58497da [1.1.X] Fixed some problems with the Frisian translation added in r12324.
Backport of r12333 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:17:30 +00:00
Russell Keith-Magee 3943979095 [1.1.X] Fixed #12711 -- Added the start of a Frisian locale. Thanks to Wim Benes.
Backport of r12324 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:10:08 +00:00
Russell Keith-Magee cf21fec23d [1.1.X] Fixed #12419 -- Updated Romanian translation. Thanks to xlotlu.
Backport of r12323 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:09:24 +00:00
Russell Keith-Magee d33cab6f19 [1.1.X] Fixed #12357 -- Added a start of a Bosian translation. Thanks to Tim Langeman.
Backport of r12322 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:08:50 +00:00
Russell Keith-Magee fa092e2746 [1.1.X] Fixed #12015 -- Updated Czech translation. Thanks to Vlada Macek.
Backport of r12321 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:08:05 +00:00
Russell Keith-Magee c162ac0757 [1.1.X] Fixed #11894 -- Updated Slovakian translation. Thanks to mandre.
Backport of r12320 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:07:35 +00:00
Russell Keith-Magee 3e4f810702 [1.1.X] Fixed #11666 -- Updated Dutch translation. Thanks to joeri and tinodb.
Backport of r12319 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:06:58 +00:00
Russell Keith-Magee 85b011287e [1.1.X] Fixed #11645 -- Updated French translation. Thanks to claudep.
Backport of r12318 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:06:28 +00:00
Russell Keith-Magee 11d5faae54 [1.1.X] Fixed #11468 -- Updated Norwegian translation. Thanks to jonklo.
Backport of r12317 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-28 02:05:58 +00:00
Justin Bronn 0c9f63f626 [1.1.X] Fixed #11969 -- `Field.post_create_sql` hook should not be called for unmanaged models. Thanks, jtiai for report.
Backport of r12313 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-27 23:52:15 +00:00
Ian Kelly 19353d9c59 [1.1.X] Fixed #11017: Changed implementation of Oracle LIKE lookups to enable index usage. Thanks to Jani Tiainen for this workaround. Backport of r12293 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-25 19:30:56 +00:00
Luke Plant 77b25ea4da [1.1.X] Documented backwards incompatibility in 1.1.X branch introduced in r12283
Backport of r12284 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 23:58:40 +00:00
Luke Plant a3f4402853 [1.1.X] Fixed #12470 - encoding of comma and semi-colon in cookies.
This is a backport of r12282 from trunk.

The original bug was about CookieStorage, which does not exist in 1.1.X,
but the fix involved the underlying cookie storage.

The change fixes other bugs with cookies for Internet Explorer and Safari,
hence it is backported.  It could, however, also cause backwards
incompatibilities with existing javascript that may parse cookie values that
contain commas or semi-colons, and, very rarely, with existing cookie values
manipulated server side.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-23 23:25:41 +00:00
Justin Bronn da954e876b [1.1.X] Fixed #12664 -- Fixed `GenericRelation.m2m_reverse_name` to return the correct pk column name.
Backport of r12276 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-22 19:43:14 +00:00
Karen Tracey 46d8ae7c24 [1.1.X] Fixed #10015 -- PostgreSQL 8.3+ no longer barfs when passing an integer as a filter() value for a CharField? or TextField?. Thanks, carljm
Backport of r12150 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-19 16:55:22 +00:00
Karen Tracey a8e659c54f [1.1.X] Fixed bad indentation in contenttypes code example so that cut and paste from doc will work.
r12253 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-18 13:02:07 +00:00
Karen Tracey d4a2d1f47c [1.1.X] Updated svnmerge metadata to reflect more stuff that has been and should not be applied to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-18 00:00:31 +00:00
Jannis Leidel 3a417736bc [1.1.X] Fixed #12230 - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas.
Backport of r12056.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 23:10:23 +00:00
Jannis Leidel d1e7fdea3f [1.1.X] Fixed #12017 - Overriding the default error message of the UKPostcodeField works again. Backport of r12044 and r12249.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:51:25 +00:00
Jannis Leidel abea4e6ee3 [1.1.X] Fixed #12013 - Marked some default error messages for translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:20:10 +00:00
Jannis Leidel b3ec5e68eb [1.1.X] Fixed #9819 - Added exemplary documentation for comments app. Thanks for the initial patch, Thejaswi Puthraya.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:12:24 +00:00
Jannis Leidel d060d84bbc [1.1.X] Fixed #11794 - Typo in model manager documentation. Thanks, timo.
Conflicts:

	docs/topics/db/managers.txt

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:12:02 +00:00
Jannis Leidel 0c4f8b345f [1.1.X] Fixed #12496 - Added code examples to built-in filter documentation. Thanks, Arthur Koziel.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:11:43 +00:00
Jannis Leidel dc3d26bb59 [1.1.X] Fixed #11301 - Properly hide SplitHiddenDateTimeWidget. Thanks to David Gouldin for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:11:23 +00:00
Jannis Leidel 889c110e51 [1.1.X] Fixed #11843 - Give MultipleHiddenInput different IDs. Thanks Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:11:00 +00:00
Jannis Leidel 8eaffeac8a [1.1.X] Fixed #11757 - Set mimetype when responding with HttpResponseNotModified in django.server.static.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:10:37 +00:00
Jannis Leidel 0216255632 [1.1.X] Fixed #10717 - Escape result of admin_media_prefix template tag.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:10:19 +00:00
Jannis Leidel 7b5b1c7ecd [1.1.X] Fixed #11478 - Use namespacing for URLs to i18n JavaScript in admin.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:09:59 +00:00
Jannis Leidel 3a6f58a169 [1.1.X] Fixed #12059 - Let TimeField.to_python correctly return a datetime.time object when having a datetime object.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:09:33 +00:00
Jannis Leidel 4d409c0b3b [1.1.X] Fixed #12480 - Use month variable for headline text.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:09:07 +00:00
Jannis Leidel fe4d3f89e4 [1.1.X] Fixed #12220 - Added Serbian Latin to list of languages in global settings. Thanks, Janos Guljas.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:08:47 +00:00
Karen Tracey 2986dc7b28 [1.1.X] Fixed code duplication caused in [11859].
r12048 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 20:47:35 +00:00
Karen Tracey 0b52750887 [1.1.X] Update svnmerge metadata to relfect things that have been and should not be merged.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 20:26:02 +00:00
Luke Plant a0ccd50623 [1.1.X] Fixed #12622 - exists() mentioned in 1.1 docs
Thanks for the report kmike.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-16 13:34:19 +00:00
Luke Plant ad6368809c [1.1.X] Created a 'DB optimization' topic, with cross-refs to relevant sections.
Also fixed #10291, which was related, and cleaned up some inconsistent doc labels.

Backport of r12229 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-16 03:26:02 +00:00
Karen Tracey 9041b1addf [1.1.X] Changed an i18n test to use a number that converts consistely from string to float on Pythons up to 2.7.
r12144 from trunk, backported to the doctest version where the change is needed for the test to pass on Python 2.7 alpha 2.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 21:03:25 +00:00
Karen Tracey 03d57f0a82 [1.1.X] Fixed #12562: Made Platypus just a tad lighter so it does not trigger noticing version-dependent differences in Ptyhon string/float conversions.
r12132 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-09 19:20:51 +00:00
Russell Keith-Magee 4bbbf6cc12 [1.1.X] Updated the docs to suggest using ``*args, **kwargs`` when implementing model save methods. Thanks to Jeff Croft for the report.
Partial backport of r12118 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-08 00:21:45 +00:00
Luke Plant 3de16688a9 [1.1.X] Fixed #12506 - 'lazy' fails when there are multiple expected classes with the same method
Thanks to Alex for report and patch

Backport of r12104 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-05 13:20:19 +00:00
Luke Plant d4f9bff7ef [1.1.X] Fixed #12503 - form examples don't validate according to w3c
Thanks to skyl for the report.

Backport of r12086 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-04 22:22:16 +00:00
Gary Wilson Jr 5d75b3d5c4 [1.1.X] Added backwards incompatibility note to 1.1.2 release notes for the change in test runner exit status codes (refs #11615).
Backport of r12070 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 19:03:33 +00:00
Gary Wilson Jr 07fa03dde4 [1.1.X] Fixed #11615 -- Changed test runners to use an exit status code of 1 for any number of failed tests. The previous behavior of using an exit status code equal to the number of failed tests produced incorrect exit status codes when the number of test failures was 256 or greater. Thanks to lamby for the report and patch.
Backport of r12068 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 18:57:15 +00:00
Gary Wilson Jr f686075083 [1.1.X] Fixed #12445 -- Added ' (single quote), @ (at sign), and ~ (tilde) to safe characters in `iri_to_uri` function.
Backport of r12066 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 18:07:11 +00:00
Russell Keith-Magee e8b001f46f [1.1.X] Fixed #12476 -- Forced the rollout of generators passed to SortedDict so that the data source can be read twice. Thanks to gsf for the report, and Alex for the patch.
Backport of r12064 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-03 06:56:10 +00:00
Jannis Leidel 618e1b1587 [1.1.X] Fixed #8468 - Updated class names in docs of Polish local flavor.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:45:07 +00:00
Jannis Leidel 8e6803f733 Typo fix for localflavor documentation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:44:48 +00:00
Jannis Leidel 1a3fd10a34 [1.1.X] Fixed #12383 - Typo fix for authentication documentation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:44:30 +00:00
Justin Bronn 30c6021f80 [1.1.X] When `GEOSFree` is not available on NT platforms, have to specifically use the MS C library.
Backport of r12024 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-29 10:41:44 +00:00
Justin Bronn db867be91e [1.1.X] Fixed #12344 -- Using `select_related()` on geographic fields with the Oracle spatial backend now works.
Backport of r12022 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-29 10:35:59 +00:00
Luke Plant 58bf653a26 [1.1.X] Fixed #11191 - Admin throws 500 instead of 404 for PK of incorrect type
Thanks to mmachine for report and test, and Chris Beaven for the patch

Backport of r12011 from trunk



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-28 14:15:34 +00:00
Justin Bronn f1fe7c00e2 [1.1.X] Fixed #11609 -- The `check_pointer` error checking routine and `GDALBase._set_ptr` are now able to handle the long pointer addresses used by some x86_64 platforms. Thanks, rmkemker, for the bug report.
Backport of r12006 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-27 18:13:20 +00:00
Justin Bronn 90f7dfb461 [1.1.X] Fixed #12450 -- `GEOSFree` was really added in GEOS 3.1.1, not 3.1.0. Thanks, jpwatts for the bug report.
Backport or r12004 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-27 08:13:37 +00:00
Gary Wilson Jr 3201e7b0b1 [1.1.X] i18n documentation fixes:
* Fixed typo (fixes #12449, thanks googol).
 * Wrapped long lines.
 * Removed unused link target directive.

Backport of r12001 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 18:03:02 +00:00
Nicola Larosa 4c5429d229 [1.1.X] Italian translation updated
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 16:36:00 +00:00
Gary Wilson Jr 9e94f8f06d [1.1.X] Removed a couple completed TODO items from the documentation documentation.
Backport of r11996 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 06:50:28 +00:00
Gary Wilson Jr d8ea6831f9 [1.1.X] Fixed several broken and redirecting URLs in the documentation (fixes #12219, refs #12427).
Backport of r11994 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 06:44:02 +00:00
Gary Wilson Jr ed192ea56f [1.1.X] Fixed #11570 -- Changed output in examples to unicode strings, thanks adamnelson.
Backport of r11992 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 04:00:35 +00:00
Gary Wilson Jr 498c31364c [1.1.X] Fixed #9465 -- Simplified API Reference documentation titles for easier lookup and made first-level heading styles consistent. Thanks, adamnelson.
Backport of r11990 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 03:47:47 +00:00
Gary Wilson Jr 81f994583c [1.1.X] Fixed #12205 -- Corrected malformed reference links in the 1.1 and 1.1-alpha release notes, and corrected position of field lookup reference label. Thanks velmont and timo.
Backport of r11988 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-26 00:56:40 +00:00
Gary Wilson Jr a94d7e761f [1.1.X] Form wizard documentation tweaks:
* Simplified Sphinx references to FormWizard class.
  * Wrapped long lines.
  * Added references to template loader functions.

Backport of r11986 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-25 21:08:02 +00:00
Gary Wilson Jr f67cd98b3f [1.1.X] Added a few Sphinx directives to the form API and template API docs.
Backport of r11984 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-25 20:56:52 +00:00
Justin Bronn 94b718915d [1.1.X] Fixed #12438 -- now use `GEOSFree` to free string pointers allocated within GEOS when available; now parse out subminor version, and added a `GEOS_VERSION` tuple.
Backport of r11979 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-24 15:01:47 +00:00
Jannis Leidel 116ff7ff35 [1.1.X] Fixed #12425 - Typo in Ukrainian translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-24 14:29:59 +00:00
Luke Plant 1ab5f1cc00 [1.1.X] Fixed typo
Backport for r11961 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 17:54:04 +00:00
Luke Plant b0d779b1dd [1.1.X] Added info on top-level use of django.conf.settings to 'contributing' documentation
Backport of r11802 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11962 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 17:44:09 +00:00
Marc Fargas 859ac5be13 [1.1.X] Updated Spanish translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 16:18:54 +00:00
Marc Fargas 24b5489354 [1.1.X] Updated Catalan translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 16:18:30 +00:00
Russell Keith-Magee d0ea8f2d4c [1.1.X] Tweaked the model_formsets test to work around a weird sorting problem between versions of Postgres. Thanks to Alex Gaynor for the report.
Backport of r11953 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 15:57:45 +00:00
Karen Tracey d65af73db4 [1.1.X] Updated svnmerge metadata to reflect trunk changesets that have been and should not be applied to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 14:48:19 +00:00
Jannis Leidel cf49f62be3 [1.1.X] Fixed #8145 - Documented the codenames of the default auth permissions
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 14:37:24 +00:00
Russell Keith-Magee 7d6213e0aa [1.1.X] Fixed #11936 -- Removed deferred models from the list returned by the app_cache. Thanks to ryszard for the report, and clamothe for the initial patch.
Backport of r11938 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 11:20:43 +00:00
Luke Plant b15d762d7a [1.1.X] Fixed #10927 - Content Types shortcut view throws 500s instead of 404s
Thanks to Jeremy Dunck/Alex Gaynor for the patch

Backport of r11917 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:31:28 +00:00
Luke Plant c81f1da152 [1.1.X] Fixed #6961 - loaddata fails if models is a package instead of a module
Thanks to pmd for report, zhaoz, mmalone and justinlilly for patch

Backport of 11914 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:27:50 +00:00
Justin Bronn 281114d209 [1.1.X] Fixed #12234 -- Create additional indexes that use the appropriate operation class for PostgreSQL `varchar` and `text` columns when `db_index=True`.
Backport of r11912 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 08:24:20 +00:00
Russell Keith-Magee d10f9766ad [1.1.X] Fixed #12393 -- Parameterized the form output in the testGenericInlineFormset test to avoid database PK problems. Thanks to Karen for the report.
Backport of r11905 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 23:48:40 +00:00
Jacob Kaplan-Moss 321fe61f64 [1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
Backport of [11901].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 22:11:39 +00:00
Justin Bronn de2c7d9fdd [1.1.X] Fixed #12390 -- `Distance` and `Area` objects now support multiplication when they are the right-hand side.
Backport of r11898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 18:29:05 +00:00
Russell Keith-Magee de64970091 [1.1.X] Updated BaseGenericInlineFormSet to match the changes made to BaseInlineFormSet in r11874.
Backport of r11885 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 07:28:26 +00:00
Jarek Zgoda 3071d098db [1.1.X] Polish translations updated (some GIS keys still unresolved)
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 19:41:59 +00:00
Karen Tracey f4282336b3 [1.1.X] Fixed #12385: Made built-in field type descriptions in admindocs translatable again. Many thanks to Ramiro for the problem report and patch.
r11878 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 18:17:18 +00:00
Russell Keith-Magee 45bc45eac2 [1.1.X] Cleaned up some stray text in the test from r11874. Thanks to Rob Hudson for the eagle eyes.
Backport of r11876 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 15:16:21 +00:00
Russell Keith-Magee 632a0e9a8d [1.1.X] Fixed #10263 -- Added a queryset argument to BaseInlineFormSet, normalizing with BaseModelFormSet, and allowing for custom ordering/subsets in inlines. Thanks to Paulo Scardine for the patch.
Backport of r11874 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 14:53:42 +00:00
Karen Tracey eef4739dee [1.1.X] Made the message strings added in r11838 visible to makemessages. Refs #12281.
r11864 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14 16:05:28 +00:00
Karen Tracey fee560f4e5 [1.1.X] Fixed #10969: Made US State field a CharField, fixing a few oddities in its behavior. Thanks Paul McLanahan.
r11847 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 22:08:03 +00:00
Karen Tracey 64736fe37f [1.1.X] Fixed #12146: Corrected Canadian postal code validation. Thanks paulschreiber and Mark Lavin.
r11844 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 17:05:17 +00:00
Karen Tracey b5ffd10547 [1.1.X] Apply doc addition that somehow was left out of r11834. Refs #7977.
r11841 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 15:19:21 +00:00
Karen Tracey 08b5d95922 [1.1.X] Update an email address in AUTHORS.
r11839 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 22:08:27 +00:00
Karen Tracey 6c91e6ecbc [1.1.X] Fixed #12281: Added some helpful messages when Go is pressed in admin actions and there
is nothing to do because no action was selected or no items are selected. 

r11837 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 22:02:55 +00:00
Karen Tracey 31618e3ea4 [1.1.X] Fixed #11632: Fixed a test broken by r11827 that relied on the exact (invalid HTML) id of an initial hidden input field.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 20:55:46 +00:00
Karen Tracey fa59129753 [1.1.X] Fixed #7977: Fixed admindocs to use docstrings instead of a static array to locate type information. Thanks J. Clifford Dyer.
r11833 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 20:36:31 +00:00
Jacob Kaplan-Moss 7f1c309cac Removed a left-over empty test directory -- the perils of git-svn, apparently.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 19:39:04 +00:00
Jacob Kaplan-Moss d053631286 [1.1.X] Fixed the tests I broke with [11825].
Backport of r11828.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:48:20 +00:00
Karen Tracey 8bb3763c2b [1.1.X] Fixed #11632: Fixed the id for hidden initial widget so that it is different from the id for its visible counterpart. Thanks geber@datacollect.com and Mark Lavin.
r11826 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 18:22:09 +00:00
Jacob Kaplan-Moss c1a8bd6779 [1.1.X] Fixed #10130: you may now delete attributes on `settings`. Thanks, jcassee.
Backport of r11824.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:53:32 +00:00
Karen Tracey 5e6c3d24b3 [1.1.X] 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/branches/releases/1.1.X@11823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 17:29:46 +00:00
Brian Rosner 512ee70527 [1.1.X] Fixed edge case that breaks the test suite on versions of Python > 2.6.4
Before http://svn.python.org/view?view=rev&revision=74647 it was possible to
pass a SimpleCookie to load, but this no longer works due to a different bug
in Python the said revision fixed.

My guess is a SimpleCookie was never intended to be passed through load which
is perfectly reasonable.

Backport of r11820 from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 15:31:14 +00:00
Karen Tracey cf844fde9f [1.1.X] Update svnmerge metadata to reflect what has been backported and what should not be backported to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 13:07:13 +00:00
Brian Rosner 17350faeae [1.1.X] Adjusted URL to #django IRC logs
Backport of r11817 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 07:15:25 +00:00
Russell Keith-Magee 9275297046 [1.1.X] Fixed #11874 -- Optimizations and cleanups for SortedDict. Thanks to Alex Gaynor and Armin Ronacher for the report and patch.
Backport of r11815 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 06:02:42 +00:00
Karen Tracey 79d8d683d2 [1.1.X] Fixed #12349: Added missing unquote in admin history view. Thanks for the report guard.
r11808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-10 20:01:59 +00:00
Justin Bronn 58c19c324b [1.1.X] Fixed #12340 -- `BaseGenericInlineFormSet.get_queryset` now returns an ordered queryset.
Backport of r11800 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 04:24:05 +00:00
Russell Keith-Magee b24bb68649 [1.1.X] Cleaned up the release notes index page, and added some stub 1.1.2 and 1.2 release notes.
Backport of r11760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-23 13:52:59 +00:00
Jacob Kaplan-Moss fa5ff296ce [1.1.X] Added an explicit test showing that field errors are correctly autoescaped.
Backport of r11756 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-20 15:04:16 +00:00
James Tauber 2ea5e4c743 [1.1.X] Added myself to committers list
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 21:56:22 +00:00
Russell Keith-Magee 55b6f3cf21 Corrected an inconsistency in the documentation regarding the way to specify the locmem and dummy cache backend. Thanks to Jens Diemer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 11:20:06 +00:00
Russell Keith-Magee 47f1330be1 [1.1.X] Fixed #12242 -- Corrected a problem with masking extra selects() in a DateQuerySet. Thanks to Alex Gaynor for his help debugging this one.
Backport of r11748 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19 04:37:26 +00:00
Brian Rosner 4cba436269 [1.1.X] Fixed #5034 -- honor request.urlconf in reverse and resolve.
This enables {% url %} to honor request.urlconf set from process_request
middleware methods.

Thanks SmileyChris for the initial patch work.

Backport of [11740] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-16 01:59:54 +00:00
Russell Keith-Magee 7f2f6bc863 [1.1.X] Fixed #12204 -- Corrected the use of :djadmin: links in the testing docs, plus updated a lot of old-style markup in the django-admin docs. Thanks to Art_S for the report.
Backport of r11734 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-12 13:59:35 +00:00
Russell Keith-Magee 6ec45f3cb4 [1.1.X] Fixed #12163 -- Corrected the unpickling of non-deferred models. Thanks to rfugger for the report and test case.
Backport of r11732 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-11 13:08:33 +00:00
Russell Keith-Magee abd4344efe [1.1.X] Fixed #11144 -- When a to/from/cc header contains unicode, make sure the email addresses are parsed correctly (especially with regards to commas). Thanks to rmt for the patch.
Backport of r11719 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-04 11:28:56 +00:00
Russell Keith-Magee 9a38c1cdb2 [1.1.X] Fixed #11849 -- Corrected handling of use_tls in the SMTP mail handler. Thanks to aromano for the report.
Backport of r11714 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-04 02:01:54 +00:00
Justin Bronn a9c816c41b [1.1.X] Fixed #12101 -- `OGRGeometry` does not need to create a clone of the `SpatialReference` object upon assignment.
Backport of r11707 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-03 06:18:52 +00:00
Russell Keith-Magee e3f07d2b4c [1.1.X] Fixed #12127 -- Corrected teardown of dateformat tests. Thanks to apollo13 for the report, and Karen Tracey for the debugging help.
Backport of r11705 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-02 08:27:00 +00:00
Justin Bronn 30ebd268be [1.1.X] Fixed #12093 -- `LayerMapping` now takes into account model inheritance when looking for the geometry column; forgot to diable extent regression test on MySQL.
Backport of r11703 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-02 02:24:01 +00:00
Karen Tracey e114f4403a [1.1.X] Repeat the setUp/tearDown changes made in r11699 for the tests
converted in r11694. This allows the dateformat tests to pass
on Windows. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 23:52:31 +00:00
Karen Tracey 13d83908a4 [1.1.X] Changed setUp and tearDown for the tests converted from doctests in r11695
to not assume TZ absolutely will be set in the environment. That environment
variable does not necessarily exist on Windows, it seems. 

r11699 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 23:13:59 +00:00
Karen Tracey 8061665c27 [1.1.X] (In [11697]) Fixed #12125 -- Fixed a typo in the generic views date_based test that caused it to fail in November. Thanks brutasse.
r11697 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 22:16:14 +00:00
Russell Keith-Magee e109de3b7e [1.1.X] Fixed #12123 -- Updated the utils.dateformat test to be a unittest too, due to a dependency on the old dateformat test.
Backport of r11695 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 04:54:56 +00:00
Russell Keith-Magee 801a8925fa [1.1.X] Fixed #12123 -- Refactored dateformat tests to use unittest. This is needed so that we have a reliable teardown that can reset the timezone at the end of the test.
Backport of r11693 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 04:21:37 +00:00
Russell Keith-Magee fe9a45e514 [1.1.X] Fixed #12121 -- Modified __reduce__ on a model to avoid an infinite recursion problem that occurs on Python 2.4. Thanks to emulbreh for the report.
Backport of r11691 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-01 03:06:44 +00:00
Karen Tracey 9e02b4a0e1 [1.1.X] Updated svnmerge metadata: block CSRF changesets, include those that have been backported in svnmerge-integrated.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-31 14:41:51 +00:00
Brian Rosner 53275a4775 [1.1.X] Fixed #11872 -- Instantiate the correct model in BaseInlineFormSet.__init__ when instance is None. Thanks tobias.
Backport of [11688] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 09:12:52 +00:00
Brian Rosner a429943467 [1.1.X] Fixed #12115 -- Corrected typo in admin documentation. Thanks encinas.
Backport of [11686] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 08:49:56 +00:00
Brian Rosner d45096437b [1.1.X] Updated INSTALL file
setup.py does not require an Internet connection nor setuptools. That was
fixed in [3906].

Backport of [11684] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-30 08:24:45 +00:00
Russell Keith-Magee 72933294d2 [1.1.X] Fixed #12057 -- Corrected regression of caching performance when a model contained a callable default. Thanks to Michael Thornhill for the excellent assistance tracking this problem.
Backport of r11681 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-29 14:36:10 +00:00
Jannis Leidel b1151bc2b3 [1.1.X] Added bio for myself
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-28 10:01:38 +00:00
Luke Plant ebe5405282 Added a no-op {% csrf_token %} tag to 1.1.X, to ease transition of apps to 1.2
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 21:50:58 +00:00
Jacob Kaplan-Moss 1ab0b23df6 [1.1.X] Fixed #11057: having no actions in the admin (`actions=None`) no longer messes up the layout. Thanks, rvdrijst.
Backport of [11670] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 20:57:13 +00:00
Luke Plant 97ee7a3baf [1.1.X] Fixed #10996 - documented login CSRF vulnerabilities in the CsrfMiddleware
1.1.X branch only fix - trunk is completely different now.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 00:38:28 +00:00
Karen Tracey d2b6f6c948 [1.1.X] Fixed #11961: Corrected a few typos in docs/testing.txt. Thanks to timo for the patch.
Merge of r11599 from trunk.
Also updated svnmerge-integrated to reflect other changesets already backported,
and added a couple more that should not be merged to svnmerge-blocked.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:31:47 +00:00
Karen Tracey 88ec9d97cb [1.1.X] Block new features and fixes from svnmerge to 1.1.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:15:17 +00:00
Jacob Kaplan-Moss bf33627c63 [1.1.X] Fixed #11371: Made `django.test.Client.put()` work for non-form-data PUT (i.e. JSON, etc.). Thanks, phyfus. Backport of [11656] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-26 15:04:32 +00:00
Luke Plant 0ed09c8a73 [1.1.X] Fixed small error in deprecation policy.
Backport of r11652


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 14:12:46 +00:00
Luke Plant 1f0266bd18 [1.1.X] Fixed #9163 - CsrfMiddleware needs to reset ETag header
Thanks to carljm for report and patch.

Backport of r11650 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 11:27:59 +00:00
Luke Plant 84dac3aa82 [1.1.X] Fixed #12067 - check_dependencies in contrib.admin.sites not triggered using new style admin include
Thanks to robhudson for report and patch.

Backport of r11648 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 10:17:25 +00:00
Brian Rosner b06d1be764 [1.1.X] Moved _get_foreign_key call after testing for fk_name fixing a broken test.
Backport of [11643] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-23 20:48:52 +00:00
Luke Plant aaa9ccfe14 [1.1.X] Fixed #12060 - equality tests between User and SimpleLazyObject-wrapped User failed.
Also added more tests for SimpleLazyObject
  
Thanks to ericholscher for report.

Backport of r11637 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-20 14:14:27 +00:00
Luke Plant c1b3808ec0 [1.1.X] Fixed #12049 - LazyObject-wrapped User breaks queries in template tags
Thanks to chipx86 for the report and patch.

Backport of r11634 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-19 21:17:33 +00:00
Brian Rosner bde4c6d995 [1.1.X] Moved the call to _get_foreign_key to run in all cases catching incorrect inline setup sooner.
Backport of [11631] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-19 19:21:08 +00:00
Brian Rosner fb8653ad0e [1.1.X] Fixed #11709 — Pass inline fk_name attribute when grabbing foreign key to test for exclusion. Thanks yishaibeeri for the report.
Backport of [11630] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-19 19:20:52 +00:00
Justin Bronn 72bc0818dd [1.1.X] The `OGRGeometry.coord_dim` property may now be set; implemented a work-around for an OGR bug that changed geometries to 3D after transformation. Refs #11433.
Backport of r11628 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-17 17:46:44 +00:00
Luke Plant bc3f59787f [1.1.X] Fixed a regression for Python 2.6 introduced in r11624 on this branch.
Backport of r11625 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-15 14:18:52 +00:00
Luke Plant e2b83db9ef [1.1.X] Fixed #6552, #12031 - Make django.core.context_processors.auth lazy to avoid "Vary: Cookie"
Thanks to olau@iola.dk, Suor for the report

Backport of r11623 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-14 18:14:19 +00:00
Russell Keith-Magee ec9b6f2616 [1.1.X] Fixed #11959 -- Updated the tutorial to ensure that the admin site continues to work after URLpatterns are introduced. Thanks to carljm for the report and draft patch.
Backport of r11621 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-14 13:41:37 +00:00
Jacob Kaplan-Moss 66939c28b9 [1.1.X] Fixed #11993: fixed the the floatformat filter on NaN values in Python 2.6.3. Thanks, kklimonda. Backport if [11619] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-12 16:57:01 +00:00
James Bennett 68ac924bb3 [1.1.X] Reset 1.1 branch packaging data post-release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 22:17:43 +00:00
James Bennett 8a65192562 [1.1.X] Really fix the download_url. We already manually tweaked it on pypi, so this is just my inner perfectionist complaining.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 22:07:49 +00:00
James Bennett fb5e58f82d [1.1.X] Update setup.py for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 21:08:21 +00:00
James Bennett 347346159b [1.1.X] Bump version number for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 21:06:09 +00:00
Jacob Kaplan-Moss e3e992e18b [1.1.X] SECURITY ALERT: Corrected regular expressions for URL and email fields.
Certain email addresses/URLs could trigger a catastrophic backtracking
situation, causing 100% CPU and server overload. If deliberately triggered, this
could be the basis of a denial-of-service attack.

This security vulnerability was disclosed in public, so we're skipping our
normal security release process to get the fix out as soon as possible.

This is a security related update. A full announcement will follow.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-09 20:59:05 +00:00
Russell Keith-Magee 17173ac65a [1.1.X] Fixed #11995 -- Modified the admin site definition for comments so that users are shown as a raw id list. Thanks to James Bennett for the report and patch.
Backport of r11601 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-08 13:32:23 +00:00
Luke Plant c557ea6c12 [1.1.X] Fixed #9674 - documented app_label.
Thanks to andymckay for the report and jpaulett for the patch.

Backport for [11596] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-28 22:04:20 +00:00
James Bennett f8c97127bb [1.1.X] Fixed #11931: Removed mention of nonexistent get_sql() method for arguments to limit_choices_to. Since the correct reference involves undocumented ORM internals, this simply removes the reference entirely in favor of publicly-documented use of Q objects. Backport of [11591] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-23 23:41:35 +00:00
James Bennett 880a447497 [1.1.X] The 1.1.X branch has been created, so that needs to be past tense. Backport of [11588] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-22 21:21:45 +00:00
Russell Keith-Magee f6eb522a81 [1.1.X] Marked r11577 as merged
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16 12:23:04 +00:00
Russell Keith-Magee a7dd69c079 [1.1.X] Fixed some ReST markup in admin installation docs.
Merge of r11580 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16 12:19:44 +00:00
Russell Keith-Magee 5074a43241 [1.1.X] Fixed counting error in admin installation overview docs.
Merge of r11579 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16 12:16:27 +00:00
Russell Keith-Magee a2c7fe52a8 [1.1.X] Fixed #11886 -- Corrected handling of F() expressions that use parentheses. Thanks to Brent Hagany for the report.
Merge of r11581 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16 12:12:54 +00:00
Justin Bronn 6febb7ef15 [1.1.X] Fixed #11827: Can now calculate extent in Oracle on tables with one point.
Backport of r11577 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 17:46:44 +00:00
Russell Keith-Magee ba925def49 [1.1.X] Updated svnmerge properties
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 17:04:47 +00:00
Justin Bronn 5f68bf0182 [1.1.X] Fixed #11624: `render_to_kmz` no longer balks on non-ASCII data.
Backport of r11527 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 16:14:58 +00:00
Russell Keith-Magee 0c222b61b4 [1.1.X] Fixed #11746 -- Marked a string for translation in the FR localflavor. Thanks to iapain for the report and patch.
Merge of r11552 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:34:11 +00:00
Russell Keith-Magee e5b3ffcd37 [1.1.X] Fixed #11820 -- Corrected the spelling of Grace Hopper's name in a test. Thanks to shields@msrl.com for the report, and apologies to Admiral Hopper for the error.
Merge of r11551 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:34:02 +00:00
Russell Keith-Magee db1768becd [1.1.X] Fixed #11862 -- Corrected an error in the Hebrew translation. Thanks to Adam Rimon for the fix.
Merge of r11550 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:49 +00:00
Russell Keith-Magee d30dd3e9c9 [1.1.X] Fixed #11755 -- Added documentation for an edge case of FormSet usage. Thanks to ffualo for the suggestion.
Merge of r11549 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:35 +00:00
Russell Keith-Magee 2075da3525 [1.1.X] Fixed #11740 -- Added extra detail on the behavior of ModelForms. Thanks to severian for the suggestion.
Merge of r11548 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:18 +00:00
Russell Keith-Magee 05c087300c [1.1.X] Fixed #9414 -- Clarified the documentation on the permission decorators. Thanks to timo for the patch.
Merge of r11547 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:09 +00:00
Russell Keith-Magee ceee67fba8 [1.1.X] Fixed #11873 -- Corrected typo in generic views docs. Thanks to Brett Cannon for the report.
Merge of r11546 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:33:02 +00:00
Russell Keith-Magee e9d1a7e98a [1.1.X] Fixed #11073 -- Added documentation for SESSION_COOKIE_PATH. Thanks to liling for the report, and gsong for the patch.
Merge of r11545 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:53 +00:00
Russell Keith-Magee b5ee4ad4ba [1.1.X] Fixed #10864 -- Clarified the role played by redirect_to_field in the login_required auth decorator. Thanks to trigeek38 for the suggestion, and SmileyChris for the draft.
Merge of r11544 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:42 +00:00
Russell Keith-Magee 5312e7b40a [1.1.X] Fixed #9236 -- Added documentation on the dependencies of the admin.
Merge of r11543 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:31 +00:00
Russell Keith-Magee 91bbfc57df [1.1.X] Added the SVN internal docs to the internal docs index.
Merge of r11542 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:19 +00:00
Russell Keith-Magee 4d84513795 [1.1.X] Fixed #6047 -- Minor correction to the documentation regarding regex field lookups. Thanks to Richard D. Worth for the suggestion, and Steve Holden for the text.
Merge of r11541 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:09 +00:00
Russell Keith-Magee bea1678a10 [1.1.X] Fixed #11359 -- Added a link to the signals topic guide in the signals reference. Thanks to tyson for the suggestion.
Merge of r11540 and r11554 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:32:00 +00:00
Russell Keith-Magee 6988dad101 [1.1.X] Fixed #11592 -- Corrected the grammar in the queryset docs. Thanks to Shannon Bradshaw for the report.
Merge of r11539 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:50 +00:00
Russell Keith-Magee d57f98b8e8 [1.1.X] Fixed #11628 -- Corrected the tutorial, removing instructions to update the year where that isn't required. Thanks to tommstein for the report.
Merge of r11538 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:40 +00:00
Russell Keith-Magee 9815484905 [1.1.X] Fixed #11659 -- Corrected a minor typo in the v1.1 release notes. Thanks to agabel for the report.
Merge of r11537 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:26 +00:00
Russell Keith-Magee 753d79a479 [1.1.X] Fixed #11728 -- Corrected a typo in a class name in the request/response docs. Thanks to Tommstein for the report.
Merge of r11536 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:17 +00:00
Russell Keith-Magee 9908d7649f [1.1.X] Fixed #11780 -- Corrected a typo in the static file serving docs.
Merge of r11535 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:31:04 +00:00
Russell Keith-Magee 1fde940414 [1.1.X] Fixed #11808 -- Corrected typo in admin docs. Thanks to kratorius for the patch.
Merge of r11534 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:30:50 +00:00
Russell Keith-Magee 0fc36e4f91 [1.1.X] Fixed #11831 -- Corrected typo in comments docs. Thanks to gsf for the patch.
Merge of r11533 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 06:30:36 +00:00
Russell Keith-Magee 10e3c9f1e0 [1.1.X] Fixed #11589 -- Corrected an argument in the shortcuts documentation. Thanks to tsaylor for the report.
Merge of r11531 and r11532 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-13 04:54:48 +00:00
Russell Keith-Magee 39c53b4bf3 [1.1.X] Fixed #11660 -- Corrected the CONTENT_TYPE and CONTENT_LENGTH headers provided by the mod_python handler. Thanks to Nowell Strite and Tareque Hossain for the report and fix.
Merge of r11528 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-12 22:05:23 +00:00
Russell Keith-Magee f03a1ab1b1 [1.1.X] Initialized svnmerge properties.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-12 22:02:08 +00:00
James Bennett 69aed8db4b [1.1.X] Document the fact that we now put dead branches in the attic. Backport of r11523 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-11 22:00:24 +00:00
James Bennett 350d7ad5a1 This branch is 1.1.1 pre-alpha.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-11 19:08:55 +00:00
James Bennett d201d57ffa Create 1.1 release branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-11 19:05:24 +00:00
519 changed files with 25284 additions and 5448 deletions

23
AUTHORS
View File

@ -16,6 +16,8 @@ The PRIMARY AUTHORS are (and/or have been):
* Brian Rosner
* Justin Bronn
* Karen Tracey
* Jannis Leidel
* James Tauber
More information on the main contributors to Django can be found in
docs/internals/committers.txt.
@ -24,6 +26,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made Django that much better:
Gisle Aas <gisle@aas.no>
ajs <adi@sieker.info>
alang@bright-green.com
Marty Alchin <gulopine@gamemusic.org>
@ -52,6 +55,7 @@ answer newbie questions, and generally made Django that much better:
Niran Babalola <niran@niran.org>
Morten Bagai <m@bagai.com>
Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
Randy Barlow <randy@electronsweatshop.com>
Scott Barr <scott@divisionbyzero.com.au>
Jiri Barton
Ned Batchelder <http://www.nedbatchelder.com/>
@ -64,7 +68,7 @@ answer newbie questions, and generally made Django that much better:
James Bennett
Julian Bez
Arvis Bickovskis <viestards.lists@gmail.com>
Natalia Bidart
Natalia Bidart <nataliabidart@gmail.com>
Paul Bissex <http://e-scribe.com/>
Simon Blanchard
David Blewett <david@dawninglight.net>
@ -132,7 +136,7 @@ answer newbie questions, and generally made Django that much better:
Andrew Durdin <adurdin@gmail.com>
dusk@woofle.net
Andy Dustman <farcepest@gmail.com>
J. Clifford Dyer <jcd@unc.edu>
J. Clifford Dyer <jcd@sdf.lonestar.org>
Clint Ecker
Nick Efford <nick@efford.org>
eibaan@gmail.com
@ -168,6 +172,7 @@ answer newbie questions, and generally made Django that much better:
Alex Gaynor <alex.gaynor@gmail.com>
Andy Gayton <andy-django@thecablelounge.com>
Idan Gazit
geber@datacollect.com
Baishampayan Ghose
Dimitris Glezos <dimitris@glezos.com>
glin@seznam.cz
@ -177,11 +182,13 @@ answer newbie questions, and generally made Django that much better:
GomoX <gomo@datafull.com>
Guilherme Mesquita Gondim <semente@taurinus.org>
Mario Gonzalez <gonzalemario@gmail.com>
David Gouldin <dgouldin@gmail.com>
pradeep.gowda@gmail.com
Collin Grady <collin@collingrady.com>
Simon Greenhill <dev@simon.net.nz>
Owen Griffiths
Espen Grindhaug <http://grindhaug.org/>
Janos Guljas
Thomas Güttler <hv@tbz-pariv.de>
Horst Gutmann <zerok@zerokspot.com>
Scot Hacker <shacker@birdhouse.org>
@ -202,6 +209,7 @@ answer newbie questions, and generally made Django that much better:
Kieran Holland <http://www.kieranholland.com>
Sung-Jin Hong <serialx.net@gmail.com>
Leo "hylje" Honkanen <sealage@gmail.com>
Tareque Hossain <http://www.codexn.com>
Richard House <Richard.House@i-logue.com>
Robert Rock Howard <http://djangomojo.com/>
John Huddleston <huddlej@wwu.edu>
@ -261,11 +269,11 @@ answer newbie questions, and generally made Django that much better:
Finn Gruwier Larsen <finn@gruwier.dk>
Lau Bech Lauritzen
Rune Rønde Laursen <runerl@skjoldhoej.dk>
Mark Lavin <markdlavin@gmail.com>
Eugene Lazutkin <http://lazutkin.com/blog/>
lcordier@point45.com
Jeong-Min Lee <falsetru@gmail.com>
Tai Lee <real.human@mrmachine.net>
Jannis Leidel <jl@websushi.org>
Christopher Lenz <http://www.cmlenz.net/>
lerouxb@gmail.com
Piotr Lewandowski <piotr.lewandowski@gmail.com>
@ -295,6 +303,7 @@ answer newbie questions, and generally made Django that much better:
Jason McBrayer <http://www.carcosa.net/jason/>
Kevin McConnell <kevin.mcconnell@gmail.com>
mccutchen@gmail.com
Paul McLanahan <paul@mclanahan.net>
Christian Metts
michael.mcewan@gmail.com
michal@plovarna.cz
@ -374,8 +383,10 @@ answer newbie questions, and generally made Django that much better:
Vinay Sajip <vinay_sajip@yahoo.co.uk>
Kadesarin Sanjek
Massimo Scamarcia <massimo.scamarcia@gmail.com>
Paulo Scardine <paulo@scardine.com.br>
David Schein
Bernd Schlapsi
schwank@gmail.com
scott@staplefish.com
Ilya Semenov <semenov@inetss.com>
serbaut@gmail.com
@ -388,6 +399,7 @@ answer newbie questions, and generally made Django that much better:
Ben Slavin <benjamin.slavin@gmail.com>
sloonz <simon.lipp@insa-lyon.fr>
SmileyChris <smileychris@gmail.com>
Paul Smith <blinkylights23@gmail.com>
Warren Smith <warren@wandrsmith.net>
smurf@smurf.noris.de
Vsevolod Solovyov
@ -401,7 +413,7 @@ answer newbie questions, and generally made Django that much better:
Vasiliy Stavenko <stavenko@gmail.com>
Thomas Steinacher <http://www.eggdrop.ch/>
Johan C. Stöver <johan@nilling.nl>
nowell strite
Nowell Strite <http://nowell.strite.org/>
Thomas Stromberg <tstromberg@google.com>
Pascal Varet
SuperJared
@ -420,7 +432,7 @@ answer newbie questions, and generally made Django that much better:
Travis Terry <tdterry7@gmail.com>
thebjorn <bp@datakortet.no>
Zach Thompson <zthompson47@gmail.com>
Michael Thornhill
Michael Thornhill <michael.thornhill@gmail.com>
Deepak Thukral <deep.thukral@gmail.com>
tibimicu@gmx.net
tobias@neuyork.de
@ -433,6 +445,7 @@ answer newbie questions, and generally made Django that much better:
tt@gurgle.no
David Tulig <david.tulig@gmail.com>
Amit Upadhyay <http://www.amitu.com/blog/>
Adam Vandenberg
Geert Vanderkelen
Vasil Vangelovski
I.S. van Oostveen <v.oostveen@idca.nl>

View File

@ -5,9 +5,6 @@ this command from the command prompt:
python setup.py install
Note this requires a working Internet connection if you don't already have the
Python utility "setuptools" installed.
AS AN ALTERNATIVE, you can just copy the entire "django" directory to Python's
site-packages directory, which is located wherever your Python installation
lives. Some places you might check are:
@ -16,7 +13,4 @@ lives. Some places you might check are:
/usr/lib/python2.3/site-packages (Unix, Python 2.3)
C:\\PYTHON\site-packages (Windows)
This second solution does not require a working Internet connection; it
bypasses "setuptools" entirely.
For more detailed instructions, see docs/intro/install.txt.

5
README
View File

@ -11,8 +11,7 @@ how we recommend you read the docs:
docs/intro/tutorial02.txt, etc.).
* If you want to set up an actual deployment server, read
docs/howto/deployment/modpython.txt for instructions on running Django
under mod_python.
docs/howto/deployment/index.txt for instructions.
* You'll probably want to read through the topical guides (in docs/topics)
next; from there you can jump to the HOWTOs (in docs/howto) for specific
@ -27,7 +26,7 @@ http://code.djangoproject.com/newticket
To get more help:
* Join the #django channel on irc.freenode.net. Lots of helpful people
hang out there. Read the archives at http://oebfare.com/logger/django/.
hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
* Join the django-users mailing list, or read the archives, at
http://groups.google.com/group/django-users.

View File

@ -1,4 +1,4 @@
VERSION = (1, 2, 0, 'alpha', 0)
VERSION = (1, 1, 4, 'final', 0)
def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1])

View File

@ -102,7 +102,7 @@ class Settings(object):
new_installed_apps.append(app)
self.INSTALLED_APPS = new_installed_apps
if hasattr(time, 'tzset'):
if hasattr(time, 'tzset') and getattr(self, 'TIME_ZONE'):
# Move the time zone info into os.environ. See ticket #2315 for why
# we don't do this unconditionally (breaks Windows).
os.environ['TZ'] = self.TIME_ZONE

View File

@ -42,8 +42,9 @@ LANGUAGE_CODE = 'en-us'
# should be the utf-8 encoded local name for the language.
LANGUAGES = (
('ar', gettext_noop('Arabic')),
('bn', gettext_noop('Bengali')),
('bg', gettext_noop('Bulgarian')),
('bn', gettext_noop('Bengali')),
('bs', gettext_noop('Bosnian')),
('ca', gettext_noop('Catalan')),
('cs', gettext_noop('Czech')),
('cy', gettext_noop('Welsh')),
@ -52,27 +53,28 @@ LANGUAGES = (
('el', gettext_noop('Greek')),
('en', gettext_noop('English')),
('es', gettext_noop('Spanish')),
('et', gettext_noop('Estonian')),
('es-ar', gettext_noop('Argentinean Spanish')),
('et', gettext_noop('Estonian')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
('fi', gettext_noop('Finnish')),
('fr', gettext_noop('French')),
('fy-nl', gettext_noop('Frisian')),
('ga', gettext_noop('Irish')),
('gl', gettext_noop('Galician')),
('hu', gettext_noop('Hungarian')),
('he', gettext_noop('Hebrew')),
('hi', gettext_noop('Hindi')),
('hr', gettext_noop('Croatian')),
('hu', gettext_noop('Hungarian')),
('is', gettext_noop('Icelandic')),
('it', gettext_noop('Italian')),
('ja', gettext_noop('Japanese')),
('ka', gettext_noop('Georgian')),
('ko', gettext_noop('Korean')),
('km', gettext_noop('Khmer')),
('kn', gettext_noop('Kannada')),
('lv', gettext_noop('Latvian')),
('ko', gettext_noop('Korean')),
('lt', gettext_noop('Lithuanian')),
('lv', gettext_noop('Latvian')),
('mk', gettext_noop('Macedonian')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
@ -83,7 +85,9 @@ LANGUAGES = (
('ru', gettext_noop('Russian')),
('sk', gettext_noop('Slovak')),
('sl', gettext_noop('Slovenian')),
('sq', gettext_noop('Albanian')),
('sr', gettext_noop('Serbian')),
('sr-latn', gettext_noop('Serbian Latin')),
('sv', gettext_noop('Swedish')),
('ta', gettext_noop('Tamil')),
('te', gettext_noop('Telugu')),

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-07 15:04+0200\n"
"POT-Creation-Date: 2009-11-30 11:39+0100\n"
"PO-Revision-Date: 2009-03-24 13:28+0100\n"
"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
@ -223,7 +223,7 @@ msgstr "xinès tradicional"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
msgid "Are you sure?"
msgstr "Esteu segurs?"
@ -266,15 +266,15 @@ msgstr "Aquest mes"
msgid "This year"
msgstr "Aquest any"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "Yes"
msgstr "Si"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "No"
msgstr "No"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
msgid "Unknown"
msgstr "Desconegut"
@ -344,27 +344,27 @@ msgstr "Eliminat %(name)s \"%(object)s\"."
msgid "No fields changed."
msgstr "Cap camp canviat."
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "El/la %(name)s \"%(obj)s\".ha estat afegit/da amb èxit."
#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/admin/options.py:603 contrib/admin/options.py:636
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Podeu editar-lo de nou a baix."
#: contrib/admin/options.py:612 contrib/admin/options.py:645
#: contrib/admin/options.py:613 contrib/admin/options.py:646
#, python-format
msgid "You may add another %s below."
msgstr "Podeu afegir un altre %s a baix."
#: contrib/admin/options.py:633
#: contrib/admin/options.py:634
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
#: contrib/admin/options.py:641
#: contrib/admin/options.py:642
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@ -372,43 +372,43 @@ msgstr ""
"S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou "
"abaix."
#: contrib/admin/options.py:772
#: contrib/admin/options.py:773
#, python-format
msgid "Add %s"
msgstr "Afegir %s"
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "No existèix cap objecte %(name)s amb la clau primària %(key)r."
#: contrib/admin/options.py:860
#: contrib/admin/options.py:861
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
#: contrib/admin/options.py:904
#: contrib/admin/options.py:905
msgid "Database error"
msgstr "Error de base de dades"
#: contrib/admin/options.py:940
#: contrib/admin/options.py:941
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit."
msgstr[1] "%(count)s %(name)s s'han modificat amb èxit."
#: contrib/admin/options.py:1018
#: contrib/admin/options.py:1020
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "El/la %(name)s \"%(obj)s\" ha estat eliminat amb èxit."
#: contrib/admin/options.py:1054
#: contrib/admin/options.py:1057
#, python-format
msgid "Change history: %s"
msgstr "Modificar històric: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
#: contrib/auth/forms.py:80
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
@ -417,11 +417,11 @@ msgstr ""
"Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
"compte que tots dos camps son sensibles a majúscules i minúscules."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:288 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Si us plau, identifiqueu-vos de nou doncs la vostra sessió ha expirat."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:295 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@ -430,29 +430,29 @@ msgstr ""
"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu "
"aquesta pàgina i proveu-ho de nou. "
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:311 contrib/admin/sites.py:317
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Els noms d'usuari no poden contenir el caracter '@'."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:314 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot "
"cas."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:370
msgid "Site administration"
msgstr "Lloc administratiu"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:384 contrib/admin/templates/admin/login.html:26
#: contrib/admin/templates/registration/password_reset_complete.html:14
#: contrib/admin/views/decorators.py:20
msgid "Log in"
msgstr "Iniciar sessió"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:429
#, python-format
msgid "%s administration"
msgstr "Administració de %s"
@ -467,27 +467,27 @@ msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Un o més %(fieldname)s en %(name)s:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Date:"
msgstr "Data:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Time:"
msgstr "Hora:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Currently:"
msgstr "Actualment:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Change:"
msgstr "Modificar:"
#: contrib/admin/widgets.py:124
#: contrib/admin/widgets.py:125
msgid "Lookup"
msgstr "Cercar"
#: contrib/admin/widgets.py:236
#: contrib/admin/widgets.py:237
msgid "Add Another"
msgstr "Afegir un altre"
@ -502,7 +502,7 @@ msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada"
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -555,18 +555,18 @@ msgstr "Anar"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Benvingut/da,"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:32
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Documentació"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -574,7 +574,7 @@ msgstr "Documentació"
msgid "Change password"
msgstr "Canviar contrasenya"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -600,7 +600,7 @@ msgstr "Històric"
#: contrib/admin/templates/admin/change_form.html:28
#: contrib/admin/templates/admin/edit_inline/stacked.html:13
#: contrib/admin/templates/admin/edit_inline/tabular.html:27
#: contrib/admin/templates/admin/edit_inline/tabular.html:28
msgid "View on site"
msgstr "Veure al lloc"
@ -670,9 +670,9 @@ msgstr ""
#, python-format
msgid ""
"Are you sure you want to delete the selected %(object_name)s objects? All of "
"the following objects and it's related items will be deleted:"
"the following objects and their related items will be deleted:"
msgstr ""
"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats?Tots "
"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats? Tots "
"aquests objectes i els seus elements relacionats s'esborraran:"
#: contrib/admin/templates/admin/filter.html:2
@ -985,7 +985,7 @@ msgstr "Adreça de correu electrònic:"
msgid "Reset my password"
msgstr "Restablir la meva contrasenya"
#: contrib/admin/templatetags/admin_list.py:299
#: contrib/admin/templatetags/admin_list.py:304
msgid "All dates"
msgstr "Totes les dates"
@ -1007,145 +1007,145 @@ msgstr "lloc"
msgid "template"
msgstr "plantilla"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "etiqueta:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filtre:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "vista:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "No s'ha pogut trobar l'aplicació %r"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "El model %(model_name)r no s'ha trobat en l'aplicació %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "l'objecte relacionat `%(app_label)s.%(data_type)s`"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "model:"
#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "objectes relacionats `%(app_label)s.%(object_name)s`"
#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "tots %s"
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "nombre de %s"
#: contrib/admindocs/views.py:268
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Camps en objectes %s"
#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350
#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Enter"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Booleà (Verdader o Fals)"
#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (de fins a %(max_length)s)"
#: contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Enters separats per comes"
#: contrib/admindocs/views.py:335
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Data (sense hora)"
#: contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Data (amb hora)"
#: contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Número decimal"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "Adreça de correu electrònic"
#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340
#: contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Ruta del fitxer"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Número amb punt de coma flotant"
#: contrib/admindocs/views.py:345 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "Adreça IP"
#: contrib/admindocs/views.py:347
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Booleà (Verdader, Fals o 'None' (cap))"
#: contrib/admindocs/views.py:348
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Relació amb el model pare"
#: contrib/admindocs/views.py:349
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Número de telèfon"
#: contrib/admindocs/views.py:354
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Text"
#: contrib/admindocs/views.py:355
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Hora"
#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:357
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Estat dels E.U.A. (dues lletres majúscules)"
#: contrib/admindocs/views.py:358
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "Text XML"
#: contrib/admindocs/views.py:384
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s no sembla ser un objecte 'urlpattern'"
@ -1442,7 +1442,7 @@ msgstr "missatge"
msgid "Logged out"
msgstr "Sessió finalitzada"
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Introduïu una adreça de correu vàlida."
@ -2615,6 +2615,10 @@ msgstr "Validació invàlida del número de compte bancari."
msgid "Enter a valid Finnish social security number."
msgstr "Introduïu un número vàlid de la seguretat social finlandesa."
#: contrib/localflavor/fr/forms.py:30
msgid "Phone numbers must be in 0X XX XX XX XX format."
msgstr "El número de telèfon ha de estar en el format 0X XX XX XX XX."
#: contrib/localflavor/in_/forms.py:14
msgid "Enter a zip code in the format XXXXXXX."
msgstr "Introduïu un codi zip en el format XXXXXXX."
@ -3053,7 +3057,8 @@ msgstr "Validació invàlida del número tributari (NIP)."
#: contrib/localflavor/pl/forms.py:109
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
msgstr ""
"El número nacional de registre de negocis (REGON) consisteix en 9 o 14 dígits."
"El número nacional de registre de negocis (REGON) consisteix en 9 o 14 "
"dígits."
#: contrib/localflavor/pl/forms.py:110
msgid "Wrong checksum for the National Business Register Number (REGON)."
@ -3962,95 +3967,95 @@ msgstr[1] ""
"Si us plau, introduïu IDs de %(self)s vàlids. Els valors %(value)r són "
"invàlids."
#: forms/fields.py:54
#: forms/fields.py:53
msgid "This field is required."
msgstr "Aquest camp és obligatori."
#: forms/fields.py:55
#: forms/fields.py:54
msgid "Enter a valid value."
msgstr "Introduïu un valor vàlid."
#: forms/fields.py:138
#: forms/fields.py:137
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %"
"(length)d)."
#: forms/fields.py:139
#: forms/fields.py:138
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Assegureu-vos de que el valor té com a mínim %(min)d caràcters (en té %"
"(length)d)."
#: forms/fields.py:166
#: forms/fields.py:165
msgid "Enter a whole number."
msgstr "Introduïu un número sencer."
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#: forms/fields.py:166 forms/fields.py:195 forms/fields.py:224
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Aquest valor ha de ser menor o igual a %s."
#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Assegureu-vos de que aquest valor sigui superior o igual a %s."
#: forms/fields.py:195 forms/fields.py:224
#: forms/fields.py:194 forms/fields.py:223
msgid "Enter a number."
msgstr "Introduïu un número."
#: forms/fields.py:227
#: forms/fields.py:226
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assegureu-vos de que no hi ha més de %s dígits en total."
#: forms/fields.py:228
#: forms/fields.py:227
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assegureu-vos de que no hi ha més de %s decimals."
#: forms/fields.py:229
#: forms/fields.py:228
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assegureu-vos de que no hi ha més de %s dígits decimals."
#: forms/fields.py:288 forms/fields.py:863
#: forms/fields.py:287 forms/fields.py:862
msgid "Enter a valid date."
msgstr "Introduïu una data vàlida."
#: forms/fields.py:322 forms/fields.py:864
#: forms/fields.py:321 forms/fields.py:863
msgid "Enter a valid time."
msgstr "Introduïu una hora vàlida."
#: forms/fields.py:361
#: forms/fields.py:360
msgid "Enter a valid date/time."
msgstr "Introduïu una data/hora vàlides."
#: forms/fields.py:447
#: forms/fields.py:446
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No s'ha enviat cap fitxer. Comprovi el tipus de codificació del formulari."
#: forms/fields.py:448
#: forms/fields.py:447
msgid "No file was submitted."
msgstr "No s'ha enviat cap fitxer."
#: forms/fields.py:449
#: forms/fields.py:448
msgid "The submitted file is empty."
msgstr "El fitxer enviat està buit."
#: forms/fields.py:450
#: forms/fields.py:449
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Assegureu-vos de que el valor té com a màxim %(max)d caràcters "
"(en té %(length)d)."
"Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %"
"(length)d)."
#: forms/fields.py:483
#: forms/fields.py:482
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4058,28 +4063,28 @@ msgstr ""
"Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o "
"estava corrupte."
#: forms/fields.py:544
#: forms/fields.py:543
msgid "Enter a valid URL."
msgstr "Introduïu una URL vàlida."
#: forms/fields.py:545
#: forms/fields.py:544
msgid "This URL appears to be a broken link."
msgstr "Aquesta URL sembla ser un enllaç trencat."
#: forms/fields.py:625 forms/fields.py:703
#: forms/fields.py:624 forms/fields.py:702
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:1003
msgid "Enter a list of values."
msgstr "Introduïu una llista de valors."
#: forms/fields.py:892
#: forms/fields.py:891
msgid "Enter a valid IPv4 address."
msgstr "Introduïu una adreça IPv4 vàlida."
#: forms/fields.py:902
#: forms/fields.py:901
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
@ -4108,7 +4113,9 @@ msgstr "Si us plau, corregiu la dada duplicada per a %(field)s."
#: forms/models.py:598
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser única."
msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser "
"única."
#: forms/models.py:604
#, python-format
@ -4116,8 +4123,8 @@ msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field_name)s, "
"la qual ha de ser única per a la cerca %(lookup)s en %(date_field)s."
"Si us plau, corregiu la dada duplicada per a %(field_name)s, la qual ha de "
"ser única per a la cerca %(lookup)s en %(date_field)s."
#: forms/models.py:612
msgid "Please correct the duplicate values below."

View File

@ -1,13 +1,15 @@
# Translation of djangojs.po to Czech
# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the DJANGO package.
# Radek Svarz <translate@svarz.cz>, 2005.
# Radek Svarz <translate@svarz.cz>, 2005,
# Vláďa Macek <macek@sandbox.cz>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-20 12:52+0200\n"
"PO-Revision-Date: 2009-10-12 11:25+0200\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -17,7 +19,7 @@ msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
msgid "Available %s"
msgstr "Dostupná %s"
msgstr "Dostupné položky: %s"
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
@ -34,7 +36,7 @@ msgstr "Odebrat"
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
msgid "Chosen %s"
msgstr "Vybraná %s"
msgstr "Vybrané položky: %s"
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
@ -50,12 +52,12 @@ msgid ""
"January February March April May June July August September October November "
"December"
msgstr ""
"Leden Únor Březen Duben Květen Červen Červenec Srpen Září Říjen Listopad "
"Prosinec"
"leden únor březen duben květen červen červenec srpen září říjen listopad "
"prosinec"
#: contrib/admin/media/js/calendar.js:25
msgid "S M T W T F S"
msgstr "N P U S C P S"
msgstr "n p ú s č p s"
#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
@ -64,7 +66,7 @@ msgstr "Neděle Pondělí Úterý Středa Čtvrtek Pátek Sobota"
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
msgid "Show"
msgstr "Ukázat"
msgstr "Zobrazit"
#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
msgid "Hide"
@ -89,7 +91,7 @@ msgstr "Půlnoc"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
msgstr "6 ráno"
msgstr "6h ráno"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"

View File

@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-07 15:15+0200\n"
"PO-Revision-Date: 2009-07-07 15:22+0200\n"
"POT-Creation-Date: 2009-11-30 11:39+0100\n"
"PO-Revision-Date: 2009-11-30 11:42+0100\n"
"Last-Translator: Django Spanish Team <django-cat@googlegroups.com>Language-"
"Team: Django Spanish Team <django-cat@googlegroups.com>MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -222,7 +222,7 @@ msgstr "chino tradicional"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Eliminado/s %(count)d %(items)s satisfactoriamente."
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
msgid "Are you sure?"
msgstr "¿Está seguro?"
@ -265,15 +265,15 @@ msgstr "Este mes"
msgid "This year"
msgstr "Este año"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "Yes"
msgstr "Sí"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "No"
msgstr "No"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
msgid "Unknown"
msgstr "Desconocido"
@ -343,70 +343,70 @@ msgstr "Eliminado/a \"%(object)s\" %(name)s."
msgid "No fields changed."
msgstr "No ha cambiado ningún campo."
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/admin/options.py:603 contrib/admin/options.py:636
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Puede editarlo de nuevo abajo."
#: contrib/admin/options.py:612 contrib/admin/options.py:645
#: contrib/admin/options.py:613 contrib/admin/options.py:646
#, python-format
msgid "You may add another %s below."
msgstr "Puede añadir otro %s abajo."
#: contrib/admin/options.py:633
#: contrib/admin/options.py:634
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"."
#: contrib/admin/options.py:641
#: contrib/admin/options.py:642
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
"Se añadió con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
#: contrib/admin/options.py:772
#: contrib/admin/options.py:773
#, python-format
msgid "Add %s"
msgstr "Añadir %s"
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "No existe ningún objeto %(name)s con la clave primaria %(key)r."
#: contrib/admin/options.py:860
#: contrib/admin/options.py:861
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
#: contrib/admin/options.py:904
#: contrib/admin/options.py:905
msgid "Database error"
msgstr "Error en la base de datos"
#: contrib/admin/options.py:940
#: contrib/admin/options.py:941
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] "%(count)s %(name)s fué modificado con éxito."
msgstr[1] "%(count)s %(name)s fueron modificados con éxito."
#: contrib/admin/options.py:1018
#: contrib/admin/options.py:1020
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
#: contrib/admin/options.py:1054
#: contrib/admin/options.py:1057
#, python-format
msgid "Change history: %s"
msgstr "Histórico de modificaciones: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
#: contrib/auth/forms.py:80
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
@ -415,11 +415,11 @@ msgstr ""
"Por favor, introduzca un nombre de usuario y contraseña correctos. Note que "
"ambos campos son sensibles a mayúsculas/minúsculas."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:288 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Por favor, inicie sesión de nuevo, ya que su sesión ha caducado."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:295 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@ -427,29 +427,29 @@ msgstr ""
"Parece que su navegador no está configurado para aceptar cookies. "
"Actívelas , recargue esta página, e inténtelo de nuevo."
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:311 contrib/admin/sites.py:317
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Los nombres de usuario no pueden contener el carácter '@'."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:314 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su "
"lugar."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:370
msgid "Site administration"
msgstr "Sitio administrativo"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:384 contrib/admin/templates/admin/login.html:26
#: contrib/admin/templates/registration/password_reset_complete.html:14
#: contrib/admin/views/decorators.py:20
msgid "Log in"
msgstr "Iniciar sesión"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:429
#, python-format
msgid "%s administration"
msgstr "Administración de %s"
@ -464,27 +464,27 @@ msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Uno o más %(fieldname)s en %(name)s:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Date:"
msgstr "Fecha:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Time:"
msgstr "Hora:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Currently:"
msgstr "Actualmente:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Change:"
msgstr "Modificar:"
#: contrib/admin/widgets.py:124
#: contrib/admin/widgets.py:125
msgid "Lookup"
msgstr "Buscar"
#: contrib/admin/widgets.py:236
#: contrib/admin/widgets.py:237
msgid "Add Another"
msgstr "Añadir otro"
@ -499,7 +499,7 @@ msgstr "Lo sentimos, pero no se encuentra la página solicitada."
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -553,18 +553,18 @@ msgstr "Ir"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Bienvenido/a,"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:32
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Documentación"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -572,7 +572,7 @@ msgstr "Documentación"
msgid "Change password"
msgstr "Cambiar contraseña"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -598,7 +598,7 @@ msgstr "Histórico"
#: contrib/admin/templates/admin/change_form.html:28
#: contrib/admin/templates/admin/edit_inline/stacked.html:13
#: contrib/admin/templates/admin/edit_inline/tabular.html:27
#: contrib/admin/templates/admin/edit_inline/tabular.html:28
msgid "View on site"
msgstr "Ver en el sitio"
@ -668,9 +668,9 @@ msgstr ""
#, python-format
msgid ""
"Are you sure you want to delete the selected %(object_name)s objects? All of "
"the following objects and it's related items will be deleted:"
"the following objects and their related items will be deleted:"
msgstr ""
"¿Está seguro de que quiere borrar los %(object_name)s? Los siguientes "
"¿Está seguro de que quiere borrar los %(object_name)s seleccionados? Los siguientes "
"objetos y sus elementos relacionados serán eliminados:"
#: contrib/admin/templates/admin/filter.html:2
@ -987,7 +987,7 @@ msgstr "Dirección de correo electrónico:"
msgid "Reset my password"
msgstr "Restablecer mi contraseña"
#: contrib/admin/templatetags/admin_list.py:299
#: contrib/admin/templatetags/admin_list.py:304
msgid "All dates"
msgstr "Todas las fechas"
@ -1009,146 +1009,146 @@ msgstr "sitio"
msgid "template"
msgstr "plantilla"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "etiqueta:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filtro:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "vista:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Aplicación %r no encontrada"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr ""
"El modelo %(model_name)r no se ha encontrado en la aplicación %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "el objeto relacionado `%(app_label)s.%(data_type)s`"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "modelo:"
#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "los objetos relacionados `%(app_label)s.%(object_name)s`"
#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "todo %s"
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "número de %s"
#: contrib/admindocs/views.py:268
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Campos en %s objetos"
#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350
#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Entero"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
#: contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
#: contrib/admindocs/views.py:335
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
#: contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Fecha (con hora)"
#: contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Número decimal"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "Dirección de correo electrónico"
#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340
#: contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Ruta de fichero"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Número en coma flotante"
#: contrib/admindocs/views.py:345 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "Dirección IP"
#: contrib/admindocs/views.py:347
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
#: contrib/admindocs/views.py:348
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Relación con el modelo padre"
#: contrib/admindocs/views.py:349
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Número de teléfono"
#: contrib/admindocs/views.py:354
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Texto"
#: contrib/admindocs/views.py:355
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Hora"
#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:357
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Estado de los EEUU (dos letras mayúsculas)"
#: contrib/admindocs/views.py:358
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "Texto XML"
#: contrib/admindocs/views.py:384
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s no parece ser un objeto urlpattern"
@ -1445,7 +1445,7 @@ msgstr "mensaje"
msgid "Logged out"
msgstr "Sesión terminada"
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida."
@ -1598,7 +1598,7 @@ msgstr "marcas de comentario"
#: contrib/comments/templates/comments/approve.html:4
msgid "Approve a comment"
msgstr "Aprovar un comentario"
msgstr "Aprobar un comentario"
#: contrib/comments/templates/comments/approve.html:7
msgid "Really make this comment public?"
@ -1815,8 +1815,8 @@ msgid ""
"An error occurred when transforming the geometry to the SRID of the geometry "
"form field."
msgstr ""
"Ocurrió un error al transformar la geometria al SRID de la geometria "
"del campo de formulario."
"Ocurrió un error al transformar la geometria al SRID de la geometria del "
"campo de formulario."
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
@ -2611,6 +2611,10 @@ msgstr "El número de cuenta bancaria es incorrecto."
msgid "Enter a valid Finnish social security number."
msgstr "Introduzca un número de seguro social finlandés válido."
#: contrib/localflavor/fr/forms.py:30
msgid "Phone numbers must be in 0X XX XX XX XX format."
msgstr "Los números de teléfono deben tener el formato 0X XX XX XX XX."
#: contrib/localflavor/in_/forms.py:14
msgid "Enter a zip code in the format XXXXXXX."
msgstr "Introduzca un código postal en el formato XXXXXXX."
@ -3052,7 +3056,8 @@ msgstr "El Número de Identificación Tributaria (NIP) es incorrecto."
#: contrib/localflavor/pl/forms.py:109
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
msgstr ""
"El Número Nacional de Registro de Negocios (REGON) consiste en 9 o 14 dígitos."
"El Número Nacional de Registro de Negocios (REGON) consiste en 9 o 14 "
"dígitos."
#: contrib/localflavor/pl/forms.py:110
msgid "Wrong checksum for the National Business Register Number (REGON)."
@ -3960,88 +3965,88 @@ msgstr[1] ""
"Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son "
"válidos."
#: forms/fields.py:54
#: forms/fields.py:53
msgid "This field is required."
msgstr "Este campo es obligatorio."
#: forms/fields.py:55
#: forms/fields.py:54
msgid "Enter a valid value."
msgstr "Introduzca un valor correcto."
#: forms/fields.py:138
#: forms/fields.py:137
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente "
"tiene %(length)d)."
#: forms/fields.py:139
#: forms/fields.py:138
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente "
"tiene %(length)d)."
#: forms/fields.py:166
#: forms/fields.py:165
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#: forms/fields.py:166 forms/fields.py:195 forms/fields.py:224
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Asegúrese de que este valor es menor o igual a %s."
#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Asegúrese de que este valor es mayor o igual a %s."
#: forms/fields.py:195 forms/fields.py:224
#: forms/fields.py:194 forms/fields.py:223
msgid "Enter a number."
msgstr "Introduzca un número."
#: forms/fields.py:227
#: forms/fields.py:226
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no hay más de %s dígitos en total."
#: forms/fields.py:228
#: forms/fields.py:227
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no hay más de %s decimales."
#: forms/fields.py:229
#: forms/fields.py:228
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no hay más de %s dígitos antes de la coma decimal."
#: forms/fields.py:288 forms/fields.py:863
#: forms/fields.py:287 forms/fields.py:862
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
#: forms/fields.py:322 forms/fields.py:864
#: forms/fields.py:321 forms/fields.py:863
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
#: forms/fields.py:361
#: forms/fields.py:360
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
#: forms/fields.py:447
#: forms/fields.py:446
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No se ha enviado ningún fichero. Compruebe el tipo de codificación en el "
"formulario."
#: forms/fields.py:448
#: forms/fields.py:447
msgid "No file was submitted."
msgstr "No se ha enviado ningún fichero"
#: forms/fields.py:449
#: forms/fields.py:448
msgid "The submitted file is empty."
msgstr "El fichero enviado está vacío."
#: forms/fields.py:450
#: forms/fields.py:449
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@ -4049,7 +4054,7 @@ msgstr ""
"Asegúrese de que su texto tiene no más de %(max)d caracteres (actualmente "
"tiene %(length)d)."
#: forms/fields.py:483
#: forms/fields.py:482
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4057,29 +4062,29 @@ msgstr ""
"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se "
"trataba de una imagen corrupta."
#: forms/fields.py:544
#: forms/fields.py:543
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
#: forms/fields.py:545
#: forms/fields.py:544
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
#: forms/fields.py:625 forms/fields.py:703
#: forms/fields.py:624 forms/fields.py:702
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Escoja una opción válida. %(value)s no es una de las opciones disponibles."
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:1003
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
#: forms/fields.py:892
#: forms/fields.py:891
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
#: forms/fields.py:902
#: forms/fields.py:901
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,119 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-27 09:59-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
msgid "Available %s"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:46
msgid "Add"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:48
msgid "Remove"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
msgid "Chosen %s"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
msgstr ""
#: contrib/admin/media/js/calendar.js:24
#: contrib/admin/media/js/dateparse.js:32
msgid ""
"January February March April May June July August September October November "
"December"
msgstr ""
#: contrib/admin/media/js/calendar.js:25
msgid "S M T W T F S"
msgstr ""
#: contrib/admin/media/js/collapse.js:9 contrib/admin/media/js/collapse.js:21
#: contrib/admin/media/js/collapse.min.js:1
msgid "Show"
msgstr ""
#: contrib/admin/media/js/collapse.js:16
#: contrib/admin/media/js/collapse.min.js:1
msgid "Hide"
msgstr ""
#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Now"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
msgid "Choose a time"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "Midnight"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "6 a.m."
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85
msgid "Noon"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:89
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:184
msgid "Cancel"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:129
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:178
msgid "Today"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:133
msgid "Calendar"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:176
msgid "Yesterday"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:180
msgid "Tomorrow"
msgstr ""

View File

@ -391,7 +391,7 @@ msgstr "הוספת %s"
#: contrib/admin/options.py:1003
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "הפריט %(name)s עם המקש %(key)r אינו קיים."
msgstr "הפריט %(name)s עם המפתח הראשי %(key)r אינו קיים."
#: contrib/admin/options.py:860
#, python-format

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
# translation of djangojs.po to Italiano
# translation of djangojs.po to Italian
# Italian translation for the django-admin JS files
# Copyright (C) 2006 the Lawrence Journal-World
# This file is distributed under the same license as the Django package.
@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-04-10 08:26+0200\n"
"PO-Revision-Date: 2009-07-26 17:51+0200\n"
"POT-Creation-Date: 2009-12-26 15:49+0100\n"
"PO-Revision-Date: 2009-12-26 16:09+0100\n"
"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
"Language-Team: Italian <django-it@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 0.3\n"
"X-Generator: KBabel 1.11.4\n"
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
@ -31,10 +31,9 @@ msgstr "Aggiungi"
#: contrib/admin/media/js/SelectFilter2.js:48
msgid "Remove"
msgstr "Rimuovi"
msgstr "Elimina"
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
#: contrib/admin/media/js/SelectFilter2.js:53, perl-format
msgid "Chosen %s"
msgstr "%s scelti"

View File

@ -1282,7 +1282,7 @@ msgstr "メールアドレスの一致するユーザはいません。本当に
#: contrib/auth/forms.py:135
#, python-format
msgid "Password reset on %s"
msgstr "%s にパスワードをリセット"
msgstr "%s のパスワードのリセット"
#: contrib/auth/forms.py:143
msgid "New password"

View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-08 15:34+0200\n"
"POT-Creation-Date: 2009-08-08 09:21+0200\n"
"PO-Revision-Date: 2008-08-28 13:58+0100\n"
"Last-Translator: Rudolph Froger <rudolphfroger@estrate.nl>\n"
"Language-Team: \n"
@ -224,7 +224,7 @@ msgstr "Traditioneel Chinees"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "%(count)d %(items)s succesvol verwijderd."
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
msgid "Are you sure?"
msgstr "Weet u het zeker?"
@ -322,7 +322,7 @@ msgstr "%s gewijzigd."
#: contrib/admin/options.py:519 contrib/admin/options.py:529
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
#: forms/models.py:587
#: forms/models.py:600
msgid "and"
msgstr "en"
@ -345,69 +345,69 @@ msgstr "%(name)s \"%(object)s\" verwijderd."
msgid "No fields changed."
msgstr "Geen velden gewijzigd."
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#: contrib/admin/options.py:599 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "De %(name)s \"%(obj)s\" is toegevoegd."
#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/admin/options.py:603 contrib/admin/options.py:636
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "U kunt dit hieronder weer bewerken."
#: contrib/admin/options.py:612 contrib/admin/options.py:645
#: contrib/admin/options.py:613 contrib/admin/options.py:646
#, python-format
msgid "You may add another %s below."
msgstr "U kunt hieronder de volgende %s toevoegen."
#: contrib/admin/options.py:633
#: contrib/admin/options.py:634
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Het wijzigen van %(name)s \"%(obj)s\" is geslaagd."
#: contrib/admin/options.py:641
#: contrib/admin/options.py:642
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "De %(name)s \"%(obj)s\" was toegevoegd. U kunt het hieronder wijzigen."
#: contrib/admin/options.py:772
#: contrib/admin/options.py:773
#, python-format
msgid "Add %s"
msgstr "Toevoegen %s"
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "%(name)s object met primaire sleutel %(key)r bestaat niet."
#: contrib/admin/options.py:860
#: contrib/admin/options.py:861
#, python-format
msgid "Change %s"
msgstr "Wijzig %s"
#: contrib/admin/options.py:904
#: contrib/admin/options.py:905
msgid "Database error"
msgstr "Databasefout"
#: contrib/admin/options.py:940
#: contrib/admin/options.py:941
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] "%(count)s %(name)s is succesvol gewijzigd."
msgstr[1] "%(count)s %(name)s zijn succesvol gewijzigd."
#: contrib/admin/options.py:1018
#: contrib/admin/options.py:1020
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "De verwijdering van %(name)s \"%(obj)s\" is geslaagd."
#: contrib/admin/options.py:1054
#: contrib/admin/options.py:1057
#, python-format
msgid "Change history: %s"
msgstr "Wijzigingsgeschiedenis: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14
#: contrib/auth/forms.py:80
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
@ -416,11 +416,11 @@ msgstr ""
"Voer een correcte gebruikersnaam en wachtwoord in. Let op, de velden zijn "
"hoofdletter-gevoelig."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Uw sessie is verlopen, meld u opnieuw aan."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@ -428,27 +428,27 @@ msgstr ""
"Het lijkt erop dat uw browser geen cookies accepteert. Zet het gebruik van "
"cookies aan in uw browser, laad deze pagina nogmaals en probeer het opnieuw."
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Gebruikersnamen mogen geen '@' teken bevatten."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Uw e-mailadres is niet uw gebruikersnaam. Probeer '%s' eens."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:367
msgid "Site administration"
msgstr "Sitebeheer"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
#: contrib/admin/templates/registration/password_reset_complete.html:14
#: contrib/admin/views/decorators.py:20
msgid "Log in"
msgstr "Inloggen"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:426
#, python-format
msgid "%s administration"
msgstr "%s beheer"
@ -498,7 +498,7 @@ msgstr "Onze excuses, maar de gevraagde pagina bestaat niet."
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -543,7 +543,7 @@ msgstr "Voer de geselecteerde actie uit"
#: contrib/admin/templates/admin/actions.html:4
msgid "Go"
msgstr "Zoek"
msgstr "Voer Uit"
#: contrib/admin/templates/admin/app_index.html:10
#: contrib/admin/templates/admin/index.html:19
@ -551,18 +551,18 @@ msgstr "Zoek"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Welkom,"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:32
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Documentatie"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -570,7 +570,7 @@ msgstr "Documentatie"
msgid "Change password"
msgstr "Wachtwoord wijzigen"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -659,8 +659,8 @@ msgid ""
"objects:"
msgstr ""
"Het verwijderen van %(object_name)s zal ook gerelateerde objecten "
"verwijderen. Echter, u heeft geen rechten om de volgende typen objecten "
"te verwijderen:"
"verwijderen. Echter, u heeft geen rechten om de volgende typen objecten te "
"verwijderen:"
#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
#, python-format
@ -668,8 +668,8 @@ msgid ""
"Are you sure you want to delete the selected %(object_name)s objects? All of "
"the following objects and it's related items will be deleted:"
msgstr ""
"Weet u zeker dat u %(object_name)s objecten wilt verwijderen? "
"Alle volgende objecten worden verwijderd:"
"Weet u zeker dat u %(object_name)s objecten wilt verwijderen? Alle volgende "
"objecten worden verwijderd:"
#: contrib/admin/templates/admin/filter.html:2
#, python-format
@ -752,6 +752,11 @@ msgstr ""
msgid "Show all"
msgstr "Alles tonen"
#: contrib/admin/templates/admin/pagination.html:11
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Opslaan"
#: contrib/admin/templates/admin/search_form.html:8
msgid "Search"
msgstr "Zoek"
@ -768,10 +773,6 @@ msgstr[1] "%(counter)s resultaten"
msgid "%(full_result_count)s total"
msgstr "%(full_result_count)s totaal"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Save"
msgstr "Opslaan"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save as new"
msgstr "Opslaan als nieuw item"
@ -997,144 +998,145 @@ msgstr "site"
msgid "template"
msgstr "sjabloon"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "tag:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filter:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "view:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Toepassing %r niet gevonden"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "Model %(model_name)r niet gevonden in toepassing %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "het gerelateerde `%(app_label)s.%(data_type)s` object"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "model:"
#: contrib/admindocs/views.py:237
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "gerelateerde `%(app_label)s.%(object_name)s` objecten"
#: contrib/admindocs/views.py:242
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "alle %s"
#: contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "aantal %s"
#: contrib/admindocs/views.py:252
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Velden van %s objecten"
#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326
#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Geheel getal"
#: contrib/admindocs/views.py:316
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Boolean (True danwel False)"
#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Karakterreeks (hooguit %(max_length)s)"
#: contrib/admindocs/views.py:318
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Komma-gescheiden gehele getallen"
#: contrib/admindocs/views.py:319
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Datum (zonder tijd)"
#: contrib/admindocs/views.py:320
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Datum (met tijd)"
#: contrib/admindocs/views.py:321
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Decimaal getal"
#: contrib/admindocs/views.py:322
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "E-mailadres"
#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324
#: contrib/admindocs/views.py:327
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Bestandspad"
#: contrib/admindocs/views.py:325
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Decimaal getal"
#: contrib/admindocs/views.py:329 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "IP-adres"
#: contrib/admindocs/views.py:331
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (True, False of None)"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Relatie tot oudermodel"
#: contrib/admindocs/views.py:333
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Telefoonnummer"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Tekst"
#: contrib/admindocs/views.py:339
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Tijd"
#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Staat van de VS (twee hoofdletters)"
#: contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "XML-tekst"
#: contrib/admindocs/views.py:368
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s lijkt geen urlpattern-object te zijn"
@ -1361,7 +1363,7 @@ msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
msgstr ""
"Gebruik '[algo]$[salt]$[hexdigest]' of gebruik het<a href=\"password/"
"Gebruik '[algo]$[salt]$[hexdigest]' of gebruik het <a href=\"password/"
"\">wachtwoord wijzigen formulier</a>."
#: contrib/auth/models.py:133
@ -1530,8 +1532,8 @@ msgid ""
"Check this box if the comment is inappropriate. A \"This comment has been "
"removed\" message will be displayed instead."
msgstr ""
"Vink dit vak aan indien de opmerking niet gepast is. Een \"Dit commentaar "
"is verwijderd\" bericht wordt dan getoond."
"Vink dit vak aan indien de opmerking niet gepast is. Een \"Dit commentaar is "
"verwijderd\" bericht wordt dan getoond."
#: contrib/comments/models.py:77
msgid "comments"
@ -1607,7 +1609,8 @@ msgstr "Bedankt voor het goedkeuren"
msgid ""
"Thanks for taking the time to improve the quality of discussion on our site"
msgstr ""
"Bedankt dat u de tijd heeft genomen om de kwaliteit van de discussie op onze site te verbeteren"
"Bedankt dat u de tijd heeft genomen om de kwaliteit van de discussie op onze "
"site te verbeteren"
#: contrib/comments/templates/comments/delete.html:4
msgid "Remove a comment"
@ -2190,12 +2193,12 @@ msgstr "Geef een postcode op in het formaat XXXXX of XXX XX."
#: contrib/localflavor/cz/forms.py:47
msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
msgstr ""
"Geef een geboorte nummer op in het formaat XXXXXX/XXXX or XXXXXXXXXX."
msgstr "Geef een geboorte nummer op in het formaat XXXXXX/XXXX or XXXXXXXXXX."
#: contrib/localflavor/cz/forms.py:48
msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
msgstr "Ongeldige optionele parameter Geslacht, geldige waarden zijn 'f' en 'm'"
msgstr ""
"Ongeldige optionele parameter Geslacht, geldige waarden zijn 'f' en 'm'"
#: contrib/localflavor/cz/forms.py:49
msgid "Enter a valid birth number."
@ -3035,7 +3038,8 @@ msgstr "Verkeerd controlecijfer voor het fiscaal nummer (NIP)."
#: contrib/localflavor/pl/forms.py:109
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
msgstr ""
"Het Nationaal Zakelijk Registratie Nummer (REGON) bestaat uit 9 of 14 cijfers."
"Het Nationaal Zakelijk Registratie Nummer (REGON) bestaat uit 9 of 14 "
"cijfers."
#: contrib/localflavor/pl/forms.py:110
msgid "Wrong checksum for the National Business Register Number (REGON)."
@ -3883,7 +3887,7 @@ msgstr "sites"
msgid "This value must be an integer."
msgstr "De waarde moet een geheel getal zijn."
#: db/models/fields/__init__.py:3883918
#: db/models/fields/__init__.py:388
msgid "This value must be either True or False."
msgstr "De waarde moet of True (Waar) of False (Onwaar) zijn."
@ -3912,8 +3916,8 @@ msgstr "Geef geldige datum/tijd in JJJJ-MM-DD UU:MM[:ss[.uuuuuu]] formaat."
msgid "This value must be a decimal number."
msgstr "De waarde moet een decimaal getal zijn."
#: db/models/fields/__init__.py:686
# Choose 'kommagetal' because it's user input.
#: db/models/fields/__init__.py:686
msgid "This value must be a float."
msgstr "De waarde moet een kommagetal zijn."
@ -3925,14 +3929,14 @@ msgstr "De waarde moet of None (leeg), True (Waar) of False (Onwaar) zijn."
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Geef een geldige tijd in UU:MM[:ss[.uuuuuu]] formaat."
#: db/models/fields/related.py:792
#: db/models/fields/related.py:816
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Houd \"Control\", of \"Command\" op een Mac, ingedrukt om meerdere te "
"selecteren."
#: db/models/fields/related.py:870
#: db/models/fields/related.py:894
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -3952,15 +3956,15 @@ msgstr "Geef een geldige waarde."
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Zorg ervoor dat waarde korter is dan %(max)d tekens (huidige lengte "
"%(length)d)."
"Zorg ervoor dat waarde korter is dan %(max)d tekens (huidige lengte %(length)"
"d)."
#: forms/fields.py:139
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Zorg ervoor dat deze tekst langer is dan %(min)d tekens (huidige lengte "
"%(length)d)."
"Zorg ervoor dat deze tekst langer is dan %(min)d tekens (huidige lengte %"
"(length)d)."
#: forms/fields.py:166
msgid "Enter a whole number."
@ -4026,7 +4030,8 @@ msgstr "Het verstuurde bestand is leeg."
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"De bestandsnaam mag maximaal %(max)d karakters bevatten (dit zijn er nu %(length)d)."
"De bestandsnaam mag maximaal %(max)d karakters bevatten (dit zijn er nu %"
"(length)d)."
#: forms/fields.py:483
msgid ""
@ -4049,7 +4054,7 @@ msgstr "Deze URL lijkt niet te werken."
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Selecteer een geldige keuze. %(value)s is geen beschikbare keuze."
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:962
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
msgid "Enter a list of values."
msgstr "Geef een lijst op met waardes."
@ -4078,43 +4083,45 @@ msgstr "%(field_name)s moet uniek zijn voor %(date_field)s %(lookup)s."
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Er bestaat al een %(model_name)s met eenzelfde %(field_label)s."
#: forms/models.py:581
#: forms/models.py:594
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Verbeter de dubbele gegevens voor %(field)s."
#: forms/models.py:585
#: forms/models.py:598
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Verbeter de dubbele gegevens voor %(field)s, welke uniek moet zijn."
#: forms/models.py:591
#: forms/models.py:604
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr "Verbeter de dubbele gegevens voor %(field_name)s, welke uniek moet "
"zijn voor de %(lookup)s in %(date_field)s."
msgstr ""
"Verbeter de dubbele gegevens voor %(field_name)s, welke uniek moet zijn voor "
"de %(lookup)s in %(date_field)s."
#: forms/models.py:599
#: forms/models.py:612
msgid "Please correct the duplicate values below."
msgstr "Verbeter de dubbele waarden hieronder."
#: forms/models.py:837
#: forms/models.py:867
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "De secundaire sleutel komt niet overeen met de primaire sleutel van "
"de bovenliggende instantie."
msgstr ""
"De secundaire sleutel komt niet overeen met de primaire sleutel van de "
"bovenliggende instantie."
#: forms/models.py:892
#: forms/models.py:930
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Selecteer een geldige keuze. Deze keuze is niet beschikbaar."
#: forms/models.py:963
#: forms/models.py:1004
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Selecteer een geldige keuze. %s is geen beschikbare keuze."
#: forms/models.py:965
#: forms/models.py:1006
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" is geen geldige waarde voor een primaire sleutel."
@ -4145,27 +4152,27 @@ msgstr "%.1f MB"
msgid "%.1f GB"
msgstr "%.1f GB"
#: utils/dateformat.py:41
#: utils/dateformat.py:42
msgid "p.m."
msgstr "p.m."
#: utils/dateformat.py:42
#: utils/dateformat.py:43
msgid "a.m."
msgstr "a.m."
#: utils/dateformat.py:47
#: utils/dateformat.py:48
msgid "PM"
msgstr "PM"
#: utils/dateformat.py:48
#: utils/dateformat.py:49
msgid "AM"
msgstr "AM"
#: utils/dateformat.py:97
#: utils/dateformat.py:98
msgid "midnight"
msgstr "middernacht"
#: utils/dateformat.py:99
#: utils/dateformat.py:100
msgid "noon"
msgstr "middag"

View File

@ -597,7 +597,7 @@ msgstr "Historikk"
#: contrib/admin/templates/admin/edit_inline/stacked.html:13
#: contrib/admin/templates/admin/edit_inline/tabular.html:27
msgid "View on site"
msgstr "Vis på nettside"
msgstr "Vis på nettsted"
#: contrib/admin/templates/admin/change_form.html:38
#: contrib/admin/templates/admin/change_list.html:54
@ -992,7 +992,7 @@ msgstr "Velg %s du ønsker å redigere"
#: contrib/admin/views/template.py:37 contrib/sites/models.py:38
msgid "site"
msgstr "nettside"
msgstr "nettsted"
#: contrib/admin/views/template.py:39
msgid "template"
@ -3861,7 +3861,7 @@ msgstr "visningsnavn"
#: contrib/sites/models.py:39
msgid "sites"
msgstr "nettsider"
msgstr "nettsteder"
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
msgid "This value must be an integer."

View File

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-17 21:59+0200\n"
"POT-Creation-Date: 2009-12-16 20:29+0100\n"
"PO-Revision-Date: 2008-02-25 15:53+0100\n"
"Last-Translator: Jarek Zgoda <jarek.zgoda@gmail.com>\n"
"MIME-Version: 1.0\n"
@ -223,7 +223,7 @@ msgstr "chiński tradycyjny"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Usunięto %(count)d %(items)s."
#: contrib/admin/actions.py:67 contrib/admin/options.py:1027
#: contrib/admin/actions.py:67 contrib/admin/options.py:1033
msgid "Are you sure?"
msgstr "Jesteś pewien?"
@ -266,15 +266,15 @@ msgstr "Ten miesiąc"
msgid "This year"
msgstr "Ten rok"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "Yes"
msgstr "Tak"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "No"
msgstr "Nie"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
msgid "Unknown"
msgstr "Nieznany"
@ -371,26 +371,37 @@ msgid ""
msgstr ""
"%(name)s \"%(obj)s\" dodane pomyślnie. Możesz edytować ponownie wpis poniżej."
#: contrib/admin/options.py:773
#: contrib/admin/options.py:693
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
"Wykonanie akcji wymaga wybrania obiektów. Żaden obiekt nie został zmieniony."
#: contrib/admin/options.py:707
msgid "No action selected."
msgstr "Nie wybrano akcji."
#: contrib/admin/options.py:779
#, python-format
msgid "Add %s"
msgstr "Dodaj %s"
#: contrib/admin/options.py:804 contrib/admin/options.py:1005
#: contrib/admin/options.py:810 contrib/admin/options.py:1011
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "Obiekt %(name)s o kluczu głównym %(key)r nie istnieje."
#: contrib/admin/options.py:861
#: contrib/admin/options.py:867
#, python-format
msgid "Change %s"
msgstr "Zmień %s"
#: contrib/admin/options.py:905
#: contrib/admin/options.py:911
msgid "Database error"
msgstr "Błąd bazy danych"
#: contrib/admin/options.py:941
#: contrib/admin/options.py:947
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
@ -398,12 +409,12 @@ msgstr[0] "%(count)s %(name)s został pomyślnie zmieniony."
msgstr[1] "%(count)s %(name)s zostały pomyślnie zmienione."
msgstr[2] "%(count)s %(name)s zostało pomyślnie zmienionych."
#: contrib/admin/options.py:1020
#: contrib/admin/options.py:1026
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie."
#: contrib/admin/options.py:1057
#: contrib/admin/options.py:1063
#, python-format
msgid "Change history: %s"
msgstr "Historia zmian: %s"
@ -417,11 +428,11 @@ msgstr ""
"Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma "
"znaczenie."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:288 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Twoja sesja wygasła, zaloguj się ponownie."
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:295 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@ -429,27 +440,27 @@ msgstr ""
"Twoja przeglądarka nie chce akceptować ciasteczek. Zmień jej ustawienia i "
"spróbuj ponownie."
#: contrib/admin/sites.py:308 contrib/admin/sites.py:314
#: contrib/admin/sites.py:311 contrib/admin/sites.py:317
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Nazwy użytkowników nie mogą zawierać znaku '@'."
#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:314 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Podany adres e-mail nie jest Twoją nazwą użytkownika. Spróbuj '%s'."
#: contrib/admin/sites.py:367
#: contrib/admin/sites.py:370
msgid "Site administration"
msgstr "Administracja stroną"
#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:384 contrib/admin/templates/admin/login.html:26
#: contrib/admin/templates/registration/password_reset_complete.html:14
#: contrib/admin/views/decorators.py:20
msgid "Log in"
msgstr "Zaloguj się"
#: contrib/admin/sites.py:426
#: contrib/admin/sites.py:429
#, python-format
msgid "%s administration"
msgstr "%s - administracja"
@ -464,27 +475,27 @@ msgstr "Jedno lub więcej %(fieldname)s w %(name)s: %(obj)s"
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Jedno lub więcej %(fieldname)s w %(name)s:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Date:"
msgstr "Data:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Time:"
msgstr "Czas:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Currently:"
msgstr "Teraz:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Change:"
msgstr "Zmień:"
#: contrib/admin/widgets.py:124
#: contrib/admin/widgets.py:125
msgid "Lookup"
msgstr "Szukaj"
#: contrib/admin/widgets.py:235
#: contrib/admin/widgets.py:237
msgid "Add Another"
msgstr "Dodaj kolejny"
@ -598,7 +609,7 @@ msgstr "Historia"
#: contrib/admin/templates/admin/change_form.html:28
#: contrib/admin/templates/admin/edit_inline/stacked.html:13
#: contrib/admin/templates/admin/edit_inline/tabular.html:27
#: contrib/admin/templates/admin/edit_inline/tabular.html:28
msgid "View on site"
msgstr "Pokaż na stronie"
@ -668,10 +679,10 @@ msgstr ""
#, python-format
msgid ""
"Are you sure you want to delete the selected %(object_name)s objects? All of "
"the following objects and it's related items will be deleted:"
"the following objects and their related items will be deleted:"
msgstr ""
"Czy chcesz skasować %(object_name)s? Następujące obiekty i zależne od nich "
"zostaną skasowane:"
"Czy chcesz skasować wybrane %(object_name)s? Następujące obiekty i zależne "
"od nich zostaną skasowane:"
#: contrib/admin/templates/admin/filter.html:2
#, python-format
@ -978,7 +989,7 @@ msgstr "Adres e-mail:"
msgid "Reset my password"
msgstr "Zresetuj moje hasło"
#: contrib/admin/templatetags/admin_list.py:299
#: contrib/admin/templatetags/admin_list.py:304
msgid "All dates"
msgstr "Wszystkie daty"
@ -1056,89 +1067,7 @@ msgstr "liczba %s"
msgid "Fields on %s objects"
msgstr "Pola obiektów %s"
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Liczba całkowita"
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Wartość logiczna (True, False - prawda lub fałsz)"
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Łańcuch (do %(max_length)s znaków)"
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Liczby całkowite rozdzielone przecinkami"
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Data (bez godziny)"
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Data (z godziną)"
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Liczba dziesiętna"
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "Adres e-mail"
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Ścieżka do pliku"
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Liczba zmiennoprzecinkowa"
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "Adres IP"
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)"
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Relacja do modelu rodzica"
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Numer telefonu"
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Tekst"
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Czas"
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Stan USA (dwie duże litery)"
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "Tekst XML"
#: contrib/admindocs/views.py:387
#: contrib/admindocs/views.py:356
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s nie jest obiektem urlpattern"
@ -1432,7 +1361,7 @@ msgstr "wiadomość"
msgid "Logged out"
msgstr "Wylogowany"
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Wprowadź poprawny adres e-mail."
@ -1463,6 +1392,13 @@ msgstr "Nazwa"
msgid "Email address"
msgstr "Adres e-mail"
#: contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
#: db/models/fields/__init__.py:917
msgid "URL"
msgstr "URL"
#: contrib/comments/forms.py:96
#: contrib/comments/templates/comments/moderation_queue.html:35
msgid "Comment"
@ -1511,6 +1447,10 @@ msgstr "komentarz"
msgid "date/time submitted"
msgstr "data/czas dodania"
#: contrib/comments/models.py:60 db/models/fields/__init__.py:737
msgid "IP address"
msgstr "Adres IP"
#: contrib/comments/models.py:61
msgid "is public"
msgstr "publicznie dostępny"
@ -1789,6 +1729,39 @@ msgstr ""
"Przepraszamy, ale Twój formularz wygasł. Proszę kontynuować wypełnianie "
"formularza od tej strony."
#: contrib/gis/db/models/fields/__init__.py:42
msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
msgstr ""
"Podstawowe pole GIS - odpowiada typowi Geometry w specyfikacji OpenGIS."
#: contrib/gis/db/models/fields/__init__.py:264
msgid "Point"
msgstr "Punkt"
#: contrib/gis/db/models/fields/__init__.py:268
msgid "Line string"
msgstr ""
#: contrib/gis/db/models/fields/__init__.py:272
msgid "Polygon"
msgstr "Wielobok"
#: contrib/gis/db/models/fields/__init__.py:276
msgid "Multi-point"
msgstr ""
#: contrib/gis/db/models/fields/__init__.py:280
msgid "Multi-line string"
msgstr ""
#: contrib/gis/db/models/fields/__init__.py:284
msgid "Multi polygon"
msgstr ""
#: contrib/gis/db/models/fields/__init__.py:288
msgid "Geometry collection"
msgstr ""
#: contrib/gis/forms/fields.py:17
msgid "No geometry value provided."
msgstr "Brak wartości geometrii."
@ -2001,11 +1974,11 @@ msgstr "Błędny numer CNPJ."
msgid "This field requires at least 14 digits"
msgstr "To pole musi zawierać co najmniej 14 cyfr"
#: contrib/localflavor/ca/forms.py:17
#: contrib/localflavor/ca/forms.py:24
msgid "Enter a postal code in the format XXX XXX."
msgstr "Wpisz kod pocztowy w formacie XXX XXX."
#: contrib/localflavor/ca/forms.py:88
#: contrib/localflavor/ca/forms.py:95
msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
msgstr ""
"Wpisz poprawny numer kanadyjskiego ubezpieczenia w formacie XXX-XXX-XXXX."
@ -2599,6 +2572,10 @@ msgstr "Niepoprawna suma kontrolna numeru konta bankowego."
msgid "Enter a valid Finnish social security number."
msgstr "Wpis poprawny numer fińskiego ubezpieczenia socjalnego."
#: contrib/localflavor/fr/forms.py:30
msgid "Phone numbers must be in 0X XX XX XX XX format."
msgstr "Numery telefoniczne muszą być w formacie 0X XX XX XX XX."
#: contrib/localflavor/in_/forms.py:14
msgid "Enter a zip code in the format XXXXXXX."
msgstr "Wpisz kod pocztowy w formacie XXXXXXX."
@ -3770,6 +3747,14 @@ msgstr "Wpisz kod pocztowy w formacie XXXXX. lub XXXXX-XXXX."
msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
msgstr "Wpisz poprawny numer U.S. Social Security w formacie XXX-XX-XXXX."
#: contrib/localflavor/us/models.py:8
msgid "U.S. state (two uppercase letters)"
msgstr "Stan USA (dwie duże litery)"
#: contrib/localflavor/us/models.py:17
msgid "Phone number"
msgstr "Numer telefonu"
#: contrib/localflavor/za/forms.py:20
msgid "Enter a valid South African ID number"
msgstr "Wpisz poprawny południowoafrykański numer ID"
@ -3874,62 +3859,139 @@ msgstr "wyświetlana nazwa"
msgid "sites"
msgstr "strony"
#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
#: db/models/fields/__init__.py:64
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Pole typu: %(field_type)s"
#: db/models/fields/__init__.py:350 db/models/fields/__init__.py:712
#: db/models/fields/__init__.py:792 db/models/fields/__init__.py:802
#: db/models/fields/__init__.py:829
msgid "Integer"
msgstr "Liczba całkowita"
#: db/models/fields/__init__.py:364 db/models/fields/__init__.py:728
msgid "This value must be an integer."
msgstr "Ta wartość musi być liczbą całkowitą."
#: db/models/fields/__init__.py:388
#: db/models/fields/__init__.py:382
msgid "Boolean (Either True or False)"
msgstr "Wartość logiczna (True, False - prawda lub fałsz)"
#: db/models/fields/__init__.py:397
msgid "This value must be either True or False."
msgstr ""
"Ta wartość musi być wartością logiczną (True, False - prawda lub fałsz)."
#: db/models/fields/__init__.py:427
#: db/models/fields/__init__.py:425 db/models/fields/__init__.py:812
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Łańcuch (do %(max_length)s znaków)"
#: db/models/fields/__init__.py:437
msgid "This field cannot be null."
msgstr "To pole nie może być puste."
#: db/models/fields/__init__.py:443
#: db/models/fields/__init__.py:447
msgid "Comma-separated integers"
msgstr "Liczby całkowite rozdzielone przecinkami"
#: db/models/fields/__init__.py:454
msgid "Enter only digits separated by commas."
msgstr "Wpisz tylko cyfry oddzielone przecinkami."
#: db/models/fields/__init__.py:474
#: db/models/fields/__init__.py:463
msgid "Date (without time)"
msgstr "Data (bez godziny)"
#: db/models/fields/__init__.py:486
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Proszę wpisać poprawną datę w formacie RRRR-MM-DD."
#: db/models/fields/__init__.py:483
#: db/models/fields/__init__.py:495
#, python-format
msgid "Invalid date: %s"
msgstr "Niepoprawna data: %s"
#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
#: db/models/fields/__init__.py:539
msgid "Date (with time)"
msgstr "Data (z godziną)"
#: db/models/fields/__init__.py:560 db/models/fields/__init__.py:578
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr ""
"Wprowadź poprawną datę i godzinę w formacie YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
#: db/models/fields/__init__.py:601
#: db/models/fields/__init__.py:600
msgid "Decimal number"
msgstr "Liczba dziesiętna"
#: db/models/fields/__init__.py:615
msgid "This value must be a decimal number."
msgstr "Ta wartość musi być liczbą dziesiętną."
#: db/models/fields/__init__.py:654
msgid "E-mail address"
msgstr "Adres e-mail"
#: db/models/fields/__init__.py:665 db/models/fields/files.py:219
#: db/models/fields/files.py:330
msgid "File path"
msgstr "Ścieżka do pliku"
#: db/models/fields/__init__.py:686
msgid "Floating point number"
msgstr "Liczba zmiennoprzecinkowa"
#: db/models/fields/__init__.py:703
msgid "This value must be a float."
msgstr "Ta wartość musi być liczbą rzeczywistą."
#: db/models/fields/__init__.py:746
#: db/models/fields/__init__.py:752
msgid "Boolean (Either True, False or None)"
msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)"
#: db/models/fields/__init__.py:766
msgid "This value must be either None, True or False."
msgstr ""
"Ta wartość musi być jedną z None (nic), True (prawda) lub False (fałsz)."
#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
#: db/models/fields/__init__.py:834
msgid "Text"
msgstr "Tekst"
#: db/models/fields/__init__.py:844
msgid "Time"
msgstr "Czas"
#: db/models/fields/__init__.py:875 db/models/fields/__init__.py:889
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Proszę wpisać poprawną godzinę w formacie HH:MM[:ss[.uuuuuu]]."
#: db/models/fields/related.py:816
#: db/models/fields/__init__.py:929
msgid "XML text"
msgstr "Tekst XML"
#: db/models/fields/related.py:686
msgid "Foreign Key (type determined by related field)"
msgstr "Klucz obcy (typ określony przez pole powiązane)"
#: db/models/fields/related.py:781
msgid "One-to-one relationship"
msgstr "Powiązanie jeden do jednego"
#: db/models/fields/related.py:796
msgid "Many-to-many relationship"
msgstr "Powiązanie wiele do wiele"
#: db/models/fields/related.py:819
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Przytrzymaj wciśnięty klawisz \"Ctrl\" lub \"Command\" na Mac'u aby "
"zaznaczyć więcej niż jeden wybór."
#: db/models/fields/related.py:894
#: db/models/fields/related.py:897
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -3944,86 +4006,86 @@ msgstr[2] ""
"Proszę podać poprawne identyfikatory %(self)s. Wartości %(value)r są "
"niepoprawne."
#: forms/fields.py:54
#: forms/fields.py:53
msgid "This field is required."
msgstr "To pole jest wymagane."
#: forms/fields.py:55
#: forms/fields.py:54
msgid "Enter a valid value."
msgstr "Wpisz poprawną wartość."
#: forms/fields.py:138
#: forms/fields.py:137
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Upewnij się, że ta wartość ma co najwyżej %(max)d znaków (ma długość %"
"(length)d)."
#: forms/fields.py:139
#: forms/fields.py:138
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Upewnij się, że ta wartość ma co najmniej %(min)d znaków (ma długość %"
"(length)d)."
#: forms/fields.py:166
#: forms/fields.py:165
msgid "Enter a whole number."
msgstr "Wpisz liczbę całkowitą."
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#: forms/fields.py:166 forms/fields.py:195 forms/fields.py:224
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Upewnij się, że ta wartość jest mniejsza lub równa %s."
#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Upewnij się, że ta wartość jest większa lub równa %s."
#: forms/fields.py:195 forms/fields.py:224
#: forms/fields.py:194 forms/fields.py:223
msgid "Enter a number."
msgstr "Wpisz liczbę."
#: forms/fields.py:227
#: forms/fields.py:226
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Upewnij się, że jest nie więcej niż %s cyfr."
#: forms/fields.py:228
#: forms/fields.py:227
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Upewnij się, że jest nie więcej niż %s miejsc po przecinku."
#: forms/fields.py:229
#: forms/fields.py:228
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Upewnij się, że jest nie więcej niż %s miejsc przed przecinkiem."
#: forms/fields.py:288 forms/fields.py:863
#: forms/fields.py:287 forms/fields.py:862
msgid "Enter a valid date."
msgstr "Wpisz poprawną datę."
#: forms/fields.py:322 forms/fields.py:864
#: forms/fields.py:321 forms/fields.py:863
msgid "Enter a valid time."
msgstr "Wpisz poprawną godzinę."
#: forms/fields.py:361
#: forms/fields.py:360
msgid "Enter a valid date/time."
msgstr "Wpisz poprawną datę/godzinę."
#: forms/fields.py:447
#: forms/fields.py:446
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nie wysłano żadnego pliku. Sprawdź typ kodowania formularza."
#: forms/fields.py:448
#: forms/fields.py:447
msgid "No file was submitted."
msgstr "Żaden plik nie został przesłany."
#: forms/fields.py:449
#: forms/fields.py:448
msgid "The submitted file is empty."
msgstr "Wysłany plik jest pusty."
#: forms/fields.py:450
#: forms/fields.py:449
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@ -4031,7 +4093,7 @@ msgstr ""
"Upewnij się, że nazwa tego pliku ma co najwyżej %(max)d znaków (ma długość %"
"(length)d)."
#: forms/fields.py:483
#: forms/fields.py:482
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4039,29 +4101,29 @@ msgstr ""
"Wgraj poprawny plik graficzny. Ten, który został wgrany, nie jest obrazem, "
"albo jest uszkodzony."
#: forms/fields.py:544
#: forms/fields.py:543
msgid "Enter a valid URL."
msgstr "Wpisz poprawny URL."
#: forms/fields.py:545
#: forms/fields.py:544
msgid "This URL appears to be a broken link."
msgstr "Ten odnośnik jest nieprawidłowy."
#: forms/fields.py:625 forms/fields.py:703
#: forms/fields.py:624 forms/fields.py:702
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Wybierz poprawną wartość. %(value)s nie jest jednym z dostępnych wyborów."
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:1005
msgid "Enter a list of values."
msgstr "Podaj listę wartości."
#: forms/fields.py:892
#: forms/fields.py:891
msgid "Enter a valid IPv4 address."
msgstr "Wprowadź poprawny adres IPv4."
#: forms/fields.py:902
#: forms/fields.py:901
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "To pole może zawierać jedynie litery, cyfry, podkreślenia i myślniki."
@ -4105,29 +4167,29 @@ msgstr ""
msgid "Please correct the duplicate values below."
msgstr "Popraw poniższe zduplikowane wartości."
#: forms/models.py:867
#: forms/models.py:869
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Osadzony klucz obcy nie pasuje do klucza głównego obiektu rodzica."
#: forms/models.py:930
#: forms/models.py:932
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
#: forms/models.py:1004
#: forms/models.py:1006
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Wybierz poprawną wartość. %s nie jest jednym z dostępnych wyborów."
#: forms/models.py:1006
#: forms/models.py:1008
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nie jest poprawną wartością klucza głównego."
#: template/defaultfilters.py:767
#: template/defaultfilters.py:768
msgid "yes,no,maybe"
msgstr "tak,nie,może"
#: template/defaultfilters.py:798
#: template/defaultfilters.py:799
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@ -4135,17 +4197,17 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtów"
#: template/defaultfilters.py:800
#: template/defaultfilters.py:801
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
#: template/defaultfilters.py:802
#: template/defaultfilters.py:803
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#: template/defaultfilters.py:803
#: template/defaultfilters.py:804
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
@ -4444,3 +4506,6 @@ msgstr "%(verbose_name)s zostało pomyślnie zmienione."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s zostało usunięte."
#~ msgid "Relation to parent model"
#~ msgstr "Relacja do modelu rodzica"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-03-20 20:16+0100\n"
"POT-Creation-Date: 2009-09-17 12:00+0200\n"
"PO-Revision-Date: 2009-03-15 17:23+0100\n"
"Last-Translator: Marian Andre <django@andre.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -0,0 +1,119 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-27 22:39-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
msgid "Available %s"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:46
msgid "Add"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:48
msgid "Remove"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:53
#, perl-format
msgid "Chosen %s"
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
msgstr ""
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
msgstr ""
#: contrib/admin/media/js/calendar.js:24
#: contrib/admin/media/js/dateparse.js:32
msgid ""
"January February March April May June July August September October November "
"December"
msgstr ""
#: contrib/admin/media/js/calendar.js:25
msgid "S M T W T F S"
msgstr ""
#: contrib/admin/media/js/collapse.js:9 contrib/admin/media/js/collapse.js:21
#: contrib/admin/media/js/collapse.min.js:1
msgid "Show"
msgstr ""
#: contrib/admin/media/js/collapse.js:16
#: contrib/admin/media/js/collapse.min.js:1
msgid "Hide"
msgstr ""
#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Now"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
msgid "Choose a time"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "Midnight"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "6 a.m."
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85
msgid "Noon"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:89
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:184
msgid "Cancel"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:129
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:178
msgid "Today"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:133
msgid "Calendar"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:176
msgid "Yesterday"
msgstr ""
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:180
msgid "Tomorrow"
msgstr ""

View File

@ -4185,7 +4185,7 @@ msgstr ""
#: .\forms\fields.py:139 .\newforms\fields.py:125
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Переконайтеся, що це значення має не менще %(max)d символів (зараз %(length)"
"Переконайтеся, що це значення має не менще %(min)d символів (зараз %(length)"
"d)."
#: .\forms\fields.py:167 .\forms\fields.py:196 .\forms\fields.py:225

View File

@ -19,6 +19,8 @@ DATABASE_PORT = '' # Set to empty string for default. Not used with
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'America/Chicago'
@ -76,4 +78,6 @@ INSTALLED_APPS = (
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
# Uncomment the next line to enable the admin:
# 'django.contrib.admin',
)

View File

@ -2,11 +2,7 @@ from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
from django.contrib.admin.options import ModelAdmin, HORIZONTAL, VERTICAL
from django.contrib.admin.options import StackedInline, TabularInline
from django.contrib.admin.sites import AdminSite, site
from django.utils.importlib import import_module
# A flag to tell us if autodiscover is running. autodiscover will set this to
# True while running, and False when it finishes.
LOADING = False
def autodiscover():
"""
@ -14,45 +10,27 @@ def autodiscover():
not present. This forces an import on them to register any admin bits they
may want.
"""
# Bail out if autodiscover didn't finish loading from a previous call so
# that we avoid running autodiscover again when the URLconf is loaded by
# the exception handler to resolve the handler500 view. This prevents an
# admin.py module with errors from re-registering models and raising a
# spurious AlreadyRegistered exception (see #8245).
global LOADING
if LOADING:
return
LOADING = True
import imp
import copy
from django.conf import settings
from django.utils.importlib import import_module
from django.utils.module_loading import module_has_submodule
for app in settings.INSTALLED_APPS:
# For each app, we need to look for an admin.py inside that app's
# package. We can't use os.path here -- recall that modules may be
# imported different ways (think zip files) -- so we need to get
# the app's __path__ and look for admin.py on that path.
# Step 1: find out the app's __path__ Import errors here will (and
# should) bubble up, but a missing __path__ (which is legal, but weird)
# fails silently -- apps that do weird things with __path__ might
# need to roll their own admin registration.
mod = import_module(app)
# Attempt to import the app's admin module.
try:
app_path = import_module(app).__path__
except AttributeError:
continue
before_import_registry = copy.copy(site._registry)
import_module('%s.admin' % app)
except:
# Reset the model registry to the state before the last import as
# this import will have to reoccur on the next request and this
# could raise NotRegistered and AlreadyRegistered exceptions
# (see #8245).
site._registry = before_import_registry
# Step 2: use imp.find_module to find the app's admin.py. For some
# reason imp.find_module raises ImportError if the app can't be found
# but doesn't actually try to import the module. So skip this app if
# its admin.py doesn't exist
try:
imp.find_module('admin', app_path)
except ImportError:
continue
# Step 3: import the app's admin file. If this has errors we want them
# to bubble up.
import_module("%s.admin" % app)
# autodiscover was successful, reset loading flag.
LOADING = False
# Decide whether to bubble up this error. If the app just
# doesn't have an admin module, we can ignore the error
# attempting to import it, otherwise we want it to bubble up.
if module_has_submodule(mod, 'admin'):
raise

View File

@ -12,10 +12,6 @@ from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.utils.text import capfirst
from django.utils.translation import ugettext_lazy, ugettext as _
try:
set
except NameError:
from sets import Set as set # Python 2.3 fallback
def delete_selected(modeladmin, request, queryset):
"""
@ -36,15 +32,7 @@ def delete_selected(modeladmin, request, queryset):
# Populate deletable_objects, a data structure of all related objects that
# will also be deleted.
# deletable_objects must be a list if we want to use '|unordered_list' in the template
deletable_objects = []
perms_needed = set()
i = 0
for obj in queryset:
deletable_objects.append([mark_safe(u'%s: <a href="%s/">%s</a>' % (escape(force_unicode(capfirst(opts.verbose_name))), obj.pk, escape(obj))), []])
get_deleted_objects(deletable_objects[i], perms_needed, request.user, obj, opts, 1, modeladmin.admin_site, levels_to_root=2)
i=i+1
deletable_objects, perms_needed = get_deleted_objects(queryset, opts, request.user, modeladmin.admin_site, levels_to_root=2)
# The user has already confirmed the deletion.
# Do the deletion and return a None to display the change list view again.
@ -66,7 +54,7 @@ def delete_selected(modeladmin, request, queryset):
context = {
"title": _("Are you sure?"),
"object_name": force_unicode(opts.verbose_name),
"deletable_objects": deletable_objects,
"deletable_objects": [deletable_objects],
'queryset': queryset,
"perms_lacking": perms_needed,
"opts": opts,
@ -76,7 +64,7 @@ def delete_selected(modeladmin, request, queryset):
}
# Display the confirmation page
return render_to_response(modeladmin.delete_confirmation_template or [
return render_to_response(modeladmin.delete_selected_confirmation_template or [
"admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.object_name.lower()),
"admin/%s/delete_selected_confirmation.html" % app_label,
"admin/delete_selected_confirmation.html"

View File

@ -53,7 +53,7 @@
vertical-align: middle;
}
#changelist table thead th:first-child {
#changelist table thead th.action-checkbox-column {
width: 1.5em;
text-align: center;
}

View File

@ -67,6 +67,12 @@ form ul.inline li {
width: 8em;
}
.aligned ul label {
display: inline;
float: none;
width: auto;
}
.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField {
width: 350px;
}

View File

@ -112,6 +112,13 @@ div.breadcrumbs {
margin-right: -10px;
}
.filtered .actions {
border-left:1px solid #DDDDDD;
margin-left:160px !important;
border-right: 0 none;
margin-right:0 !important;
}
/* FORMS */
.aligned label {
@ -189,7 +196,7 @@ fieldset .field-box {
/* MISC */
.inline-related h2 {
.inline-related h2, .inline-group h2 {
text-align: right
}

View File

@ -6,9 +6,11 @@ from django.contrib.contenttypes.models import ContentType
from django.contrib.admin import widgets
from django.contrib.admin import helpers
from django.contrib.admin.util import unquote, flatten_fieldsets, get_deleted_objects, model_ngettext, model_format_dict
from django.core.exceptions import PermissionDenied
from django.core.exceptions import PermissionDenied, ValidationError
from django.db import models, transaction
from django.db.models.fields import BLANK_CHOICE_DASH
from django.db.models.related import RelatedObject
from django.db.models.fields import BLANK_CHOICE_DASH, FieldDoesNotExist
from django.db.models.sql.constants import LOOKUP_SEP, QUERY_TERMS
from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.shortcuts import get_object_or_404, render_to_response
from django.utils.datastructures import SortedDict
@ -20,10 +22,6 @@ from django.utils.text import capfirst, get_text_list
from django.utils.translation import ugettext as _
from django.utils.translation import ungettext, ugettext_lazy
from django.utils.encoding import force_unicode
try:
set
except NameError:
from sets import Set as set # Python 2.3 fallback
HORIZONTAL, VERTICAL = 1, 2
# returns the <ul> class for a given radio_admin field
@ -53,6 +51,7 @@ FORMFIELD_FOR_DBFIELD_DEFAULTS = {
class BaseModelAdmin(object):
"""Functionality common to both ModelAdmin and InlineAdmin."""
__metaclass__ = forms.MediaDefiningClass
raw_id_fields = ()
fields = None
@ -66,7 +65,9 @@ class BaseModelAdmin(object):
formfield_overrides = {}
def __init__(self):
self.formfield_overrides = dict(FORMFIELD_FOR_DBFIELD_DEFAULTS, **self.formfield_overrides)
overrides = FORMFIELD_FOR_DBFIELD_DEFAULTS.copy()
overrides.update(self.formfield_overrides)
self.formfield_overrides = overrides
def formfield_for_dbfield(self, db_field, **kwargs):
"""
@ -172,9 +173,56 @@ class BaseModelAdmin(object):
return None
declared_fieldsets = property(_declared_fieldsets)
def lookup_allowed(self, lookup, value):
model = self.model
# Check FKey lookups that are allowed, so that popups produced by
# ForeignKeyRawIdWidget, on the basis of ForeignKey.limit_choices_to,
# are allowed to work.
for l in model._meta.related_fkey_lookups:
for k, v in widgets.url_params_from_lookup_dict(l).items():
if k == lookup and v == value:
return True
parts = lookup.split(LOOKUP_SEP)
# Last term in lookup is a query term (__exact, __startswith etc)
# This term can be ignored.
if len(parts) > 1 and parts[-1] in QUERY_TERMS:
parts.pop()
# Special case -- foo__id__exact and foo__id queries are implied
# if foo has been specificially included in the lookup list; so
# drop __id if it is the last part. However, first we need to find
# the pk attribute name.
model = self.model
pk_attr_name = None
for part in parts[:-1]:
field, _, _, _ = model._meta.get_field_by_name(part)
if hasattr(field, 'rel'):
model = field.rel.to
pk_attr_name = model._meta.pk.name
elif isinstance(field, RelatedObject):
model = field.model
pk_attr_name = model._meta.pk.name
else:
pk_attr_name = None
if pk_attr_name and len(parts) > 1 and parts[-1] == pk_attr_name:
parts.pop()
try:
self.model._meta.get_field_by_name(parts[0])
except FieldDoesNotExist:
# Lookups on non-existants fields are ok, since they're ignored
# later.
return True
else:
if len(parts) == 1:
return True
clean_lookup = LOOKUP_SEP.join(parts)
return clean_lookup in self.list_filter or clean_lookup == self.date_hierarchy
class ModelAdmin(BaseModelAdmin):
"Encapsulates all admin options and functionality for a given model."
__metaclass__ = forms.MediaDefiningClass
list_display = ('__str__',)
list_display_links = ()
@ -193,6 +241,7 @@ class ModelAdmin(BaseModelAdmin):
change_form_template = None
change_list_template = None
delete_confirmation_template = None
delete_selected_confirmation_template = None
object_history_template = None
# Actions
@ -347,6 +396,20 @@ class ModelAdmin(BaseModelAdmin):
defaults.update(kwargs)
return modelform_factory(self.model, **defaults)
def get_object(self, request, object_id):
"""
Returns an instance matching the primary key provided. ``None`` is
returned if no match is found (or the object_id failed validation
against the primary key field).
"""
queryset = self.queryset(request)
model = queryset.model
try:
object_id = model._meta.pk.to_python(object_id)
return queryset.get(pk=object_id)
except (model.DoesNotExist, ValidationError):
return None
def get_changelist_form(self, request, **kwargs):
"""
Returns a Form class for use in the Formset on the changelist page.
@ -522,16 +585,16 @@ class ModelAdmin(BaseModelAdmin):
for formset in formsets:
for added_object in formset.new_objects:
change_message.append(_('Added %(name)s "%(object)s".')
% {'name': added_object._meta.verbose_name,
% {'name': force_unicode(added_object._meta.verbose_name),
'object': force_unicode(added_object)})
for changed_object, changed_fields in formset.changed_objects:
change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
% {'list': get_text_list(changed_fields, _('and')),
'name': changed_object._meta.verbose_name,
'name': force_unicode(changed_object._meta.verbose_name),
'object': force_unicode(changed_object)})
for deleted_object in formset.deleted_objects:
change_message.append(_('Deleted %(name)s "%(object)s".')
% {'name': deleted_object._meta.verbose_name,
% {'name': force_unicode(deleted_object._meta.verbose_name),
'object': force_unicode(deleted_object)})
change_message = ' '.join(change_message)
return change_message or _('No fields changed.')
@ -655,6 +718,7 @@ class ModelAdmin(BaseModelAdmin):
changelist; it returns an HttpResponse if the action was handled, and
None otherwise.
"""
# There can be multiple action forms on the page (at the top
# and bottom of the change list, for example). Get the action
# whose button was pushed.
@ -689,6 +753,9 @@ class ModelAdmin(BaseModelAdmin):
# perform an action on it, so bail.
selected = request.POST.getlist(helpers.ACTION_CHECKBOX_NAME)
if not selected:
# Reminder that something needs to be selected or nothing will happen
msg = _("Items must be selected in order to perform actions on them. No items have been changed.")
self.message_user(request, msg)
return None
response = func(self, request, queryset.filter(pk__in=selected))
@ -700,6 +767,9 @@ class ModelAdmin(BaseModelAdmin):
return response
else:
return HttpResponseRedirect(".")
else:
msg = _("No action selected.")
self.message_user(request, msg)
def add_view(self, request, form_url='', extra_context=None):
"The 'add' admin view for this model."
@ -789,13 +859,7 @@ class ModelAdmin(BaseModelAdmin):
model = self.model
opts = model._meta
try:
obj = self.queryset(request).get(pk=unquote(object_id))
except model.DoesNotExist:
# Don't raise Http404 just yet, because we haven't checked
# permissions yet. We don't want an unauthenticated user to be able
# to determine whether a given object exists.
obj = None
obj = self.get_object(request, unquote(object_id))
if not self.has_change_permission(request, obj):
raise PermissionDenied
@ -906,9 +970,9 @@ class ModelAdmin(BaseModelAdmin):
return HttpResponseRedirect(request.path + '?' + ERROR_FLAG + '=1')
# If the request was POSTed, this might be a bulk action or a bulk edit.
# Try to look up an action first, but if this isn't an action the POST
# will fall through to the bulk edit check, below.
if actions and request.method == 'POST':
# Try to look up an action or confirmation first, but if this isn't an
# action the POST will fall through to the bulk edit check, below.
if actions and request.method == 'POST' and (helpers.ACTION_CHECKBOX_NAME in request.POST or 'index' in request.POST):
response = self.response_action(request, queryset=cl.get_query_set())
if response:
return response
@ -990,13 +1054,7 @@ class ModelAdmin(BaseModelAdmin):
opts = self.model._meta
app_label = opts.app_label
try:
obj = self.queryset(request).get(pk=unquote(object_id))
except self.model.DoesNotExist:
# Don't raise Http404 just yet, because we haven't checked
# permissions yet. We don't want an unauthenticated user to be able
# to determine whether a given object exists.
obj = None
obj = self.get_object(request, unquote(object_id))
if not self.has_delete_permission(request, obj):
raise PermissionDenied
@ -1006,9 +1064,7 @@ class ModelAdmin(BaseModelAdmin):
# Populate deleted_objects, a data structure of all related objects that
# will also be deleted.
deleted_objects = [mark_safe(u'%s: <a href="../../%s/">%s</a>' % (escape(force_unicode(capfirst(opts.verbose_name))), object_id, escape(obj))), []]
perms_needed = set()
get_deleted_objects(deleted_objects, perms_needed, request.user, obj, opts, 1, self.admin_site)
(deleted_objects, perms_needed) = get_deleted_objects((obj,), opts, request.user, self.admin_site)
if request.POST: # The user has already confirmed the deletion.
if perms_needed:
@ -1052,7 +1108,7 @@ class ModelAdmin(BaseModelAdmin):
content_type__id__exact = ContentType.objects.get_for_model(model).id
).select_related().order_by('action_time')
# If no history was found, see whether this object even exists.
obj = get_object_or_404(model, pk=object_id)
obj = get_object_or_404(model, pk=unquote(object_id))
context = {
'title': _('Change history: %s') % force_unicode(obj),
'action_list': action_list,
@ -1113,6 +1169,7 @@ class InlineModelAdmin(BaseModelAdmin):
template = None
verbose_name = None
verbose_name_plural = None
can_delete = True
def __init__(self, parent_model, admin_site):
self.admin_site = admin_site
@ -1155,6 +1212,7 @@ class InlineModelAdmin(BaseModelAdmin):
"formfield_callback": curry(self.formfield_for_dbfield, request=request),
"extra": self.extra,
"max_num": self.max_num,
"can_delete": self.can_delete,
}
defaults.update(kwargs)
return inlineformset_factory(self.parent_model, self.model, **defaults)

View File

@ -191,6 +191,9 @@ class AdminSite(object):
def get_urls(self):
from django.conf.urls.defaults import patterns, url, include
if settings.DEBUG:
self.check_dependencies()
def wrap(view, cacheable=False):
def wrapper(*args, **kwargs):
return self.admin_view(view, cacheable)(*args, **kwargs)

View File

@ -1,7 +1,8 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_modify adminmedia %}
{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="../../../../jsi18n/"></script>
{% url admin:jsi18n as jsi18nurl %}
<script type="text/javascript" src="{{ jsi18nurl|default:"../../../../jsi18n/" }}"></script>
{% endblock %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}

View File

@ -25,7 +25,7 @@
{% if user.is_authenticated and user.is_staff %}
<div id="user-tools">
{% trans 'Welcome,' %}
<strong>{% firstof user.first_name user.username %}</strong>.
<strong>{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</strong>.
{% block userlinks %}
{% url django-admindocs-docroot as docsroot %}
{% if docsroot %}

View File

@ -2,7 +2,8 @@
{% load i18n admin_modify adminmedia %}
{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="../../../jsi18n/"></script>
{% url admin:jsi18n as jsi18nurl %}
<script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script>
{{ media }}
{% endblock %}
@ -37,7 +38,7 @@
<p class="errornote">
{% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
</p>
<ul class="errorlist">{% for error in adminform.form.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul>
{{ adminform.form.non_field_errors }}
{% endif %}
{% for fieldset in adminform %}

View File

@ -6,7 +6,8 @@
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
{% if cl.formset %}
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
<script type="text/javascript" src="../../jsi18n/"></script>
{% url admin:jsi18n as jsi18nurl %}
<script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>
{% endif %}
{{ media }}
{% if not actions_on_top and not actions_on_bottom %}
@ -53,7 +54,7 @@
<p class="errornote">
{% blocktrans count cl.formset.errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
</p>
<ul class="errorlist">{% for error in cl.formset.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul>
{{ cl.formset.non_form_errors }}
{% endif %}
<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
{% block search %}{% search_form cl %}{% endblock %}

View File

@ -20,8 +20,8 @@
</ul>
{% else %}
<p>{% blocktrans %}Are you sure you want to delete the selected {{ object_name }} objects? All of the following objects and their related items will be deleted:{% endblocktrans %}</p>
{% for deleteable_object in deletable_objects %}
<ul>{{ deleteable_object|unordered_list }}</ul>
{% for deletable_object in deletable_objects %}
<ul>{{ deletable_object|unordered_list }}</ul>
{% endfor %}
<form action="" method="post">
<div>

View File

@ -106,6 +106,11 @@ def result_headers(cl):
else:
header = field_name
header = header.replace('_', ' ')
# if the field is the action checkbox: no sorting and special class
if field_name == 'action_checkbox':
yield {"text": header,
"class_attrib": mark_safe(' class="action-checkbox-column"')}
continue
# It is a non-field, but perhaps one that is sortable
admin_order_field = getattr(attr, "admin_order_field", None)
@ -237,7 +242,7 @@ def items_for_result(cl, result, form):
result_repr = conditional_escape(result_repr)
yield mark_safe(u'<td%s>%s</td>' % (row_class, result_repr))
if form:
yield mark_safe(force_unicode(form[cl.model._meta.pk.name]))
yield mark_safe(u'<td>%s</td>' % force_unicode(form[cl.model._meta.pk.name]))
def results(cl):
if cl.formset:

View File

@ -1,4 +1,5 @@
from django.template import Library
from django.utils.encoding import iri_to_uri
register = Library()
@ -10,5 +11,5 @@ def admin_media_prefix():
from django.conf import settings
except ImportError:
return ''
return settings.ADMIN_MEDIA_PREFIX
return iri_to_uri(settings.ADMIN_MEDIA_PREFIX)
admin_media_prefix = register.simple_tag(admin_media_prefix)

View File

@ -7,6 +7,13 @@ from django.utils.encoding import force_unicode
from django.utils.translation import ungettext, ugettext as _
from django.core.urlresolvers import reverse, NoReverseMatch
from django.utils.datastructures import SortedDict
try:
set
except NameError:
from sets import Set as set # Python 2.3 fallback
def quote(s):
"""
Ensure that primary key values do not confuse the admin URLs by escaping
@ -55,135 +62,179 @@ def flatten_fieldsets(fieldsets):
field_names.append(field)
return field_names
def _nest_help(obj, depth, val):
current = obj
for i in range(depth):
current = current[-1]
current.append(val)
def get_change_view_url(app_label, module_name, pk, admin_site, levels_to_root):
"""
Returns the url to the admin change view for the given app_label,
module_name and primary key.
"""
def _format_callback(obj, user, admin_site, levels_to_root, perms_needed):
has_admin = obj.__class__ in admin_site._registry
opts = obj._meta
try:
return reverse('%sadmin_%s_%s_change' % (admin_site.name, app_label, module_name), None, (pk,))
admin_url = reverse('%s:%s_%s_change'
% (admin_site.name,
opts.app_label,
opts.object_name.lower()),
None, (quote(obj._get_pk_val()),))
except NoReverseMatch:
return '%s%s/%s/%s/' % ('../'*levels_to_root, app_label, module_name, pk)
admin_url = '%s%s/%s/%s/' % ('../'*levels_to_root,
opts.app_label,
opts.object_name.lower(),
quote(obj._get_pk_val()))
if has_admin:
p = '%s.%s' % (opts.app_label,
opts.get_delete_permission())
if not user.has_perm(p):
perms_needed.add(opts.verbose_name)
# Display a link to the admin page.
return mark_safe(u'%s: <a href="%s">%s</a>' %
(escape(capfirst(opts.verbose_name)),
admin_url,
escape(obj)))
else:
# Don't display link to edit, because it either has no
# admin or is edited inline.
return u'%s: %s' % (capfirst(opts.verbose_name),
force_unicode(obj))
def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_depth, admin_site, levels_to_root=4):
def get_deleted_objects(objs, opts, user, admin_site, levels_to_root=4):
"""
Helper function that recursively populates deleted_objects.
Find all objects related to ``objs`` that should also be
deleted. ``objs`` should be an iterable of objects.
`levels_to_root` defines the number of directories (../) to reach the
admin root path. In a change_view this is 4, in a change_list view 2.
Returns a nested list of strings suitable for display in the
template with the ``unordered_list`` filter.
`levels_to_root` defines the number of directories (../) to reach
the admin root path. In a change_view this is 4, in a change_list
view 2.
This is for backwards compatibility since the options.delete_selected
method uses this function also from a change_list view.
This will not be used if we can reverse the URL.
"""
nh = _nest_help # Bind to local variable for performance
if current_depth > 16:
return # Avoid recursing too deep.
opts_seen = []
for related in opts.get_all_related_objects():
has_admin = related.model in admin_site._registry
if related.opts in opts_seen:
continue
opts_seen.append(related.opts)
rel_opts_name = related.get_accessor_name()
if isinstance(related.field.rel, models.OneToOneRel):
try:
sub_obj = getattr(obj, rel_opts_name)
except ObjectDoesNotExist:
pass
else:
if has_admin:
p = '%s.%s' % (related.opts.app_label, related.opts.get_delete_permission())
if not user.has_perm(p):
perms_needed.add(related.opts.verbose_name)
# We don't care about populating deleted_objects now.
continue
if not has_admin:
# Don't display link to edit, because it either has no
# admin or is edited inline.
nh(deleted_objects, current_depth,
[u'%s: %s' % (capfirst(related.opts.verbose_name), force_unicode(sub_obj)), []])
else:
# Display a link to the admin page.
nh(deleted_objects, current_depth, [mark_safe(u'%s: <a href="%s">%s</a>' %
(escape(capfirst(related.opts.verbose_name)),
get_change_view_url(related.opts.app_label,
related.opts.object_name.lower(),
sub_obj._get_pk_val(),
admin_site,
levels_to_root),
escape(sub_obj))), []])
get_deleted_objects(deleted_objects, perms_needed, user, sub_obj, related.opts, current_depth+2, admin_site)
collector = NestedObjects()
for obj in objs:
# TODO using a private model API!
obj._collect_sub_objects(collector)
# TODO This next bit is needed only because GenericRelations are
# cascade-deleted way down in the internals in
# DeleteQuery.delete_batch_related, instead of being found by
# _collect_sub_objects. Refs #12593.
from django.contrib.contenttypes import generic
for f in obj._meta.many_to_many:
if isinstance(f, generic.GenericRelation):
rel_manager = f.value_from_object(obj)
for related in rel_manager.all():
# There's a wierdness here in the case that the
# generic-related object also has FKs pointing to it
# from elsewhere. DeleteQuery does not follow those
# FKs or delete any such objects explicitly (which is
# probably a bug). Some databases may cascade those
# deletes themselves, and some won't. So do we report
# those objects as to-be-deleted? No right answer; for
# now we opt to report only on objects that Django
# will explicitly delete, at risk that some further
# objects will be silently deleted by a
# referential-integrity-maintaining database.
collector.add(related.__class__, related.pk, related,
obj.__class__, obj)
perms_needed = set()
to_delete = collector.nested(_format_callback,
user=user,
admin_site=admin_site,
levels_to_root=levels_to_root,
perms_needed=perms_needed)
return to_delete, perms_needed
class NestedObjects(object):
"""
A directed acyclic graph collection that exposes the add() API
expected by Model._collect_sub_objects and can present its data as
a nested list of objects.
"""
def __init__(self):
# Use object keys of the form (model, pk) because actual model
# objects may not be unique
# maps object key to list of child keys
self.children = SortedDict()
# maps object key to parent key
self.parents = SortedDict()
# maps object key to actual object
self.seen = SortedDict()
def add(self, model, pk, obj,
parent_model=None, parent_obj=None, nullable=False):
"""
Add item ``obj`` to the graph. Returns True (and does nothing)
if the item has been seen already.
The ``parent_obj`` argument must already exist in the graph; if
not, it's ignored (but ``obj`` is still added with no
parent). In any case, Model._collect_sub_objects (for whom
this API exists) will never pass a parent that hasn't already
been added itself.
These restrictions in combination ensure the graph will remain
acyclic (but can have multiple roots).
``model``, ``pk``, and ``parent_model`` arguments are ignored
in favor of the appropriate lookups on ``obj`` and
``parent_obj``; unlike CollectedObjects, we can't maintain
independence from the knowledge that we're operating on model
instances, and we don't want to allow for inconsistency.
``nullable`` arg is ignored: it doesn't affect how the tree of
collected objects should be nested for display.
"""
model, pk = type(obj), obj._get_pk_val()
key = model, pk
if key in self.seen:
return True
self.seen.setdefault(key, obj)
if parent_obj is not None:
parent_model, parent_pk = (type(parent_obj),
parent_obj._get_pk_val())
parent_key = (parent_model, parent_pk)
if parent_key in self.seen:
self.children.setdefault(parent_key, list()).append(key)
self.parents.setdefault(key, parent_key)
def _nested(self, key, format_callback=None, **kwargs):
obj = self.seen[key]
if format_callback:
ret = [format_callback(obj, **kwargs)]
else:
has_related_objs = False
for sub_obj in getattr(obj, rel_opts_name).all():
has_related_objs = True
if not has_admin:
# Don't display link to edit, because it either has no
# admin or is edited inline.
nh(deleted_objects, current_depth,
[u'%s: %s' % (capfirst(related.opts.verbose_name), force_unicode(sub_obj)), []])
else:
# Display a link to the admin page.
nh(deleted_objects, current_depth, [mark_safe(u'%s: <a href="%s">%s</a>' %
(escape(capfirst(related.opts.verbose_name)),
get_change_view_url(related.opts.app_label,
related.opts.object_name.lower(),
sub_obj._get_pk_val(),
admin_site,
levels_to_root),
escape(sub_obj))), []])
get_deleted_objects(deleted_objects, perms_needed, user, sub_obj, related.opts, current_depth+2, admin_site)
# If there were related objects, and the user doesn't have
# permission to delete them, add the missing perm to perms_needed.
if has_admin and has_related_objs:
p = '%s.%s' % (related.opts.app_label, related.opts.get_delete_permission())
if not user.has_perm(p):
perms_needed.add(related.opts.verbose_name)
for related in opts.get_all_related_many_to_many_objects():
has_admin = related.model in admin_site._registry
if related.opts in opts_seen:
continue
opts_seen.append(related.opts)
rel_opts_name = related.get_accessor_name()
has_related_objs = False
ret = [obj]
# related.get_accessor_name() could return None for symmetrical relationships
if rel_opts_name:
rel_objs = getattr(obj, rel_opts_name, None)
if rel_objs:
has_related_objs = True
children = []
for child in self.children.get(key, ()):
children.extend(self._nested(child, format_callback, **kwargs))
if children:
ret.append(children)
return ret
def nested(self, format_callback=None, **kwargs):
"""
Return the graph as a nested list.
Passes **kwargs back to the format_callback as kwargs.
"""
roots = []
for key in self.seen.keys():
if key not in self.parents:
roots.extend(self._nested(key, format_callback, **kwargs))
return roots
if has_related_objs:
for sub_obj in rel_objs.all():
if not has_admin:
# Don't display link to edit, because it either has no
# admin or is edited inline.
nh(deleted_objects, current_depth, [_('One or more %(fieldname)s in %(name)s: %(obj)s') % \
{'fieldname': force_unicode(related.field.verbose_name), 'name': force_unicode(related.opts.verbose_name), 'obj': escape(sub_obj)}, []])
else:
# Display a link to the admin page.
nh(deleted_objects, current_depth, [
mark_safe((_('One or more %(fieldname)s in %(name)s:') % {'fieldname': escape(force_unicode(related.field.verbose_name)), 'name': escape(force_unicode(related.opts.verbose_name))}) + \
(u' <a href="%s">%s</a>' % \
(get_change_view_url(related.opts.app_label,
related.opts.object_name.lower(),
sub_obj._get_pk_val(),
admin_site,
levels_to_root),
escape(sub_obj)))), []])
# If there were related objects, and the user doesn't have
# permission to change them, add the missing perm to perms_needed.
if has_admin and has_related_objs:
p = u'%s.%s' % (related.opts.app_label, related.opts.get_change_permission())
if not user.has_perm(p):
perms_needed.add(related.opts.verbose_name)
def model_format_dict(obj):
"""

View File

@ -149,12 +149,16 @@ def validate(cls, model):
validate_inline(inline, cls, model)
def validate_inline(cls, parent, parent_model):
# model is already verified to exist and be a Model
if cls.fk_name: # default value is None
f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name)
if not isinstance(f, models.ForeignKey):
raise ImproperlyConfigured("'%s.fk_name is not an instance of "
"models.ForeignKey." % cls.__name__)
fk = _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name, can_fail=True)
# extra = 3
# max_num = 0
for attr in ('extra', 'max_num'):
@ -169,7 +173,6 @@ def validate_inline(cls, parent, parent_model):
# exclude
if hasattr(cls, 'exclude') and cls.exclude:
fk = _get_foreign_key(parent_model, cls.model, can_fail=True)
if fk and fk.name in cls.exclude:
raise ImproperlyConfigured("%s cannot exclude the field "
"'%s' - this is the foreign key to the parent model "
@ -217,6 +220,20 @@ def validate_base(cls, model):
for field in flattened_fieldsets:
check_formfield(cls, model, opts, "fieldsets[%d][1]['fields']" % idx, field)
# exclude
if cls.exclude: # default value is None
check_isseq(cls, 'exclude', cls.exclude)
for field in cls.exclude:
check_formfield(cls, model, opts, 'exclude', field)
try:
f = opts.get_field(field)
except models.FieldDoesNotExist:
# If we can't find a field on the model that matches,
# it could be an extra field on the form.
continue
if len(cls.exclude) > len(set(cls.exclude)):
raise ImproperlyConfigured('There are duplicate field(s) in %s.exclude' % cls.__name__)
# form
if hasattr(cls, 'form') and not issubclass(cls.form, BaseModelForm):
raise ImproperlyConfigured("%s.form does not inherit from "

View File

@ -1,6 +1,7 @@
from django.contrib.admin.filterspecs import FilterSpec
from django.contrib.admin.options import IncorrectLookupParameters
from django.contrib.admin.util import quote
from django.core.exceptions import SuspiciousOperation
from django.core.paginator import Paginator, InvalidPage
from django.db import models
from django.db.models.query import QuerySet
@ -183,7 +184,21 @@ class ChangeList(object):
# if key ends with __in, split parameter into separate values
if key.endswith('__in'):
lookup_params[key] = value.split(',')
value = value.split(',')
lookup_params[key] = value
# if key ends with __isnull, special case '' and false
if key.endswith('__isnull'):
if value.lower() in ('', 'false'):
value = False
else:
value = True
lookup_params[key] = value
if not self.model_admin.lookup_allowed(key, value):
raise SuspiciousOperation(
"Filtering by %s not allowed" % key
)
# Apply lookup parameters from the query string.
try:
@ -191,7 +206,7 @@ class ChangeList(object):
# Naked except! Because we don't have any other way of validating "params".
# They might be invalid if the keyword arguments are incorrect, or if the
# values are not in the correct type, so we might get FieldError, ValueError,
# ValicationError, or ? from a custom field that raises yet something else
# ValicationError, or ? from a custom field that raises yet something else
# when handed impossible data.
except:
raise IncorrectLookupParameters

View File

@ -2,7 +2,7 @@
Form Widget classes specific to the Django admin site.
"""
import copy
import django.utils.copycompat as copy
from django import forms
from django.forms.widgets import RadioFieldRenderer
@ -93,10 +93,27 @@ class AdminFileWidget(forms.FileInput):
output = []
if value and hasattr(value, "url"):
output.append('%s <a target="_blank" href="%s">%s</a> <br />%s ' % \
(_('Currently:'), value.url, value, _('Change:')))
(_('Currently:'), escape(value.url), escape(value), _('Change:')))
output.append(super(AdminFileWidget, self).render(name, value, attrs))
return mark_safe(u''.join(output))
def url_params_from_lookup_dict(lookups):
"""
Converts the type of lookups specified in a ForeignKey limit_choices_to
attribute to a dictionary of query parameters
"""
params = {}
if lookups and hasattr(lookups, 'items'):
items = []
for k, v in lookups.items():
if isinstance(v, list):
v = u','.join([str(x) for x in v])
else:
v = unicode(v)
items.append((k, v))
params.update(dict(items))
return params
class ForeignKeyRawIdWidget(forms.TextInput):
"""
A Widget for displaying ForeignKeys in the "raw_id" interface rather than
@ -112,33 +129,23 @@ class ForeignKeyRawIdWidget(forms.TextInput):
related_url = '../../../%s/%s/' % (self.rel.to._meta.app_label, self.rel.to._meta.object_name.lower())
params = self.url_parameters()
if params:
url = '?' + '&amp;'.join(['%s=%s' % (k, v) for k, v in params.items()])
url = u'?' + u'&amp;'.join([u'%s=%s' % (k, v) for k, v in params.items()])
else:
url = ''
url = u''
if not attrs.has_key('class'):
attrs['class'] = 'vForeignKeyRawIdAdminField' # The JavaScript looks for this hook.
output = [super(ForeignKeyRawIdWidget, self).render(name, value, attrs)]
# TODO: "id_" is hard-coded here. This should instead use the correct
# API to determine the ID dynamically.
output.append('<a href="%s%s" class="related-lookup" id="lookup_id_%s" onclick="return showRelatedObjectLookupPopup(this);"> ' % \
output.append(u'<a href="%s%s" class="related-lookup" id="lookup_id_%s" onclick="return showRelatedObjectLookupPopup(this);"> ' % \
(related_url, url, name))
output.append('<img src="%simg/admin/selector-search.gif" width="16" height="16" alt="%s" /></a>' % (settings.ADMIN_MEDIA_PREFIX, _('Lookup')))
output.append(u'<img src="%simg/admin/selector-search.gif" width="16" height="16" alt="%s" /></a>' % (settings.ADMIN_MEDIA_PREFIX, _('Lookup')))
if value:
output.append(self.label_for_value(value))
return mark_safe(u''.join(output))
def base_url_parameters(self):
params = {}
if self.rel.limit_choices_to:
items = []
for k, v in self.rel.limit_choices_to.items():
if isinstance(v, list):
v = ','.join([str(x) for x in v])
else:
v = str(v)
items.append((k, v))
params.update(dict(items))
return params
return url_params_from_lookup_dict(self.rel.limit_choices_to)
def url_parameters(self):
from django.contrib.admin.views.main import TO_FIELD_VAR
@ -148,7 +155,10 @@ class ForeignKeyRawIdWidget(forms.TextInput):
def label_for_value(self, value):
key = self.rel.get_related_field().name
obj = self.rel.to._default_manager.get(**{key: value})
try:
obj = self.rel.to._default_manager.get(**{key: value})
except self.rel.to.DoesNotExist:
return ''
return '&nbsp;<strong>%s</strong>' % escape(truncate_words(obj, 14))
class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):

View File

@ -0,0 +1 @@
# Empty models.py to allow for specifying admindocs as a test label.

View File

@ -0,0 +1,30 @@
import unittest
import fields
from django.contrib.admindocs import views
from django.db.models import fields as builtin_fields
class TestFieldType(unittest.TestCase):
def setUp(self):
pass
def test_field_name(self):
self.assertRaises(AttributeError,
views.get_readable_field_data_type, "NotAField"
)
def test_builtin_fields(self):
self.assertEqual(
views.get_readable_field_data_type(builtin_fields.BooleanField()),
u'Boolean (Either True or False)'
)
def test_custom_fields(self):
self.assertEqual(
views.get_readable_field_data_type(fields.CustomField()),
u'A custom field type'
)
self.assertEqual(
views.get_readable_field_data_type(fields.DescriptionLackingField()),
u'Field of type: DescriptionLackingField'
)

View File

@ -0,0 +1,7 @@
from django.db import models
class CustomField(models.Field):
description = "A custom field type"
class DescriptionLackingField(models.Field):
pass

View File

@ -5,6 +5,7 @@ from email.Parser import HeaderParser
from email.Errors import HeaderParseError
from django.utils.safestring import mark_safe
from django.core.urlresolvers import reverse
from django.utils.encoding import smart_str
try:
import docutils.core
import docutils.nodes
@ -64,7 +65,7 @@ def parse_rst(text, default_reference_context, thing_being_parsed=None):
"link_base" : reverse('django-admindocs-docroot').rstrip('/')
}
if thing_being_parsed:
thing_being_parsed = "<%s>" % thing_being_parsed
thing_being_parsed = smart_str("<%s>" % thing_being_parsed)
parts = docutils.core.publish_parts(text, source_path=thing_being_parsed,
destination_path=None, writer_name='html',
settings_overrides=overrides)

View File

@ -326,43 +326,12 @@ def get_return_data_type(func_name):
return 'Integer'
return ''
# Maps Field objects to their human-readable data types, as strings.
# Column-type strings can contain format strings; they'll be interpolated
# against the values of Field.__dict__ before being output.
# If a column type is set to None, it won't be included in the output.
DATA_TYPE_MAPPING = {
'AutoField' : _('Integer'),
'BooleanField' : _('Boolean (Either True or False)'),
'CharField' : _('String (up to %(max_length)s)'),
'CommaSeparatedIntegerField': _('Comma-separated integers'),
'DateField' : _('Date (without time)'),
'DateTimeField' : _('Date (with time)'),
'DecimalField' : _('Decimal number'),
'EmailField' : _('E-mail address'),
'FileField' : _('File path'),
'FilePathField' : _('File path'),
'FloatField' : _('Floating point number'),
'ForeignKey' : _('Integer'),
'ImageField' : _('File path'),
'IntegerField' : _('Integer'),
'IPAddressField' : _('IP address'),
'ManyToManyField' : '',
'NullBooleanField' : _('Boolean (Either True, False or None)'),
'OneToOneField' : _('Relation to parent model'),
'PhoneNumberField' : _('Phone number'),
'PositiveIntegerField' : _('Integer'),
'PositiveSmallIntegerField' : _('Integer'),
'SlugField' : _('String (up to %(max_length)s)'),
'SmallIntegerField' : _('Integer'),
'TextField' : _('Text'),
'TimeField' : _('Time'),
'URLField' : _('URL'),
'USStateField' : _('U.S. state (two uppercase letters)'),
'XMLField' : _('XML text'),
}
def get_readable_field_data_type(field):
return DATA_TYPE_MAPPING[field.get_internal_type()] % field.__dict__
"""Returns the description for a given field type, if it exists,
Fields' descriptions can contain format strings, which will be interpolated
against the values of field.__dict__ before being output."""
return field.description % field.__dict__
def extract_views_from_urlpatterns(urlpatterns, base=''):
"""

View File

@ -95,9 +95,25 @@ class Group(models.Model):
class UserManager(models.Manager):
def create_user(self, username, email, password=None):
"Creates and saves a User with the given username, e-mail and password."
"""
Creates and saves a User with the given username, e-mail and password.
"""
now = datetime.datetime.now()
user = self.model(None, username, '', '', email.strip().lower(), 'placeholder', False, True, False, now, now)
# Normalize the address by lowercasing the domain part of the email
# address.
try:
email_name, domain_part = email.strip().split('@', 1)
except ValueError:
pass
else:
email = '@'.join([email_name, domain_part.lower()])
user = self.model(username=username, email=email, is_staff=False,
is_active=True, is_superuser=False, last_login=now,
date_joined=now)
if password:
user.set_password(password)
else:

View File

@ -219,4 +219,13 @@ True
>>> form.cleaned_data['email']
u'jsmith3@example.com'
# bug #5605, preserve the case of the user name (before the @ in the email address)
# when creating a user.
>>> user = User.objects.create_user('forms_test2', 'tesT@EXAMple.com', 'test')
>>> user.email
'tesT@example.com'
>>> user = User.objects.create_user('forms_test3', 'tesT', 'test')
>>> user.email
'tesT'
"""

View File

@ -2,7 +2,7 @@ from datetime import datetime
from django.conf import settings
from django.contrib.auth.backends import RemoteUserBackend
from django.contrib.auth.models import AnonymousUser, User
from django.contrib.auth.models import User
from django.test import TestCase
@ -30,15 +30,15 @@ class RemoteUserTest(TestCase):
num_users = User.objects.count()
response = self.client.get('/remote_user/')
self.assert_(isinstance(response.context['user'], AnonymousUser))
self.assert_(response.context['user'].is_anonymous())
self.assertEqual(User.objects.count(), num_users)
response = self.client.get('/remote_user/', REMOTE_USER=None)
self.assert_(isinstance(response.context['user'], AnonymousUser))
self.assert_(response.context['user'].is_anonymous())
self.assertEqual(User.objects.count(), num_users)
response = self.client.get('/remote_user/', REMOTE_USER='')
self.assert_(isinstance(response.context['user'], AnonymousUser))
self.assert_(response.context['user'].is_anonymous())
self.assertEqual(User.objects.count(), num_users)
def test_unknown_user(self):
@ -115,7 +115,7 @@ class RemoteUserNoCreateTest(RemoteUserTest):
def test_unknown_user(self):
num_users = User.objects.count()
response = self.client.get('/remote_user/', REMOTE_USER='newuser')
self.assert_(isinstance(response.context['user'], AnonymousUser))
self.assert_(response.context['user'].is_anonymous())
self.assertEqual(User.objects.count(), num_users)

View File

@ -0,0 +1 @@
Password reset successfully

View File

@ -0,0 +1,5 @@
{% if validlink %}
Please enter your new password: {{ form }}
{% else %}
The password reset link was invalid
{% endif %}

View File

@ -0,0 +1 @@
E-mail sent

View File

@ -0,0 +1 @@
{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/

View File

@ -0,0 +1 @@
{{ form }}

View File

@ -34,4 +34,9 @@ True
>>> p2.check_token(u, tk1)
False
This will put a 14-digit base36 timestamp into the token, which is too large.
>>> tk1 = p0._make_token_with_timestamp(u, 175455491841851871349)
>>> p0.check_token(u, tk1)
False
"""

View File

@ -1,8 +1,9 @@
import os
import re
import urllib
from django.conf import settings
from django.contrib.auth import SESSION_KEY
from django.contrib.auth import SESSION_KEY, REDIRECT_FIELD_NAME
from django.contrib.auth.forms import AuthenticationForm
from django.contrib.sites.models import Site, RequestSite
from django.contrib.auth.models import User
@ -37,16 +38,6 @@ class AuthViewsTestCase(TestCase):
class PasswordResetTest(AuthViewsTestCase):
def setUp(self):
self.old_LANGUAGES = settings.LANGUAGES
self.old_LANGUAGE_CODE = settings.LANGUAGE_CODE
settings.LANGUAGES = (('en', 'English'),)
settings.LANGUAGE_CODE = 'en'
def tearDown(self):
settings.LANGUAGES = self.old_LANGUAGES
settings.LANGUAGE_CODE = self.old_LANGUAGE_CODE
def test_email_not_found(self):
"Error is raised if the provided email address isn't currently registered"
response = self.client.get('/password_reset/')
@ -191,9 +182,49 @@ class LoginTest(AuthViewsTestCase):
site = Site.objects.get_current()
self.assertEquals(response.context['site'], site)
self.assertEquals(response.context['site_name'], site.name)
self.assert_(isinstance(response.context['form'], AuthenticationForm),
self.assert_(isinstance(response.context['form'], AuthenticationForm),
'Login form is not an AuthenticationForm')
def test_security_check(self, password='password'):
login_url = reverse('django.contrib.auth.views.login')
# Those URLs should not pass the security check
for bad_url in ('http://example.com',
'https://example.com',
'ftp://exampel.com',
'//example.com'):
nasty_url = '%(url)s?%(next)s=%(bad_url)s' % {
'url': login_url,
'next': REDIRECT_FIELD_NAME,
'bad_url': urllib.quote(bad_url)
}
response = self.client.post(nasty_url, {
'username': 'testclient',
'password': password,
}
)
self.assertEquals(response.status_code, 302)
self.failIf(bad_url in response['Location'], "%s should be blocked" % bad_url)
# Now, these URLs have an other URL as a GET parameter and therefore
# should be allowed
for url_ in ('http://example.com', 'https://example.com',
'ftp://exampel.com', '//example.com'):
safe_url = '%(url)s?%(next)s=/view/?param=%(safe_param)s' % {
'url': login_url,
'next': REDIRECT_FIELD_NAME,
'safe_param': urllib.quote(url_)
}
response = self.client.post(safe_url, {
'username': 'testclient',
'password': password,
}
)
self.assertEquals(response.status_code, 302)
self.failUnless('/view/?param=%s' % url_ in response['Location'], "/view/?param=%s should be allowed" % url_)
class LogoutTest(AuthViewsTestCase):
urls = 'django.contrib.auth.tests.urls'
@ -218,7 +249,7 @@ class LogoutTest(AuthViewsTestCase):
self.assert_('Logged out' in response.content)
self.confirm_logged_out()
def test_logout_with_next_page_specified(self):
def test_logout_with_next_page_specified(self):
"Logout with next_page option given redirects to specified resource"
self.login()
response = self.client.get('/logout/next_page/')

View File

@ -1,4 +1,4 @@
# These URLs are normally mapped to /admin/urls.py. This URLs file is
# These URLs are normally mapped to /admin/urls.py. This URLs file is
# provided as a convenience to those who want to deploy these URLs elsewhere.
# This file is also used to provide a reliable view deployment for test purposes.
@ -11,7 +11,7 @@ urlpatterns = patterns('',
(r'^password_change/done/$', 'django.contrib.auth.views.password_change_done'),
(r'^password_reset/$', 'django.contrib.auth.views.password_reset'),
(r'^password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),
(r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm'),
(r'^reset/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 'django.contrib.auth.views.password_reset_confirm'),
(r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete'),
)

View File

@ -1,5 +1,8 @@
import re
from django.conf import settings
from django.contrib.auth import REDIRECT_FIELD_NAME
# Avoid shadowing the login() view below.
from django.contrib.auth import login as auth_login
from django.contrib.auth.decorators import login_required
from django.contrib.auth.forms import AuthenticationForm
from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm
@ -17,24 +20,38 @@ from django.views.decorators.cache import never_cache
def login(request, template_name='registration/login.html', redirect_field_name=REDIRECT_FIELD_NAME):
"Displays the login form and handles the login action."
redirect_to = request.REQUEST.get(redirect_field_name, '')
if request.method == "POST":
form = AuthenticationForm(data=request.POST)
if form.is_valid():
# Light security check -- make sure redirect_to isn't garbage.
if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
if not redirect_to or ' ' in redirect_to:
redirect_to = settings.LOGIN_REDIRECT_URL
from django.contrib.auth import login
login(request, form.get_user())
# Heavier security check -- redirects to http://example.com should
# not be allowed, but things like /view/?param=http://example.com
# should be allowed. This regex checks if there is a '//' *before* a
# question mark.
elif '//' in redirect_to and re.match(r'[^\?]*//', redirect_to):
redirect_to = settings.LOGIN_REDIRECT_URL
# Okay, security checks complete. Log the user in.
auth_login(request, form.get_user())
if request.session.test_cookie_worked():
request.session.delete_test_cookie()
return HttpResponseRedirect(redirect_to)
else:
form = AuthenticationForm(request)
request.session.set_test_cookie()
if Site._meta.installed:
current_site = Site.objects.get_current()
else:
current_site = RequestSite(request)
return render_to_response(template_name, {
'form': form,
redirect_field_name: redirect_to,

View File

@ -20,6 +20,7 @@ class CommentsAdmin(admin.ModelAdmin):
list_filter = ('submit_date', 'site', 'is_public', 'is_removed')
date_hierarchy = 'submit_date'
ordering = ('-submit_date',)
raw_id_fields = ('user',)
search_fields = ('comment', 'user__username', 'user_name', 'user_email', 'user_url', 'ip_address')
# Only register the default admin if the model is the built-in comment model

View File

@ -250,12 +250,11 @@ class Moderator(object):
models registered for comment moderation, and their associated
moderation classes, and apply moderation to all incoming comments.
To register a model, obtain an instance of ``CommentModerator``
(this module exports one as ``moderator``), and call its
``register`` method, passing the model class and a moderation
class (which should be a subclass of ``CommentModerator``). Note
that both of these should be the actual classes, not instances of
the classes.
To register a model, obtain an instance of ``Moderator`` (this
module exports one as ``moderator``), and call its ``register``
method, passing the model class and a moderation class (which
should be a subclass of ``CommentModerator``). Note that both of
these should be the actual classes, not instances of the classes.
To cease moderation for a model, call the ``unregister`` method,
passing the model class.

View File

@ -248,7 +248,7 @@ def comment_form_target():
Example::
<form action="{% comment_form_target %}" method="POST">
<form action="{% comment_form_target %}" method="post">
"""
return comments.get_form_target()

View File

@ -1,7 +1,7 @@
from django import http
from django.conf import settings
from utils import next_redirect, confirmation_view
from django.core.exceptions import ObjectDoesNotExist
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.db import models
from django.shortcuts import render_to_response
from django.template import RequestContext
@ -59,6 +59,10 @@ def post_comment(request, next=None):
return CommentPostBadRequest(
"No object matching content-type %r and object PK %r exists." % \
(escape(ctype), escape(object_pk)))
except (ValueError, ValidationError), e:
return CommentPostBadRequest(
"Attempting go get content-type %r and object PK %r exists raised %s" % \
(escape(ctype), escape(object_pk), e.__class__.__name__))
# Do we want to preview the comment?
preview = "preview" in data

View File

@ -39,7 +39,7 @@ def confirmation_view(template, doc="Display a confirmation view."):
if 'c' in request.GET:
try:
comment = comments.get_model().objects.get(pk=request.GET['c'])
except ObjectDoesNotExist:
except (ObjectDoesNotExist, ValueError):
pass
return render_to_response(template,
{'comment': comment},

View File

@ -131,7 +131,7 @@ class GenericRelation(RelatedField, Field):
return self.object_id_field_name
def m2m_reverse_name(self):
return self.model._meta.pk.column
return self.rel.to._meta.pk.column
def contribute_to_class(self, cls, name):
super(GenericRelation, self).contribute_to_class(cls, name)
@ -291,18 +291,28 @@ class BaseGenericInlineFormSet(BaseModelFormSet):
"""
A formset for generic inline objects to a parent.
"""
ct_field_name = "content_type"
ct_fk_field_name = "object_id"
def __init__(self, data=None, files=None, instance=None, save_as_new=None, prefix=None):
def __init__(self, data=None, files=None, instance=None, save_as_new=None,
prefix=None, queryset=None):
# Avoid a circular import.
from django.contrib.contenttypes.models import ContentType
opts = self.model._meta
self.instance = instance
self.rel_name = '-'.join((
opts.app_label, opts.object_name.lower(),
self.ct_field.name, self.ct_fk_field.name,
))
if self.instance is None or self.instance.pk is None:
qs = self.model._default_manager.none()
else:
if queryset is None:
queryset = self.model._default_manager
qs = queryset.filter(**{
self.ct_field.name: ContentType.objects.get_for_model(self.instance),
self.ct_fk_field.name: self.instance.pk,
})
super(BaseGenericInlineFormSet, self).__init__(
queryset=self.get_queryset(), data=data, files=files,
queryset=qs, data=data, files=files,
prefix=prefix
)
@ -314,16 +324,6 @@ class BaseGenericInlineFormSet(BaseModelFormSet):
))
get_default_prefix = classmethod(get_default_prefix)
def get_queryset(self):
# Avoid a circular import.
from django.contrib.contenttypes.models import ContentType
if self.instance is None or self.instance.pk is None:
return self.model._default_manager.none()
return self.model._default_manager.filter(**{
self.ct_field.name: ContentType.objects.get_for_model(self.instance),
self.ct_fk_field.name: self.instance.pk,
})
def save_new(self, form, commit=True):
# Avoid a circular import.
from django.contrib.contenttypes.models import ContentType
@ -386,7 +386,7 @@ class GenericInlineModelAdmin(InlineModelAdmin):
"formfield_callback": self.formfield_for_dbfield,
"formset": self.formset,
"extra": self.extra,
"can_delete": True,
"can_delete": self.can_delete,
"can_order": False,
"fields": fields,
"max_num": self.max_num,

View File

@ -25,16 +25,34 @@ def update_contenttypes(app, created_models, verbosity=2, **kwargs):
if verbosity >= 2:
print "Adding content type '%s | %s'" % (ct.app_label, ct.model)
# The presence of any remaining content types means the supplied app has an
# undefined model and can safely be removed, which cascades to also remove
# related permissions.
for ct in content_types:
if verbosity >= 2:
print "Deleting stale content type '%s | %s'" % (ct.app_label, ct.model)
ct.delete()
# undefined model. Confirm that the content type is stale before deletion.
if content_types:
if kwargs.get('interactive', False):
content_type_display = '\n'.join([' %s | %s' % (ct.app_label, ct.model) for ct in content_types])
ok_to_delete = raw_input("""The following content types are stale and need to be deleted:
def update_all_contenttypes(verbosity=2):
%s
Any objects related to these content types by a foreign key will also
be deleted. Are you sure you want to delete these content types?
If you're unsure, answer 'no'.
Type 'yes' to continue, or 'no' to cancel: """ % content_type_display)
else:
ok_to_delete = False
if ok_to_delete == 'yes':
for ct in content_types:
if verbosity >= 2:
print "Deleting stale content type '%s | %s'" % (ct.app_label, ct.model)
ct.delete()
else:
if verbosity >= 2:
print "Stale content types remain."
def update_all_contenttypes(verbosity=2, **kwargs):
for app in get_apps():
update_contenttypes(app, None, verbosity)
update_contenttypes(app, None, verbosity, **kwargs)
signals.post_syncdb.connect(update_contenttypes)

View File

@ -9,7 +9,7 @@ def shortcut(request, content_type_id, object_id):
try:
content_type = ContentType.objects.get(pk=content_type_id)
obj = content_type.get_object_for_this_type(pk=object_id)
except ObjectDoesNotExist:
except (ObjectDoesNotExist, ValueError):
raise http.Http404("Content type %s object %s doesn't exist" % (content_type_id, object_id))
try:
absurl = obj.get_absolute_url()

View File

@ -37,9 +37,6 @@ class CsrfViewMiddleware(object):
if getattr(callback, 'csrf_exempt', False):
return None
if request.is_ajax():
return None
try:
session_id = request.COOKIES[settings.SESSION_COOKIE_NAME]
except KeyError:
@ -48,9 +45,12 @@ class CsrfViewMiddleware(object):
csrf_token = _make_token(session_id)
# check incoming token
try:
request_csrf_token = request.POST['csrfmiddlewaretoken']
except KeyError:
request_csrf_token = request.POST.get('csrfmiddlewaretoken', '')
if request_csrf_token == "":
# Fall back to X-CSRFToken, to make things easier for AJAX
request_csrf_token = request.META.get('HTTP_X_CSRFTOKEN', '')
if request_csrf_token == "":
return HttpResponseForbidden(_ERROR_MSG)
if request_csrf_token != csrf_token:
@ -101,7 +101,13 @@ class CsrfResponseMiddleware(object):
"' /></div>")
# Modify any POST forms
response.content = _POST_FORM_RE.sub(add_csrf_field, response.content)
response.content, n = _POST_FORM_RE.subn(add_csrf_field, response.content)
if n > 0:
# Since the content has been modified, any Etag will now be
# incorrect. We could recalculate, but only is we assume that
# the Etag was set by CommonMiddleware. The safest thing is just
# to delete. See bug #9163
del response['ETag']
return response
class CsrfMiddleware(CsrfViewMiddleware, CsrfResponseMiddleware):

View File

@ -4,11 +4,12 @@ from django.test import TestCase
from django.http import HttpRequest, HttpResponse, HttpResponseForbidden
from django.contrib.csrf.middleware import CsrfMiddleware, _make_token, csrf_exempt
from django.conf import settings
from django.template import Template
def post_form_response():
resp = HttpResponse(content="""
<html><body><form method="POST"><input type="text" /></form></body></html>
<html><body><form method="post"><input type="text" /></form></body></html>
""", mimetype="text/html")
return resp
@ -134,11 +135,17 @@ class CsrfMiddlewareTest(TestCase):
req2 = CsrfMiddleware().process_view(req, csrf_exempt(self.get_view()), (), {})
self.assertEquals(None, req2)
def test_ajax_exemption(self):
def test_csrf_token_in_header(self):
"""
Check that AJAX requests are automatically exempted.
Check that we can pass in the token in a header instead of in the form
"""
req = self._get_POST_session_request()
req.META['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
req.META['HTTP_X_CSRFTOKEN'] = _make_token(self._session_id)
req2 = CsrfMiddleware().process_view(req, self.get_view(), (), {})
self.assertEquals(None, req2)
def test_template_tag_noop(self):
"""
Check that the {% csrf_token %} works in 1.1.2 and later
"""
self.assertEquals(u"", Template("{% csrf_token %}").render({}))

View File

@ -6,7 +6,7 @@
<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a> / <a href="../../../">Calendars</a> / <a href="../../">By {{ field.verbose_name }}</a> / <a href="../">{{ month.year }}</a> / {{ month|date:"F" }}</div>
<h1>{{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.verbose_name }} on {{ day|date:"F Y" }}</h1>
<h1>{{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.verbose_name }} on {{ month|date:"F Y" }}</h1>
<ul class="objectlist">
{% for object in object_list %}

View File

@ -16,19 +16,25 @@ from django.utils.translation import ugettext_lazy as _
from django.contrib.formtools.utils import security_hash
class FormWizard(object):
# Dictionary of extra template context variables.
extra_context = {}
# The HTML (and POST data) field name for the "step" variable.
step_field_name="wizard_step"
# METHODS SUBCLASSES SHOULDN'T OVERRIDE ###################################
def __init__(self, form_list, initial=None):
"form_list should be a list of Form classes (not instances)."
"""
Start a new wizard with a list of forms.
form_list should be a list of Form classes (not instances).
"""
self.form_list = form_list[:]
self.initial = initial or {}
self.step = 0 # A zero-based counter keeping track of which step we're in.
# Dictionary of extra template context variables.
self.extra_context = {}
# A zero-based counter keeping track of which step we're in.
self.step = 0
def __repr__(self):
return "step: %d\nform_list: %s\ninitial_data: %s" % (self.step, self.form_list, self.initial)

View File

@ -64,7 +64,7 @@ class GeoModelAdmin(ModelAdmin):
def get_map_widget(self, db_field):
"""
Returns a subclass of the OpenLayersWidget (or whatever was specified
in the `widget` attribute) using the settings from the attributes set
in the `widget` attribute) using the settings from the attributes set
in this class.
"""
is_collection = db_field.geom_type in ('MULTIPOINT', 'MULTILINESTRING', 'MULTIPOLYGON', 'GEOMETRYCOLLECTION')
@ -111,12 +111,6 @@ class GeoModelAdmin(ModelAdmin):
}
return OLMap
# Using the Beta OSM in the admin requires the following:
# (1) The Google Maps Mercator projection needs to be added
# to your `spatial_ref_sys` table. You'll need at least GDAL 1.5:
# >>> from django.contrib.gis.gdal import SpatialReference
# >>> from django.contrib.gis.utils import add_postgis_srs
# >>> add_postgis_srs(SpatialReference(900913)) # Adding the Google Projection
from django.contrib.gis import gdal
if gdal.HAS_GDAL:
class OSMGeoAdmin(GeoModelAdmin):

View File

@ -7,9 +7,6 @@
indices may only be used on MyISAM tables -- if you need
transactions, take a look at PostGIS.
"""
from django.db import connection
qn = connection.ops.quote_name
# To ease implementation, WKT is passed to/from MySQL.
GEOM_FROM_TEXT = 'GeomFromText'
GEOM_FROM_WKB = 'GeomFromWKB'
@ -40,7 +37,7 @@ MYSQL_GIS_TERMS = MYSQL_GIS_FUNCTIONS.keys()
MYSQL_GIS_TERMS += MISC_TERMS
MYSQL_GIS_TERMS = dict((term, None) for term in MYSQL_GIS_TERMS) # Making dictionary
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot, qn):
"Returns the SQL WHERE clause for use in MySQL spatial SQL construction."
# Getting the quoted field as `geo_col`.
geo_col = '%s.%s' % (qn(table_alias), qn(name))

View File

@ -9,10 +9,8 @@
"""
import re
from decimal import Decimal
from django.db import connection
from django.contrib.gis.db.backend.util import SpatialFunction
from django.contrib.gis.measure import Distance
qn = connection.ops.quote_name
# The GML, distance, transform, and union procedures.
AREA = 'SDO_GEOM.SDO_AREA'
@ -110,7 +108,7 @@ ORACLE_SPATIAL_TERMS += MISC_TERMS
ORACLE_SPATIAL_TERMS = dict((term, None) for term in ORACLE_SPATIAL_TERMS) # Making dictionary for fast lookups
#### The `get_geo_where_clause` function for Oracle ####
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot, qn):
"Returns the SQL WHERE clause for use in Oracle spatial SQL construction."
# Getting the quoted table name as `geo_col`.
geo_col = '%s.%s' % (qn(table_alias), qn(name))

View File

@ -12,7 +12,8 @@ def _get_postgis_func(func):
cursor = connection.cursor()
cursor.execute('SELECT %s()' % func)
row = cursor.fetchone()
cursor.close()
# Close out the connection. See #9437.
connection.close()
return row[0]
### PostGIS management functions ###

View File

@ -5,13 +5,10 @@
import re
from decimal import Decimal
from django.db import connection
from django.conf import settings
from django.contrib.gis.measure import Distance
from django.contrib.gis.db.backend.util import SpatialOperation, SpatialFunction
qn = connection.ops.quote_name
# Get the PostGIS version information.
# To avoid the need to do a database query to determine the PostGIS version
# each time the server starts up, one can optionally specify a
@ -250,7 +247,7 @@ def num_params(lookup_type, val):
else: return exactly_two(val)
#### The `get_geo_where_clause` function for PostGIS. ####
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot, qn):
"Returns the SQL WHERE clause for use in PostGIS SQL construction."
# Getting the quoted field as `geo_col`.
geo_col = '%s.%s' % (qn(table_alias), qn(name))

View File

@ -4,10 +4,8 @@
"""
import re
from decimal import Decimal
from django.db import connection
from django.contrib.gis.measure import Distance
from django.contrib.gis.db.backend.util import SpatialOperation, SpatialFunction
qn = connection.ops.quote_name
GEOM_SELECT = 'AsText(%s)'
@ -115,7 +113,7 @@ SPATIALITE_TERMS += MISC_TERMS # Adding any other miscellaneous terms (e.g., 'is
SPATIALITE_TERMS = dict((term, None) for term in SPATIALITE_TERMS) # Making a dictionary for fast lookups
#### The `get_geo_where_clause` function for SpatiaLite. ####
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot, qn):
"Returns the SQL WHERE clause for use in SpatiaLite SQL construction."
# Getting the quoted field as `geo_col`.
geo_col = '%s.%s' % (qn(table_alias), qn(name))

Some files were not shown because too many files have changed in this diff Show More