Compare commits

...

902 Commits

Author SHA1 Message Date
Ramiro Morales cf96d88421 [1.2.X] Fixed #17846 -- Made a note about the micro-version in which a security fix for URLField was introduced in the 1.2.X branch more accurate.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@17677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-10 17:45:26 +00:00
James Bennett ed736e6a25 [1.2.X] Bump to 1.2.7, refs #16804.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-11 01:01:58 +00:00
James Bennett 216a79ee47 [1.2.X] Bump to 1.2.6 for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:41:36 +00:00
Russell Keith-Magee 7268f8af86 [1.2.X] Altered the behavior of URLField to avoid a potential DOS vector, and to avoid potential leakage of local filesystem data. A security announcement will be made shortly.
Backport of r16760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:28:50 +00:00
Russell Keith-Magee ac7c3a110f [1.2.X] Corrected an issue which could allow attackers to manipulate session data using the cache. A security announcement will be made shortly.
Backport of r16759 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:28:40 +00:00
Russell Keith-Magee c613af4d64 [1.2.X] Added protection against spoofing of X_FORWARDED_HOST headers. A security announcement will be made shortly.
Backport of r16758 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 01:28:31 +00:00
Luke Plant 285b464fb8 [1.2.X] Updated AJAX example code in CSRF docs to be consistent regarding what are safe HTTP methods
Backport of [16202] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:56:04 +00:00
Luke Plant cfc1756ef5 [1.2.X] Fixed #15469 - CSRF token is inserted on GET requests
Thanks to goran for report.

Backport of [16191] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 21:39:22 +00:00
Luke Plant 87fa64ca7c [1.2.X] Fixed #15869 - example AJAX code in CSRF docs fails sometimes for IE7 or absolute same origin URLs
Thanks to nick for the report.

Backport of [16183] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@16185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 15:49:54 +00:00
Karen Tracey 1dc518555b [1.2.X] Ensure stdin is a tty before handing it to termios, so as to prevent prolems when running under IDEs.
r15911 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-24 13:00:59 +00:00
Simon Meers c5b476e22a [1.2.X] Fixed typo in forms API documentation.
Backport of r15896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-22 23:24:13 +00:00
Ramiro Morales 1332e89852 [1.2.X] Tweaked title level in custom file storage systems documentation.
Backport of [15888] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-21 15:41:53 +00:00
Karen Tracey f9f2f4b7ec [1.2.X] Fixed #15565: Ensure terminal echo is on after reloader reloads (something turns it off on some systems if reload happens while at a pdb prompt). Thanks for the report zimnyx.
r15883 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 22:13:35 +00:00
Russell Keith-Magee 52e81079be [1.2.X] Fixed #13686 -- Ensure that memcache handling of unicode values in add() and set_many() is consistent with the handling provided by get() and set(). Thanks to nedbatchelder for the report, and to jbalogh, accuser and Jacob Burch for their work ont the patch.
Backport of r15880 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19 02:45:51 +00:00
Justin Bronn 9ccf1d087e [1.2.X] Fixed #14133 -- Updated Windows installation instructions for GeoDjango, now recommend the OSGeo4W installer for spatial libraries.
Backport of r15872 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 20:12:38 +00:00
Russell Keith-Magee cbf9688b12 [1.2.X] Fixed #15622 -- Clear content type cache to avoid problems with subsequence TransactionTestCases. Thanks to zyga for the report
Backport of r15867 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:42:10 +00:00
Russell Keith-Magee 1d64c8a539 [1.2.X] Fixed #15142 -- Force test views to be non-cached so that projects with caching middleware enabled don't cause test failures. Thanks to jsdalton for the report and patch
Backport of r15865 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 08:10:52 +00:00
Russell Keith-Magee 05c929fb3b [1.2.X] Fixed #15569 -- Corrected the numbering updates to inlines when rows are added and deleted. Thanks to sbaechler for the report, to Arthur de Jong and mk for the work on the patch, and to Karen Tracey for the last minute testing help.
Backport of r15862 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-17 00:50:53 +00:00
Justin Bronn 33c0d50c0c [1.2.X] Added GIS test fixture directories to the MANIFEST.
Backport of r15860 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 19:03:34 +00:00
Justin Bronn 28462b693f [1.2.X] Add `setUp` and `tearDown` methods to the geographic feed and sitemap tests to ensure `Site` exists for tests.
Backport of r15856 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 18:23:39 +00:00
Justin Bronn 64c83ac6fb [1.2.X] Use Sphinx `:download:` directives for spatial database template creation scripts instead of linking to geodjango.org.
Backport of r15854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 16:52:53 +00:00
Justin Bronn e594ca7f93 [1.2.X] Fixed #15194 -- Add OSGeo4W DLL library names to GEOS and GDAL interfaces. Thanks, master for ticket and initial patch.
Backport of r15852 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 04:45:00 +00:00
Justin Bronn 1e2d896e33 [1.2.X] Fixed #15533 -- Now use 3857 as spherical mercator projection instead of deprecated 900913 on platforms that support it. Thanks to cnorthwood for bug report and Christopher Schmidt for OpenLayers JavaScript workaround.
Backport of r15845 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-16 03:07:30 +00:00
Luke Plant 1d628d7ecf [1.2.X] Fixed #15617 - CSRF referer checking too strict
Thanks to adam for the report.

Backport of [15840] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:24:26 +00:00
Justin Bronn 63686ce2c6 [1.2.X] Previous changeset did not include new test data, stupid hgsubversion. Refs #15378.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 02:30:54 +00:00
Justin Bronn ddb1cee0e5 [1.2.X] Fixed #15378 -- Now properly handle OGR layers that have features with invalid geometries. Thanks, kunitoki for bug report and initial patch.
Backport of r15813 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 02:27:48 +00:00
Carl Meyer e8dcaa4bba [1.2.X] Added backwards-incompatibility note for r15808.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 22:52:12 +00:00
Carl Meyer e5f49f8c06 [1.2.X] Fixed #9213 - Added check to prevent inactive users from resetting their password. Thanks to John Scott for report and draft patch, and Evgeny Fadeev for final patch with test.
Backport of r15805 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15808 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 21:22:00 +00:00
Justin Bronn f10dae5160 [1.2.X] Fixed brittle tests that broke with release of GDAL 1.8.
Backport of r15806 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 21:17:20 +00:00
Justin Bronn 8ad87ec6ea [1.2.X] Fixed an invalid import in the GeoDjango 3D tests.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 21:11:42 +00:00
Gabriel Hurley e9857ed5b1 [1.2.X] Fixed #15592 -- corrected an missing backtick in the syndication docs. Thanks to bradley.ayers for the report and patch.
Backport of [15793] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 17:22:35 +00:00
Luke Plant 2bb360c91c [1.2.X] Fixed #15559 - distinct queries introduced by [15607] cause errors with some custom model fields
This patch just reverts [15607] until a more satisfying solution can be
found.

Refs #11707

Backport of [15791] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 01:21:59 +00:00
Ian Kelly ec7dd583f2 [1.2.X] Fixed a bunch more tests that were failing in Oracle due to false assumptions about the primary keys of objects.
Backport of r15789 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10 00:04:43 +00:00
Ian Kelly 317f30a77f [1.2.X] Fixed another case-sensitivity bug in Oracle introspection. This one was harmless, but it was causing an irritating test failure.
Backport of r15787 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 22:47:25 +00:00
Ian Kelly 76636c81cd [1.2.X] Fixed a case-sensitivity bug in Oracle introspection that was preventing inspectdb from identifying foreign keys.
Backport of r15785 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 19:41:33 +00:00
Ian Kelly 4c152afbb6 [1.2.X] Fixed a test that was failing in Oracle due to default ordering assumptions.
Backport of r15783 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 19:22:27 +00:00
Ian Kelly 1c08ca568f [1.2.X] Fixed a number of tests that were failing in Oracle due to false assumptions about the primary keys of objects.
Backport of r15779 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 00:43:36 +00:00
Ian Kelly 05b197dbb1 [1.2.X] Added a skip for a test that fails in Oracle. Unlike other backends, Oracle does not allow duplicate rows where there is a unique_together constraint for which some but not all of the columns are NULL.
Backport of r15777 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 22:50:56 +00:00
Ian Kelly e81e64cd63 [1.2.X] Fixed field names that were preventing the tests from running in Oracle. Backport of r15774 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08 19:38:54 +00:00
Russell Keith-Magee ee31d7124f [1.2.X] Fixed #15554 -- Corrected test failure in contenttypes when default site isn't example.com. Thanks to twil for the report, and PaulM for the patch.
Backport of r15766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 00:12:02 +00:00
Russell Keith-Magee 20cf3b82a1 [1.2.X] Fixed #3094 -- Updated docs to reflect actual behavior of XMLField. Thanks to PaulM for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-06 07:03:27 +00:00
Russell Keith-Magee cb4b469a7f [1.2.X] Added trove classifiers for specific python versions. Thanks to Brett Cannon for the suggestion.
Backport of r15760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-05 10:39:10 +00:00
Gabriel Hurley 64011c8e5a [1.2.X] Fixed #11864 -- Improved the "see also" section of the many-to-one model topic guide to more clearly connect people to the backwards-related objects docs and to the correct point in the model tests for sample code (since the doctests went away). Thanks to dwillis for the work on the patch.
Backport of [15758] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 22:30:18 +00:00
Simon Meers 52739520c6 [1.2.X] Fixed #15547 -- incorrect link in generic views reference page. 1.2 only.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 20:05:57 +00:00
Russell Keith-Magee 64cf5d33ac [1.2.X] Refs #15550 -- Corrected another primary-key ordering problem in the modelforms tests. Thanks to bberes for the report.
Backport of r15753 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 01:28:22 +00:00
Russell Keith-Magee 138c4aaa77 [1.2.X] Fixed #15550 -- Corrected an ordering dependency in the model_forms doctests. Thanks to bberes for the report.
Backport of r15745 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 00:42:37 +00:00
Russell Keith-Magee d9b9684eff [1.2.X] Fixed #15549 -- Removed dependency on specific primary keys. Thanks to bberes for the report.
Backport of r15744 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 00:42:21 +00:00
Russell Keith-Magee a1697e883a [1.2.X] Fixed #15548 -- Added an ordering clause to prevent test failures under Postgres. Thanks to bberes for the report.
Backport of r15743 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 00:41:54 +00:00
Gabriel Hurley a9a85d7cfa [1.2.X] Fixed #15504 -- Cleaned up contrib.syndication and contrib.utils.feedgenerator docs. Corrected numerous reST problems, removed duplicate method declarations, corrected method signatures, etc. Thanks to slinkp for the report.
Backport of [15739] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 22:22:03 +00:00
Ramiro Morales f88b9eee53 [1.2.X] Fixed #11206 -- Ensure that the floatformat template filter doesn't switch to scientific notation when asked to format a zero value with more than six decimal places. Thanks Tai Lee for the report and fix and Facundo Batista for his help when Decimal module expertise was needed.
Backport of [15736] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 21:17:48 +00:00
Gabriel Hurley de46b6687f [1.2.X] Added crossref targets for a couple of Django exceptions and cleaned up related reST markup.
Backport of [15733] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 19:32:55 +00:00
Ramiro Morales 1091a8e73e [1.2.X] Fixed #15543 -- Tweaked change from r15696 to not use 'if' syntax introduce in Python 2.5. Thanks to an anonymous reporter for the heads up.
Backport of [15731] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 18:45:07 +00:00
Gabriel Hurley ef53365a7d [1.2.X] Fixed #15541 -- Updated FAQ to point at djangosites.org instead of defunct wiki page. Thanks to aaugustin for the report and draft patch.
Backport of [15729] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 18:27:08 +00:00
Russell Keith-Magee 113a8c1f1c [1.2.X] Fixed #12252 -- Ensure that queryset unions are commutative. Thanks to benreynwar for the report, and draft patch, and to Karen and Ramiro for the review eyeballs and patch updates.
Backport of r15726 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:53:12 +00:00
Jannis Leidel a97396948b [1.2.X] Fixed wrong import introduced in r15697.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:47:46 +00:00
Jannis Leidel 0516b99875 [1.2.X] Fixed #12475 -- Fixed an edge case with hidden fields in ModelAdmin changelists when used in conjunction with list_display_links or list_editable. Thanks, Simon Meers, Julien Phalip, Karen and master.
Backport from trunk (r15722).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:47:39 +00:00
Jannis Leidel 1985ca77ea [1.2.X] Fixed #13411 -- Made sure URL fragments are correctly handled by the next_redirect utility of the comments apps. Thanks, timesong, dpn and Julien Phalip.
Backport from trunk (r15720).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 13:04:51 +00:00
Russell Keith-Magee ac87e4f8fa [1.2.X] Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are propegated with a meaningful error message when loaded using select_template. Thanks to jaylett for the report, and GDorn for the patch.
Backport of r15717 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:42:56 +00:00
Russell Keith-Magee 4c76896ead [1.2.X] Fixed #15530 -- Corrected typo in template loader deprecation message. Thanks to msaelices for the report and patch.
Backport of r15714 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:38:08 +00:00
Russell Keith-Magee 76f5b4eb5c [1.2.X] Fixed #15532 -- Clarified the error message for unknown auth backends. Thanks to kmike for the report.
Backport of r15713 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 00:37:56 +00:00
Jannis Leidel 84f398e77c Fixed typo in r15710.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 21:47:55 +00:00
Jannis Leidel b34a08e070 [1.2.X] Fixed #15535 -- Stopped the blocktrans template tag from raising a KeyError if an included variable can't be found in the context. Thanks, melinath.
Backport from trunk (r15709).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 21:37:29 +00:00
Jannis Leidel 7207481aa8 [1.2.X] Fixed #11223 -- Fixed logout view to use the 'next' GET parameter correctly as described in the docs, while only allowing redirection to the same host.
Backport from trunk (r15706).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02 12:59:26 +00:00
Luke Plant 29fccc353c [1.2.X] Added file missing from [15696], sorry for breakage.
Thanks to Ramiro for letting me know. Refs #717.

Backport of [15699] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 18:55:39 +00:00
Luke Plant 58bd249283 [1.2.X] Fixed #717 - If-Modified-Since handling should compare dates according to RFC 2616
Thanks to Maniac for the report, julienb for the initial patch, and
especially to aaugustin for the final patch and tests.

Backport of [15696] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 14:34:03 +00:00
Ramiro Morales 8d3ee29847 [1.2.X] Reverted 'now' template tag documentation changes so it describes the real code implementation regarding (lack of) interaction with L10N machinery. Refs #15263. Thanks danielr for the report.
Backport of [15678] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 03:07:25 +00:00
Ramiro Morales b5b5d3c280 [1.2.X] Fixed #15520 -- Fixed incompatibility with email module shipped with Python 2.4 introduced in r15669. Thanks dobcey for the report.
Backport of [15675] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 14:09:58 +00:00
Gabriel Hurley a5f71e1264 [1.2.X] Fixed #15365 -- Added a warning to the `contrib.markup` docs reminding users that the marked up output will not be escaped.
Backport of [15673] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:40:55 +00:00
Gabriel Hurley 32ac8d913e [1.2.X] Fixed #15395 -- Documented the modules/import paths for the various decorators in `django.views.decorators`. Thanks to slinkp for the report.
Backport of [15671] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 05:26:48 +00:00
Ramiro Morales f5c0328fd3 [1.2.X] Fixed #13433 -- Changed default behavior of Django email message wrappers to not mangle lines starting with 'From '. Thanks Leo for the report and patch.
Backport of [15669] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-28 02:56:02 +00:00
Russell Keith-Magee 076ce17f0e [1.2.X] Converted the new contributions docs to unix line endings.
Backport of r15667 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 23:34:14 +00:00
Gabriel Hurley f1dd46b63d [1.2.X] Fixed #14702 -- Added a "needsinfo" resolution to Trac, and added supporting documentation on the new resolution and closing tickets in general.
Backport of [15665] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 22:14:17 +00:00
Gabriel Hurley a90e297f58 [1.2.X] Fixed #15492 -- Documented the `invalid_date` and `invalid_time` error keys for !SplitDateTimeField. Thanks to lode for the report.
Backport of [15663] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 21:18:16 +00:00
Luke Plant e233917832 [1.2.X] Fixed #15368 - test failures due to regression with RequestContext
Thanks to cyberdelia for the reports on this.

Backport of [15660] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-27 00:28:53 +00:00
Russell Keith-Magee 120d01c20b [1.2.X] Fixed #10918 -- Ensure that the search widget on a raw_id_admin uses the right field name when the ForeignKey has a to_field definition. Thanks to David Cramer for the report, Collin Anderson for the fix, and Julien Phalip for the test.
Backport of r15657 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 12:49:15 +00:00
Russell Keith-Magee 3a31023783 [1.2.X] Fixed #11447 -- Ensured that ForeignKey widgets in a list-editable admin changelist won't wrap split the widget. Thanks to patrick@vonautomatisch.at for the report, and Julien Phalip for the patch.
Backport of r15656 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 12:49:00 +00:00
Ramiro Morales 049b3ff8a2 [1.2.X] Fixed #15424 -- Corrected lookup of callables listed in admin inlines' `readonly_fields` by passing the right ModelAdmin (sub)class instance when instantiating inline forms admin wrappers. Also, added early validation of its elements. Thanks kmike for the report and Karen for the patch fixing the issue.
Backport of [15650] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-26 02:00:18 +00:00
Luke Plant 9a5ebbcac9 [1.2.X] Fixed #15493 - csrf_migration_helper.py parsing fix.
Thanks to 'john' for the patch.

Backport of [15647] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 09:45:54 +00:00
Gabriel Hurley 69af5573c3 [1.2.X] Fixed #14401 -- Added a contributing howto guide for new users. Thank you to everyone who added their advice, feedback, and wisdom to the wiki article while constructing this new guide.
Backport of [15645] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 02:51:16 +00:00
Russell Keith-Magee 97e81089a2 [1.2.X] Fixed #15491 -- Added a CDATA block and closed a stray tag in the comments HTML. Thanks to Jonathan Slenders for the report.
Backport of r15642 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 01:08:04 +00:00
Russell Keith-Magee 5b342d7c30 [1.2.X] Fixed #15490 -- Added some missing semicolons in admin javascript. Thanks to Jonathan Slenders for the report and patch.
Backport of r15641 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-25 01:07:49 +00:00
Jacob Kaplan-Moss 062cbfb1ec [1.2.X] Prevented non-admin users from accessing the admin redirect shortcut.
If the admin shortcut view (e.g. /admin/r/<content-type>/<pk>/) is
publically-accessible, and if a public users can guess a content-type ID
(which isn't hard given that they're sequential), then the redirect view could
possibly leak data by redirecting to pages a user shouldn't "know about." So
the redirect view needs the same protection as the rest of the admin site.

Thanks to Jason Royes for pointing this out.

Backport of [15639] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-24 13:38:32 +00:00
Ramiro Morales fa1a74ff3c [1.2.X] Fixed #14012 (again) -- Admin app: Don't show the full user edition view after adding a user in a FK popup. Thanks dburke for reporting this regression introduced in r14628.
Backport of [15637] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-24 01:09:23 +00:00
Simon Meers f87936fa89 [1.2.X] Fixed #15375 -- clarified apparent contradiction in Form Wizard documentation. Thanks to codysomerville for the report.
Backport of r15633 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-23 09:44:40 +00:00
Russell Keith-Magee 8ed8b249ef [1.2.X] Fixed #15371 -- Ensure that a superuser created with the createsuperuser management command with --noinput has an invalid password, not a blank password. Thanks to yishaibeeri for the report and patch.
Backport of r15631 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 11:35:25 +00:00
Luke Plant e89c471ebb [1.2.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.2.X@15629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 11:30:10 +00:00
Ramiro Morales dc9d639c0a [1.2.X] Fixed #13510 -- Corrected colspan of non-field-specific error messages in admin app tabular inlines so it isn't greater than the actual number of field cells. Thanks KyleMac for the report and Julien Phalip for the patch fixing the issue.
Backport of [15626] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 03:25:55 +00:00
Timo Graham 53663be502 [1.2.X] Fixed #15257 - Add a link about field lookups to the tutorial; thanks dwillis.
Backport of r15624 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-22 00:58:38 +00:00
Luke Plant a6114e1a14 [1.2.X] Fixed error that was introduced in [15601] causing lots of test failures on 1.2.X
In 1.2.X and earlier, the test client adds the 'template' attribute to
responses, while in trunk it adds 'templates', hence the confusion.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 22:56:01 +00:00
Luke Plant 31d0f2fa29 [1.2.X] Fixed #11058 - list_display_links doesn't allow callables not defined in the model
Thanks to dvine for the report and julien for the patch.

Backport of [15619] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 21:20:41 +00:00
Luke Plant 25c217bc17 [1.2.X] Fixed #14835 -- Corrected a lack of indentation in the reST markup for docs/ref/contrib/admin/index.txt and reflowed the text accordingly.
Thanks to cogat for the report.

Backport of [14830] from trunk - approximate, because other changes have
made it very hard to do exactly.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 21:04:25 +00:00
Chris Beaven 58c4aca370 Remove reference to use_l10n which snuck in from a backport from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 18:45:46 +00:00
Luke Plant 5baa06ecfe [1.2.X] Fixed HTML error in admin when using list_editable.
Backport of [15616] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 18:44:42 +00:00
Luke Plant e63db6597c [1.2.X] Fixed #15349 - Bound FormSet produces bound empty_form
Thanks to hidde-jan for the report and patch.

Backport of [15614] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 16:14:04 +00:00
Luke Plant c326ec48d8 [1.2.X] Fixed #14099 - BaseModelFormSet should use _should_delete_form
Thanks to kenth for the report and patch.

Backport of [15612] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:32:12 +00:00
Luke Plant 4df0e5ff84 [1.2.X] Fixed #11707 - limit_choices_to on a ForeignKey can render duplicate options in formfield
Thanks to Chris Wesseling for the report and patch.

Backport of [15607] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:08:06 +00:00
Russell Keith-Magee fee8a49866 [1.2.X] Fixed #15359 -- Ensure that the -h option is always honored by django-admin.py. Thanks to teubank for the report.
Backport of r15605 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:06:28 +00:00
Russell Keith-Magee bf4507f255 [1.2.X] Fixed #15364 -- Ensure files are closed correctly during file tests. Thanks to Mila for the report and patch.
Backport of r15604 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 14:06:12 +00:00
Karen Tracey e636db1066 [1.2.X] Fixed #15362: Added explicit deletion of file to test, needed now since files are no longer auto-deleted when a referencing object is deleted. Thanks mila.
r15602 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 12:40:55 +00:00
Chris Beaven 39b8a1f7ed [1.2.X] Fix broken tests due to changes in r15591 by updating the test store_rendered_templates signal handler.
Backport of r15600 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 10:13:11 +00:00
Russell Keith-Magee 3db9383daf [1.2.X] Fixed #15358 -- Renamed a test to avoid a naming collision. Thanks to mila for the report.
Backport of r15598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-21 00:08:07 +00:00
Ramiro Morales 1d1f3632c6 [1.2.X] Fixed #14529 -- Fixed representation of model names in admin messages after model object changes when the ModelAdmin queryset() uses defer() or only(). Thanks rlaager for report and initial patch, to rasca an julien for help in tracking the problem.
Backport of [15596] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-20 23:19:21 +00:00
Ramiro Morales d65ca449ac [1.2.X] Expanded InlineModelAdmin documentation a bit. Partial backport of [14882].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-20 15:27:01 +00:00
Russell Keith-Magee 6ef2b4c2da [1.2.X] Tweaked the changes from changeset r15580 so as to avoid introducing a backwards incompatible context change to the change_list_results template. Refs #13126. Thanks to Sean Brant for the report.
Backport of r15593 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-20 13:44:37 +00:00
Chris Beaven 2377f109bc [1.2.X] Ensure render_to_string leaves the context instance stack in the state it was originally passed in.
Backport of r15591 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-20 05:56:45 +00:00
Russell Keith-Magee 69a3bb5d47 [1.2.X] Fixed #9161 -- Ensure that ModelMultipleChoiceField respects to_field_name in validation. Thanks to Honza for the report, and Gregor Müllegger for the patch.
Backport of r15587 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 14:47:33 +00:00
Russell Keith-Magee 626ad2c9ab [1.2.X] Fixed #11513 -- Ensure that the redirect at the end of an object change won't redirect to a page for which the user doesn't have permission. Thanks to rlaager for the report and draft patch, and to Julien Phalip for the final patch.
Backport of r15584 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 14:30:23 +00:00
Ramiro Morales 3202d2abbc [1.2.X] Fixed #15327 -- Modified the Oracle test database signature method to allow for the case where TEST_USER is unspecified. Thanks to depaolim for the report.
Backport of [15568]

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 14:22:57 +00:00
Russell Keith-Magee 909ee62563 [1.2.X] Fixed #14355 -- Ensure that help_text is displayed for readonly fields in the admin. Thanks to jester for the report, and to alexbmeng, subsume, wamberg and Julien Phalip for ther work on the patch.
Backport of r15582 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 12:56:25 +00:00
Russell Keith-Magee da4dea5834 [1.2.X] Fixed #13126 -- Ensured that individual form errors are displayed when errors occur on a list-editable changelist. Thanks to slafs for the report, and to Julien Phalip for the patch.
Backport of r15580 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 11:52:33 +00:00
Russell Keith-Magee c9949103df [1.2.X] Fixed #12893 -- Added tests to validate that the right queryset is always used in model admins. Thanks to mk and Julien Phalip for their work on the patch.
Backport of r15578 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 08:38:53 +00:00
Russell Keith-Magee efc4c62691 [1.2.X] Fixed #15291 -- Corrected alignment issue when actions are disabled in a ModelAdmin. Thanks to Julien Phalip for the report and patch.
Backport of r15573 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 08:15:20 +00:00
Russell Keith-Magee c94804b14f [1.2.X] Fixed #15290 -- Fixed a CSS styling issue with borders when the link item in a changelist isn't the first item in the list_display. Thanks to Julien Phalip for the report and patch.
Backport of r15572 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 08:15:01 +00:00
Russell Keith-Magee 10a12cd6f2 [1.2.X] Fixed #15336 -- Silenced a warning about the DATABASES transition when a database backend isn't specified. Thanks to Ivan Sagalaev for the report and patch.
Backport of r15571 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 08:14:44 +00:00
Russell Keith-Magee 19fa3bcebc [1.2.X] Fixed #15292 -- Removed redundant code in admin list template tag. Thanks to Julien Phalip for the report.
Backport of r15570 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 08:14:28 +00:00
Carl Meyer b9fc7809f5 [1.2.X] Fixed #15343 -- Added import of handler500 and handler404 in URLconf for contrib.auth tests, so that other configuration errors that cause test failures aren't masked by 'missing handler500' errors.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-19 02:49:04 +00:00
Carl Meyer aae16079ef [1.2.X] Fixed #15260 -- Ensured that CACHE_MIDDLEWARE_ANONYMOUS_ONLY is effective with the cache_page decorator, not only the middleware. Thanks to brodie for report and draft patch.
Backport of r15559 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-17 05:01:42 +00:00
Carl Meyer 9ec9d2efd1 [1.2.X] Improved CACHE_MIDDLEWARE_ANONYMOUS_ONLY test.
Backport of r15557 from trunk. (Backported in order to simplify backport of upcoming test addition).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-17 04:15:14 +00:00
Gabriel Hurley dbe7010d47 [1.2.X] Fixed #15308 -- Sphinx/reST fixes for the Custom Model Fields docs.
Backport of [15447] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-16 00:26:17 +00:00
Gabriel Hurley 95a6d5a2ef [1.2.X] Fixed #14820 -- Added more information to the generic relation docs regarding different choices for storing PK references for a GenericForeignKey. Thanks to mrmachine for the all the work on the patch.
Backport of [15545] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-16 00:21:27 +00:00
Gabriel Hurley ddc9cefc21 [1.2.X] Fixed #15285 -- Corrected an erroneous import statement in the testing docs. Thanks to kamal.mustafa for the report.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15543 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-15 21:51:27 +00:00
Jannis Leidel 551da285db [1.2.X] Moved the test added in r15511 to a different test where it doesn't actually verify the existence of the URL by calling urlopen but only validates it.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-15 20:42:57 +00:00
Timo Graham fe21117cc3 [1.2.X] Fixed "the the" typos.
Backport of r15536 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 23:25:46 +00:00
Ramiro Morales 7520dbd5a5 [1.2.X] Fixed a couple of documentation typos.
Backport of [15534] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 15:04:26 +00:00
Ramiro Morales 7cfb2b6335 [1.2.X] Tweaked some asserts not present in older unittest or deprecated from tests added in r15499. Refs #13987
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-13 03:15:34 +00:00
Ramiro Morales af03867f00 [1.2.X] Fixed #13007 -- Made cookie parsing resilent to the presence of cookies with invalid characters in their names. Thanks Warlax for the report, Ubercore for his work on a fix and Jannis and Luke for review and guidance.
Backport of [15523] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-13 02:37:52 +00:00
Justin Bronn 4bcc5012b1 [1.2.X] Updated GeoDjango installation docs and spatial database template script for latest Ubuntu/Debian packages.
Backport of r15520 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-13 01:54:31 +00:00
Luke Plant cfaac48710 [1.2.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.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 23:39:39 +00:00
Jannis Leidel 6a438e2d1a [1.2.X] Fixed #15237 -- Always set charset of Atom1 feeds to UTF-8. Thanks, Simon and jasonkotenko.
Backport from trunk (r15505).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15512 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 19:24:42 +00:00
Jannis Leidel 748110cb94 [1.2.X] Fixed #14941 -- Stop raising ValidationError in form fields that use the URLValidator and get a IDN domain passed. Thanks, Claude Paroz.
Backport from trunk (r15504).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 19:24:34 +00:00
Jannis Leidel 89c03dcbf3 [1.2.X] Fixed #14132 -- Fixed feedgenerator to support years < 1900. Thanks, mk.
Backport from trunk (r15503).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 19:24:25 +00:00
Jannis Leidel 90ee3af279 [1.2.X] Fixed #12988 -- Extended regular expression of the URLValidator to fully support IDN-URLs, especially the long TLDs.
Backport from trunk (r15502).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 19:24:17 +00:00
Russell Keith-Magee 48fe6099c0 [1.2.X] Fixed #13987 -- Ensure that the primary key is set correctly for all models that have concrete-abstract-concrete inheritance, not just the first model. Thanks to Aramgutang for the report and patch.
Backport of r15498 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 15:15:44 +00:00
Russell Keith-Magee c775f95abb [1.2.X] Fixed #13948 -- Corrected the direction of arrows on the admin changelist. Thanks to jsdalton for the report, and Julien Phalip for the patch.
Backport of r15495 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 13:25:16 +00:00
Russell Keith-Magee f8ff9fee2b [1.2.X] Fixed #15283 -- Made a minor performance tweak to __iter__. Thanks to lanyjie for the report.
Backport of r15491 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 13:24:42 +00:00
Alex Gaynor 54987dd0d1 [1.2.X] Fixed #15243 -- More clearly document that the transaction functions needs to be called with a using parameter to work with a non-default database. Thanks to Jason Kotenko for the patch. Backport of [15489].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-11 18:24:24 +00:00
Russell Keith-Magee b17f47cac7 [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.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-10 11:56:36 +00:00
Russell Keith-Magee 5c4acfec0e [1.2.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.2.X@15483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-10 09:29:38 +00:00
Russell Keith-Magee e62e740732 [1.2.X] Fixed #15245 -- Added note about the CSRF AJAX exception to the 1.2.5 release notes. Thanks to Matt Austin for the report.
Backport of r15478 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15480 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 13:00:25 +00:00
James Bennett 66dc41aa05 [1.2.X] Bump version number for impendign security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 03:05:58 +00:00
Carl Meyer 1f814a9547 [1.2.X] Fixed security issue in AdminFileWidget. Disclosure and release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:44:16 +00:00
Alex Gaynor 194566480b [1.2.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.2.X@15468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:13:59 +00:00
Alex Gaynor 818e70344e [1.2.X] Fixed a security issue in the CSRF componenent. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:07:05 +00:00
Russell Keith-Magee fdd3bd9d15 [1.2.X] Ensure that L10N formats aren't cached between tests.
Backport of r15461 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 00:11:57 +00:00
Russell Keith-Magee c058dfa9cd Corrected merge failure from r15455.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 00:11:09 +00:00
Russell Keith-Magee 5e485a15ad [1.2.X] Fixed #13815 -- Ensure that reverse exclude lookups on nullable foreign keys exclude null values. Thanks to bpeschier for the report and patch.
Backport of r15458 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-08 14:07:14 +00:00
Russell Keith-Magee bbfdb36b54 [1.2.X] Fixed #15116 -- Strip ordering clause from in_bulk() queries, since ordering information will be lost. Thanks to lamby for the report and patch.
Backport of r15457 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-08 14:06:59 +00:00
Russell Keith-Magee 27e7fcbab0 [1.2.X] Fixed #10573 -- Corrected autofocus problem in admin when the first widget displayed is a multiwidget. Thanks to rduffield for the report, and to Ramiro and Julien Phalip for the patch.
Backport of r15452 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-08 12:23:23 +00:00
Russell Keith-Magee 09a820550b [1.2.X] Fixed #15234 -- Ensure that years in a date heirarchy don't use commas for thousand separators, regardless of the value of USE_THOUSAND_SEPARATOR. Thanks to Julien Phalip for the report and patch.
Backport of r15451 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-08 12:23:03 +00:00
Russell Keith-Magee e1ad54307f [1.2.X] Fixed #15175 -- Ensured that Chliean RUT checksum letters aren't case sensitive. Thanks to rvimer for the report, and to ersame for the patch.
H: Enter commit message.  Lines beginning with 'HG:' are removed.

Backport of r15450 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-08 12:22:44 +00:00
Gabriel Hurley 40a13657e3 [1.2.X] Fixed #15055 -- added information about (and an example of) the csrf_token template tag to the forms documentation. Thanks to sneakyness for the report and bpeschier for the draft patch.
Backport of [15445] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 22:54:14 +00:00
Ramiro Morales 1406265e17 [1.2.X] Tweaked language markers in i18n topic document for better Sphinx syntax highlighting.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 19:50:07 +00:00
Russell Keith-Magee 5f0ed3e198 [1.2.X] Fixed #13674 -- Ensure that labels on added inlines fields have the right 'for' attribute. Thanks to Jonas for the report, and Julien Phalip for the patch.
Backport of r15436 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-06 06:22:07 +00:00
Ramiro Morales cd2a1a0b32 [1.2.X] Modified wrong expected model formset output in a couple of additional tests after fix introduced in [15424]. Refs #15167.
Backport of [15430] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 19:22:09 +00:00
Ramiro Morales 3f3a9ae699 [1.2.X] Fixed small problem in backport of [15418] tests changes to 1.2.X ([15419]). Refs #15111.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 19:05:30 +00:00
Ramiro Morales 7be9e52041 [1.2.X] Fixed #15226 - Made SelectDateWidget render the label tag associated with the correct dropdown sub-widget when USE_L10N is active and non-English locale is in use.
Backport of [15427] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 18:38:06 +00:00
Russell Keith-Magee ebd0a6a09f [1.2.X] Fixed #15167 -- Ensure that non-form errors are always part of an ErrorList. Thanks to Harm Geerts for the report and patch.
Backport of r15424 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 06:34:04 +00:00
Russell Keith-Magee 0e4d8d47b0 [1.2.X] Fixed #14303 -- Ensure that the ids created for new inlines are unique after interstitial deletions have occurred. Thanks to m0nonoke for the report, and Julien Phalip for the patch.
Backport of r15422 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 04:46:55 +00:00
Russell Keith-Magee 4a3a97e531 [1.2.X] Fixed #14830 -- Ensure that radio buttons on inlines preserve their default value. Thanks to Julien Phalip for the report and patch, and to antoinemartin for the diagnosis.
Backport of r15420 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 04:12:33 +00:00
Russell Keith-Magee 6987048561 [1.2.X] Fixed #15111 -- Ensured that the auth, contenttypes and sitemaps tests will run when the sites app isn't installed. Thanks to Waldemar Kornewald for the report and draft patch.
Backport of r15418 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 03:56:23 +00:00
Ramiro Morales 693506609d [1.2.X] Fixed #13968 -- Fixed SelectDateWidget processing of an invalid date input value when USE_L10N is on, for consistency with its behavior when USE_L10N=False (now the form field reports the validation error in both cases). Thanks mitar for the report.
Backport of [15416] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-05 00:15:18 +00:00
Russell Keith-Magee 2d0252ef41 [1.2.X] Fixed #14046 -- Made {% include %} behave the same, regardless of whether the template included is named by variable or constant string. Thanks to defcube for the report, and George Karpenkov for the draft patch.
Backport of r15413 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 17:21:10 +00:00
Ramiro Morales 05232a2604 [1.2.X] Modified a few tests methods to make sure no leaks of activated locale or USE_L10N setting value happen between tests.
Backport of [15411] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 16:17:45 +00:00
Russell Keith-Magee 6ba0f324e4 [1.2.X] Fixed #15181 -- Ensure that special characters are escaped when querying for the URL of an uploaded file. Thanks to e.generalov for the report and patch.
Backport of r15409 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 14:43:59 +00:00
Russell Keith-Magee 46b1fdaba0 [1.2.X] Fixed #15016 -- Ensured that the messages tests are isolated from local template directories. Thanks to Gabriel Hurley for the report and patch.
Backport of r15407 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 14:35:39 +00:00
Russell Keith-Magee bb46b44ec9 [1.2.X] Fixed #14824 -- Corrected the handling of formats when USE_L10N is disabled. Thanks to nullie for the report and initial patch, and to idle for the separate report with helpful debug info.
Backport of r15404 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 13:53:44 +00:00
Ramiro Morales 5f2f0113db [1.2.X] Fixed #15129 -- Fixed stability of data input/output L10N format modules priority order. Thanks tonnzor for the report and fix.
Backport of [15402] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-03 15:54:27 +00:00
Timo Graham f6606da3e8 [1.2.X] Fixed #15208 - Document ModelAdmin.formfield_for_choice_field; thanks julien.
Backport of r15399 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 20:57:33 +00:00
Timo Graham 01fce67c17 [1.2.X] Fixed #7325 -- Broken links for model documentation; thanks Justin Lilly.
Backport of r15397 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 20:40:24 +00:00
Ramiro Morales 0b8b9fbe30 [1.2.X] Fixed #15029 -- Moved to database backends the ability to decide if two DATABASES items are different when creating temporary databases for tests.
Backport of [15392] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 15:33:37 +00:00
Alex Gaynor 837a2e2773 [1.2.X] Fixed #15212 -- ensure that ModelAdmin.get_actions still returns a SortedDict if there are no actions. Backport of [15393].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 15:25:57 +00:00
Russell Keith-Magee e26de119f4 [1.2.X] Reordered the shutdown process for tests so that all tests force a connection close. This is required to prevent some cross-test failures. Thanks to Florian Apolloner for the report and help tracking down the problem.
Backport of r14399 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 04:41:47 +00:00
Carl Meyer cda07b4cfa [1.2.X] Fixed #13283 -- Corrected CACHE_MIDDLEWARE_ANONYMOUS_ONLY's bad habit of setting Vary: Cookie on all responses and destroying cache efficiency. Thanks to natrius for the fix.
Backport of r15381 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 00:31:34 +00:00
Justin Bronn 432ff76035 [1.2.X] Fixed #13488 -- No longer generate unhandled exceptions that may occur when destructors of global GEOS I/O objects are called on process termination.
Backport of r15378 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-31 20:12:23 +00:00
Timo Graham 776bf6e5f7 [1.2.X] Fixed #15191 - typo in form validation docs; thanks berto for the report.
Backport of r15372 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 19:10:16 +00:00
Russell Keith-Magee d88753066d [1.2.X] Fixed #15134 -- Removed a duplicate TOC entry for modelforms docs. Thanks to Aryeh Leib Taurog for the report.
Backport of r15366 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:35:40 +00:00
Russell Keith-Magee afb8c44cde [1.2.X] Fixed #15187 -- Ensure that missing page emails aren't sent when running under debug. Thanks to Dan Carroll for the report and patch.
Backport of r15363 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:20:14 +00:00
Russell Keith-Magee 7e83c3b91f [1.2.X] Fixed #14698 -- Ensure that module_has_sumodule doesn't mistake a cache miss for an existent package. Thanks to Łukasz Rekucki for the report and patch, and to shields for the test case.
Backport of r15362 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:20:00 +00:00
Ramiro Morales a289eba59c [1.2.X] Fixed #15158 -- Fixed error introduced in r15252 in rendering of the template post morten section of the 500 error debug page with loaders other than the file system or application dir loaders. Refs #15122. Thanks gsf for the report.
Backport of [15360] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 15:06:37 +00:00
Justin Bronn 86b0d5c1eb [1.2.X] Fixed example use of deprecated function in GeoDjango tutorial.
Backport of r15358 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 08:11:28 +00:00
Luke Plant a138e3be0e [1.2.X] Added note to 1.2.5 release notes about ModelAdmin.lookup_allowed change
Backport of [15352] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 15:48:35 +00:00
Luke Plant b3ad41bfd5 [1.2.X] Fixed #14880 - raw_id_fields in admin does not work when limit_choices_to dictionary has value=False
Thanks to smallming for the report.

Backport of [15348] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 15:36:41 +00:00
Luke Plant 276ecc7209 [1.2.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.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 14:59:54 +00:00
Russell Keith-Magee 8ab768f935 [1.2.X] Fixed #13662 -- Added an entry in the README to direct people to the instructions for running the test suite, and cleaned up that section of the docs. Thanks to mir for the report, and to cogat and gg for the draft text.
Backport of r15342 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15345 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 03:52:44 +00:00
Russell Keith-Magee d073d30e45 [1.2.X] Fixed #15046 -- Added "CHROMEFRAME" as a user agent alias for various MSIE fixes. Thanks to chrj for the report and patch.
Backport of r15340 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 03:52:14 +00:00
Russell Keith-Magee 407208b0c2 [1.2.X] Fixed #14823 -- Corrected bootstrapping problems with register_serializers. Thanks to miker985@uw.edu for the report and draft patch.
Backport of r15336 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:43:30 +00:00
Russell Keith-Magee 81f844afb1 [1.2.X] Fixed #14818 -- Added explicit tests for the way that the cycle tag handles escaping. Thanks to steveire.
Backport of r15335 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:43:06 +00:00
Russell Keith-Magee ee29ec62be [1.2.X] Fixed #15041 -- Added tests for the spaceless tag interacting with escaping. Thanks to steveire.
Backport of r15334 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27 02:42:45 +00:00
Carl Meyer 10b4d93f50 [1.2.X] Fixed #15161 - Corrected handling of ManyToManyField with through table using to_field on its ForeignKeys. Thanks to adehnert for the report.
Backport of r15330 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 19:27:46 +00:00
Ramiro Morales 5b8c593053 [1.2.X] Fixed #15157 -- Modified evaluation of literals surrounded by '_(' and ')' in templates to be done at render time instead of at compile time by using ugettext_lazy. Thanks Jonathan S for the report.
Backport of [15327] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 15:44:11 +00:00
Russell Keith-Magee 167d1cbdf5 [1.2.X] Made a transaction test optional unless transactions are supported.
Backport of r15325 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 14:55:27 +00:00
Carl Meyer 3af1bf8217 [1.2.X] Fixed #6456 - Excised FileField file deletion to avoid data loss. Thanks to durdinator for the report.
Backport of r15321 from trunk. Backported despite slight backwards-incompatibility due to potential for data loss.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 08:04:19 +00:00
Alex Gaynor c4b0878b43 [1.2.X] Fixed #13206 -- call super().__init__() in Model.__init__ to allow mixins to do things there. Backport of [15317].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 03:52:52 +00:00
Alex Gaynor 4cee764a46 [1.2.X] Fixed #13159 -- properly quote aggregates in order_by. Backport of [15318].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 03:52:41 +00:00
Timo Graham 1418c215f4 [1.2.X] Fixed #15163 - typo in email docs; thanks metal for the report.
Backport of r15311 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 00:37:55 +00:00
Ramiro Morales 7d0d10ce20 [1.2.X] Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report.
Backport of [15309] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 15:44:41 +00:00
Carl Meyer c09249731b [1.2.X] Fixed #14938 - Fixed save-as-new on inline formset with new forms.
Backport of r15306 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 05:06:43 +00:00
Carl Meyer 131d83b9cd [1.2.X] Fixed #11319 - Added lookup support for ForeignKey.to_field. Also reverted no-longer-needed model formsets workaround for lack of such support from r10756. Thanks Russell and Alex for review.
Backport of r15303 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 03:39:38 +00:00
Ramiro Morales f01e1cd425 [1.2.X] Fixed #14796 -- Modified order of operations performed on field names by the inspectdb command so it doesn't generates model fields with names equal to Python keywords. Thanks pappjm at gmail dot com for the report, mmcnickle for the fix and Alex for simplifying the tests.
Backport of r15296 and r15297 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 00:42:54 +00:00
Ian Kelly 5f923671e5 [1.2.X] Fixed #14149: Initialize the Oracle connection.operators at connection time since some systems don't seem to like the "TRANSLATE" trick.
Backport of r15299 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 21:48:27 +00:00
Jannis Leidel 63536a8ee5 [1.2.X] Updated all existing translations after changes to filesize translation strings made in [15291].
Backport from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 09:49:28 +00:00
Russell Keith-Magee a116ae6633 [1.2.X] Fixed #14240 -- Enabled localization for the filesize filter. Thanks to David Danier for the report and patch.
Backport of r15290 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 08:33:51 +00:00
Russell Keith-Magee dec539f360 [1.2.X] Fixed #15067 -- Modified the range checks on base36_to_int so you are guaranteed to always get an int, avoiding possible OverflowErrors. Thanks to Garthex for the report, jboutros for the patch, and kfrazier for the feedback.
Backport of r15288 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 08:04:14 +00:00
Russell Keith-Magee a9cf3d2372 [1.2.X] Fixed #14982 -- Ensure that EMPTY_CHANGELIST_VALUE is honored for nullable foreign keys. Thanks to marcob for the report and fix, and to sontek for the test case.
Backport of r15286 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 07:10:18 +00:00
Timo Graham ccd68f2d43 [1.2.X] Fixed #15141 - remove some deprecated storage engines from the MySQL notes; thanks mariuz for the suggestion.
Backport of r15282 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-22 16:21:25 +00:00
Ramiro Morales 80264702d0 [1.2.X] Added a modification missed in r15241 (backport of r15239 to this branch.)
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 02:15:13 +00:00
Ramiro Morales 715c00df76 [1.2.X] Fixed a regression in the test suite from [15236]. Backport of r15244.
Also, changed an asertion not supported by unittest.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 01:37:08 +00:00
Ramiro Morales cf7157a7a4 [1.2.X] Fixed #15122 -- Restored reporting of the template files tried in the texmplate loader post mortem section of the TemplateDoesNotExit 500 error debug page. Thanks rdrey for reporting this regression.
Backport of [15252] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-20 23:17:37 +00:00
Russell Keith-Magee 0958f32209 [1.2.X] Refs #14661 -- Clarified the handling of initial data injected via custom SQL.
This is BACKWARDS INCOMPATIBLE CHANGE for anyone relying on SQL-injected initial data in a test case.

Backport of r15239 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:55:00 +00:00
Russell Keith-Magee 86239cbb56 [1.2.X] Refs #14661 -- Corrected (well... hacked around) a test failure under MySQL/MyISAM with the queries regression test.
Backport of r15238 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:54:28 +00:00
Jannis Leidel b305cc33c5 [1.2.X] Fixed #14468 -- Extended the list of content types that the test client could guess when handling zip files. Thanks, Russ and emulbreh.
Backport from trunk (r15236).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 00:00:11 +00:00
Russell Keith-Magee b9db129a7e [1.2.X] Fixed #13062 -- Ensure that runserver exposes all warnings requested at the command line. Thanks to gremmie for the report, and claudep for the patch.
Backport of r15233 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-17 13:16:07 +00:00
Russell Keith-Magee aeddab3fc7 [1.2.X] Corrected an aggregation test failure under PostgreSQL, introduced by r15223. Thanks to Alex for the report.
Backport of r15230 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-17 02:40:16 +00:00
Timo Graham 0866dc1715 [1.2.X] Fixed #13628 - Discourage the use of doctests; thanks d0ugal for the suggestion.
Backport of r15227 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 19:27:23 +00:00
Russell Keith-Magee be12f9e278 [1.2.X] Fixed #14707 -- Relax the protections on aggregate naming collisions when a ValuesQuerySet removes the colliding name. Thanks to Andy McKay for the report.
Backport of r15223 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 08:04:39 +00:00
Russell Keith-Magee 73b3611723 [1.2.X] Fixed #15062 -- Documented the fact that managers must be able to be shallow copied. Thanks to Ian Clelland for the report, and Łukasz Rekucki for the help diagnosing the problem.
Backport of r15220 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 06:45:35 +00:00
Russell Keith-Magee 84db894f44 [1.2.X] Fixed #15042 -- Ensured that email addresses without a domain can still be mail recipients. Patch also improves the IDN handling introduced by r15006, and refactors the test suite to ensure even feature coverage. Thanks to net147 for the report, and to Łukasz Rekucki for the awesome patch.
Backport of r15211 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 06:06:34 +00:00
Russell Keith-Magee f7d04c37b9 [1.2.X] Corrected r15205 syntax to be Python2.4 compatible.
Backport of r15210 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 06:06:09 +00:00
Ramiro Morales 74a61e35b8 [1.2.X] Fixed #14948 -- Fixed a couple of cases where invalid model classes were passed to the database router when collecting reverse foreign key and many to many relationships. Thanks shell_dweller for the report and Harm Geerts for the patch.
This also enhances tests added in r15186.

Code in SVN trunk doesn't suffer from this problem because it was refactored in r14507.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 23:30:17 +00:00
Andrew Godwin eb9ebb1931 [1.2.X] Fixed #11193 -- WSGI handler not properly handling lock on error in load_middleware. Thanks to Phillip Sitbon.
Backport of [15205] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 23:19:50 +00:00
Ramiro Morales 88dfbc50fb [1.2.X] Enhanced tests for r14857 added in r15185. Refs #14870. Thanks Harm Geerts.
Backport of [15201] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 03:53:01 +00:00
Luke Plant 0ebb02e9dc [1.2.X] Fixed some bugs with formtools tests.
Without these checks, it is possible for the tests to pass by virtue of
asserts never being reached for some reason (very possible in this case, due
to handling of security hashes).

Backport of [15198] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 23:25:23 +00:00
Luke Plant 444bda0be0 [1.2.X] Fixed #15075 - No longer possible to alter the form_list in FormWizard.process_step
Thanks to niels, stas for the report, and stas for the patch.

Backport of [15196] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 23:10:13 +00:00
Russell Keith-Magee 924bad822a [1.2.X] Fixed #13631 -- Made sure that max_length and min_length are retained as attributes on form fields. Thanks to mila for the report.
Backport of r15194 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 16:43:18 +00:00
Russell Keith-Magee 3ce473617c [1.2.X] Fixed #14975, #14925 -- Added some cache flushing to avoid some cross-test effects. Thanks to jsdalton and rpbarlow for the reports.
Backport of r15192 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 16:24:19 +00:00
Ramiro Morales 3297c09da4 [1.2.X] Fixed #2986 -- Made the JavaScript code that drives related model instance addition in a popup window handle a model representation containing new lines. Also, moved the escapejs functionality to django.utils.html so it can be used from Python code. Thanks andrewwatts for the patch.
Backport of [15131] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 15:47:36 +00:00
Russell Keith-Magee 58038a8b2b [1.2.X] Fixed #14176 -- Added forwards compatibility to the legacy syndication feed view. This allows class-based feeds to be deployed using the old-style feed view, as long as the feed requires no arguments (i.e., get_object returns None). Thanks to psychcf for the report, cwhaines for the investigation, and Andrew Godwin for the assist.
Backport of r15189 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 14:54:49 +00:00
Ramiro Morales 857b49d1c3 [1.2.X] Fixed #13668 -- Corrected database router methods invocation for ManyToMany fields without through models. Thanks craig.kimerer for the report and David Gouldin for the fix.
This also adds tests for r14857.

Backport of [15185] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 04:59:31 +00:00
Ramiro Morales 4d2708ff01 [1.2.X] Fixed #15024 -- Ensure that choice of L10N format module used is stable given a stable setup of format modules in ll/ and ll_CC/ dirs. Thanks David Reynolds for the report and suggestions leading to the solution.
Backport of [15183] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 03:13:39 +00:00
Ramiro Morales 0a0472f51b [1.2.X] Fixed #14951 -- Made the unique_for_{date,month,year} model field constraints to not fail when the related DateField is empty.
Existing modelforms tests were extended to cover this case and an equivalent set of tests was added for the model functionality.

Backport of [15167] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 00:15:31 +00:00
Ramiro Morales 0e49b8b8bd [1.2.X] Fixed #11434 -- Corrected style of arrow buttons located at the center of filter_{horizontal|vertical} m2m widgets to not give them focus borders that span from the left page border. Thanks defaultwombat for the report and patch.
Backport of [15144] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:59:49 +00:00
Ramiro Morales 9846fee794 [1.2.X] Fixed #11414 -- Made sure the calendar and clock popup windows in the admin don't have a negative vertical position. Thanks uipko for the report and fix.
Backport of [15143] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:57:45 +00:00
Ramiro Morales 10ca44ba8d [1.2.X] Fixed #11124 -- Expanded docstrings of the ModelAdmin has_{change|delete}_permission methods to make it clear they can be overriden to implement per-instance permission checks. Refs #12642.
Backport of [15126] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:54:17 +00:00
Ramiro Morales 90be6ca20d [1.2.X] Fixed #15032 -- Replaced 1.2.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 rene for reporting this.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:25:33 +00:00
Alex Gaynor b28756bb29 [1.2.X] Fixed #11293 -- fixed using Q objects to generate ORs with aggregates. Backport of [15173].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-11 01:03:08 +00:00
Timo Graham 52999afaf5 [1.2.X] Fixed #15045 - Typo auto_add_now -> auto_now_add; thanks dr_gone for the report.
Backport of r15171 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-11 00:30:24 +00:00
Andrew Godwin 663eb9656a [1.2.X] Fix wrong attribute name in [15156]. Thanks to Alex Gaynor for spotting this.
Backport of [15169] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-10 13:45:36 +00:00
Luke Plant 03ab30c3f1 [1.2.X] Fixed test failure when using Python 2.7
Backport of [14309] from trunk.

Fixed #14947

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 16:13:58 +00:00
Andrew Godwin 989486d05d [1.2.X] Fixed #14888 -- Removing duplicated code in serialisers. Thanks to eric.fortin.
Backport of [15163] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 15:14:24 +00:00
Andrew Godwin d065e7eed2 [1.2.X] Fixed #14929 -- Move gzip_page docstring to the right place. Thanks adamv.
Backport of [15161] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 14:56:02 +00:00
Andrew Godwin 34d306c71c Fixed #12295 -- Issue had already been fixed, but added test. Thanks tomevans222 and dpn.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 14:50:31 +00:00
Andrew Godwin 2b90267fa8 [1.2.X] Fixed #9029 -- Allow use of fieldname_id with get_or_create. Thanks to aaron and mrmachine.
Backport of [15156] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 13:40:23 +00:00
Luke Plant 6849c5f3d5 [1.2.X] Fixed sending mail on 404s to fail silently.
A failure in the e-mail system should not turn a 404 into a 500.

Backport of [15145] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-04 04:02:42 +00:00
Timo Graham 0b0e9457b2 [1.2.X] Fixed #10078 - Document use of locales in management commands. Thanks gregoire for the suggestion and ramiro for the patch.
Backport of r15141 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 14:27:51 +00:00
Russell Keith-Magee c76ab45fc6 [1.2.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.2.X@15140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 14:01:44 +00:00
Russell Keith-Magee 9f49666114 [1.2.X] Fixed #15006 -- Removed some stray tabs in python code. Thanks to vanschelven for the report.
Backport of r15134 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:52:28 +00:00
Timo Graham 12d5c09fdd [1.2.X] Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv.
Backport of r15135 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:30:12 +00:00
Ramiro Morales e501f50237 [1.2.X] Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report.
Backport of [15124] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 23:06:07 +00:00
Luke Plant fa4ac6f80c [1.2.X] Some small fixes to DB optimization docs.
Backport of [15122] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 15:48:51 +00:00
Timo Graham 2d854539c3 [1.2.X] Fixed #14997 - A typo in "Overriding delete". thanks phunehehe for the report.
Backport of r15117 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 13:10:05 +00:00
Timo Graham ae7f7a257f [1.2.X] Fixed #13912 - Fixed AliasMatch regex in modwsgi docs. Thanks SmileyChris for the report.
Backport of r15115 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-30 13:30:37 +00:00
Timo Graham cd2cf87243 [1.2.X] Fixed #14842 - Indent the model Meta options. Thanks adamv.
Backport of r15110 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:34:40 +00:00
Timo Graham 6c51b80c04 [1.2.X] Fixed #13452 - Document that regroup can be used with any template lookup. Thanks shacker for the suggestion and draft patch.
Backport of r15108 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:21:28 +00:00
Timo Graham 863240e336 [1.2.X] Fixed #14712 - Add an example for the post_syncdb signal. Thanks Frank Wiles for the patch.
Backport of r15104 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 15:48:50 +00:00
Timo Graham b5a7ac4fff [1.2.X] Fixed #12193 - Add details to the i18n documentation for translation of model classes (relations and methods). Thanks Maxime Petazzoni and Ramiro for work on the patch.
Backport of r15102 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 15:39:44 +00:00
Timo Graham 235f29fa37 [1.2.X] Fixed #13961 - note that reverse URL lookups can't be done within a blocktrans tag. Thanks garrison for the report and richardb and zerok for work on the patch.
Backport of r15100 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 14:23:10 +00:00
Timo Graham 6ace3a9313 [1.2.X] Fixed #14277 - Clarify path names in modwsgi docs; thanks neitpiet for the report, elbarto for the patch.
Backport of r15098 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 13:59:51 +00:00
Timo Graham 6510bb76c6 [1.2.X] Fixed #14959 - Add a link to localflavor in the model field docs. Thanks PaulM for the suggestion, elbarto for the patch.
Backport of r15096 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 13:47:58 +00:00
Ramiro Morales 9bb995c6e0 [1.2.X] Fixed #7726 -- Added validation of max_digits and decimal_places options to DecimalField model field. Thanks theevilgeek for the report and elbarto for the patch.
Backport of [15094] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 01:26:45 +00:00
Gabriel Hurley 116804fbb5 [1.2.X] Fixed a crossref formatting problem in the signals reference docs.
Backport of [15092] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 00:09:46 +00:00
Gabriel Hurley 8db865c8fb [1.2.X] Fixed #14403 -- Provided some extra resources on the difference between FloatField and DecimalField in the model field reference. Thanks to typeshige for the report and trebor74hr and dmedvinsky for the draft patch.
Backport of [15090] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 00:04:06 +00:00
Gabriel Hurley a3169e3e8e [1.2.X] Fixed #14905 -- Corrected some misleading linking and language in the FileField docs. Thanks to Keryn Knight for the report and draft patch.
Backport of [15088] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 23:25:28 +00:00
Gabriel Hurley d4e19c68e8 [1.2.X] Fixed #14912 -- Expanded documentation for the urlize template filter. Thanks to adamv for the draft patch.
Backport of [15086] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 22:54:32 +00:00
Timo Graham 4c37802679 [1.2.X] Fixed #11496 - note that DecimalField max/min_value should be type(decimal.Decimal); thanks adamv.
Backport of r15084 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:56:33 +00:00
Timo Graham 031eb9983e [1.2.X] Fixed #14708 - Document available keys for form field error messages; thanks adamv.
Backport of r15080 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:16:25 +00:00
Timo Graham 483cddf23e [1.2.X] Fixed #14320 - Add a note about lack of timezone support in MySQL. Thanks RauntyDave for the suggestion, adamv for the patch.
Backport of r15078 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15079 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 13:36:12 +00:00
Timo Graham b0ce5fce73 [1.2.X] Fixed #13837 - Add geodjango packages for Ubuntu 10.04; thanks muanis and zerok for the patch.
Backport of r15075 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 00:13:13 +00:00
Timo Graham d514b1b23d [1.2.X] Fixed #13397 - Include third level headings in the TOC. thanks cyang for the suggestion, rleland for the patch.
Backport of r15073 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:58:41 +00:00
Timo Graham d5970df38e [1.2.X] Fixed #12313 - Add a note that QuerySet.delete() doesn't necessarily call obj.delete(). thanks FunkyELF for the suggestion.
Backport of r15071 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:47:14 +00:00
Timo Graham 93e42272a4 [1.2.X] Fixed #14890 - Clarify poll "index" page in tutorial. thanks dbaggott for the report.
Backport of r15069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 23:30:19 +00:00
Timo Graham c0335a30bc [1.2.X] Fixed #12642 - Add docs for has_[add|change|delete]_permission ModelAdmin methods. Thanks to MadeR for the report and for the wiki contributors from which I took language for this patch.
Backport of r15066 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:41:57 +00:00
Timo Graham 5ba7bac5e7 [1.2.X] Fixed #6181 - Document `django.views.decorators.http` - thanks adamv for the patch.
Backport of r15064 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:28:04 +00:00
Alex Gaynor 05588a1897 [1.2.X] Converted the Czech localflavor tests to be unittests. We have always been at war with doctests. Thanks to Idan Gazit. Partial backport of [15062].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 07:47:25 +00:00
Timo Graham b1487c499b [1.2.X] Fixed #13949 - Note that readonly fields can't be modified via custom clean methods. thanks alk for the suggestion and elbarto and Gabriel Hurley whose language I used in the final patch.
Backport of r15060 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 21:51:51 +00:00
Jannis Leidel 79e64d7cff [1.2.X] Converted Swedish localflavor tests from doctests to unittests. Thanks, Idan Gazit!
Backport from trunk (r15057).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 11:49:45 +00:00
Timo Graham 89cb543f9e [1.2.X] Fixed #14000 - Remove versionadded/changed tags for 1.0. thanks ramiro!
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 00:46:36 +00:00
Timo Graham 40f2bb37c9 [1.2.X] Fixed #13020 - add clarifying note to SessionStore. thanks elbarto for the patch.
Backport of r15053 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:46:44 +00:00
Timo Graham 3003ddec1a [1.2.X] Fixed #14927 - typo in model option docs. thanks tiliv.
Backport of r15051 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:30:45 +00:00
Timo Graham ba7a151804 [1.2.X] Fixed #14956 - typo in messages docs. thanks alexarsh for the report.
Backport of r15049 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:27:21 +00:00
Andrew Godwin b168c1b1f9 [1.2.X] Fixed #14939: Don't strip ;-parameters from URLs in the test client.
Backport of [15027] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 21:39:34 +00:00
Ramiro Morales 6c32577d31 [1.2.X] Fixed #14576, #14946 - FormWizard.done() method doesn't get passed the last form in the list.
Thanks to cyberdelia for report and test, and steph for the initial patch.

Backport of r14574 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 15:32:59 +00:00
James Bennett 56007af321 [1.2.X] Update download_url for 1.2.4.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 04:12:24 +00:00
James Bennett c30be9739d [1.2.X] Bump to 1.2.4 for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:52:07 +00:00
Alex Gaynor d5d8942a16 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.2.X@15034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:46:37 +00:00
Alex Gaynor 85207a245b Fix a security issue in the admin. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:46:16 +00:00
Ramiro Morales 47fe010a8e [1.2.X] Rolled back r146331, r14640 (partially) and r14625 so 1.2.X docs are still buildable with Sphinx 0.6.x for the benefit of downstream packagers shipping stable releases of Django.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:01:06 +00:00
Ramiro Morales 8301a8b9c2 [1.2.X] Fixed a couple of broken internal links in the documentation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 00:02:03 +00:00
Russell Keith-Magee c1376c81a7 [1.2.X] Added some reST markup to avoid a warning during docs compilation.
Backport of r15022 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 16:03:33 +00:00
Justin Bronn a60d85aa1a [1.2.X] Fixed #14439 -- Improved documentation for running the GeoDjango test suite.
Backport of r15015 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-22 00:42:11 +00:00
Justin Bronn b145b12634 [1.2.X] Fixed #10420 -- GeoDjango tests are run as part of Django tests when using spatial database backends with `runtests.py`.
Backport of r15013 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 23:43:04 +00:00
Jannis Leidel 2565b80706 [1.2.X] Fixed #14301 -- Further refine changes made in r14217 to support non-ASCII characters in email addresses. Thanks, Claude Peroz and Andi Albrecht.
Backport from trunk (r15006).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:28:11 +00:00
Jannis Leidel 0e651d3fd4 [1.2.X] Fixed #4976 -- Stopped humanize template tags to raise a TypeError if passed a value of ``None``. Thanks, Simon G. and Adam Vandenberg.
Backport from trunk (r15000).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:16:05 +00:00
Jannis Leidel eb18ea7899 [1.2.X] Fixed #13782 -- Added CSS for errors in textareas and multiple fields in one line. Thanks, julien.
Backport from trunk (r14999).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:15:28 +00:00
Jannis Leidel af1c8b2cfa [1.2.X] Fixed #14910 -- Clarified the order of precedence of loading translation catalogues. Thanks, vanschelven.
Backport from trunk (r14998).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:14:52 +00:00
Jannis Leidel 9184dba1f5 [1.2.X] Fixed #13743 -- Fixed CommentsAdmin to not blow up if the delete_selected action is disabled. Thanks, Daniel Lindsley.
Backport from trunk (r14996).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:14:28 +00:00
Alex Gaynor eb7f2789f8 [1.2.X] Fixed a Python 2.5 syntax error. Backport of [14983].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 02:01:01 +00:00
Ramiro Morales d5c15a490e [1.2.X] Fixed a couple of tests migrated to unit tests in r14279 so they actually and correctly exercise the functionality under test.
Backport of [14981] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 23:10:29 +00:00
Alex Gaynor 160533410f [1.2.X] Fixed #14871, #14872 -- ZAIDField didn't handle alll EMPTY_VALUES correctly and ZAPostCodeField didn't respect *args or **kwargs (such as required=False). Also converted South African localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14956].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:16:15 +00:00
Alex Gaynor 989f59299c [1.2.X] Converted Uruguayan localflavor doctests into unittests. We have alwyas been at war with doctests. Thanks to Idan Gazit. Backport of [14955].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:16:01 +00:00
Alex Gaynor 0c33a3a89c [1.2.X] Converted United States localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14954].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:52 +00:00
Alex Gaynor e7703398c4 [1.2.X] Converted United Kingdom localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14953].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:41 +00:00
Alex Gaynor b17b567744 [1.2.X] Converted Slovak localflavor doctests into unitttests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14952].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:31 +00:00
Alex Gaynor 60e36fbc72 [1.2.X] Fixed #14864, #14864 -- ROCIFField didn't accept values starting with RO, as it was supposed to, and ROCNPField, ROIBANField, and ROPhoneNumberField didn't handle all EMPTY_VALUES correctly. Also converted Romanian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14951].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:18 +00:00
Alex Gaynor b6fbf30a32 [1.2.X] Converted Portuguese localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14950].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:03 +00:00
Alex Gaynor 4b3198d15d [1.2.X] Fixed #14860 -- PLPESELField, PLNIPField, and PLREGONField didn't handle all EMPTY_VALUES correctly. Also converted teh Polish localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14949].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:52 +00:00
Alex Gaynor a15aa66917 [1.2.X] Converted Dutch localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14948].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:39 +00:00
Alex Gaynor 771ffbf0f6 [1.2.X] Converted Kuwaiti localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14947].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:30 +00:00
Alex Gaynor 5c3ede2171 [1.2.X] Converted Japanese localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14946].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:20 +00:00
Alex Gaynor f2a8534d7b [1.2.X] Fixed #14859 -- ITSocialSecurityNumberField and ITVatNumberField didn't handle all EMPTY_VALUES gracefully. Also converted the Italias localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14945].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:11 +00:00
Alex Gaynor edcb475381 [1.2.X] Converted Icelandic localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14944].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:58 +00:00
Alex Gaynor 56f5043c23 [1.2.X] Converted Irish localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14942].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:49 +00:00
Alex Gaynor 3c50c138c5 [1.2.X] Converted Indonesian localflavor doctests to unittests. We have always been a war with doctests. Thanks to Idan Gazit. Backport of [14941].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:39 +00:00
Alex Gaynor 994ba4f3ad [1.2.X] Converted generic localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14940].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:30 +00:00
Alex Gaynor 4aedbcb57e [1.2.X] Converted French localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14939].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:20 +00:00
Alex Gaynor aaaaa831fe [1.2.X] Converted Finnish localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14938].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:11 +00:00
Alex Gaynor 812b1b2d8c [1.2.X] Converted Spanish localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14937].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14962 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:01 +00:00
Alex Gaynor cae809bb3c [1.2.X] Converted Chilean localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14936].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:12:51 +00:00
Alex Gaynor 177b090ec2 [1.2.X] Converted Swiss localflavor doctests to unittests. Thanks to Idan Gazit for the patch. Backport of [14935].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:12:41 +00:00
Alex Gaynor 94adbd1d12 [1.2.X] Converted Canadian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14934].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:12:31 +00:00
Alex Gaynor d2ef2cd9cc [1.2.X] Converted the Brazillian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14933].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:12:22 +00:00
Alex Gaynor f32feafccf [1.2.X] Converted Australian localfavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit for the patch. Backport of [14931],
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:12:08 +00:00
Luke Plant 5a33ce2500 [1.2.X] Fixed #14919 - test isolation issue with model_inheritance.ModelInheritanceTests.test_multiple_table and views.DefaultsTests.test_csrf_token_in_404
test_csrf_token_in_404 was assuming DEBUG = False, and test_multiple_table
was leaving DEBUG = True.  Both issues have been fixed.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 19:35:46 +00:00
Karen Tracey 6c357cc9bb [1.2.X] Fixed the ModelMultipleChoiceFieldTests to pass even on DB backends that do not reuse pk values after rollback.
r14928 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 17:40:53 +00:00
Karen Tracey 5e6c5418c0 [1.2.X] Fixed test_runner tests on 1.2.X branch to not atempt to use new unittest support that does not exist there.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 16:51:18 +00:00
Timo Graham 82e8ad3dca [1.2.X] Fixed #14676 - Document that the removetags filter is case-sensitive. Thanks peterh32 for the report and elbarto for the patch.
Backport of r14925 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 15:37:55 +00:00
Timo Graham 2a0dda3df9 [1.2.X] Fixed #6434 - Add clarifying note about auto_now and auto_now_add. thank adamv for the patch.
Backport of r14923 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 14:05:40 +00:00
Timo Graham 38c88f7c2a [1.2.X] Fixed #14848 - change example verbose name to match convention. thanks madisv for the suggestion.
Backport of r14917 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-14 23:44:28 +00:00
Alex Gaynor 642ba981e1 [1.2.X] Fixed #14897 -- fixed some synax highlighting in the formset documentation. Thanks to marcusf for the patch. Backport of [14912].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 19:37:48 +00:00
Jannis Leidel bd4f4b8ab9 [1.2.X] Fixed #13726 -- Further refine changes made in r12384 and r13069 for using non-English source languages in JavaScript translation catalogues. Thanks, Ramiro.
Backport from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:58:38 +00:00
Jannis Leidel 2ab1e92854 [1.2.X] Fixed #12735 and #14892 -- Fixed support for the latest IPython (development) version in the shell management command.
Backport from trunk (r14895).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:58:09 +00:00
Jannis Leidel 4803410721 [1.2.X] Fixed #14446 -- Prevented the password reset confirmation view to be cached. Thanks, Paul and Gabriel.
Backport from trunk (r14890).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:57:54 +00:00
Jannis Leidel 33a6201fdf [1.2.X] Fixed #14312 -- Raising an ``IncorrectLookupParameters`` if the page number given to an admin change list exceeds the number of the last page. Thanks, mk.
Backport from trunk (r14889).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:57:38 +00:00
Jannis Leidel 49c2f23ec1 [1.2.X] Fixed #14158 -- Fixed SelectMultiple._has_changed to not assume same order of data anymore. Thanks, akaariai and dmoisset.
Backport from trunk (r14887).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:57:15 +00:00
Jannis Leidel 32bf35da09 [1.2.X] Fixed #14144 -- Made sure custom validators are called in ModelMultipleChoiceFields. Thanks, matiasb.
Backport from trunk (r14886).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:56:55 +00:00
Jannis Leidel 69edfc7531 [1.2.X] Fixed #14805 -- Capitalize "Google" in sitemaps docs. Thanks, Adam.
Backport from trunk (r14884).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:56:38 +00:00
Jannis Leidel 33e7a8214b [1.2.X] Fixed #13856 -- Float admin's top links on the right for RTL languages.
Backport from trunk (r14881).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:56:18 +00:00
Jannis Leidel d6cf84b032 [1.2.X] Fixed #12955 -- Use the size attribute of the file instead of len() to support uploads larger than 2GB. Thanks, swiedenroth and isagalaev.
Backport from trunk (r14878).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:56:02 +00:00
Jannis Leidel 38d848a3fe [1.2.X] Fixed #11990 -- Show the correct URLconf in the technical 404 template even if it was overridden, e.g. in a middleware. Thanks, mattbennett.
Backport from trunk (r14877).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:55:46 +00:00
Luke Plant 3c208d1cca [1.2.X] Reverted [13998] because it never worked.
Refs #5425, #14844

Backport of [14897] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:41:12 +00:00
Alex Gaynor b734e3514e [1.2.X] Fixed #14499 -- ATSocialSecurityNumberField now responds to all EMPTY_VALUES correctly. Also converted Austrian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit for the patch. Backport of [14873].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 04:37:01 +00:00
Alex Gaynor 9bbd12120e [1.2.X] Converted the Argentina localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit for the patch. Backport of [14872].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 04:35:24 +00:00
Timo Graham cf53963b6a [1.2.X] Fixed #14863 - Add contrib.messages to list of default INSTALLED_APPS in tutorial.
Backport of r14870 (without staticfiles) from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 15:06:50 +00:00
Timo Graham f1a9a8bb41 [1.2.X] Fixed #11470 - add documentation for ModelAdmin.message_user. thanks adamv.
Backport of r14868 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 13:58:11 +00:00
Timo Graham 546c77e0ae [1.2.X] Fixed #14875 - moved mention of `email_re` in 1.2 release notes from features deprecated to backwards incompatible changes. thanks galund for the report and elbarto for the patch.
Backport of r14866 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-11 13:30:21 +00:00
Alex Gaynor ff7f25052b [1.2.X] Fixed the world's ugliest syntax (that's not an actual error) that snuck in with [14858]. Backport of [14859].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 18:37:24 +00:00
Alex Gaynor 0f7f6a8adf [1.2.X] Fixed #14870 -- don't catch AttributeErrors in database router methods, instead check that the method itself exists. Thanks to jonash for the patch. Backport of [14857].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 18:32:20 +00:00
Ian Kelly d0056051a5 [1.2.X] Replaced an ImportError with ImproperlyConfigured in the Oracle backend. Backport of r14855 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 08:00:50 +00:00
Alex Gaynor 1c81377af5 [1.2.X] Ensure that a Popen object is closed promptly during the tests. Backport [14853].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-08 04:03:30 +00:00
Simon Meers 7c23fbd9a0 [1.2.X] Fixed #8975 -- documented related order methods -- thanks to Leo for the report and dwillis for the initial patch.
Backport of r14848 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 23:09:55 +00:00
Gabriel Hurley a47c2eff6c [1.2.X] Fixed #14846 -- Corrected a tiny typo in from [14832]. Thanks to elbarto for catching the mistake.
Backport of [14846] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 23:08:21 +00:00
Gabriel Hurley d1c0c473ce [1.2.X] Fixed #14840 -- Added crossrefs to related objects reference docs. Thanks to adamv for the report and patch.
Backport of [14842] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 12:17:45 +00:00
Timo Graham bc709e6b86 [1.2.X] Fixed #14746 - Add links to docs/ref/request-response.txt. Thanks adamv.
Backport of r14840 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-06 01:55:53 +00:00
Simon Meers 63f2c07d3a [1.2.X] Fixed #14841 -- added xrefs to topics/db/models. Thanks adamv.
Backport of r14837 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 23:53:59 +00:00
Timo Graham ecca5414f9 [1.2.X] Fixed #14745 - add links to topics/http/shortucts.txt. thanks adamv for the patch.
Backport of r14835 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 16:48:05 +00:00
Gabriel Hurley 8f2feb2e76 [1.2.X] Fixed #13162 and #11597 -- Improved the file handling documentation: Removed documentation of methods on django.core.files.File that did not exist, added documentation for undocumented methods and attributes that did exist, did a general cleanup of the text and organization, and added more metadata targets. Thanks to amenasse and tyrion.mx for the reports.
Backport of [14833] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 07:36:40 +00:00
Gabriel Hurley a4d88f007c [1.2.X] Fixed #13605 -- Improved documentation of the django.core.files.storage module. Added documentation for DefaultStorage, get_storage_class, FileSystemStorage, and some missing public methods on Storage. New metadata targets included for everything. Thanks to kopernikus for the report and elbarto for contributing to the patch.
Backport of [14831] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 06:46:23 +00:00
Russell Keith-Magee 54b122c9bb [1.2.X] Fixed #14833 -- Skip the sitemaps localization test if i18n isn't enabled. Thanks to Julien Phalip for the report and patch.
Backport of r14826 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 02:09:29 +00:00
Russell Keith-Magee b0d9eaaa6a [1.2.X] Fixed #14799 -- Provided a full solution for test database creation order problems.
Backport of r14822, r14823 and r14824 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 01:54:15 +00:00
Timo Graham 778782eac8 [1.2.X] Fixed #14120 - Document get() in Making Queries - thanks danielr and adamv for work on the patch.
Backport of r14820 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 22:32:28 +00:00
Timo Graham f6294c00e2 [1.2.X] Fixed #12407 - Document 'call_command' - thanks UloPe for the suggestion and adamv for the patch.
Backport of r14818 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 20:58:36 +00:00
Timo Graham 84c283744f [1.2.X] Fixed #9033 - Add bullets to QuerySet extra() arguments. thanks julien for the suggestion and dwillis for the patch.
Backport of r14816 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 20:42:07 +00:00
Timo Graham ff76e2cde8 [1.2.X] Fixed #14811 - Add clarifying note to render_to_response - thanks adamv.
Backport of r14814 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 20:21:49 +00:00
Justin Bronn d54d7a52a9 [1.2.X] GeoDjango test suite housekeeping. Moved data into fixtures for `relatedapp` and `distapp` tests, and made both use Django's `TestCase`; moved functionality out of `GeoDjangoTestSuiteRunner` to allow future re-use in `runtests.py` (refs #10420); compressed test app fixtures and cleaned up imports.
Backport of r14776 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 13:11:54 +00:00
Simon Meers 65b26b30a7 [1.2.X] Fixed #12812 -- added warning about cyclic imports in contrib.comments. Thanks to Beetle_B, bjourne and philgyford for the reports, and Russ for the wording.
Backport of r14810 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 11:38:26 +00:00
Russell Keith-Magee 6c53a816e7 [1.2.X] Fixed #14807 -- Ensure that boolean values aren't localized as T.rue and Fa.lse because of the thousand separator. Thanks to vanschelven for the report and
Backport of r14804 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 08:04:16 +00:00
Alex Gaynor 70383ccf68 [1.2.X] Fixed a broken test introduced in [14786].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:53:23 +00:00
Alex Gaynor cc48f66f73 [1.2.X] Removed all usages of deprecated TestCase methods (self.fail*). This removed most of the Warnings emitted (with -Wall) during the test suite. Backport of [14803].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:49:31 +00:00
Russell Keith-Magee 5a792ec4cc [1.2.X] Fixed #14737 -- Moved the docstring comment for the cache_page decorator so it gets picked up as a docstring. Thanks to adamv for the report and patch.
Backport of r14798 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:05:57 +00:00
Russell Keith-Magee 821b7f362c [1.2.X] Fixed #14795 -- Ensure that get_all_permissions() returns the right result (i.e., all permissions) for superusers. Thanks to jay.halleaux@gmail.com for the report, and Brett Haydon for the patch.
Backport of r14797 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:05:39 +00:00
Russell Keith-Magee 3ad1cb7701 [1.2.X] Normalized the name order of arguments. There's no actual bug here, other than potential confusion for anyone reading the code. Thanks to Aram Dulyan for the report.
Backport of r14796 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:05:22 +00:00
Russell Keith-Magee 81a85a0c2b [1.2.X] Fixed #13190 -- Improved error handling for the case where no authentication backends are defined. Thanks to Joel3000 for the report, and Łukasz Rekucki for the final patch.
Backport of r14793 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 07:05:04 +00:00
Russell Keith-Magee c7d68418d2 [1.2.X] Fixed #14819 -- Corrected typo in serializer docstring. Thanks to stringify for the report and patch.
Backport of r14789 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 04:34:04 +00:00
Simon Meers 84e5277a25 [1.2.X] Fixed #14764 -- specified that a set is returned by User.get_..._permissions methods. Thanks MostAwesomeDude for the report.
Backport of r14787 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 01:23:11 +00:00
Alex Gaynor e0d68084a0 [1.2.X] Fixed #14700 -- ensure that a raw query is only executed once per iteration. Backport of [14785].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-03 20:26:57 +00:00
Ian Kelly 99b5526c19 [1.2.X] Added a regression test for r14781.
Backport of r14783 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-03 18:39:09 +00:00
Ian Kelly 57e5ccbc1a [1.2.X] Fixed the Oracle environment variables not getting set correctly under Cygwin.
Backport of r14781 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-03 00:58:56 +00:00
Ramiro Morales f8d014504f [1.2.X] Fixed grammar and tweaked notes about MySQL database/table collation interaction with text fields. Refs #14417.
Backport of [14779] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 22:38:09 +00:00
Jannis Leidel 6690e08eac [1.2.X] Fixed broken German localflavor test introduced in r14627. Thanks for Rubber Ducking, Alex and Carl.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 02:00:32 +00:00
Jannis Leidel d7391648d4 [1.2.X] Fixed #8217 -- Correctly sort files in FilePathFields on older Python versions. Thanks, bernd and davidb.
Backport from trunk (r14772).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 01:03:00 +00:00
Jannis Leidel a607d9d345 [1.2.X] Fixed #8342 -- Removed code from the admin that assumed that you can't login with an email address (nixed by r12634).
Backport from trunk (r14769).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 01:02:11 +00:00
Ian Kelly 1155b493bc [1.2.X] Fixed result ordering assumptions in the select_related tests.
Backport of r14762 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-01 21:44:37 +00:00
Alex Gaynor e86e303140 [1.2.X] Fixed a bug in date queries with GIS backends introduced in [14716]. Backport of [14760].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-01 17:54:06 +00:00
Ramiro Morales 0d6c945622 [1.2.X] Removed reference to potential exception during template rendering-time from the ungettext() documentation. Exceptions at that point should be considered and reported as a bug.
Backport of [14758] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-01 15:09:56 +00:00
Jacob Kaplan-Moss 5eb62e1d94 [1.2.X] Ensured that the test suite creates the default DB before any others.
Refs #14799. Backport of [14756], and see the note there for a caveat.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-30 22:16:53 +00:00
Ramiro Morales f1d4f713e5 [1.2.X] Small grammar fix in 'user-uploaded files' comment from [14561]
Backport of r14582 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-30 21:39:54 +00:00
Ramiro Morales 6128255838 [1.2.X] Fixed #14812 -- Made parsing of the If-Modified-Since HTTP header more robust in presence of malformed values when serving static content. Thanks shaohua for the report, and alexey.smolsky@gmail.com for a similar report and patch.
Backport of r14753 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-30 21:32:11 +00:00
Gabriel Hurley 3d07bb71c6 [1.2.X] Fixed #14777 -- Added docs on working around the Python CSV module's lack of Unicode support. Thanks to adamv for the report and draft patch.
Backport of [14749] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-29 06:25:25 +00:00
Gabriel Hurley 3c951d94b6 [1.2.X] Fixed #14775 -- Backports the changes in [13772], which documented an undocumented feature from 1.0. Thanks to jweyrich for the report, and timo and leovitch for the patch (again).
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-29 05:54:43 +00:00
Gabriel Hurley a647d0b8ba [1.2.X] Fixed #14804 -- Metadata improvement, broken link fix, and alphabetization of template filters in contrib.humanize reference docs. Thanks to adamv for the patch.
Backport of [14746] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-29 05:33:06 +00:00
Timo Graham fe74b832b1 [1.2.X] Fixed #11152 - Add some classes to the template docs. Thanks adamv for the patch.
Backport of r14744 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-29 01:00:09 +00:00
Timo Graham 57c55c69f8 [1.2.X] Fixed #14762 - Add documention for ContentFile. Thanks jesh for the suggestion and adamv for the patch.
Backport of r14742 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 20:14:40 +00:00
Timo Graham 1dd9c9c1fb [1.2.X] Fixed #14791 - Clarify additional note on save(). Thanks OldTroll.
Backport of r14740 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 18:49:37 +00:00
Timo Graham 84e65e91a1 Fixed #14758 - Remove entire method signatures from QuerySet headings - thanks adamv for the patch.
Backport of r14737 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 18:20:05 +00:00
Timo Graham 7b4c0a73e4 [1.2.X] Fixed #14790 - Fix reST in 1.0 porting guide - thanks adamv.
Backport of r14735 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-28 17:50:17 +00:00
Timo Graham 0a0d4884f6 [1.2.X] Fixed #14785 - fixes to middleware docs - thanks adamv for the patch.
Backport of r14731 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27 21:59:03 +00:00
Timo Graham 82261de2fe [1.2.X] Fixed #14789 - remove an unused link from docs/topics/install.txt. thanks adamv for the report.
Backport of r14727 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27 12:34:54 +00:00
Timo Graham c71451c985 [1.2.X] Fixed #14784 - Add links to docs/topics/files.txt
Backport of r14725 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27 12:28:35 +00:00
Timo Graham d9ec98ca5d [1.2.X] Fixed #14783 - Links + style improvements to docs/topics/email.txt. Thanks adamv for the patch.
Backport of r14723 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27 12:20:09 +00:00
Timo Graham db345ac5a2 [1.2.X] Fixed #14744 - Add cross-links to docs/topics/http/views.txt. Thanks adamv for the patch.
Backport of r14720 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 16:54:21 +00:00
Timo Graham 165a860f87 Add back a colon that's needed but was removed in r14706
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 15:33:39 +00:00
Timo Graham f26dae8fb2 [1.2.X] Fixed #14782 - Add/fix links in docs/topics/cache.txt. Thanks to adamv for the patch.
Backport of r14717 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 15:10:58 +00:00
Alex Gaynor 56dc22d64c [1.2.X] Fixed a suite of errors in the ORM -- a) fixed calling values_list().values_list() and changing whether the results are flat, b) fixed an issue with fields on the left-hand side of what becomes the HAVING clause not being included in the GROUP BY clause, and c) fixed a bug with fields from values() calls not being included in the GROUP BY clause. This fixed the recent test failures under postgresql. Backport of [14715].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 14:28:27 +00:00
Jannis Leidel c8e9d35e5c [1.2.X] Fixed #14730 -- Fixed unclosed anchor tag in Mongolian translation. Thanks for the report, ankhbayar.
Backport from trunk (r14709).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:38:53 +00:00
Jannis Leidel 537c45e394 [1.2.X] Fixed #14721 -- Made the THOUSAND_SEPERATOR a unicode string in a few locales. Thanks, Claude Paroz.
Backport from trunk (r14708).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:38:33 +00:00
Timo Graham 4b752d6490 [1.2.X] Fixes #14743 - Add sphinx links and other cleanups to topics/http/urls.txt. Thanks adamv for the patch.
Backport of applicable portions of 14705 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:27:28 +00:00
Timo Graham 1c68437d1d [1.2.X] Fixed #14756 - fix typo in "related objects reference" docs. Thanks deisner for the report.
Backport of r14703 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 12:41:26 +00:00
Timo Graham edaf6aaba8 Add myself to committers
Backport of r14701 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 12:34:22 +00:00
Russell Keith-Magee 7704bd9462 [1.2.X] Fixed #14415 -- Corrected the process of creating and destroying test databases to prevent accidental deletion of the source database. Also improves the mirroring process to prevent some cross-connection effects. Thanks to Shai Berger for the help diagnosing and testing.
Backport of r14696 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-25 12:40:12 +00:00
Alex Gaynor 73ff0f1287 [1.2.X] Fixed #14771 -- corrected a typo in the testing docs. Thanks to Christian Oudard for the patch. Backport of [14694].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 19:52:34 +00:00
Luke Plant cb9cb65c68 [1.2.X] Fixed #14700 - speed up RawQuerySet iterator.
This moves constant work out of the loop, and uses the much faster *args
based model instantiation where possible, to produce very large speed ups.

Thanks to akaariai for the report and patch.

Backport of [14692] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 15:29:50 +00:00
Gabriel Hurley 857131685a [1.2.X] Fixed #14767 -- Reflowed paragraphs and cleaned up some markup/links in the topics/db/optimizations docs. Thanks to adamv for the report and patch.
Backport of [14690] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 11:53:04 +00:00
Luke Plant 1c451c0f39 [1.2.X] Fixed #14697 - speeded up model instance creation by moving work outside of loops
Thanks to akaariai for the report and initial patch.

Backport of [14687] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-23 14:11:20 +00:00
Alex Gaynor c2de746ea5 [1.2.X] Fixed #14754 -- corrected using an aggregate in an F expressions when that queryset is later used in a subquery. Thanks to master for the patch. Backport of [14681].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 18:02:33 +00:00
Gabriel Hurley 56b9e0c45f [1.2.X] Fixed #14736 -- corrected an ungrammatical sentence in the template tags docs. Thanks to DD for the report and adamv for the draft patch.
Backport of [14677] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-22 06:44:59 +00:00
Honza Král 2aa47f2b32 [1.2.X] Preventing problems possibly introduced by r14662
acquire a lock before entering a try block that ends with the lock's
release. Thanks for the catch Alex.

Backport of r14668 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 17:35:48 +00:00
Ramiro Morales 4e3c8c6aff [1.2.X] Fixed #14453 -- Changed handling of microseconds part in typecast_timestamp() DB backend helper function to be more correct. Thanks philipn for the report and fix.
Backport of [14664] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 15:19:46 +00:00
Honza Král 99bad1b055 [1.2.X] Make django signals more thread-safe. Thanks milosu for the patch!
Backport of r14662 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 14:58:18 +00:00
Honza Král 4d7525c5b1 [1.2.X] CZ Localflavor clean() incorrectly called super.__init__. Thanks for the report and patch idangazit!
Backport of r14660 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 14:08:13 +00:00
Chris Beaven d04ffd7247 Fixes #13804 -- URLField validation failure for a url containing '://' on the path and no scheme. Backport of r14657
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-21 10:16:02 +00:00
Justin Bronn 4a8519334d [1.2.X] Now possible to run the GeoDjango test suite with a minimal settings file. Refs #10420, #14439.
Backport of r14653 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 23:57:01 +00:00
Gabriel Hurley 76a51a3f04 [1.2.X] Replaced an unnecessary UTF8 character in the admindocs docs. Thanks to Luke Plant for the report.
Backport of [14646] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 11:11:39 +00:00
Gabriel Hurley 762aaf45b7 [1.2.X] Fixed #14727 -- Corrected three minor issues in the docs. Thanks to OldTroll for the report and the patch.
Backport of [14644] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 10:51:04 +00:00
Luke Plant 077d04b7fe [1.2.X] Fixed a garbage character that was somehow introduced into some backported docs.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 01:56:34 +00:00
Luke Plant 8a0de6985c [1.2.X] Fixed hyperlinking of template tags for Sphinx >= 1.0
Follow on from incomplete fix in [14477], and [14631] which removed
compatibility for Sphinx < 1.0

Backport of [14639] from trunk, and [14477] which was never applied to 1.2.X
branch but should have been.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 01:56:20 +00:00
Ian Kelly 84d809d822 [1.2.X] Updated an old workaround described in the Oracle backend notes with more modern advice.
Backport of r14637 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 01:15:14 +00:00
Carl Meyer b199cb36f3 [1.2.X] Fixed poorly-constructed test from r14612. Thanks to Alex Gaynor for the eagle eyes.
Backport of r14635 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20 00:06:19 +00:00
Alex Gaynor 7236b76e25 Corrected some issues with the backport from [14627].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:56:38 +00:00
Ramiro Morales 8d3e66fad6 [1.2.X] Removed compatibility with Sphinx < 1.0 workarounds in our extension code. Also, started to use the 'needs_sphinx' Sphinx config var.
Follow up on r14624.

Backport of [14631] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:23:17 +00:00
Ian Kelly 04fec1be96 [1.2.X] Fixed #13351: Added documentation about the cx_Oracle 'threaded' option to the oracle backend notes.
Backport of r14630 from trunk.

Thanks to Skaffen for the suggestion.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:23:03 +00:00
Ramiro Morales 237e9557d7 [1.2.X] Corrected change in behavior regarding the page shown after the 'Save' button is pressed when adding a user through the admin.
It had been introduced in trunk (r13503) and between 1.2.1 and 1.2.2 (r13504). The original fix intended to correct a similar problem introduced between 1.1 and 1.2 (r12218) this time in the 'Save and add another' button.
We have now tests for the three buttons present in the Add User admin form to avoid future regressions.
Thanks to Juan Pedro Fisanotti and Cesar H. Roldan for their work.

Backport of [14628] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 23:04:48 +00:00
Alex Gaynor da163cc957 [1.2.X] Began converting localflavor doctests into unittests, starting with the German ones. Also introduced a new base class to facilitate ease of testing form fields. We have always been at war with doctests. Thanks to Idan Gazit for the patch. Backport of [14626].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 19:34:17 +00:00
Carl Meyer 426a28f967 [1.2.X] Bumped documentation-building requirements to Sphinx 1.0.2 and Pygments 1.1. The use of 'console' highlight in staticfiles docs requires Pygments 1.1.
Backport of r14624 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 17:30:56 +00:00
Carl Meyer 5ef3269b78 [1.2.X] Fixed #14728 -- Broadened warning about django-admin.py missing .py suffix to include more than just Ubuntu, since at least Fedora also does this. Thanks to giallu for the report.
Backport of r14621 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 14:57:50 +00:00
Alex Gaynor 4f2e9aed33 [1.2.X] Corrected the way databases were compared. This allows running the test suite with two in memory SQLite databases. Backport of [14619].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 08:15:40 +00:00
Alex Gaynor 9edd6953cc [1.2.X] Converted the model_regress doctests into unittests. We have always been at war with doctests. Backport of [14614].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 23:51:20 +00:00
Carl Meyer 87fe4be9c5 [1.2.X] Fixed pk uniqueness validation for new objects created outside of a ModelForm. Also removed need for ModelForm to poke at Model._state.adding, keeping it an internal ORM concern.
Backport of r14613.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 23:46:26 +00:00
Carl Meyer d88cabd3da [1.2.X] Fixed #14234 -- Re-validating a model instance added via ModelForm no longer throws spurious PK uniqueness errors. Thanks to David Reynolds and Jeremy Dunck.
Also moved Model._adding to Model._state.adding to reduce instance namespace footprint.

Backport of r14612.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-18 23:46:09 +00:00
Jannis Leidel 395af9d5cf [1.2.X] Fixed #7077 and #7431 -- Use getpass.getuser instead of pwd.getpwuid to determine the current system user's username in the createsuperuser management command to enable the feature on Windows. getpass.getuser automatically falls back to the previous method.
Backport from trunk (r14607).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 20:30:44 +00:00
Alex Gaynor 9057450af0 [1.2.X] Added a hidden toctree pointing at the index file in the docs to silence a sphinx warning. Backport of [14605].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 20:26:58 +00:00
Alex Gaynor 030fdcc7c8 [1.2.X] Fixed #14713 -- documented that resolve can raise Http404. Thanks to Adam for the patch. Backport of [14603].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 20:04:49 +00:00
Alex Gaynor 1aaf270d73 [1.2.X] Fixed #14423 -- corrected incorrect SQL being generated when a nullable, inherited field was used in an exclude. Thanks to PhiR_42 for the patch. Backport of [14600].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 16:47:46 +00:00
Alex Gaynor 6469eec71d [1.2.X] Corrected some syntax issues in the docs. Backport of [14598].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 16:11:17 +00:00
Jannis Leidel f58d17db74 [1.2.X] Fixed a bunch of code examples in the form media documentation.
Backport from trunk (r14594).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:45:15 +00:00
Russell Keith-Magee 17d0c7ad4c [1.2.X] Migrated model_formsets doctests. Thanks to Gregor Müllegger for the patch.
Backport of r14590 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 13:38:53 +00:00
Ramiro Morales 8acad926df [1.2.X] Fixed #11369 -- Corrected verbose_name_plural model Meta option to be consistent with verbose_name when using abstract model inheritance. Thanks Beetle_B for the report.
Backport of [14588] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 12:24:47 +00:00
Alex Gaynor 03b111c6cc [1.2.X] Fixed #12687 -- fixed an issue with aggregates and counts in conjunction with annotations where the QuerySet was provably empty. Backport of [14586].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 02:58:59 +00:00
Chris Beaven 929b8ff3da [1.2.X] Remove an obsolete admonition in tutorial one (referencing 0.96 functionality)
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 02:24:58 +00:00
Ramiro Morales 746ce7d967 [1.2.X] Fixed #14691 -- Made ForeignKey.validate() use the right database. Thanks Marco Paolini for the report.
Backport of [14580] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 22:17:51 +00:00
Chris Beaven 6ff1f38646 [1.2.X] Better cross-referencing of the USE_THOUSAND_SEPARATOR setting in documentation. Thanks to Klaas van Schelven for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 21:34:53 +00:00
Russell Keith-Magee 10fafed666 [1.2.X] Migrated model_inheritance_regress doctests. Thanks to Gregor Müllegger for the patch.
Backport of r14576 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 15:15:47 +00:00
Russell Keith-Magee 587c66f7a0 [1.2.X] Migrated forms (minus localflavor) doctests. A huge thanks to Daniel Lindsley for the patch.
Backport of r14570 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 14:48:52 +00:00
Luke Plant 3cbcce429c [1.2.X] Corrected 'email' to 'e-mail' in error reporting docs.
Backport of [14571] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 13:32:07 +00:00
Alex Gaynor 478a4e22ad [1.2.X] Added a test for using an `__in` lookup with a ValueListQueryset from a none() call. Refs #14622. Backport of [14568].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 02:36:00 +00:00
Alex Gaynor bfab752286 [1.2.X] Fixed #14696, corrected some messed up syntax in the docs. Backport of [14566].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 02:21:38 +00:00
Ramiro Morales 2f91f76417 [1.2.X] Fixed #3055 -- Validate that models target of a GenericRelation have a GenericForeignKey field.
Thanks jason for diagnosing the problem and Marcos Moyano for the patch.

Backport of [14563] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 23:36:40 +00:00
Ramiro Morales dc3b524f6c [1.2.X] Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work.
Backport of [14560] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 15:50:01 +00:00
Ramiro Morales a052bcb011 Fixed #14536 -- Corrected DB connection OPTIONS examples in documentation. Thanks denilsonsa for reporting the error.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 14:09:52 +00:00
Ian Kelly 17bd39ae5a [1.2.X] Backport of r14547 from trunk.
Fixed a test case that was failing in Oracle due to conflation of null and empty strings.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 19:47:41 +00:00
Alex Gaynor 8c7df2198a [1.2.X]Converted m2m_signals from doctests to unittests. Thanks to Gregor Müllegger for the patch. We have always been at war with doctests. Backport of [14548].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 19:40:04 +00:00
Ian Kelly 80946dc0fa [1.2.X] Backport of r14545 from trunk.
Fixed a multiple_database test case that was failing in Oracle due to forced table name capitalization.  The test case now matches the style used by the raw_query tests.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 18:51:54 +00:00
Gabriel Hurley e074d2b9e9 [1.2.X] Fixed #14669 -- corrected an ungrammatical sentence in the internationalization docs. Thanks to steveire for the report.
Backport of [14539] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 02:49:21 +00:00
Ian Kelly 0046f37393 [1.2.X] Backport of r14537 from trunk.
Fixed #11101: Rewrote the sequence reset SQL for Oracle to prevent it from performing an implicit commit that caused all fixtures to be automatically committed, causing a large number of test failures.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-12 01:54:07 +00:00
Alex Gaynor 4e4418d34d [1.2.X] Removed the executable bit from a test file, it wasn't. Thanks to Florian for the report. Backport of [14530].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 17:53:59 +00:00
Alex Gaynor 659ac65cc3 [1.2.X] Remove the executable flag from uploadhandler.py, it wasn't. Thanks to Florian for the report. Backport of [14528].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 17:51:45 +00:00
Luke Plant d7b8d07cf2 [1.2.X] Fixed #14508 - test suite silences warnings.
Utility functions get_warnings_state and save_warnings_state have been added
to django.test.utils, and methods to django.test.TestCase for convenience.

The implementation is based on the catch_warnings context manager from
Python 2.6.

Backport of [14526] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14527 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 15:30:13 +00:00
Ramiro Morales 79ab8cad03 [1.2.X] Fixed error introduced in r14512.
Backport of [14514] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 05:18:27 +00:00
Ramiro Morales 2778f14660 [1.2.X] Fixed small multi-db compatibility issue in the Oracle backend.
Also, converted a couple of constructs to a more Python idiomatic form.

Backport of [14512] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 05:12:05 +00:00
Ramiro Morales 0f065d346d [1.2.X] Implemented changes made in r14320 in the Oracle backend. Thanks Russell for reviewing the proposed fix.
Backport of [14510] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 04:37:37 +00:00
Justin Bronn 7335388be2 [1.2.X] Fixed #14653 -- Removed vestigal `getstatusoutput` from GeoDjango utils.
Backport of r14508 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 17:42:38 +00:00
Carl Meyer a8114d64d5 Fixed #14599 -- Added documentation for QuerySet.delete() in the QuerySet API reference. Thanks to abeld for the report. Backport of r14505 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 16:35:39 +00:00
Alex Gaynor 66c72b1f80 [1.2.X] Fixed #14650 -- noted that underscores are also valid in slug fields. Thanks to stringify for the report and patch. Backport of [14503].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 05:19:17 +00:00
Ramiro Morales caf51bfcd4 [1.2.X] Fixed typo in raw SQL docs example.
Backport of [14501] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-09 05:07:42 +00:00
Jacob Kaplan-Moss 33c0a14180 [1.2.X] Small rewording of tutorial01.txt changes from [14066]
Backport of [14499] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-08 23:50:17 +00:00
Jacob Kaplan-Moss 6e5eb99c55 [1.2.X] Fixed #14641 - a handful of grammer/typo fixes.
Thanks, programmerq.

Backport of [14497] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-08 20:43:30 +00:00
Russell Keith-Magee cbe27e3cc4 [1.2.X] Corrected some backporting errors in the template tests.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-08 04:42:13 +00:00
Gabriel Hurley 488c9b3f11 [1.2.X] Backporting myself to the 1.2.X docs/internals/committers.txt... and fixing the typo in Jeremy's bio (again). :)
Backport of [14056] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 23:10:35 +00:00
Gabriel Hurley 6e201bcae2 [1.2.X] Fixed #11877 -- Documented that HttpRequest.get_host() fails behind multiple reverse proxies, and added an example middleware solution. Thanks to Tom Evans for the report, and arnav for the patch.
Backport of [14493] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 23:03:47 +00:00
Ramiro Morales 0164ee0082 [1.2.X] Completed and enhanced links to database-specific notes from the install docs.
Backport of [14491] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 21:46:03 +00:00
Ramiro Morales 1431bcc70e [1.2.X] Fixed some Oracle backend test DB creation code bugs.
Made saving of modified settings compatible with multi-db, removed dead and superfluous code.

Backport of [14489] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 21:02:49 +00:00
Gabriel Hurley 7509bdf86b [1.2.X] Fixed #12975 -- Moved the docs for contrib.admindocs out of the template docs and into their own reference section, and significantly improved the documentation of what admindocs can do. Thanks to jabapyth for the report, and whiteinge for the patch.
Backport of [14484] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 09:23:12 +00:00
Gabriel Hurley 969ac914ff [1.2.X] Fixed #10904 -- Corrected inappropriate usage of the term "absolute URL" throughout the docs. Replaced with the (RFC 2396-compliant) terms "absolute path reference" or "absolute path" as appropriate for the context. Thanks to sharan666 for the report, and Malcolm, Chris, and dwillis for their work in supplying a solution and patch.
Backport of [14482] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 01:44:32 +00:00
Gabriel Hurley 2946a657cd [1.2.X] Fixed #8325 -- Reorganization and expansion of the login_required decorator docs to make it clearer how the redirect_field_name parameter works and improve the overall flow of the text. Thanks to Robert Reeves for the report.
Backport of [14480] from trunk (sans 1.3-specific changes).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-07 01:00:05 +00:00
Justin Bronn d8e0052d45 [1.2.X] Fix for running GEOS/GDAL tests on Python 2.6 and below.
Backport of r14474 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 16:32:08 +00:00
Gabriel Hurley 24ce5033c8 [1.2.X] Fixed #14627 -- Made Tutorial 3 more explicit regarding the transformations the URLconf undergoes in the final two sections, and gave an example of concatenating two patterns() in the process. Thanks to filmer for the report.
Backport of [14472] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 10:09:35 +00:00
Gabriel Hurley 1423593e8f [1.2.X] Fixed #14624 -- Updated a few outdated references to CacheMiddleware in the transactions topic guide. Thanks to quinode for the report.
Backport of [14470] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14471 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 09:21:00 +00:00
Ramiro Morales c8c781a9d5 [1.2.X] Fixed #14630 -- Increased maximum size of the Oracle tablespace datafile used for tests from 100MB to 200MB.
This allows the execution of the full Django test suite without running out of allocated space.

Backport of [14468] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 04:32:23 +00:00
Alex Gaynor 80d6495f6e [1.2.X] Fixed #14629 -- corrected a misspelling and poor wording in the docs. Thanks to OldTroll for the patch. Backport of [14466].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-06 03:26:46 +00:00
Alex Gaynor 25452e3aa5 [1.2.X] Fixed #14619 -- corrected a typo in the email docs. Backport of [14463].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 21:10:22 +00:00
Jannis Leidel 85f4dd6353 [1.2.X] Fixed #11966 -- Made it possible to use a percent sign in a translation message id. Thanks for the patch, Claude Paroz.
Backport from trunk (r14459).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 14:15:16 +00:00
Luke Plant fca56e8450 [1.2.X] Fixed #14612 - Password reset page leaks valid user ids publicly.
Thanks to PaulM for the report.

Backport of [14456] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14458 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 12:39:27 +00:00
Luke Plant 74b566e81c [1.2.X] Fixed a test setup and isolation bug that was causing PasswordResetTest to fail when run individually
Backport of [14455] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 12:39:11 +00:00
Jannis Leidel b66df2f49e [1.2.X] Fixed typo in i18n docs.
Backport from trunk (r14451).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 12:03:01 +00:00
Alex Gaynor d633a58108 [1.2.X] Converted templates doctests into unittests. We have always been at war with doctests. Backport of [14448].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04 04:47:54 +00:00
Alex Gaynor 6f30440b72 [1.2.X] Fixed #10728 -- corrected subclassing of Fields who use the SubfieldBase metaclass. Thanks to G2P and George Sakkis for their work on the patch. Backport of [14443].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 18:41:23 +00:00
Alex Gaynor a25718c157 [1.2.X] Fixed #14559 -- corrected some typos and misleading docstrings. Thanks to Gabriel Hurley for the patch. Backport of [14441].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 18:30:31 +00:00
Gabriel Hurley 72e3bc6e6f [1.2.X] Fixed #14584 -- Documented settings.PASSWORD_RESET_TIMEOUT_DAYS. Also fixed some cross-refs in the neighborhood. Thanks to hop for the report and Adam Mckerlie for the draft patch.
Backport of [14437] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 11:53:53 +00:00
Alex Gaynor 5b78abeba7 [1.2.X] Fixed a few more cases of the tests not properly restoring sys.path (follow up on [14430]). Backport of [14431].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 05:31:53 +00:00
Alex Gaynor a24ccfc79f [1.2.X] Properly handle the fact that lists are mutable when trying to maintain state in a test. Backport of [14429].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 05:28:12 +00:00
Russell Keith-Magee 3cfde8364b [1.2.X] Migrated app_loading doctests.
Backport of r14427 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 05:23:44 +00:00
Russell Keith-Magee 628be3497a [1.2.X] Fixed #14470 -- Migrated modeladmin doctests. Thanks to Preston Timmons for the patch.
Backport of r14425 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 05:15:19 +00:00
Russell Keith-Magee 09ccdde265 [1.2.X] Migrated lookup doctests. Thanks to George Sakkis for the patch.
Backport of r14423 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 04:38:29 +00:00
Russell Keith-Magee 443423c55f [1.2.X] Migrated basic doctests. Thanks to Preston Timmons for the patch.
Backport of r14421 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 02:48:43 +00:00
Russell Keith-Magee 0b0ae709d1 [1.2.X] Migrated m2m_through doctests. Thanks to the anonymous contributor.
Backport of r14419 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 02:01:18 +00:00
Justin Bronn 775165b236 [1.2.X] Fixed some a stale location and whitespace in GeoIP tests.
Backport of r14416 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-01 22:18:50 +00:00
Justin Bronn 2854336cc2 [1.2.X] Fixed regression introduced in r13755 that prevented the running of the GEOS/GDAL test suites without configuring Django settings; moved reference geometry data from Python module to compressed JSON fixture; put in workaround in tests for GDAL bug #3783.
Backport of r14414 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-01 22:12:31 +00:00
Russell Keith-Magee d1175f815b [1.2.X] Reverted r14196, restoring the 1.2 test suite to a passing state. Refs #14455.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-31 23:46:14 +00:00
Alex Gaynor 3a25098c25 [1.2.X] Fixed the auth tests so they work when the AUTHENTICATION_BACKENDS setting is a list. Thanks to Patrick Altman for the report. Backport of [14406].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-31 16:26:04 +00:00
Ramiro Morales 20c6f3f3d1 [1.2.X] Fixed #13503 -- Corrected misleading custom permission example in the docs.
Thanks Daniel Moisset for the report.

Backport of [14403] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-31 02:35:18 +00:00
Russell Keith-Magee 29ea1bef21 [1.2.X] Fixed #14471 -- Corrected a regression in the use of methods on custom managers on related querysets. Thanks to Lucky for the report.
Backport of r14389 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 13:00:08 +00:00
Russell Keith-Magee 3a679cc1c4 [1.2.X] Fixed #14412 -- Pointed contrib.comments comments-url-redirect URLpattern at the actual view instead of the deprecated view. Thanks, subsume
Backport of r13995 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:16:39 +00:00
Russell Keith-Magee 181f26428a [1.2.X] Fixed #14414 -- Improved contenttypes shortcut() view to check that the ContentType has a model_class(). Thanks, subsume
Backport of r13994 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:16:21 +00:00
Russell Keith-Magee c120794b9d [1.2.X] Fixed the ugly spacing of 'BEGIN;' and 'COMMIT;' in the output of the sql/sqlall commands. They're no longer smooshed with the rest of the SQL.
Backport of r13993 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:16:04 +00:00
Russell Keith-Magee 4890ff1292 [1.2.X] Negligible formatting improvement to an error in management/sql.py
Backport of r13992 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:15:46 +00:00
Russell Keith-Magee 5d0f4edb8b [1.2.X] Fixed #14409 -- Fixed typo in docs/internals/documentation.txt. Thanks, kurtmckee
Backport of r13991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:15:27 +00:00
Russell Keith-Magee 4b8a391a3b [1.2.X] Fixed #14395 -- Fixed typo in error message in db/__init__.py. Thanks, agabel
Backport of r13990 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 12:15:05 +00:00
Luke Plant 36dd744460 [1.2.X] Fixed #14565 - No csrf_token on 404 page.
This solution doesn't have the negative side-effects of [14356].

Backport of [14377] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 11:58:51 +00:00
Luke Plant fcc283a52d [1.2.X] Reverted changeset [14356]
That fix for #14565 introduced test failures.  A better fix will
follow shortly.

Refs #14565

Backport of [14376] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 11:58:30 +00:00
Gabriel Hurley 12652baca6 [1.2.X] Fixed #14578 -- Corrected a typo in the Models topic docs. Thanks to tobych for the report and patch.
Backport of [14369] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 01:56:41 +00:00
Alex Gaynor e8c413a3e2 [1.2.X] Fixed #14577 -- fixed a docstring typo. Thanks to dauerbaustelle for the report and patch. Backport of [14364].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 20:08:54 +00:00
Ramiro Morales f2d6c6f54d [1.2.X] Documented options accepted by the runfcgi management command.
Also, modified our custom management command option docs xref parser
to also process those without a ``--`` prefix. --  Refs #14398.

Backport of [14361] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14363 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 16:10:48 +00:00
Ramiro Morales 99fbf0a46d [1.2.X] Fixed #14398 -- Changed runfcgi command to interpret the umask option argument as an octal value.
Thanks petteyg for report and aptiko for help with the fix.

Backport of [14360] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14362 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 16:04:33 +00:00
Luke Plant cbc110a467 [1.2.X] Fixed #14565 - No csrf_token on 404 pages
Thanks to gvangool for report and patch.

Backport of [14356] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-26 18:11:22 +00:00
Gabriel Hurley 4527535a93 [1.2.X] Fixed #14047 -- Updated the CommonMiddleware docs to include sending broken link email notifications. Thanks to Leon Matthews for the report and patch.
Backport of [14532] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14353 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 21:06:11 +00:00
Gabriel Hurley da5f6ef9e0 [1.2.X] Fixed #10545 -- Mentioned that template context variables only exist in the scope of th block in which they're assigned. Thanks to yaniv.haber for the report and timo for the patch.
Backport of [14350] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 20:52:04 +00:00
Alex Gaynor 1826039e00 [1.2.X] Converted model_inheritance doctests to unittests. We have always been at war with doctests. Backport of [14348].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 18:21:39 +00:00
Ramiro Morales 188a8e39fd [1.2.X] Removed obsolete 'date' filter -> 'now' tag link.
Backport of [14346] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-25 12:57:36 +00:00
Alex Gaynor 552acc652d [1.2.X] Fixed #14551 -- corrected a type in the remote user auth documentation. Thanks to mag for the report and fix. Backport of [14344].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14345 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 17:29:49 +00:00
Justin Bronn 2d4ddc0416 [1.2.X] Fixed #13617 -- `OSMGeoAdmin` now works again when `USE_L10N` (or `LANGUAGE_CODE`) is set. Thanks, Federico Hlawaczek, for workaround and piquadrat for patch.
Backport of r14341 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 09:41:08 +00:00
Gabriel Hurley 4b61183840 [1.2.X] Fixed #13040 -- Added info on where to import File class from to File reference docs, and improved Sphinx formatting. Thanks to stherrien for the report.
Backport of [14339] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 09:13:56 +00:00
Gabriel Hurley 92435e1e48 [1.2.X] Fixed #11441 -- Improved signal topic guide, particularly regarding the weak and dispatch_uid parameters to the Signal.connect method. Thanks to Mike_A and sayane for the report, and gremmie for the draft patch.
Backport of [14337] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 08:54:51 +00:00
Gabriel Hurley d269738f41 [1.2.X] Fixed #14526 -- Updated wording regarding the minimum Python version required for GeoDjango. Thanks to PaulM for the report.
Backport of [14335] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:29:53 +00:00
Gabriel Hurley 74fe397646 [1.2.X] Fixed #14541 -- Corrected an outdated bit of wording in the LANGUAGES setting docs. Thanks to akelm for the report and suggested fix.
Backport of [14333] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:15:27 +00:00
Gabriel Hurley f0416f693f [1.2.X] Fixed #14537 -- Added documentation on where validators can be imported from to Validators Reference docs, and improved Sphinx formatting and metadata. Thanks to rfugger for the report.
Backport of [14331] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14332 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 22:07:33 +00:00
Gabriel Hurley 2380a469d7 [1.2.X] Fixed #14545 -- Added ValidationError to Exceptions Reference docs and improved Sphinx metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14330 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 21:21:34 +00:00
Ramiro Morales af3de6a712 [1.2.X] Fixed #14173 -- Added sections about contrib apps-provided commands to django-admin.py docs.
Added documentation about changepassword, pointers to GeoDjango and sitemaps
commands, grouped them by app.

Backport of [14327] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 16:43:42 +00:00
Ramiro Morales 67ba914b87 [1.2.X] Fixed #14463 -- Fixed links to new location of date/time format specifiers docs.
Thanks epicserve for the report.

Backport of [14325] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 14:53:18 +00:00
Ramiro Morales f6de03b3a2 [1.2.X] Fixed #14223 -- Extended unification of exception raised in presence of integrity constraint violations.
The unification had been introduced in r12352 and native backend exceptions still
slipped through in cases that end in connection.commit() call. Thanks Alex,
Jacob and Carl for reviewing.

Backport of [14320] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 00:11:50 +00:00
Alex Gaynor 7377e4f92d [1.2.X] Fixed #14534 -- updated an out of date link in the docs. Thanks to d0ugal for the report and Frank Wiles for the patch. Backport of [14318].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-22 21:20:30 +00:00
Chris Beaven 54cb6ab1f3 [1.2.X] Fixed #14513 -- check fields with underscores for validity when ordering. Bonus points to Klaas van Schelven.
Backport from trunk (r14315)

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 21:22:11 +00:00
Chris Beaven 7f404e2628 [1.2.X] Revert [13850], this was a new feature not a bugfix.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 21:21:43 +00:00
Alex Gaynor 0df4c1c411 [1.2.X] Ensure the mutliple_database tests leave the settings in the same state they found them. Backport of [14313].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 17:37:38 +00:00
Gabriel Hurley b855dbf676 [1.2.X] Fixed #14477 -- Corrects several instances of "add" and "remove" m2m_changed signal actions not having been updated to "pre_add", "post_add", etc. Thanks to slink and andrews for reporting several instances of it, and andrews for the draft patch.
Backport of [14304] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 22:15:26 +00:00
Gabriel Hurley 1160d81e44 [1.2.X] Fixed #14432 -- Added an import statement which was previously implied in tutorial 3's URLconf to make it as explicit as possible for new users. Thanks to gorus for the report and andrews for the patch.
Backport of [14302] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 21:19:50 +00:00
Gabriel Hurley c2cb82b3c7 [1.2.X] Fixed #14493 -- Corrected use of the wrong attribute in the model validation example pseudo-code. Thanks to wogan for the report and patch.
Backport of [14300] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 21:08:50 +00:00
Luke Plant f71f312283 [1.2.X] Fixed bug and test failure introducted in [14290]
Thanks Russell for alerting me.

Backport of [14294] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 08:02:07 +00:00
Luke Plant a7a91c2d40 [1.2.X] Fixed #14498 - Forms passed to FormWizard.process_step are not guaranteed to have cleaned_data
Thanks to stas for the report.

Backport of [14290] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 21:45:51 +00:00
Ramiro Morales 6a369d2ff3 [1.2.X] Fixed errors introduced in r14280 when running Django tests under Python < 2.6.
Backport of [14287] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 19:42:36 +00:00
Russell Keith-Magee ed195a6fd3 [1.2.X] Migrated many-to-many doctests. Thanks to George Sakkis for the patch.
Backport of r14285 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 12:28:48 +00:00
Russell Keith-Magee 0476014a76 [1.2.X] Migrated many-to-one doctests. Thanks to George Sakkis for the patch.
Backport of r14281 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 05:11:56 +00:00
Ramiro Morales 9bcdb620cb [1.2.X] Converted queries tests from doctests to unittests.
Thanks Russell and Alex for reviews and suggestions.

Backport of [14279] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 04:17:29 +00:00
Gabriel Hurley da17c2b84f [1.2.X] Fixed #7616 -- Added advice on unix socket permissions and umasks to fastcgi deployment documentation. Thanks to Malcolm Tredinnick for the report and advice, and PaulM and cramm for reviewing the patch.
Backport of [14276] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:58:34 +00:00
Gabriel Hurley 4ec58f702b [1.2.X] Fixed #14464 -- Strengthened the admonition regarding documentation versions at the end of the install docs. Thanks to PaulM for the report.
Backport of [14274] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:28:00 +00:00
Gabriel Hurley 9dfdcf86be [1.2.X] Fixed #14426 -- Removed "mysite" import statements from examples that might teach people "bad habits" in regards to creating reusable apps.
Thanks to idahogray for assisting with the patch (and sorry for forgetting the attribution in the patch on trunk).

Backport of [14270] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 00:11:51 +00:00
Honza Král efcb7776a0 [1.2.X] Fixed #13790 -- auto detection of m2m fields to Site. Thanks, gabrielhurley!
Backport from trunk (r14251).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-18 05:02:28 +00:00
Jannis Leidel 55d8c47d29 [1.2.X] Fixed a few other backporting-related bugs introduced in r14213.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 16:09:07 +00:00
Jannis Leidel 630b1fc09b [1.2.X] Removed stray code introduced in r14126 that broke the test suite.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 15:41:00 +00:00
Jannis Leidel 0e4737ec24 [1.2.X] Fixed #13963 -- Use the correct verbose name of a reverse relation field in the admin. Thanks, sfllaw and d0ugal.
Backport from trunk (r14244).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 15:40:41 +00:00
Alex Gaynor 2a33115040 Corrected a suite of test failures when running under postgres. Backport of [14241].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 01:50:58 +00:00
Jannis Leidel 11713a8771 [1.2.X] Fixed #14126 -- Fixed an issue with changes to the blocktrans tag introduced in r13973 related to multiple plural forms. Thanks, mark0978, svetlyak40wt and Ramiro.
Backport from trunk (r14239).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-16 20:51:06 +00:00
Alex Gaynor 386b681105 [1.2.X] Converted or_lookups tests from doctests to unittests. We have always been at war with doctests. Thanks to Paul Tax for the patch. Backport of [14236].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-16 17:00:35 +00:00
Gabriel Hurley ac16c59d35 [1.2.X] Fixed #14307 -- Added a new crossref target to model field reference docs and fixed broken relative link in form field reference docs. Thanks to adamv for the report.
Backport of [14234] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14235 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 20:14:22 +00:00
Gabriel Hurley 560f58aba3 [1.2.X] Fixed #14307 -- Linked ChoiceField.choices docs to Field.choices docs to explain the formatting options available. Thanks to adamv for the report and Russ for the suggested fix.
Backport of [14231] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 10:22:50 +00:00
Gabriel Hurley d0a056bcff [1.2.X] Fixed #14376 -- added docs for previously undocumented Brazilian localflavor fields. Thanks to henriquebastos for the report and patch.
Backport of [14229] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 09:31:59 +00:00
Alex Gaynor 7ddeb86cb6 [1.2.X] Fixed #14473 -- converted the model_package tests from doctests to unitests. We have always been at war with doctests. Thanks to Gabriel Hurley for the patch. Backport of [14227].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 07:34:41 +00:00
Alex Gaynor 3c469e95fb [1.2.X] Fixed #14472 -- converted generic_relations tests from doctests to unitests. We have always been at war with doctests. Thanks to Gabriel Hurley for the patch. Backport of [14225].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 06:52:53 +00:00
Alex Gaynor f18e27145c [1.2.x] Fixed #14454 -- converted admin_widgets tests from doctests to unittests. We have always been at war with doctests. Thanks to prestontimmons for the patch. Backport of [14221].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14222 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 02:41:21 +00:00
Jannis Leidel 7be27dc083 [1.2.X] Fixed #14301 -- Handle email validation gracefully with email addresses containing non-ASCII characters. Thanks, Andi Albrecht.
Backport from trunk (r14216).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 18:38:43 +00:00
Gabriel Hurley ece06a8006 [1.2.X] Fixed #5327 -- Added standardized field information to ModelChoiceField and ModelMultipleChoiceField documentation. Thanks to danielrubio for the report and PhiR for the text.
Backport of [14214] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 10:04:03 +00:00
Alex Gaynor e50066d0b5 [1.2.X] Fixed #14456 -- converted inline_formsets tests from doctests to unittests. We have always been at war with doctests. Thanks to prestontimmons for the patch. Backport of [14212].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 01:40:39 +00:00
Alex Gaynor 14419f916b [1.2.X] Fixed #14459 -- converted many_to_one_regress tests from doctests to unittests. We have always been at war with doctests. Patch from Gabriel Hurley. Backport of [14210].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 01:24:55 +00:00
Alex Gaynor 25db006b7b [1.2.X] Fixed #14460 -- converted managers_regress tests from doctests to unittests. We have always been at war with doctests. Patch from Gabriel Hurley. Backport of [14207].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 01:17:32 +00:00
Alex Gaynor 1df25941b3 [1.2.X] Fixed #14458 -- converted m2m_regress tests from doctests to unittests. We have always been at war with doctests. Thanks to Gabriel Hurley for the patch. Backport of [14205].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 01:11:22 +00:00
Chris Beaven 55b68363f2 [1.2.X] Fix a typo in my bio. Backport of [14200]
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-13 07:02:43 +00:00
Justin Bronn a6d7836fd1 [1.2.X] Fixed #13830 -- Updated province name in Indonesian localflavor. Thanks, rodin.
Backport of r14195 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-13 01:25:04 +00:00
Honza Král 18a605d6ad [1.2.X] Changed unique validation in model formsets to ignore None values, not just omit them. Thanks claudep!
Backport of r14193 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-13 00:33:10 +00:00
Justin Bronn 4ed10675f9 [1.2.X] Enabled area calculations for geography columns.
Backport of r14189 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 17:27:07 +00:00
Russell Keith-Magee 3c8bc8c64b [1.2.X] Modified the test_client tests to use the non-deprecated mail API.
Backport of r14187 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 14:09:02 +00:00
Russell Keith-Magee 23ecf3cf6c [1.2.X] Modified the sitemaps tests to remove an assumption about the environment in which the tests are run. Thanks to Gabriel Hurley for the report and patch.
Backport of r14184 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 07:27:49 +00:00
Alex Gaynor 9b077ee4b6 [1.2.X] Converted model_inheritance_select_related tests from doctests to unittests. We have always been at war with doctests. Backport of [14181].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 02:09:35 +00:00
Alex Gaynor 9ab383b394 [1.2.X] Converted initial_sql_regress tests from doctests (sort of...) to unittests. We have always been at war with doctests. Backport of [14179].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:59:46 +00:00
Alex Gaynor de8ff6b672 [1.2.X] Converted get_or_create_regress tests from doctests to unittests. We have always been at war with doctests. Backport of [14177].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:54:48 +00:00
Russell Keith-Magee 5f8332af04 [1.2.X] Tweak to many_to_one_null doctest to avoid primary key assumptions (causing breakage on PostgreSQL).
Backport of r14168 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:02:57 +00:00
Russell Keith-Magee 6f7f1f651b [1.2.X] Migrated one_to_one doctests. Thanks to George Sakkis for the patch. (We have always been at war with doctests)
Backport of r14167 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:02:37 +00:00
Russell Keith-Magee 6b1a45289b [1.2.X] Migrated many_to_one_null doctests. Thanks to George Sakkis for the patch.
Backport of r14166 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:02:13 +00:00
Russell Keith-Magee 5ecb496d6c [1.2.X] Migrated properties doctests. Thanks to George Sakkis for the patch.
Backport of r14165 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:01:49 +00:00
Russell Keith-Magee d83af03c59 [1.2.X] Migrated the mutually_referential doctests. Thanks to George Sakkis for the patch.
Backport of r14164 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:01:25 +00:00
Russell Keith-Magee b12428de91 [1.2.X] Migrated m2o_recursive and m2o_recursive2 tests, merging them into a single package. Thanks to George Sakkis for the patches.
Backport of r14163 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:00:58 +00:00
Jannis Leidel d327611b24 [1.2.X] Fixed #13494 -- Correctly concat an email subject prefix with a translation string. Thanks, hcarvalhoalves and Andi Albrecht.
Backport from trunk (r14157).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 22:36:17 +00:00
Jannis Leidel cf6b26d7a2 [1.2.X] Fixed links to the date formats choices in the global settings. Thanks, Russell.
Backport from trunk (r14032).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 22:35:24 +00:00
Justin Bronn cc1a41f3de [1.2.X] Updated version of PostGIS in GeoDjango install docs.
Backport of r14150 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 22:24:59 +00:00
Gabriel Hurley d2724d883e [1.2.X] Added information about the "easy-pickings" keyword to the contributing docs. Thanks to Russ for the report and cmheisel for the patch.
Backport of [14154] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 21:58:46 +00:00
Alex Gaynor 01d1dd6935 [1.2.X] Fixed #14444 -- Convert the pagination doctests to unittests. We have always been at war with doctests. Thanks to Gabriel Hurley for the patch. Backport of [14152].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 20:38:29 +00:00
Alex Gaynor efc7524236 [1.2.X] Converted ordering tests from doctests to unittests. We have always been at war with doctests. Backport of [14147].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 18:18:12 +00:00
Alex Gaynor 6d34d308aa [1.2.X] Converted save_delete_hooks tests from doctests to unittests. We have always been at war with doctests. Backport of [14145].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 17:41:59 +00:00
Jacob Kaplan-Moss 69d40b4a6f [1.2.X] Fixed #14440 - Converted mail doctests to unittests.
Thanks to Rob Hudson for the patch and also to andialbrecht who filed a
similar patch that I didn't use.

Backport of r14143 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 15:18:34 +00:00
Luke Plant 1534af4b44 [1.2.X] Fixed #14433 - replaced a thread-unsafe solution to #10235 introduced in [13980]
This patch also addresses sitemap code found in contrib/gis, which [13980]
did not.

Thanks to gabrielhurley for the initial patch.

Refs #10235, #14386

Backport of [14141] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 14:36:20 +00:00
Alex Gaynor 1d9336bb6c [1.2.X] Fixed #14279 -- Corrected a typo in the sitemaps tests (didn't affect the passage of the test). Thanks to jamesodo for the report and patch. Backport of [14136].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 03:40:26 +00:00
Gabriel Hurley 1b7d73848c [1.2.X] Changed ModelForm.fields and ModelForm.exclude examples to use tuples instead of lists since they were used inconsistently throughout the page (it wasn't hurting anything, but consistency is nice). Thanks to lspcity for the report and gruszczy for the patch.
Backport of [14134] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 22:41:51 +00:00
Alex Gaynor b014c81fa7 [1.2.X] Converted signals tests from doctests to unittests. We have always been at war with doctests. Backport of [14131].
Conflicts:

	tests/modeltests/signals/models.py

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 18:28:53 +00:00
Carl Meyer e226a113a6 [1.2.X] Fixed typo in tutorial 01. Backport of [14129].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 18:17:32 +00:00
Ramiro Morales 46812b4c2b [1.2.X] Fixed #6073 -- Made compilemessages 18n management command reject PO files with BOM.
Backport of [14125] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 16:45:06 +00:00
Chris Beaven fee4aa31d7 [1.2.X] Fixed #11907 -- EmailField now runs strip() on its input. This means mistakenly including leading or trailing spaces will not cause a validation error, and clean() will remove those spaces. Thanks, krisneuharth and djansoft. Backport of [13997].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 10:02:18 +00:00
Andrew Godwin be190d1913 [1.2.X] Fixed #14193: prepopulated_fields javascript now concatenates in correct order. Thanks to bmihelac for the patch.
Backport of [14122] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 09:58:24 +00:00
Andrew Godwin c4956d1b9e [1.2.X] Fixed #14391 - Updated django-admin.1 man page to include newer commands. Thanks to laurentluce for the patch.
Backport of [14120] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 09:40:38 +00:00
Chris Beaven a23b42924a [1.2.X] Add myself to committers. Backport of [14118]
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 09:38:55 +00:00
Carl Meyer 700c5a3dfe [1.2.X] Refs #11256 -- Extended the annotation field name conflict check to cover m2ms and reverse related descriptors as well. This is needed to actually cover the case raised by #14373. Backport of [14116].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 08:06:39 +00:00
Gabriel Hurley 4395b6575b [1.2.X] Clarified information on OPTIONS setting (for adding additional parameters when connecting to a database) and linked to Database Backend docs. Thanks to chris@cwroofs for the report.
Backport of [14114] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 07:59:49 +00:00
Gabriel Hurley 1322968409 [1.2.X] Makes links to form and field validation (and form reference docs in general) more readily available from form topic overview. Thanks to john_fries for the report.
Backport of [14112] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 07:09:57 +00:00
Gabriel Hurley 95d0ffbb0f [1.2.X] Added additional information on what the APPEND_SLASH setting does. Thanks to ttencate for the report and draft text.
Backport of [14110] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 06:37:19 +00:00
Gabriel Hurley 7de577093c [1.2.X] Advises that the Ubuntu package manager drops the .py extension from django-admin.py. Thanks to islands for the report and d0ugal for the patch.
Backport of [14108] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 06:07:25 +00:00
Ramiro Morales 4d70df8b78 [1.2.X] Fixed #12650 -- Don't generate invalid XHTML in the admin, databrowse apps when
the i18n context processor is active. Thanks to Rob Hudson for the report and
fix suggestion.

Backport of [14104] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 01:59:17 +00:00
Luke Plant a92da6e80b [1.2.X] Converted contrib/webdesign doctests to unittests. We thoroughly deplore those doctests.
Backport of [14101] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 01:09:34 +00:00
Luke Plant cf2e9f66ed [1.2.X] Converted contrib/auth/tokens doctests to unittests. We've always said "no more" to doctests.
Backport of [14100] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 01:09:20 +00:00
Alex Gaynor 5d9140c137 [1.2.X] Fixed a typo in the comments tests, as well as a dependency on CPython's reference counting semantics. Backport of [14098].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 23:05:09 +00:00
Carl Meyer 846febeb7a [1.2.X] Fixed misspelling in model fields docs. Backport of [14096] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 22:42:01 +00:00
Alex Gaynor ee8fc8d93a [1.2.X] Converted defer_regress tests from doctests to unittests. We have always been at war with doctests. Backport of [14094].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 21:55:33 +00:00
Carl Meyer b6223d3020 [1.2.X] Added sanity-checking of annotation alias names. Backport of [14092] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 20:10:00 +00:00
Alex Gaynor 62dfe54d70 [1.2.X] Fixed a PendingDeprecationWarning coming from django.core.cache in Python 2.6. Backport of [14090].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 17:32:43 +00:00
Alex Gaynor 50ce457330 [1.2.X] Fixed #14356. Remove some dead imports from django.core.management.sql. Thanks to xiaket for the report and patch. Backport of [14088].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 17:15:35 +00:00
Alex Gaynor b3e02d19ec [1.2.X] Fixed #14011 -- Doing a subquery with __in and an EmptyQuerySet no longer raises an Exception. This is actually just a test for this, it was fixed by [14085]. Thanks to skatei for the report and mk for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 16:51:50 +00:00
Alex Gaynor bb66cb8463 [1.2.X] Fixed #14366 -- Model.objects.none().values() now correctly returns a QuerySet with no items, rather than raising an Exception. Thanks to Carl Meyer for the patch. Backport of [14084].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 16:46:25 +00:00
Alex Gaynor 2e5f0c228f [1.2.X]. Convert m2m_recursive tests to unittests. We have always been at war with doctests. Backport of [14082].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 16:27:19 +00:00
Russell Keith-Magee 935f6873dd [1.2.X] Fixed #14427 -- Added --bisect and --pair flags to runtests.py, making it easier to find pairs of tests that fail when run together.
Backport of r14079 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 14:47:28 +00:00
Russell Keith-Magee e8d5038218 [1.2.X] Ensure that the sitemaps test deactivates it's locale, so that subsequent tests aren't run in French.
Backport of r14078 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 14:47:04 +00:00
Gabriel Hurley 4241197b40 [1.2.X] Improved example to account for environments where cStringIO is not available. Thanks to rubic for the report and niall for the patch.
Backport of [14076] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 10:23:48 +00:00
Gabriel Hurley a96e50b76b [1.2.X] Adds documentation for QuerySet.update() method. Thanks to dwillis and timo for the majority of the wording.
Backport of [14074] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 10:01:01 +00:00
Gabriel Hurley 91310e759a [1.2.X] Fixed #13538 -- Clarified query examples with more explicit import statements and model vs. instance differentiation. Thanks to yipengh87 and kmtracey for the report, and timo for the patch.
Backport of [14070] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:26:29 +00:00
Russell Keith-Magee 9584b77c35 [1.2.X] Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch
Backport of r14069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:25:01 +00:00
Russell Keith-Magee a322ba66a1 [1.2.X] Migrated the custom_columns doctests to unit tests. Thanks to Alex Gaynor.
Backport of r13765 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:23:32 +00:00
Simon Meers 824ca0d6e5 [1.2.X] Fixed #14255 -- factor project name out of app imports in tutorial. Thanks to adamend for the report and initial patch.
Backport of r14066 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 07:48:09 +00:00
Gabriel Hurley b2bd6c9d56 [1.2.X] Corrects a typo in [14063]. Thanks to Russ for the report.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14065 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 07:36:07 +00:00
Gabriel Hurley 19352c9cd9 [1.2.X] Fixed #13279 -- Made the paths in the Unix install docs more explicit. Thanks to KathyManwaring for the report and stumbles for the patch.
Backport of [14062] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 07:28:47 +00:00
Simon Meers 8fd9f2eb9f [1.2.X] Fixed #5677 -- update modpython stdout documentation. Thanks to Manfred Wassmann for the report, nickefford for the initial patch and Graham Dumpleton for the expert advice.
Backported of r14059 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 05:10:32 +00:00
Ramiro Morales fae5b04f11 [1.2.X] Fixed #12872 -- Removed vestiges of mythic old template validation admin app functionality.
Backport of [14055] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 04:10:39 +00:00
Russell Keith-Magee a3581f9a55 [1.2.X] Fixed #14354 -- Normalized the handling of empty/null passwords in contrib.auth. This also updates the createsuperuser command to be more testable, and migrates some auth doctests. Thanks to berryp for the report, and Laurent Luce for the patch.
Backport of r14053 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 03:36:46 +00:00
Ramiro Morales 714694aeed [1.2.X] Added myself to the committers list.
Backport of [14051] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 03:23:01 +00:00
Simon Meers 52e7812901 [1.2.X] Fixed #5537 -- document trailing '+' on related_name for supressing backward relation.
Thanks to dcramer for the report, and Russ for pointing out the workaround.

Backport of r14049 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 02:57:11 +00:00
Carl Meyer 5ff085d65e [1.2.X] Added myself to committers. Backport of [14047].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 02:11:18 +00:00
Alex Gaynor ae448e4439 [1.2.X] Fixed #13241. order_with_respect_to now works with ForeignKeys who refer to their model lazily (i.e. with a string). Thanks to Gabriel Grant for the patch. This is a backport of [14045].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 23:55:38 +00:00
Alex Gaynor 3ab1a0c7d6 [1.2.X] Converted order_with_respect_to to unittests. We have always been at war with doctests. Backport of [14043].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 23:48:07 +00:00
Simon Meers 0eb8c02c6e [1.2.X] Fixed #14023 -- include non_field_errors in example. Thanks to konryd for the report and patch.
Backport of r14041 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14042 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 23:37:48 +00:00
Andrew Godwin 475fb82d98 [1.2.X] Adding my bio. This is a backport of [14309].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 23:17:14 +00:00
Simon Meers cd1134d6df [1.2.X] Added my bio to committers.txt. Backport of [14037]
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 22:52:41 +00:00
Alex Gaynor e8051e983a [1.2.X] Added myself to the committers docs. This is a backport of [14034] and [14035].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 21:12:55 +00:00
Jannis Leidel 9937943f3a [1.2.X] Fixed a few minor backporting oversights that prevented the tests to pass.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 17:54:40 +00:00
Jannis Leidel fb3f629457 [1.2.X] Fixed #10970 -- Initialize DateFields with datetime.date objects, not datetime.datetime. Thanks, summerisgone, Cyberj and Ramiro Morales.
Backport from trunk (r14029).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 17:54:11 +00:00
Russell Keith-Magee 9d1bf9d5ad [1.2.X] Fixed #14232 -- Clarified the data type of date_list in date-based generic views. Thanks to clelland for the report and patch.
Backport of r14020 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:47:09 +00:00
Russell Keith-Magee de3669d2fa [1.2.X] Fixed #14274 -- Added admonition about using -Wall when you run tests. Thanks to Eric Holscher for the suggestion and draft, and to timo for contributions to the patch.
Backport of r14019 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14027 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:46:49 +00:00
Russell Keith-Magee eae8c65177 [1.2.X] Fixed #14375 -- Corrected the capitalization of MultiValueField. Thanks to Blue for the report.
Backport of r14018 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:46:27 +00:00
Russell Keith-Magee 9ad73135c0 [1.2.X] Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch.
Backport of r14017 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:46:03 +00:00
Russell Keith-Magee 5170a12a88 [1.2.X] Fixed #14384 -- Updated mod_wsgi docs to match documented best practice. Thanks to monokrome for the report and wogan for the patch.
Backport of r14016 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:45:33 +00:00
Russell Keith-Magee bbab38dc50 [1.2.X] Fixed #14421 -- Clarified the english in the i18n documentation. Thanks to Ned Batchelder for the report and patch.
Backport of r14015 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:45:07 +00:00
Russell Keith-Magee 21be09dbb4 [1.2.X] Fixed #14225 -- Added a documentation marker (and a 1.2.2 release notes file, required to satisfy Sphinx) for the enable_csrf_checks flag on the test client. Thanks to public@grep.ro for the report.
Backport of r14011 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:44:28 +00:00
Jannis Leidel 83f762e3ac Fixed #13188 -- Moved date format documentation from the now template tag to the date filter. Thanks, dwillis and timo.
Backport from trunk (r14013).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14021 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:43:20 +00:00
Russell Keith-Magee 0d4d924ca5 [1.2.X] Fixed #13218 -- Ensure that syndicated content served over HTTPS uses https:// links by default. Thanks to schaefer for the report, and Ben Firshman for the patch.
Backport of r14007 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 14:17:13 +00:00
Russell Keith-Magee 36167517aa [1.2.X] Fixed #14221 -- Cleaned up some text in the GIS tutorial. Thanks to Grant <renderbox@gmail.com> for the report.
Backport of r14006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 14:16:50 +00:00
Russell Keith-Magee 5b1e21e200 [1.2.X] Fixed #14381 -- Clarified exception handling when instantiating Routers. Thanks to dauerbaustelle for the suggestion and patch.
Backport of r14005 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 14:16:29 +00:00
Russell Keith-Magee 0a52a04a07 Backport of r14003 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 13:53:25 +00:00
Luke Plant cf1d9f4b2c [1.2.X] Fixed #14430 - Test failure on Windows with get_image_dimensions since [13715]
Thanks to gabrielhurley for report and patch.

Backport of [14001] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-07 23:49:31 +00:00
Luke Plant 01b12a6fab [1.2.X] Fixed #5425 - Incorrect plurals in admin pagination template.
Thanks to Petr Marhoun for the report, and mk for the patch.

Backport of [13998] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-07 22:33:02 +00:00
Luke Plant 12187bfd26 [1.2.X] Fixed #14386, #8960, #10235, #10909, #10608, #13845, #14377 - standardize Site/RequestSite usage in various places.
Many thanks to gabrielhurley for putting most of this together.  Also to
bmihelac, arthurk, qingfeng, hvendelbo, petr.pulc@s-cape.cz, Hraban for
reports and some initial patches.

The patch also contains some whitespace/PEP8 fixes.

Backport of [13980] from trunk. Some items could be considered features
(i.e.  supporting RequestSite in various contrib apps), others are definite
bugs, but it was much more robust to backport all these tightly related
changes together.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-05 20:31:02 +00:00
Luke Plant c7ce5b8929 [1.2.X] Fixed #13092 -- Added support for the "in" operator when dealing with context lists. Thanks to clelland for the patch.
Backport of [13510] from trunk.  Backported in order to support some other
tests which need to be backported.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-05 20:27:11 +00:00
Luke Plant cb00181854 [1.2.X] Fixed #11358: Don't include private flatpages in sitemap. Thanks dburke and mlavin.
Backport of [13734] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-05 19:41:48 +00:00
Russell Keith-Magee 8266925684 [1.2.X] Fixed #10215 -- Ensured that there is parity between enter and leave transaction calls in loaddata when commit=False. The test case for this is the fixtures_regress unittests under MyISAM, which were failing previous to this fix. Thanks to MockSoul for the report.
Backport of r13978 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-02 13:56:58 +00:00
Russell Keith-Magee 1429a3dbba [1.2.X] Corrected a test failure under MySQL.
Backport of r13976 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-02 13:14:47 +00:00
Jannis Leidel 36ce5d0b3a [1.2.X] Fixed #14363 -- Fixed render method of ManyToManyRawIdWidget to set attrs to an empty dict. Thanks, tyrion and dpn.
Backport from trunk (r13971).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:40:25 +00:00
Jannis Leidel 6d30b2847c [1.2.X] Fixed #14362 -- Made sure all parameters are passed to the ManyToManyRawIdWidget. Thanks, tyron.
Backport from trunk (r13970).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:40:01 +00:00
Jannis Leidel a0cabd766f [1.2.X] Fixed #13568 -- Fixed the blocktrans tag to not raise a KeyError if the number of variables in the singular and the plural block differ. Thanks, deloide.
Backport from trunk (r13967).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:39:45 +00:00
Jannis Leidel ebc084ca35 [1.2.X] Fixed #13876 -- Fixed duplication in docs. Thanks, zerok and timo.
Backport from trunk (r13966).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:39:25 +00:00
Jacob Kaplan-Moss 89e0fde948 [1,2,X] Additions to the contributing document explaining our new decision-making process.
Backport of r13962.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-29 17:58:29 +00:00
Luke Plant ed1aa807e2 [1.2.X] Fixed #14182 - documented how to modify upload handlers when using CsrfViewMiddleware
Thanks to dc for the report.

Backport of [13960] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-29 17:34:26 +00:00
Russell Keith-Magee f27d85b8f4 [1.2.X] Modified a fixtures_regress test case to make it more robust to database ordering.
Backport of r13958 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-29 01:29:10 +00:00
Russell Keith-Magee a40380f37a [1.2.X] Corrected the spelling of David Brenneman's name in the AUTHORS file. Apologies, David.
Backport of r13956 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 15:09:06 +00:00
Russell Keith-Magee cd7e271e54 [1.2.X] Migrated fixtures_regress doctests. Thanks to David Brenneman for the patch.
Backport of r13954 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 14:53:21 +00:00
Russell Keith-Magee 49544ffb36 [1.2.X] Migrated extra_regress doctests. Thanks to Stephan Jaekel.
Backport of r13951 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 13:45:22 +00:00
Russell Keith-Magee 51ded1500f [1.2.X] Migrated expressions_regress doctests. Thanks to Stephan Jaekel.
Backport of r13950 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 13:44:49 +00:00
Russell Keith-Magee aec5f084a3 [1.2.X] Modified the requests unit tests so that they aren't dependent on dictionary ordering.
Backport of r13848 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 12:10:52 +00:00
Russell Keith-Magee 0f41f91bc2 [1.2.X] Unified the regressiontests/dateformat tests with the regressiontests/utils/dateformat tests.
Backport of r13938 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:31:01 +00:00
Russell Keith-Magee a36a8bbb39 [1.2.X] Migrated defaultfilters doctests. Thanks to Stephan Jaekel
Backport of r13937 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:30:22 +00:00
Russell Keith-Magee 3b255e33e8 [1.2.X] Migrated regressiontest/datastructures doctest, and moved it into the existing utils datastructures package. Thanks to Stephan Jaekel.
Backport of r13937 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:29:58 +00:00
Russell Keith-Magee efa27fc86c [1.2.X] A few test optimizations; using native unittest where no Django-specific TestCase features are required.
Backport of r13935 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:29:30 +00:00
Russell Keith-Magee 5277425ae4 [1.2.X] Migrated null_fk doctests. Thanks to Stephan Jaekel.
Backport of r13934 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:28:56 +00:00
Russell Keith-Magee ccd6a6783b [1.2.X] Migrated null_fk_ordering doctests. Thanks to Stephan Jaekel.
Backport of r13933 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:28:32 +00:00
Russell Keith-Magee a9e0305f22 [1.2.X] Migrated null_queries doctests. Thanks to Stephan Jaekel.
Backport of r13932 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:28:07 +00:00
Russell Keith-Magee 45859fe9ff [1.2.X] Migrated one_to_one_regress doctests. Thanks to Stephan Jaekel.
Backport of r13931 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 08:27:43 +00:00
Russell Keith-Magee 66cb5d5aae [1.2.X] Migrated requests doctests. Thanks to Stephan Jaekel.
Backport of r13927 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 07:10:05 +00:00
Russell Keith-Magee 7230b609c3 [1.2.X] Migrated reverse_single_related doctests. Thanks to Stephan Jaekel.
Backport of r13926 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 07:09:40 +00:00
Russell Keith-Magee e9f10deec0 [1.2.X] Migrated select_related_regress doctests. Thanks to Stephan Jaekel.
Backport of r13925 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 07:09:19 +00:00
Russell Keith-Magee cf0e0c47f0 [1.2.X] Removed a test assertion that depended on primary key ordering. The test doesn't validate anything significant, and fails under Postgres. Thanks to Tobias McNulty and the magical Caktus buildbot for pointing out the problem.
Backport of r13923 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-28 04:49:37 +00:00
Jannis Leidel 229c738a03 [1.2.X] Fixed #14053 -- Also localize long integers. Thanks, David Danier.
Backport from trunk (r13920).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 16:22:30 +00:00
Russell Keith-Magee 2511939883 [1.2.X] Added Stephan Jaekel to AUTHORS for his excellent work purging doctests.
Backport of r13897 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:38:08 +00:00
Russell Keith-Magee 554be48d01 [1.2.X] Migrated signals_regress doctests. Thanks to Stephan Jaekel.
Backport of r13896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:37:45 +00:00
Russell Keith-Magee 025ee2c13e [1.2.X] Migrated string_lookup doctests. Thanks to Stephan Jaekel.
Backport of r13895 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:37:19 +00:00
Russell Keith-Magee 74b6c76e25 [1.2.X] Migrated text doctests. Thanks to Stephan Jaekel.
Backport of r13894 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:36:54 +00:00
Russell Keith-Magee 2f480e0882 [1.2.X] Migrated urlpatterns_reverse doctests. Thanks to Stephan Jaekel.
Backport of r13893 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:36:30 +00:00
Russell Keith-Magee 8425cdef45 [1.2.X] Added imports for some new unittest modules. Thanks to Stephan Jaekel.
Backport of r13892 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:36:07 +00:00
Russell Keith-Magee 0b7b3e1ae8 [1.2.X] Migrated datastructures utils doctests. Thanks to Stephan Jaekel.
Backport of r13891 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:35:39 +00:00
Russell Keith-Magee 46d1d951c2 [1.2.X] Migrated timesince utils doctests. Thanks to Stephan Jaekel.
Backport of r13890 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:35:07 +00:00
Russell Keith-Magee 4cd11f8681 [1.2.X] Reorganized utils tests so it's all in separate modules. Thanks to Stephan Jaekel.
Backport of r13889 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:34:41 +00:00
Russell Keith-Magee 494933a36b [1.2.X] Migrated datetime_safe doctests. Thanks to Stephan Jaekel.
Backport of r13888 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:34:06 +00:00
Russell Keith-Magee 1917a43c4b [1.2.X] Migrated tzinfo doctests. Thanks to Stephan Jaekel.
Backport of r13887 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:33:42 +00:00
Russell Keith-Magee 46448ec51e [1.2.X] Migrated datatypes doctests. Thanks to Sebastian Hillig.
Backport of r13886 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:33:17 +00:00
Russell Keith-Magee f1328b3adb [1.2.X] Migrated custom_columns_regress doctests. Thanks to Sebastian Hillig.
Backport of r13885 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:32:49 +00:00
Russell Keith-Magee 804b94e27d [1.2.X] Migrated backends doctests. Thanks to Sebastian Hillig.
Backport of r13884 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:32:19 +00:00
Russell Keith-Magee e8ccba765c [1.2.X] Migrated admin_validation doctests. Thanks to Sebastian Hillig.
Backport of r13883 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:27:25 +00:00
Jannis Leidel d99f19fb6a [1.2.X] Fixed #14290 -- Made format localization faster by caching the format modules. Thanks, Teemu Kurppa and Anssi Kääriäinen for the report and initial patches.
Backport from trunk (r13898).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:27:07 +00:00
Russell Keith-Magee 6ee04e0f97 [1.2.X] Migrated admin_registration doctests. Thanks to Sebastian Hillig.
Backport of r13882 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:26:57 +00:00
Russell Keith-Magee 3a66f15a68 [1.2.X] Migrated admin_ordering doctests. Thanks to Sebastian Hillig.
Backport of r13881 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:26:29 +00:00
Russell Keith-Magee 3640abd976 [1.2.X] Migrated admin_inlines doctest. Thanks to Sebastian Hillig.
Backport of r13880 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:25:57 +00:00
Jannis Leidel bb857bf4d4 [1.2.X] Fixed #14280 -- Fixed duplicate import of deepcopy. Thanks, Carl Meyer.
Backport from trunk (r13877).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 23:00:44 +00:00
Jannis Leidel ad3b281c97 [1.2.X] Fixed #14271 -- Use absolute path for admin media tests. Thanks, Alex Gaynor.
Backport from trunk (r13874).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 20:57:00 +00:00
Jannis Leidel 7b556c2f1b [1.2.X] Fixed #14122 -- Added example for builtin yesno template filter. Thanks, idahogray.
Backport from trunk (r13872).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 20:53:45 +00:00
Jannis Leidel 4d966ee202 Fixed #12544 and #13600 -- Fixed static files serving view to catch invalid date from If-Modified-Since header. Thanks akaihola and SmileyChris for patches.
Backport from trunk (r13870).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 20:46:37 +00:00
Jannis Leidel c37add7c47 [1.2.X] Fixed #7535 -- Correctly set Content-Encoding header in static files serving view. Thanks for the report and patch, Kevin Hunter.
Backport from trunk (r13868).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 15:12:38 +00:00
Russell Keith-Magee 5f4fe3cdfc [1.2.X] Migrated the custom_managers_regress doctests. Thanks to Paul McMillan.
Backport of r13866 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 09:56:37 +00:00
Luke Plant 804719ff23 [1.2.X] Fixed #12019 - backwards compatibility issues with cache_page decorator.
Thanks to rokclimb15 for the report, and j4mie/rokclimb15 for the patches.

Backport of [13864] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-21 19:33:53 +00:00
Russell Keith-Magee 80b9233e4a [1.2.X] Fixed #11486 -- Corrected the XML serializer to allow for the serialization of objects with a null PK value. Also includes migration of doctests to unittests (we have always been at war with doctests). Thanks to zdmytriv for the report, and Niall Kelly for the patch.
Backport of r13862 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-19 14:05:43 +00:00
Ian Kelly 1fb572a6d6 [1.2.X] Committing missing files from [13859].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-16 19:58:25 +00:00
Ian Kelly a63bea3e3b [1.2.X] Fixed #14244: Allow lists of more than 1000 items to be used with the 'in' lookup in Oracle, by breaking them up into groups of 1000 items and ORing them together. Thanks to rlynch for the report and initial patch. Backport of [13859] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-16 19:56:39 +00:00
Luke Plant d443d16063 [1.2.X] Fixed paste-o in [13855]
Backport of [13857] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-14 21:42:06 +00:00
Luke Plant efae9a166b [1.2.X] Fixed #2283 (again) - comment form templates don't validate as XHTML
Thanks to hjoreteg/thejaswi_puthraya for the report and patch.

Backport of [13855] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-14 14:24:15 +00:00
Luke Plant 2d7a3e71c1 [1.2.X] Fixed #14254 - More tests for storage backends
Thanks to steph for the patch, also to tobias for cleanups.

Backport of [13852] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 23:17:27 +00:00
Luke Plant 238eea44eb [1.2.X] Fixed #14252 - django.contrib.flatpages unit tests assume default value for settings.LOGIN_URL
Thanks to pmclanahan for report and patch.

Backport of [13851] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 23:17:11 +00:00
Luke Plant 759625cd90 [1.2.X] Fixed #13765 - 'safe' parameter for urlencode filter
Thanks to KyleMac for the suggestion and SmileyChris for the patch

Backport of [13849] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 23:02:29 +00:00
Luke Plant b176bd4f1e [1.2.X] Fixed #13623 - code in intro-tutorial03 missing an import statement
Thanks to lescoutinhovr@gmail.com, AMJ for the report, and to zerok/timo for
the patch.

Backport of [13847] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 22:49:18 +00:00
Luke Plant 93e83546a3 [1.2.X] Fixed #12965 - unordered_list template filter fails when given a non-iterable second item in a two item list
Thanks to grahamu for the report and patch.

Backport of [13845] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 22:34:39 +00:00
Luke Plant 21f60e9fa9 [1.2.X] Fixed #11594 - Inaccurate docstring for WhereNode.add()
Thanks to garrison for report, dwillis for patch

Backport of [13843] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 21:45:56 +00:00
Luke Plant 0c8e8b15b5 [1.2.X] Fixed #12918 - Tutorial page 2 issues
Thanks to Leam for report, cassidy for patch.

Backport of [13841] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 19:43:41 +00:00
Russell Keith-Magee c675410005 [1.2.X] Migrated proxy_models doctests. Thanks to Eric Florenzano.
Backport of r13831 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:48:18 +00:00
Russell Keith-Magee 896ebdcb71 [1.2.X] Migrated reserved_names doctests. Thanks to Eric Florenzano.
Backport of r13830 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:48:06 +00:00
Russell Keith-Magee 11f77de533 [1.2.X] Migrated reverse_lookup doctests. Thanks to Eric Florenzano
Backport of r13829 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:47:52 +00:00
Russell Keith-Magee 21fccbc13e [1.2.X] Migrated select_related doctests. Thanks to Eric Florenzano.
Backport of r13828 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:47:39 +00:00
Russell Keith-Magee 902c111442 [1.2.X] Migrated str doctests. Thanks to Eric Florenzano.
Backport of r13827 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:47:26 +00:00
Russell Keith-Magee 685ddbbe24 [1.2.X] Migrated transactions doctests. Thanks to Eric Florenzano.
Backport of r13826 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:47:13 +00:00
Russell Keith-Magee 06211b05cb [1.2.X] Migrated unmanaged_models doctests. Thanks to Eric Florenzano.
Backport of r13825 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:46:59 +00:00
Russell Keith-Magee f7bdebf2fe [1.2.X] Migrated the update doctests. Thanks to Eric Florenzano.
Backport of r13824 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:46:46 +00:00
Russell Keith-Magee 62585b7570 [1.2.X] Migrated user_commands doctests. Thanks to Eric Florenzano.
Backport of r13823 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 05:46:34 +00:00
Malcolm Tredinnick fa35d2bd4d [1.2.X] Fixed the get_or_create tests for postgreSQL, by using
TransactionTestCase.

Backport of r13814 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 22:16:36 +00:00
Russell Keith-Magee 0c65a6f7da [1.2.X] Modified the egg template loader tests; firstly to ensure that we are testing the new, non-deprecated interface; secondly to ensure that the old deprecated interface is also tested, but deprecation warnings are silenced.
Backport of r13812 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 21:56:25 +00:00
Russell Keith-Magee 6752258289 [1.2.X] Migrated expressions doctests. Thanks to Alex Gaynor.
Backport of r13790 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:33 +00:00
Russell Keith-Magee 411f8dc0d6 [1.2.X] Migrated empty doctests. Thanks to Alex Gaynor.
Backport of r13789 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:23 +00:00
Russell Keith-Magee cbcdd408c0 [1.2.X] Migrated m2m_multiple doctests. Thanks to Alex Gaynor.
Backport of r13789 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:14 +00:00
Russell Keith-Magee a4a19b81c3 [1.2.X] Migrated m2m_intermediary doctests. Thanks to Alex Gaynor.
Backport of r13787 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:12:02 +00:00
Russell Keith-Magee 42f7bbda1a [1.2.X] Migrate m2m_and_m2o doctests. Thanks to Alex Gaynor.
Backport of r13786 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:52 +00:00
Russell Keith-Magee 0023357eb0 [1.2.X] Migrate get_or_create doctests. Thanks to Alex Gaynor.
Backport of r13785 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:41 +00:00
Russell Keith-Magee f0835cecf8 [1.2.X] Migrated get_object_or_404 doctests. Thanks to Alex Gaynor.
Backport of r13784 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:30 +00:00
Russell Keith-Magee 4395164765 [1.2.X] Migrate get_latest doctests. Thanks to Alex Gaynor.
Backport of r13783 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:17 +00:00
Russell Keith-Magee 5b2ec255e6 [1.2.X] Migrated the force_insert_update tests. Thanks to Alex Gaynor.
Backport of r13782 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:11:06 +00:00
Russell Keith-Magee ae26534567 [1.2.X] Migrate the files doctests. Thanks to Alex Gaynor.
Backport of r13781 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:54 +00:00
Russell Keith-Magee 106600edb6 [1.2.X] Migrated the field_subclsasing doctests. Thanks to Alex Gaynor.
Backport of r13780 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:43 +00:00
Russell Keith-Magee f7f2c7251a [1.2.X] Migrated i18n and field_defaults doctests. Thanks to Alex Gaynor.
Backport of r13779 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:30 +00:00
Russell Keith-Magee 24f4a4b26f [1.2.X] Migrated delete doctests. Thanks to Alex Gaynor.
Backport of r13778 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:17 +00:00
Russell Keith-Magee 7fbdeb49f9 [1.2.X] Migrated defer doctests. Thanks to Alex Gaynor.
Backport of r13777 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:10:03 +00:00
Russell Keith-Magee 592288fb95 [1.2.X] Migrated custom_pk doctests. Thanks to Alex Gaynor.
Backport of r13776 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:09:49 +00:00
Russell Keith-Magee 574ee82792 [1.2.X] Migrated custom_methods doctests. Thanks to Alex Gaynor.
Backport of r13775 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:09:37 +00:00
Russell Keith-Magee e41d1b7614 [1.2.X] Migrated the custom_managers tests. Thanks to Alex Gaynor.
Backport of r13774 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 20:09:23 +00:00
Jannis Leidel 3a6afc7e0b [1.2.X] Fixed #13702 -- Made sure to actually fall back to the l10n format strings provided in the settings, when disabled.
Backport from trunk (r13770).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 19:41:48 +00:00
Malcolm Tredinnick 686d6a414c [1.2.X] Add warning when using cache keys that might not work with
memcached.

This means testing with local dev caches (not memcache) will warn
developers if they are introducing inadvertent importabilities.  There
is also the ability to silence the warning if a dev is not planning to
use memcache and knows what they are doing with their keys.

Thanks to Carl Meyer for the patch. Fixed #6447.

Backport of r13766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 19:07:09 +00:00
Karen Tracey 6bc74f06e2 [1.2.X] Fix AdminDocsTest failure on 1.2.X branch by correcting the test to reference an app tag that actually exists in 1.2.X.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 18:14:45 +00:00
Russell Keith-Magee ceedef1447 [1.2.X] More cleanups for the manifest file.
Backport of r13760 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 06:39:02 +00:00
Justin Bronn 31744a78cd [1.2.X] Fixed #14060 -- PostGIS never implemented the `~=` operator for geography types, so removed support for it.
Backport of r13757 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 02:09:17 +00:00
Justin Bronn 24586d4d86 [1.2.X] Fixed regression in running the GeoDjango test suite after r13670 with addition of `GeoDjangoTestSuiteRunner` (replaces `run_gis_tests`, which is now a stub).
Backport of r13755 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 01:44:51 +00:00
Justin Bronn 864361aabd [1.2.X] Fixed #13390 -- `SplitDateTimeWidget` now recognizes when it's no longer required. Thanks vaxXxa for bug report and patch.
Backport of r13753 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 21:28:00 +00:00
Justin Bronn e4bd5e8a2d [1.2.X] Fixed #13149 -- The admin `ForeignKeyRawIdWidget` now properly handles non-integer values. Thanks, Chris Adams.
Backport of r13751 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 18:38:24 +00:00
Malcolm Tredinnick f4ebd701f2 [1.2.X] Adjust AdminDocTests to run after r13728. Also match comments to tests and add test that was there in comment form only.Refs #3695.
Backport of r13737 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 17:55:08 +00:00
James Bennett f140436e3a [1.2.X] Bump to 1.2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 06:49:33 +00:00
Malcolm Tredinnick 4eb78b89ce [1.2.X] Improved unicode-type, ASCII-convertible header handling in
HttpResponse.

Fixed #8765. Thanks to SmileyChris and semenov for working on this one.

Backport of r13740 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 03:25:44 +00:00
Malcolm Tredinnick dc00873da0 [1.2.X] Fixed id attribute generation in the admin docs page. Patch from simeon.
Fixed #3695. Thanks.

Backport of r13728 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 03:25:39 +00:00
Justin Bronn ff0cb11c1b [1.2.X] Fixed #13599 -- No longer embed hidden `<td>` elements in `ChangeList` that cause improper rendering when `list_editable` is enabled; refactored `admin_changelist` tests. Thanks, skevy for bug report and patch.
Backport of r13744 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 03:04:28 +00:00
Justin Bronn 8829b7d956 [1.2.X] Fixed #12632 -- Improved performance of `SortedDict`. Thanks, Alex Gaynor.
Backport of r13742 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13743 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 02:30:39 +00:00
Luke Plant 260eff5684 [1.2.X] Fixed a test so that it actually tests what it's supposed to test.
Previously it passed whether or not the view was 'csrf_exempt'ed.

Backport of [13735] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 23:58:52 +00:00
Luke Plant 890b0b6234 [1.2.X] Fixed #14235 - UnicodeDecodeError in CSRF middleware
Thanks to jbg for the report.
  
This changeset essentially backs out [13698] in favour of a method that
sanitizes the token rather than escaping it.

Backport of [13732] from trunk.




git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 23:11:24 +00:00
Justin Bronn 43988e9835 [1.2.X] Fixed #13095 -- `formfield_callback` keyword argument is now more sane and works with widgets defined in `ModelForm.Meta.widgets`. Thanks, hvdklauw for bug report, vung for initial patch, and carljm for review. Backport of r13730 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 22:54:52 +00:00
Karen Tracey aec5cbc370 [1.2.X] Fixed #13799, a test failure on Postgres. Thanks, Alex.
r13400 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 20:59:36 +00:00
Jannis Leidel ebda0e014a [1.2.X] Converted doctest to unittest. Patch by Alex Gaynor.
Backport from trunk (r13725).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 20:55:09 +00:00
Ramiro Morales 19cce79253 [1.2.X] Fixed typos in es_AR translation.
Backport of r13572 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:46:25 +00:00
Russell Keith-Magee de91b33a78 [1.2.X] Fixed #14245 -- Added some files and paths missing from the MANIFEST.in. Thanks to pmclanahan for the report.
Backport of r13719 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:22:06 +00:00
Karen Tracey 924ae1a09c [1.2.X] Pass commit=False to loaddata in tests, which will keep the DB connection open. Closing the connection has the side-effect on some DBs (Postgres, MySQL/InnoDB) of rolling back the transaction that was in progress, causing these tests to fail.
r13717 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:19:08 +00:00
Luke Plant ec8d04cffe [1.2.X] Fixed #11158 - get_image_dimensions very slow/incorrect after 1 call
Thanks to kua for the report, and to kua, SmileyChris and SAn for the patch

Backport of [13715] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 18:49:45 +00:00
Karen Tracey 13f1192911 [1.2.X] Fixed #14246: Modified aggregation_regress tests so that they will pass on a variety (sqlite, Postgres, MySQL/MyISAM) of DBs.
r13712 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 18:11:25 +00:00
Karen Tracey 1b0084e2a0 [1.2.X] Fixed some of the problems with aggregation_regress tests on higher levles of Postgres. Refs #14246.
r13709 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 17:08:14 +00:00
Luke Plant ec4d6bb21d [1.2.X] Fixed #14247 - 'forms' test failure in 1.2.X
Thanks to ramiro/pmclanaham for the report and analysis.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 13:17:38 +00:00
Luke Plant 6e1c46dab9 [1.2.X] Fixed #14250 - FileBasedCacheTests.test_cull test failure
This patch makes the cull behaviour (which files deleted and how many
deleted) deterministic.

Backport of [13705] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 13:09:19 +00:00
Luke Plant 6ea90256d7 [1.2.X] Fixed #14242 - UserChangeForm subclasses without 'user_permissions' field causes KeyError
This was a regression introduced by [13684]
  
Thanks to adammckerlie@gmail.com for report.

Backport of [13702] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 23:43:01 +00:00
Luke Plant 5357000bc3 [1.2.X] Converted tests for contrib.auth.forms to unit tests.
Backport of [13701], needed in order to backport [13702]


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 23:38:01 +00:00
James Bennett 329fab430b [1.2.X] Increment to Django 1.2.2.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 00:37:33 +00:00
James Bennett 7f84657b6b [1.2.X] Patch CSRF-protection system to deal with reported security issue. Announcement and details to follow. Backport of [13698] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 00:36:08 +00:00
Luke Plant a04398eb1b [1.2.X] Fixed #13081 - Admin actions lose get-parameters in changelist view
Thanks to joh for report and to SmileyChris for patch.

Backport of [13696] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:59:28 +00:00
Luke Plant 1b910d7fbc [1.2.X] Fixed #13350 - Documentation on autoescape should mention endautoescape
Thanks to mountainpaul@gmail.com for report and to dwillis for patch.

Backport of [13694] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:54:13 +00:00
Luke Plant 79d9206711 [1.2.X] Fixed #13414 - QuerySet API ref wrong sql equivalent in __year lookup example
Thanks to idle for report and patch

Backport of [13690] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:45:48 +00:00
Luke Plant a537235d7f [1.2.X] Fixed #13853 - line with csrf_token too wide
Thanks to alper for report, alper/richardb for patch

Backport of [13688] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:33:58 +00:00
Luke Plant 01e8d75c20 [1.2.X] Fixed #14205 - Tiny grammar fix in form validation documentation
Thanks to zendak for report and patch.

Backport of [13687] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:26:23 +00:00
Luke Plant 17ae1d3262 [1.2.X] Fixed #13754 - Add a note about a test client session property gotcha
Thanks SmileyChris for report and patch.

Backport of [13685] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-03 19:04:29 +00:00
Luke Plant 4b4168b1bf Fixed #14090 - Many sql queries needed to display change user form
Thanks to Suor for report and patch.

Backport for [13683] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-03 18:58:53 +00:00
Luke Plant 94047d7a3a [1.2.X] Added explanatory note on CSRF failure page for the case of a missing Referer header.
This is intended to help power users who have disabled Referer headers, or
installed add-ons which have done so, and to help web site administrators
with debugging, since this problem will be browser specific and not a
programming error.

Backport of [13680] from trunk. Technically this is a (tiny) new feature,
but it has been backported because it might give significant help with
debugging rare problems with Django 1.2's new CSRF protection.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-03 18:34:30 +00:00
Luke Plant 7a601b3fc1 [1.2.X] Fixed #14145 - undeterministic behavior when project or app template contains dotdir
Thanks to marbu for report and patch.

Backport of [13668] from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-03 18:29:33 +00:00
Russell Keith-Magee 7a1b694189 [1.2.X] Fixed #14199 -- Added a missing table creation statement in the db cache backend cull implementation, and added tests for cache culling. Thanks to Tim for the report.
Backport of r13678 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-31 00:45:35 +00:00
Russell Keith-Magee 4d8af2faa3 [1.2.X] Fixed #14198 -- Corrected rendering of generic sitemaps when no priority is specified. Thanks to palkeo for the report.
Backport of r13676 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 15:11:21 +00:00
Russell Keith-Magee 5295d678b9 [1.2.X] Fixed #14054 -- Added documentation for the connection_created event. Thanks to Rob Hudson for the report and patch.
Backport of r13673 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 13:25:47 +00:00
Russell Keith-Magee 62355d8253 [1.2.X] Fixed #13798 -- Added connection argument to the connection_created signal. Thanks to liangent for the report, and Alex Gaynor for the patch.
Backport of r13672 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 13:25:22 +00:00
Russell Keith-Magee 2c82a2aaf7 [1.2.X] Added a missing (empty) models.py file required for the tests from r13644 to actually run.
Backport of r13670 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 12:33:45 +00:00
Luke Plant 57e6ee8507 Fixed #14189 - permalink docs import mistake
Thanks to 7times9 for report and patch.

Backport of [13666] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 10:31:56 +00:00
Luke Plant dde1f13315 [1.2.X] Fixed #13759 - Multi-db docs have an example that isn't syntax highlighting
Thanks to Tim Hatch for report and patch.

Backport of [13664] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 10:27:08 +00:00
Russell Keith-Magee 6fbd860fa8 [1.2.X] Fixed #12343 -- Added support for connection-by-socket to MySQL using the dbshell management command. Thanks to elyon001@gmail.com for the report, and sfllaw for the patch.
Backport of r13660 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 13:20:11 +00:00
Russell Keith-Magee af0e3217ae [1.2.X] Fixed #13723 -- Improved the legibility of hyperlinks included in admin validation error messages. Thanks to Sebastian Noack for the suggestion and patch.
Backport of r13659 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 13:19:49 +00:00
Russell Keith-Magee ba876ea2cc [1.2.X] Fixed #13681 -- Added a commented out admindocs entry to the default INSTALLED_APPS for a new project. Thanks to elkan for the report, and andrews for the patch.
Backport of r13658 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 13:19:28 +00:00
Russell Keith-Magee 174940cab2 [1.2.X] Fixed #14166 -- Modified the list of state choices in the Indian localflavor to be a list of tuples, not just a list of values. Thanks to gogna for the report and patch.
Backport of r13656 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 12:31:12 +00:00
Luke Plant be7f912ce7 [1.2.X] Fixed #14185 - improved example SQL for 'select' example.
Thanks to Trindaz for the suggestion.
  
Also fixed some references to 'lede' which is no longer part of the
example Blog model.

Backport of [13652] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 11:30:28 +00:00
Russell Keith-Magee 37d5ec34b6 [1.2.X] Removed a stray DEBUG=True test setting introduced in r13641.
Backport of r13650 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 06:13:41 +00:00
Russell Keith-Magee c868c368eb [1.2.X] Refactored markup documentation to give it it's own home.
Backport of r13647 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 02:44:24 +00:00
Russell Keith-Magee 38e9ca1e09 [1.2.X] Fixed #14164 -- Ensure that sitemap priorities aren't rendered with localized numerical formats. Thanks to dokterbob for the report, and vung for the draft patch.
Backport of r13644 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-27 15:18:10 +00:00
Russell Keith-Magee 2370a10380 [1.2.X] Fixed #14156 -- Modified the way CSRF protection is applied to flatpages so that the flatpage middleware doesn't cause all POSTs resulting in 404s to turn into 403s. Thanks to patrys for the report.
Backport of r13641 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-27 13:59:46 +00:00
Russell Keith-Magee 35411fd7da [1.2.X] Fixed #14116 -- Added a flag to enable CSRF checks in the test client. Thanks to jon@licq.org for the suggestion.
Backport of r13640 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-27 13:58:36 +00:00
Karen Tracey 188c6b3e9a [1.2.X] Fixed #14172: Corrected misspelling of explicitly. Thanks 3point2.
r13638 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-26 11:10:45 +00:00
Russell Keith-Magee 0ed363dd1a [1.2.X] Fixed #14159 -- Corrected more potential uses of relative paths in tests. Thanks to Alex Gaynor for the patch.
Backport of r13636 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-24 02:27:22 +00:00
Russell Keith-Magee 06a35609a1 [1.2.X] Fixed #14154 -- Corrected grammar error in settings docs. Thanks to d00gs for the report.
Backport of r13633 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 13:51:49 +00:00
Russell Keith-Magee 87cd047123 [1.2.X] Fixed #14084 -- Updated French translation. Thanks to stephaner.
Backport of r13580 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 13:39:58 +00:00
Russell Keith-Magee 2bbcb1a821 [1.2.X] Fixed #13951 -- Corrected docstring in formtools wizard. Thanks to suzaku for the report, and lrekucki for the patch.
Backport of r13630 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 08:12:17 +00:00
Russell Keith-Magee e47520b8ba [1.2.X] Fixed #14112 -- Various Markup fixes for the docs. Thanks to ramiro for the patch.
Backport of r13628 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 08:08:46 +00:00
Russell Keith-Magee 0472978da5 [1.2.X] Fixed #3051 -- Documented the requirements for standalone testing. Thanks to Daniel Roseman for the draft text.
Backport of r13626 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 07:54:07 +00:00
Russell Keith-Magee e5c4ba6151 [1.2.X] Fixed #14147 -- Added documentation metadata for new assertQuerysetEqual test method. Thanks to djoume for the report.
Backport of r13624 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 07:15:14 +00:00
Russell Keith-Magee 1a2464c069 [1.2.X] Fixed #14155 -- Refactored another doctest suite and call to flush. Thanks to Alex Gaynor for the patch.
Backport of r13622 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 07:06:10 +00:00
Russell Keith-Magee 49c5c07568 [1.2.X] Fixed #13140 -- Ensure that request headers are preserved through redirect chains in the test client. Thanks to David Novakovic for the report.
Backport of r13620 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-21 03:02:47 +00:00
Russell Keith-Magee 5c6fe321fe [1.2.X] Fixed #14148 -- Ensure the admin_script tests always use an absolute path; PyPy (and sometimes CPython) return relative paths for __file__. Thanks to Alex Gaynor for the report and patch.
Backport of r13618 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-21 02:56:05 +00:00
Russell Keith-Magee 1c3e3d3dba [1.2.X] Fixed #12574 -- Removed an unnecessary exception catch from the system runtest script, which could hide failing tests. Thanks to CarlFK for the report, and Ramiro Morales for the polish.
Backport of r13616 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-20 15:06:09 +00:00
Russell Keith-Magee c3b13d8f03 [1.2.X] Fixed #13895 -- Refactored aggregation_regress doctests. Thanks to Alex Gaynor for the patch.
Backport of r13614 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-20 14:29:57 +00:00
Russell Keith-Magee 3fc9d7e390 [1.2.X] Fixed #14068 -- Corrected error handling in loaddata when an allow_syncdb method is defined on the router. Thanks to Xavier Ordoquy for the report.
Backport of r13612 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-20 14:07:02 +00:00
Russell Keith-Magee 1d291ff733 [1.2.X] Clarified some markup in the discussion of fixture loading in testcases.
Backport of r13610 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-20 07:15:16 +00:00
Jacob Kaplan-Moss 936203434e [1.2.X] Fixed #14141: docs now use the :doc: construct for links between documents.
Thanks, Ramiro Morales.

Backport of [13608] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-19 19:31:56 +00:00
Russell Keith-Magee c9016c15a9 [1.2.X] Fixed #14123 -- Made AdminDocs tests optional, based on the availability of docutils. Thanks to PaulM for the original report, and Łukasz Rekucki for narrowing down the cause.
Backport of r13606 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-19 13:12:52 +00:00
Jannis Leidel 5588870529 [1.2.X] Fixed #14111 -- Updated Sphinx version recommendation in documentation. Thanks, Ramiro Morales and Paul McMillan.
Backport of r13604 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-18 16:35:48 +00:00
Jannis Leidel d9bba6b13f [1.2.X] Fixed #14033 -- Fixed another problem with xrefs and Sphinx 1.X in the Django doc extension. Thanks for the report and patch, Ramiro Morales and Georg Brandl.
Backport of r13602 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-18 16:32:25 +00:00
Karen Tracey 6fd09c600f [1.2.X] Fixed #14127: Adding a couple of missing backticks. Thanks kishkin.
r13600 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-18 02:44:58 +00:00
Russell Keith-Magee 14fa7f9907 [1.2.X] Fixed #14102 -- Ensure that fields that have been excluded from a form aren't included in the unique_for_* checks, either. Thanks to Travis Cline for the report and fix.
Backport of r13598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-17 07:08:26 +00:00
Russell Keith-Magee 1e3ed71ca6 [1.2.X] Fixed #14118 -- Removed a reference to the "Python" serializer.
Backport of r13595 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-16 06:51:15 +00:00
Russell Keith-Magee 13953badb7 [1.2.X] Fixed #13796 -- Ensure that builtin tags and filters are included in admin documentation views.
Backport of r13588 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 13:43:13 +00:00
Russell Keith-Magee e4a8b6c3f9 [1.2.X] Corrected some alphabetization and dupe issues in the AUTHORS file.
Backport of r13586 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 13:02:03 +00:00
Russell Keith-Magee 8a006e1819 [1.2.X] Fixed #13679, #13231, #7287 -- Ensured that models that have ForeignKeys/ManyToManyField can use a a callable default that returns a model instance/queryset. #13679 was a regression in behavior; the other two tickets are pleasant side effects. Thanks to 3point2 for the report.
Backport of r13577 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 12:07:25 +00:00
Karen Tracey 653da2dceb [1.2.X] Fixed #14100: Corrected spelling error in description of user_email. Thanks tom_simpson.
r13574 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-12 10:50:22 +00:00
Russell Keith-Magee ff51df013a [1.2.X] Fixed #10952 -- Corrected the documentation for the behavior of password reset forms and views. Thanks to danielhepper for the report and initial patch, timo for the patch update.
Backport of r13556 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 15:02:21 +00:00
Russell Keith-Magee c7c59bc24f [1.2.X] Fixed #11021 -- Clarified newline stripping behavior in the truncatewords and truncatewords_html filters. Thanks to Ben Spaulding for the report and patch.
Backport of r13555 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 15:02:01 +00:00
Russell Keith-Magee 0ea661cb12 [1.2.X] Fixed #11047 -- Clarified the explanation of arguments to GenericForeignKey. Thanks to psmith and timo for their work on the patch.
Backport of r13554 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 15:01:38 +00:00
Russell Keith-Magee d176d112b9 [1.2.X] Fixed #11735 -- Corrected an example of FormSet subclassing. Thanks to claudep for the report.
Backport of r13553 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 15:01:17 +00:00
Russell Keith-Magee 9e33599bc3 [1.2.X] Fixed #11882 -- Added documentation for formfield_for_manytomany. Thanks to Rob Hudson, timo and Simon Meers for their work on the patch.
Backport of r13552 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 15:00:54 +00:00
Russell Keith-Magee 15ca40d555 [1.2.X] Fixed #13627 -- Added instructions on how to reset your Trac password. Thanks to zerok for the suggestion.
Backport of r13551 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 15:00:29 +00:00
Russell Keith-Magee 0fda7c8a2b [1.2.X] Fixed #11748 -- Clarified the ways that search_field can be used. Thanks to Michael Richardson for the patch.
Backport of r13550 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 15:00:03 +00:00
Russell Keith-Magee 7c05d23af1 [1.2.X] Fixed #11800 -- Updated Sphinx metadata in queryset docs. Thanks to timo for the patch.
Backport of r13548 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:27:15 +00:00
Russell Keith-Magee 94528b9067 [1.2.X] Fixed #14076 -- Updated Danish translation. Thanks to finngruwier.
Backport of r13546 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:18:47 +00:00
Russell Keith-Magee e2d7d52c33 [1.2.X] Fixed #8567 -- Clarified the process of instantiating FormWizards. Thanks to ClaesBas for the suggestion, and ElliotM and timo for draft text.
Backport of r13543 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13545 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 07:58:58 +00:00
Russell Keith-Magee 3309c39438 [1.2.X] Fixed #7284 -- Provided an example for the use of the search_fields clause on ModelAdmin. Thanks to rbell01824@earthlink.net for the suggestion, and Simon Meers for the initial patch.
Backport of r13542 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 07:58:38 +00:00
Russell Keith-Magee e990a2cbc4 [1.2.X] Fixed #13516 -- Added an internal type definition for AutoFields, so that subclassed fields are handled correctly by the SQL generator. Thanks to manfre for the report and patch.
Backport of r13540 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 07:39:19 +00:00
Russell Keith-Magee 8b70c75ed6 [1.2.X] Fixed #13658 -- Added missing command in JavaScript example. Thanks to erikr for the report.
Backport of r13531 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:48:31 +00:00
Russell Keith-Magee e7b009ce05 [1.2.X] Fixed #13661 -- Corrected example in the serialization docs. Thanks to jabapyth for the report.
Backport of r13530 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:48:11 +00:00
Russell Keith-Magee 049a246cc4 [1.2.X] Fixed #13687 -- Corrected request/response docs that mistakenly suggested __getitem__ and __delitem__ were case sensitive. Thanks to master for the report.
Backport of r13529 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:47:51 +00:00
Russell Keith-Magee 490bd7f9bc [1.2.X] Fixed #13718 -- Corrected typo in model docs. Thanks to gvkalra for the report.
Backport of r13528 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:47:31 +00:00
Russell Keith-Magee b1c621bea4 [1.2.X] Fixed #13727 -- Corrected alphabetical sorting in settings docs. Thanks to adamv.
Backport of r13527 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:47:10 +00:00
Russell Keith-Magee 849c6079b4 [1.2.X] Fixed #13594 -- Corrected typo in email docs. Thanks to mostrovsky for the report.
Backport of r13526 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:46:50 +00:00
Russell Keith-Magee 486b0dfb21 [1.2.X] Fixed #14070 -- Updated Serbian translations. Thanks to janos.
Backport of r13524 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:19:29 +00:00
Russell Keith-Magee 0ffbd44097 [1.2.X] Updated es_AR translation (via Ramiro)
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13523 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:16:28 +00:00
Russell Keith-Magee 3ccc25b10c [1.2.X] Fixed #11159 -- Added mimetype detection to the test client for file uploads. Thanks to notanumber for the report and patch, and lomin for the test case.
Backport of r13517 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13518 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 17:16:19 +00:00
Jannis Leidel fc3c72a47b [1.2.X] Updated German translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13516 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:56:24 +00:00
Russell Keith-Magee fac923a301 [1.2.X] Fixed #14069 -- Updated Czech translation. Thanks to Tuttle.
Backport of r13513 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:56:05 +00:00
Russell Keith-Magee 5d1dcfbfa5 [1.2.X] Added __init__.py file that was left out of [13505].
Backport of r13507 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:25:19 +00:00
Russell Keith-Magee e2fbe478bd [1.2.X] Fixed #13495 -- Refactored the localflavor test directory to provide the placeholder structure for other flavors. Thanks to chronos for the report and patch.
Backport of r13505 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:19:23 +00:00
Russell Keith-Magee c543f079ff [1.2.X] Fixed #14014 -- Ensure that the "save and add another" button for users actually does what it says. Thanks to Ramiro for the report.
Backport of r13503 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:09:28 +00:00
Russell Keith-Magee 7930d8c477 [1.2.X] Fixed #14012 -- Corrected the handling of the create user popup dialog in the admin. Thanks to gk@lka.hu for the report, and Ramiro Morales for the patch.
Backport of r13051 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 14:59:13 +00:00
Russell Keith-Magee 8419b092ae [1.2.X] Fixed #14027 -- Ensure that reverse() raises an exception when you try to reverse None. Thanks to Alex for the report and patch.
Backport of r13499 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 14:39:24 +00:00
Russell Keith-Magee 5bd352a966 [1.2.X] Fixed #14064 -- Corrected spelling of Argentinian. There are arguments that it can be spelled both ways (and arguments that the right phrase is Argentine), but we're going with the OED on this one.
Backport of r13492 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 02:13:41 +00:00
Russell Keith-Magee 6d76cae2bc [1.2.X] Fixed #13651 -- Added Malayalam (ml) translation. Thanks to rajeesh.
Backport of r13491 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13493 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 02:13:20 +00:00
Russell Keith-Magee 9ff58e30c1 [1.2.X] Fixed #13610 -- Improved error reporting when the ENGINE setting is ommitted from a database configuration. Thanks to Gregor Müllegger for the report and patch.
Backport of r13489 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 13:19:54 +00:00
Russell Keith-Magee e10e3007d1 [1.2.X] Fixed #13153 -- Removed a stale reference to the examples directory in setup.cfg. Thanks to cesar@mifprojects.com for the report.
Backport of r13487 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 13:01:10 +00:00
Russell Keith-Magee 908b91b69e [1.2.X] Fixed #13621 -- Corrected the handling of input formats on date/time form fields. Thanks to bufke for the report, zerok and jacmkno for their work on the patch, and Karen, Jannis and Alex for feedback.
Backport of r13484 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 12:53:27 +00:00
Russell Keith-Magee aa59bc7404 [1.2.X] Fixed #13732 -- Fixed minor typo in docstring. Thanks to schinckel for the report.
Backport of r13483 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 12:52:59 +00:00
Karen Tracey 91d64a5a09 [1.2.X] Fixed #14062: Corrected a stray reference to 2.6 as the high level for supported Pythons. Thanks aesmail.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13481 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 11:29:18 +00:00
Russell Keith-Magee d302a60c8d [1.2.X] Fixed #13613 -- Ensure that forms.URLField and forms.EmailField are used on a modelform. This ensures that fields are URL and Email fields are cleaned consistently when included on model forms. Thanks to amadison for the report.
Backport of r13475 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 04:00:56 +00:00
Russell Keith-Magee 6c2e31e9b7 [1.2.X] Fixed #13946 -- Modified the database cache backend to use the database router to determine availability of the cache table. Thanks to tiemonster for the report.
Backport of r13473 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 02:14:31 +00:00
Russell Keith-Magee 9383a37485 [1.2.X] Corrected fix committed in r13466. Refs #14025.
Backport of r13471 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 01:30:54 +00:00
Jacob Kaplan-Moss 1c237cb77c [1.2.X] ixed #13746: made the dumdata help message a bit clearer. Thanks, PaulM.
Backport of [13469] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-04 19:08:58 +00:00
Russell Keith-Magee 389c72c358 [1.2.X] Fixed #14025 -- Modified flush to adhere to router sync instructions when emmiting post-sync signals. Thanks to linovia for the patch.
Backport of r13466 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-04 14:36:44 +00:00
Jacob Kaplan-Moss 972a9c7e18 [1.2.X] Fixed #11377: the template join filter now correctly escapes the joiner, too.
Thanks, Stephen Kelly.

Backport of [13464] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03 15:43:29 +00:00
Jacob Kaplan-Moss 4441f7b0f3 [1.2.X] Fixed #11376: added some extra tests for autoescaping subtleties.
Thanks, Stephen Kelly.

Backport of [13461] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03 15:37:07 +00:00
Jacob Kaplan-Moss c0040b4151 [1.2.X] Fixed #11288: added some tests for the handling of number-like variables in templates.
Thanks, Stephen Kelly.

Backport of [13460] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03 15:37:00 +00:00
Russell Keith-Magee 38813c4bbd [1.2.X] Fixed #13740 -- Added documentation for the can_delete InlineModelAdmin option. Thanks to Alex Gaynor for the patch.
Backport of r13458 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-30 04:16:20 +00:00
Russell Keith-Magee dc449e9664 [1.2.X] Fixed #13882 -- Removed an unnecessary nested where clause introduced on __isnull queries. Thanks to Alex Gaynor for the report and patch.
Backport of r13456 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-30 04:07:27 +00:00
Russell Keith-Magee c61811a8f2 [1.2.X] Fixed #13730 -- Removed the hard-coding of the requirement that ForeignKeys have an index. Thanks to Suor for the report.
Backport of r13452 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-30 02:59:14 +00:00
Russell Keith-Magee 3227cc5951 [1.2.X] Fixed #13773 -- Passed in the current connection in a call to db_type(). Thanks to Suor for the report and patch.
Backport of r13451 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-30 02:58:51 +00:00
Jannis Leidel 953f4be201 [1.2.X] Fixed #14005 - Removed a few unneeded workarounds in the Sphinx extension. Thanks for the report and patch, Ramiro Morales.
Backport of r13447 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-25 20:58:58 +00:00
Jannis Leidel acbf74a721 [1.2.X] Fixed #13616 - Updated the documentation to be compatible with Sphinx 1.0.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-24 10:19:39 +00:00
Justin Bronn 8c87622f8b [1.2.X] Fixed #13967 -- MySQL spatial backend now respects when `spatial_index=False`. Thanks, Simon Law, for bug report and patch.
Backport of r13443 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-21 15:28:06 +00:00
Justin Bronn 5dc560636b [1.2.X] Fixed #13934 -- `GeoSQLCompiler.get_default_columns` was missing `local_only` keyword argument. Thanks, Simon Law, for bug report and initial patch.
Backport of r13439 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-20 19:14:23 +00:00
Karen Tracey 48dd139e54 [1.2.X] Fixed import example code for NON_FIELD_ERRORS.
r13434 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-17 09:33:27 +00:00
Karen Tracey ab693cea80 [1.2.X] Set svnmerge-integrated for 1.2.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-17 09:31:09 +00:00
Luke Plant 1fed500337 [1.2.X] Doc updates missed in [13424]
Refs #13880

Backport of [13425] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-05 17:22:29 +00:00
Luke Plant a84a390c7a [1.2.X] Fixed #13880 - added 2.7 to list of supported versions of Python
Thanks Alex

Backport of [13423] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-05 17:10:58 +00:00
Luke Plant b9f085a9de [1.2.X] Added missing module directive for validators documentation.
Backport of [13421] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-05 16:54:37 +00:00
Luke Plant 558732c37b [1.2.X] Small corrections/improvements to DB optimization docs.
Bakport of [13419] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-05 16:43:51 +00:00
Luke Plant 867d690752 [1.2.X] Fixed error in AnonymousUser docs since [12316]
Backport of [13401] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-24 11:21:10 +00:00
Justin Bronn 90380b8fcf [1.2.X] Fixed #13671, #13748 -- Fixed errata and minor updates to GeoDjango docs.
Backport of r13398 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-23 17:38:47 +00:00
Justin Bronn 1b5f812aad [1.2.X] Fixed #13779 -- Can now discover GDAL 1.7 from debian-based packages. Thanks to Leo for bug report and patch.
Backport of r13396 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-23 17:19:56 +00:00
Luke Plant 71cecc4952 [1.2.X] Fixed #12803 - Added styling for 'error' and 'warning' messages in admin.
Thanks to bboli and sebastian_noack for the report, DrMeers for the patch.

Backport of [13393] from trunk.  Considered a bug (and therefore backported)
due to error and warning messages being styled with green tick previously.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-23 13:20:38 +00:00
Russell Keith-Magee 8f5236fa35 [1.2.X] Fixed #13747 -- Reverted documentation suggesting the use of self.stdout/err in management commands in 1.2. Thanks to metamemetics for the report.
Strictly, self.stdout/err is a feature addition; however, it's a
feature that is required in order to achieve a massive speedup in the
tests and to maintain parity between 1.2.X and trunk tests. However,
the feature is completely transparent -- the old technique will work
fine, it just isn't as testable. Therefore, we'll treat this as an
undocumented feature in the 1.2 branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-21 12:01:37 +00:00
Jacob Kaplan-Moss b1b172114a Created 1.2.X release branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-19 21:12:12 +00:00
980 changed files with 49786 additions and 32355 deletions

44
AUTHORS
View File

@ -18,6 +18,11 @@ The PRIMARY AUTHORS are (and/or have been):
* Karen Tracey
* Jannis Leidel
* James Tauber
* Alex Gaynor
* Andrew Godwin
* Carl Meyer
* Ramiro Morales
* Chris Beaven
More information on the main contributors to Django can be found in
docs/internals/committers.txt.
@ -29,7 +34,6 @@ answer newbie questions, and generally made Django that much better:
Gisle Aas <gisle@aas.no>
ajs <adi@sieker.info>
alang@bright-green.com
Alcides Fonseca
Andi Albrecht <albrecht.andi@gmail.com>
Marty Alchin <gulopine@gamemusic.org>
Ahmad Alhashemi <trans@ahmadh.com>
@ -39,7 +43,6 @@ answer newbie questions, and generally made Django that much better:
AgarFu <heaven@croasanaso.sytes.net>
Dagur Páll Ammendrup <dagurp@gmail.com>
Collin Anderson <cmawebsite@gmail.com>
Nicolas Lara <nicolaslara@gmail.com>
Jeff Anderson <jefferya@programmerq.net>
Marian Andre <django@andre.sk>
Andreas
@ -67,7 +70,6 @@ answer newbie questions, and generally made Django that much better:
Ned Batchelder <http://www.nedbatchelder.com/>
batiste@dosimple.ch
Batman
Chris Beaven <http://smileychris.tactful.co.nz/>
Brian Beck <http://blog.brianbeck.com/>
Shannon -jj Behrens <http://jjinux.blogspot.com/>
Esdras Beleza <linux@esdrasbeleza.com>
@ -84,20 +86,21 @@ answer newbie questions, and generally made Django that much better:
Matías Bordese
Sean Brant
Andrew Brehaut <http://brehaut.net/blog>
David Brenneman <http://davidbrenneman.com>
brut.alll@gmail.com
bthomas
btoll@bestweb.net
Jonathan Buchanan <jonathan.buchanan@gmail.com>
Keith Bussell <kbussell@gmail.com>
C8E
Chris Cahoon <chris.cahoon@gmail.com>
Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>
Trevor Caira <trevor@caira.com>
Brett Cannon <brett@python.org>
Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
Jeremy Carbaugh <jcarbaugh@gmail.com>
Carl Meyer <carl@dirtcircle.com>
Graham Carlyle <graham.carlyle@maplecroft.net>
Antonio Cavedoni <http://cavedoni.com/>
C8E
cedric@terramater.net
Chris Chamberlin <dja@cdc.msbx.net>
Amit Chakradeo <http://amit.chakradeo.net/>
@ -110,6 +113,7 @@ answer newbie questions, and generally made Django that much better:
Michal Chruszcz <troll@pld-linux.org>
Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
Ian Clelland <clelland@gmail.com>
Travis Cline <travis.cline@gmail.com>
Russell Cloran <russell@rucus.net>
colin@owlfish.com
crankycoder@gmail.com
@ -123,7 +127,7 @@ answer newbie questions, and generally made Django that much better:
John D'Agostino <john.dagostino@gmail.com>
dackze+django@gmail.com
Mihai Damian <yang_damian@yahoo.com>
David Danier <goliath.mailinglist@gmx.de>
David Danier <david.danier@team23.de>
Dirk Datzert <dummy@habmalnefrage.de>
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
dave@thebarproject.com
@ -137,6 +141,7 @@ answer newbie questions, and generally made Django that much better:
Rajesh Dhawan <rajesh.dhawan@gmail.com>
Sander Dijkhuis <sander.dijkhuis@gmail.com>
Jordan Dimov <s3x3y1@gmail.com>
Nebojša Dorđević
dne@mayonnaise.net
dready <wil@mojipage.com>
Maximillian Dornseif <md@hudora.de>
@ -167,7 +172,6 @@ answer newbie questions, and generally made Django that much better:
Liang Feng <hutuworm@gmail.com>
Bill Fenner <fenner@gmail.com>
Stefane Fermgier <sf@fermigier.com>
Afonso Fernández Nogueira <fonzzo.django@gmail.com>
J. Pablo Fernandez <pupeno@pupeno.com>
Maciej Fijalkowski
Ben Firshman <ben@firshman.co.uk>
@ -175,11 +179,11 @@ answer newbie questions, and generally made Django that much better:
Eric Floehr <eric@intellovations.com>
Eric Florenzano <floguy@gmail.com>
Vincent Foley <vfoleybourgon@yahoo.ca>
Alcides Fonseca
Rudolph Froger <rfroger@estrate.nl>
Jorge Gajon <gajon@gajon.org>
gandalf@owca.info
Marc Garcia <marc.garcia@accopensys.com>
Alex Gaynor <alex.gaynor@gmail.com>
Andy Gayton <andy-django@thecablelounge.com>
Idan Gazit
geber@datacollect.com
@ -195,6 +199,7 @@ answer newbie questions, and generally made Django that much better:
David Gouldin <dgouldin@gmail.com>
pradeep.gowda@gmail.com
Collin Grady <collin@collingrady.com>
Gabriel Grant <g@briel.ca>
Simon Greenhill <dev@simon.net.nz>
Owen Griffiths
Espen Grindhaug <http://grindhaug.org/>
@ -231,6 +236,7 @@ answer newbie questions, and generally made Django that much better:
Ibon <ibonso@gmail.com>
Tom Insam
Baurzhan Ismagulov <ibr@radix50.net>
Stephan Jaekel <steph@rdev.info>
james_027@yahoo.com
jcrasta@gmail.com
jdetaeye
@ -244,9 +250,11 @@ answer newbie questions, and generally made Django that much better:
Bahadır Kandemir <bahadir@pardus.org.tr>
Karderio <karderio@gmail.com>
Nagy Károly <charlie@rendszergazda.com>
George Karpenkov <george@metaworld.ru>
Erik Karulf <erik@karulf.com>
Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
Ian G. Kelly <ian.g.kelly@gmail.com>
Niall Kelly <duke.sam.vimes@gmail.com>
Ryan Kelly <ryan@rfk.id.au>
Thomas Kerpe <thomas@kerpe.net>
Wiley Kestner <wiley.kestner@gmail.com>
@ -275,11 +283,11 @@ answer newbie questions, and generally made Django that much better:
kurtiss@meetro.com
Denis Kuzmichyov <kuzmichyov@gmail.com>
Panos Laganakos <panos.laganakos@gmail.com>
Lakin Wecker <lakin@structuredabstraction.com>
Nick Lane <nick.lane.au@gmail.com>
Stuart Langridge <http://www.kryogenix.org/>
Paul Lanier <planier@google.com>
David Larlet <http://david.larlet.fr>
Nicolas Lara <nicolaslara@gmail.com>
Nicola Larosa <nico@teknico.net>
Finn Gruwier Larsen <finn@gruwier.dk>
Lau Bech Lauritzen
@ -298,9 +306,9 @@ answer newbie questions, and generally made Django that much better:
limodou
Philip Lindborg <philip.lindborg@gmail.com>
Simon Litchfield <simon@quo.com.au>
Daniel Lindsley <polarcowz@gmail.com>
Daniel Lindsley <daniel@toastdriven.com>
Trey Long <trey@ktrl.com>
msaelices <msaelices@gmail.com>
Laurent Luce <http://www.laurentluce.com>
Martin Mahner <http://www.mahner.org/>
Matt McClanahan <http://mmcc.cx/>
Stanislaus Madueke
@ -313,20 +321,20 @@ answer newbie questions, and generally made Django that much better:
Petr Marhoun <petr.marhoun@gmail.com>
Petar Marić <http://www.petarmaric.com/>
Nuno Mariz <nmariz@gmail.com>
Marijn Vriens <marijn@metronomo.cl>
mark@junklight.com
Orestis Markou <orestis@orestis.gr>
Takashi Matsuo <matsuo.takashi@gmail.com>
Yasushi Masuda <whosaysni@gmail.com>
mattycakes@gmail.com
Glenn Maynard <glenn@zewt.org>
Jason McBrayer <http://www.carcosa.net/jason/>
Kevin McConnell <kevin.mcconnell@gmail.com>
mccutchen@gmail.com
michael.mcewan@gmail.com
Paul McLanahan <paul@mclanahan.net>
Tobias McNulty <http://www.caktusgroup.com/blog>
Zain Memon
Christian Metts
michael.mcewan@gmail.com
michal@plovarna.cz
Slawek Mikula <slawek dot mikula at gmail dot com>
mitakummaa@gmail.com
@ -334,14 +342,14 @@ answer newbie questions, and generally made Django that much better:
Andreas Mock <andreas.mock@web.de>
Reza Mohammadi <reza@zeerak.ir>
Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
Ramiro Morales <rm0@gmx.net>
Eric Moritz <http://eric.themoritzfamily.com/>
msaelices <msaelices@gmail.com>
Gregor Müllegger <gregor@muellegger.de>
Robin Munn <http://www.geekforgod.com/>
James Murty
msundstr
Robert Myers <myer0052@gmail.com>
Alexander Myodov <alex@myodov.com>
Nebojša Dorđević
Doug Napoleone <doug@dougma.com>
Gopal Narayanan <gopastro@gmail.com>
Fraser Nevett <mail@nevett.org>
@ -369,7 +377,6 @@ answer newbie questions, and generally made Django that much better:
phil.h.smith@gmail.com
Gustavo Picon
Michael Placentra II <someone@michaelplacentra2.net>
Luke Plant <http://lukeplant.me.uk/>
plisk
Daniel Poelzleithner <http://poelzi.org/>
polpak@yahoo.com
@ -400,7 +407,6 @@ answer newbie questions, and generally made Django that much better:
Henrique Romano <onaiort@gmail.com>
Armin Ronacher
Daniel Roseman <http://roseman.org.uk/>
Brian Rosner <brosner@gmail.com>
Rozza <ross.lawley@gmail.com>
Oliver Rutherfurd <http://rutherfurd.net/>
ryankanno
@ -479,6 +485,7 @@ answer newbie questions, and generally made Django that much better:
George Vilches <gav@thataddress.com>
Vlado <vlado@labath.org>
Zachary Voase <zacharyvoase@gmail.com>
Marijn Vriens <marijn@metronomo.cl>
Milton Waddams
Chris Wagner <cw264701@ohio.edu>
Rick Wagner <rwagner@physics.ucsd.edu>
@ -487,6 +494,7 @@ answer newbie questions, and generally made Django that much better:
Filip Wasilewski <filip.wasilewski@gmail.com>
Dan Watson <http://theidioteque.net/>
Joel Watts <joel@joelwatts.com>
Lakin Wecker <lakin@structuredabstraction.com>
Chris Wesseling <Chris.Wesseling@cwi.nl>
James Wheare <django@sparemint.com>
Mike Wiacek <mjwiacek@google.com>
@ -508,8 +516,6 @@ answer newbie questions, and generally made Django that much better:
Gasper Zejn <zejn@kiberpipa.org>
Jarek Zgoda <jarek.zgoda@gmail.com>
Cheng Zhang
Glenn Maynard <glenn@zewt.org>
bthomas
A big THANK YOU goes to:

View File

@ -3,12 +3,12 @@ include AUTHORS
include INSTALL
include LICENSE
include MANIFEST.in
include django/utils/simplejson/LICENSE.txt
include django/contrib/gis/gdal/LICENSE
include django/contrib/gis/geos/LICENSE
include django/dispatch/license.txt
include django/utils/simplejson/LICENSE.txt
recursive-include docs *
recursive-include scripts *
recursive-include examples *
recursive-include extras *
recursive-include tests *
recursive-include django/conf/locale *
@ -20,8 +20,12 @@ recursive-include django/contrib/auth/tests/templates *
recursive-include django/contrib/comments/templates *
recursive-include django/contrib/databrowse/templates *
recursive-include django/contrib/formtools/templates *
recursive-include django/contrib/flatpages/fixtures *
recursive-include django/contrib/flatpages/tests/templates *
recursive-include django/contrib/gis/templates *
recursive-include django/contrib/gis/tests/data *
recursive-include django/contrib/gis/tests/distapp/fixtures *
recursive-include django/contrib/gis/tests/geoapp/fixtures *
recursive-include django/contrib/gis/tests/geogapp/fixtures *
recursive-include django/contrib/gis/tests/relatedapp/fixtures *
recursive-include django/contrib/sitemaps/templates *

6
README
View File

@ -35,3 +35,9 @@ To contribute to Django:
* Check out http://www.djangoproject.com/community/ for information
about getting involved.
To run Django's test suite:
* Follow the instructions in the "Unit tests" section of
docs/internals/contributing.txt, published online at
http://docs.djangoproject.com/en/dev/internals/contributing/#running-the-unit-tests

View File

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

View File

@ -54,7 +54,7 @@ LANGUAGES = (
('en', gettext_noop('English')),
('en-gb', gettext_noop('British English')),
('es', gettext_noop('Spanish')),
('es-ar', gettext_noop('Argentinean Spanish')),
('es-ar', gettext_noop('Argentinian Spanish')),
('et', gettext_noop('Estonian')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
@ -78,6 +78,7 @@ LANGUAGES = (
('lt', gettext_noop('Lithuanian')),
('lv', gettext_noop('Latvian')),
('mk', gettext_noop('Macedonian')),
('ml', gettext_noop('Malayalam')),
('mn', gettext_noop('Mongolian')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
@ -257,7 +258,7 @@ SECRET_KEY = ''
# Default file storage mechanism that holds media.
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
# Absolute path to the directory that holds media.
# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''
@ -291,34 +292,34 @@ FILE_UPLOAD_PERMISSIONS = None
FORMAT_MODULE_PATH = None
# Default formatting for date objects. See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'N j, Y'
# Default formatting for datetime objects. See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATETIME_FORMAT = 'N j, Y, P'
# Default formatting for time objects. See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
TIME_FORMAT = 'P'
# Default formatting for date objects when only the year and month are relevant.
# See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
YEAR_MONTH_FORMAT = 'F Y'
# Default formatting for date objects when only the month and day are relevant.
# See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
MONTH_DAY_FORMAT = 'F j'
# Default short formatting for date objects. See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
SHORT_DATE_FORMAT = 'm/d/Y'
# Default short formatting for datetime objects.
# See all available format strings here:
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#now
# http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
SHORT_DATETIME_FORMAT = 'm/d/Y P'
# Default formats to be used when parsing dates from input boxes, in order
@ -369,8 +370,8 @@ DECIMAL_SEPARATOR = '.'
# Boolean that sets whether to add thousand separator when formatting numbers
USE_THOUSAND_SEPARATOR = False
# Number of digits that will be togheter, when spliting them by THOUSAND_SEPARATOR
# 0 means no grouping, 3 means splitting by thousands...
# Number of digits that will be together, when spliting them by
# THOUSAND_SEPARATOR. 0 means no grouping, 3 means splitting by thousands...
NUMBER_GROUPING = 0
# Thousand separator symbol
@ -389,6 +390,8 @@ URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_vers
DEFAULT_TABLESPACE = ''
DEFAULT_INDEX_TABLESPACE = ''
USE_X_FORWARDED_HOST = False
##############
# MIDDLEWARE #
##############

View File

@ -4801,18 +4801,18 @@ msgstr[3] "%(size)d بايت"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f ك.ب"
msgid "%s KB"
msgstr "%s ك.ب"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f م.ب"
msgid "%s MB"
msgstr "%s م.ب"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f ج.ب"
msgid "%s GB"
msgstr "%s ج.ب"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4935,20 +4935,20 @@ msgstr "%(size)d байт"
#: django/template/defaultfilters.py:728
#: template/defaultfilters.py:724
#, python-format
msgid "%.1f KB"
msgstr "%.1f КБ"
msgid "%s KB"
msgstr "%s КБ"
#: django/template/defaultfilters.py:730
#: template/defaultfilters.py:726
#, python-format
msgid "%.1f MB"
msgstr "%.1f МБ"
msgid "%s MB"
msgstr "%s МБ"
#: django/template/defaultfilters.py:731
#: template/defaultfilters.py:727
#, python-format
msgid "%.1f GB"
msgstr "%.1f ГБ"
msgid "%s GB"
msgstr "%s ГБ"
#: django/utils/dateformat.py:41
#: utils/dateformat.py:41

View File

@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'd.m.Y'
# TIME_INPUT_FORMATS =
# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' '
THOUSAND_SEPARATOR = u' ' # Non-breaking space
# NUMBER_GROUPING =

View File

@ -3733,18 +3733,18 @@ msgstr[1] "%(size)d বাইট"
#: template/defaultfilters.py:739
#, python-format
msgid "%.1f KB"
msgstr "%.1f কেবি"
msgid "%s KB"
msgstr "%s কেবি"
#: template/defaultfilters.py:741
#, python-format
msgid "%.1f MB"
msgstr "%.1f এমবি"
msgid "%s MB"
msgstr "%s এমবি"
#: template/defaultfilters.py:742
#, python-format
msgid "%.1f GB"
msgstr "%.1f জিবি"
msgid "%s GB"
msgstr "%s জিবি"
#: utils/dateformat.py:41
msgid "p.m."

View File

@ -4831,18 +4831,18 @@ msgstr[2] "%(size)d bajtova"
#: .\template\defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: .\template\defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: .\template\defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: .\utils\dateformat.py:42
msgid "p.m."

View File

@ -4157,18 +4157,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:800
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:802
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:803
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-09 14:26+0200\n"
"PO-Revision-Date: 2010-05-09 14:09+0100\n"
"POT-Creation-Date: 2010-08-06 18:35+0200\n"
"PO-Revision-Date: 2010-08-06 18:33+0100\n"
"Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
@ -70,7 +70,7 @@ msgid "Spanish"
msgstr "španělsky"
#: conf/global_settings.py:57
msgid "Argentinean Spanish"
msgid "Argentinian Spanish"
msgstr "španělsky (Argentina)"
#: conf/global_settings.py:58
@ -122,138 +122,146 @@ msgid "Hungarian"
msgstr "maďarsky"
#: conf/global_settings.py:70
msgid "Indonesian"
msgstr "indonésky"
#: conf/global_settings.py:71
msgid "Icelandic"
msgstr "islandsky"
#: conf/global_settings.py:71
#: conf/global_settings.py:72
msgid "Italian"
msgstr "italsky"
#: conf/global_settings.py:72
#: conf/global_settings.py:73
msgid "Japanese"
msgstr "japonsky"
#: conf/global_settings.py:73
#: conf/global_settings.py:74
msgid "Georgian"
msgstr "gruzínsky"
#: conf/global_settings.py:74
#: conf/global_settings.py:75
msgid "Khmer"
msgstr "khmersky"
#: conf/global_settings.py:75
#: conf/global_settings.py:76
msgid "Kannada"
msgstr "kannadsky"
#: conf/global_settings.py:76
#: conf/global_settings.py:77
msgid "Korean"
msgstr "korejsky"
#: conf/global_settings.py:77
#: conf/global_settings.py:78
msgid "Lithuanian"
msgstr "litevsky"
#: conf/global_settings.py:78
#: conf/global_settings.py:79
msgid "Latvian"
msgstr "lotyšsky"
#: conf/global_settings.py:79
#: conf/global_settings.py:80
msgid "Macedonian"
msgstr "makedonsky"
#: conf/global_settings.py:80
#: conf/global_settings.py:81
msgid "Malayalam"
msgstr "malajálamsky"
#: conf/global_settings.py:82
msgid "Mongolian"
msgstr "mongolsky"
#: conf/global_settings.py:81
#: conf/global_settings.py:83
msgid "Dutch"
msgstr "holandsky"
#: conf/global_settings.py:82
#: conf/global_settings.py:84
msgid "Norwegian"
msgstr "norsky"
#: conf/global_settings.py:83
#: conf/global_settings.py:85
msgid "Norwegian Bokmal"
msgstr "norsky (Bokmål)"
#: conf/global_settings.py:84
#: conf/global_settings.py:86
msgid "Norwegian Nynorsk"
msgstr "norsky (Nynorsk)"
#: conf/global_settings.py:85
#: conf/global_settings.py:87
msgid "Polish"
msgstr "polsky"
#: conf/global_settings.py:86
#: conf/global_settings.py:88
msgid "Portuguese"
msgstr "portugalsky"
#: conf/global_settings.py:87
#: conf/global_settings.py:89
msgid "Brazilian Portuguese"
msgstr "portugalsky (Brazílie)"
#: conf/global_settings.py:88
#: conf/global_settings.py:90
msgid "Romanian"
msgstr "rumunsky"
#: conf/global_settings.py:89
#: conf/global_settings.py:91
msgid "Russian"
msgstr "rusky"
#: conf/global_settings.py:90
#: conf/global_settings.py:92
msgid "Slovak"
msgstr "slovensky"
#: conf/global_settings.py:91
#: conf/global_settings.py:93
msgid "Slovenian"
msgstr "slovinsky"
#: conf/global_settings.py:92
#: conf/global_settings.py:94
msgid "Albanian"
msgstr "albánsky"
#: conf/global_settings.py:93
#: conf/global_settings.py:95
msgid "Serbian"
msgstr "srbsky"
#: conf/global_settings.py:94
#: conf/global_settings.py:96
msgid "Serbian Latin"
msgstr "srbsky (latinkou)"
#: conf/global_settings.py:95
#: conf/global_settings.py:97
msgid "Swedish"
msgstr "švédsky"
#: conf/global_settings.py:96
#: conf/global_settings.py:98
msgid "Tamil"
msgstr "tamilsky"
#: conf/global_settings.py:97
#: conf/global_settings.py:99
msgid "Telugu"
msgstr "telužsky"
#: conf/global_settings.py:98
#: conf/global_settings.py:100
msgid "Thai"
msgstr "thajsky"
#: conf/global_settings.py:99
#: conf/global_settings.py:101
msgid "Turkish"
msgstr "turecky"
#: conf/global_settings.py:100
#: conf/global_settings.py:102
msgid "Ukrainian"
msgstr "ukrajinsky"
#: conf/global_settings.py:101
#: conf/global_settings.py:103
msgid "Vietnamese"
msgstr "vietnamsky"
#: conf/global_settings.py:102
#: conf/global_settings.py:104
msgid "Simplified Chinese"
msgstr "čínsky (zjednodušeně)"
#: conf/global_settings.py:103
#: conf/global_settings.py:105
msgid "Traditional Chinese"
msgstr "čínsky (tradičně)"
@ -305,15 +313,15 @@ msgstr "Tento měsíc"
msgid "This year"
msgstr "Tento rok"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "Yes"
msgstr "Ano"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "No"
msgstr "Ne"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:469
#: contrib/admin/filterspecs.py:154 forms/widgets.py:478
msgid "Unknown"
msgstr "Neznámé"
@ -359,7 +367,7 @@ msgid "Changed %s."
msgstr "Změněno: %s"
#: contrib/admin/options.py:559 contrib/admin/options.py:569
#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:844
#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:845
#: forms/models.py:568
msgid "and"
msgstr "a"
@ -853,7 +861,7 @@ msgstr "Uložit a přidat další položku"
msgid "Save and continue editing"
msgstr "Uložit a pokračovat v úpravách"
#: contrib/admin/templates/admin/auth/user/add_form.html:5
#: contrib/admin/templates/admin/auth/user/add_form.html:6
msgid ""
"First, enter a username and password. Then, you'll be able to edit more user "
"options."
@ -861,6 +869,10 @@ msgstr ""
"Nejdříve vložte uživatelské jméno a heslo. Poté budete moci upravovat více "
"uživatelských nastavení."
#: contrib/admin/templates/admin/auth/user/add_form.html:8
msgid "Enter a username and password."
msgstr "Vložte uživatelské jméno a heslo."
#: contrib/admin/templates/admin/auth/user/change_password.html:28
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
@ -1418,8 +1430,8 @@ msgstr "zpráva"
msgid "Logged out"
msgstr "Odhlášeno"
#: contrib/auth/management/commands/createsuperuser.py:23
#: core/validators.py:120 forms/fields.py:428
#: contrib/auth/management/commands/createsuperuser.py:24
#: core/validators.py:120 forms/fields.py:427
msgid "Enter a valid e-mail address."
msgstr "Vložte platnou e-mailovou adresu."
@ -1491,7 +1503,7 @@ msgid "Email address"
msgstr "E-mailová adresa"
#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1109
msgid "URL"
msgstr "URL"
@ -1541,7 +1553,7 @@ msgstr "komentář"
msgid "date/time submitted"
msgstr "datum a čas byly zaslané"
#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
#: contrib/comments/models.py:60 db/models/fields/__init__.py:904
msgid "IP address"
msgstr "Adresa IP"
@ -4473,22 +4485,22 @@ msgstr "weby"
msgid "Enter a valid value."
msgstr "Vložte platnou hodnotu."
#: core/validators.py:87 forms/fields.py:529
#: core/validators.py:87 forms/fields.py:528
msgid "Enter a valid URL."
msgstr "Vložte platnou adresu URL."
#: core/validators.py:89 forms/fields.py:530
#: core/validators.py:89 forms/fields.py:529
msgid "This URL appears to be a broken link."
msgstr "Tato adresa URL je zřejmě neplatný odkaz."
#: core/validators.py:123 forms/fields.py:873
#: core/validators.py:123 forms/fields.py:877
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Vložte platný identifikátor složený pouze z písmen, čísel, podtržítek a "
"pomlček."
#: core/validators.py:126 forms/fields.py:866
#: core/validators.py:126 forms/fields.py:870
msgid "Enter a valid IPv4 address."
msgstr "Vložte platnou adresu typu IPv4."
@ -4501,12 +4513,12 @@ msgstr "Vložte pouze číslice oddělené čárkami."
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Hodnota musí být %(limit_value)s (nyní je %(show_value)s)."
#: core/validators.py:153 forms/fields.py:205 forms/fields.py:257
#: core/validators.py:153 forms/fields.py:204 forms/fields.py:256
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Hodnota musí být menší nebo rovna %(limit_value)s."
#: core/validators.py:158 forms/fields.py:206 forms/fields.py:258
#: core/validators.py:158 forms/fields.py:205 forms/fields.py:257
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Hodnota musí být větší nebo rovna %(limit_value)s."
@ -4529,13 +4541,13 @@ msgstr ""
"Hodnota smí mít nejvýše %(limit_value)d znaků, ale nyní jich má %(show_value)"
"d."
#: db/models/base.py:822
#: db/models/base.py:823
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"Pole %(field_name)s musí být unikátní testem %(lookup)s pole %(date_field)s."
#: db/models/base.py:837 db/models/base.py:845
#: db/models/base.py:838 db/models/base.py:846
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
@ -4559,13 +4571,13 @@ msgstr "Pole nemůže být prázdné."
msgid "Field of type: %(field_type)s"
msgstr "Pole typu: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:852
#: db/models/fields/__init__.py:961 db/models/fields/__init__.py:972
#: db/models/fields/__init__.py:999
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:860
#: db/models/fields/__init__.py:969 db/models/fields/__init__.py:980
#: db/models/fields/__init__.py:1007
msgid "Integer"
msgstr "Celé číslo"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:850
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:858
msgid "This value must be an integer."
msgstr "Hodnota musí být celé číslo."
@ -4577,7 +4589,7 @@ msgstr "Hodnota musí být buď Ano (True) nebo Ne (False)."
msgid "Boolean (Either True or False)"
msgstr "Pravdivost (buď Ano (True), nebo Ne (False))"
#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:982
#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:990
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Řetězec (max. %(max_length)s znaků)"
@ -4619,44 +4631,44 @@ msgstr "Desetinné číslo"
msgid "E-mail address"
msgstr "E-mailová adresa"
#: db/models/fields/__init__.py:799 db/models/fields/files.py:220
#: db/models/fields/__init__.py:807 db/models/fields/files.py:220
#: db/models/fields/files.py:331
msgid "File path"
msgstr "Cesta k souboru"
#: db/models/fields/__init__.py:822
#: db/models/fields/__init__.py:830
msgid "This value must be a float."
msgstr "Hodnota musí být desetinné číslo."
#: db/models/fields/__init__.py:824
#: db/models/fields/__init__.py:832
msgid "Floating point number"
msgstr "Číslo s pohyblivou řádovou čárkou"
#: db/models/fields/__init__.py:883
#: db/models/fields/__init__.py:891
msgid "Big (8 byte) integer"
msgstr "Velké číslo (8 bajtů)"
#: db/models/fields/__init__.py:912
#: db/models/fields/__init__.py:920
msgid "This value must be either None, True or False."
msgstr "Hodnota musí být buď Nic (None), Ano (True) nebo Ne (False)."
#: db/models/fields/__init__.py:914
#: db/models/fields/__init__.py:922
msgid "Boolean (Either True, False or None)"
msgstr "Pravdivost (buď Ano (True), Ne (False) nebo Nic (None))"
#: db/models/fields/__init__.py:1005
#: db/models/fields/__init__.py:1013
msgid "Text"
msgstr "Text"
#: db/models/fields/__init__.py:1021
#: db/models/fields/__init__.py:1029
msgid "Time"
msgstr "Čas"
#: db/models/fields/__init__.py:1025
#: db/models/fields/__init__.py:1033
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Vložte platný čas ve tvaru HH:MM[:ss[.uuuuuu]]"
#: db/models/fields/__init__.py:1109
#: db/models/fields/__init__.py:1125
msgid "XML text"
msgstr "XML text"
@ -4669,22 +4681,22 @@ msgstr "Položka typu %(model)s s primárním klíčem %(pk)r neexistuje."
msgid "Foreign Key (type determined by related field)"
msgstr "Cizí klíč (typ určen pomocí souvisejícího pole)"
#: db/models/fields/related.py:918
#: db/models/fields/related.py:919
msgid "One-to-one relationship"
msgstr "Vazba jedna-jedna"
#: db/models/fields/related.py:980
#: db/models/fields/related.py:981
msgid "Many-to-many relationship"
msgstr "Vazba mnoho-mnoho"
#: db/models/fields/related.py:1000
#: db/models/fields/related.py:1001
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Výběr více než jedné položky je možný přidržením klávesy \"Control\" (nebo "
"\"Command\" na Macu)."
#: db/models/fields/related.py:1061
#: db/models/fields/related.py:1062
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -4697,74 +4709,74 @@ msgstr[2] "Vložte platné ID položky %(self)s. Hodnoty %(value)r jsou neplatn
msgid "This field is required."
msgstr "Pole je povinné."
#: forms/fields.py:204
#: forms/fields.py:203
msgid "Enter a whole number."
msgstr "Vložte celé číslo."
#: forms/fields.py:235 forms/fields.py:256
#: forms/fields.py:234 forms/fields.py:255
msgid "Enter a number."
msgstr "Vložte číslo."
#: forms/fields.py:259
#: forms/fields.py:258
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Hodnota nesmí celkem mít více než %s cifer."
#: forms/fields.py:260
#: forms/fields.py:259
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Hodnota nesmí mít za desetinnou čárkou více než %s cifer."
#: forms/fields.py:261
#: forms/fields.py:260
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Hodnota nesmí mít před desetinnou čárkou více než %s cifer."
#: forms/fields.py:323 forms/fields.py:838
#: forms/fields.py:322 forms/fields.py:837
msgid "Enter a valid date."
msgstr "Vložte platné datum."
#: forms/fields.py:351 forms/fields.py:839
#: forms/fields.py:350 forms/fields.py:838
msgid "Enter a valid time."
msgstr "Vložte platný čas."
#: forms/fields.py:377
#: forms/fields.py:376
msgid "Enter a valid date/time."
msgstr "Vložte platné datum a čas."
#: forms/fields.py:435
#: forms/fields.py:434
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Soubor nebyl odeslán. Zkontrolujte parametr \"encoding type\" formuláře."
#: forms/fields.py:436
#: forms/fields.py:435
msgid "No file was submitted."
msgstr "Žádný soubor nebyl odeslán."
#: forms/fields.py:437
#: forms/fields.py:436
msgid "The submitted file is empty."
msgstr "Odeslaný soubor je prázdný."
#: forms/fields.py:438
#: forms/fields.py:437
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Délka názvu souboru má být nejvýše %(max)d znaků, ale nyní je %(length)d."
#: forms/fields.py:473
#: forms/fields.py:472
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Nahrajte platný obrázek. Odeslaný soubor buď nebyl obrázek nebo byl poškozen."
#: forms/fields.py:596 forms/fields.py:671
#: forms/fields.py:595 forms/fields.py:670
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Vyberte platnou možnost, \"%(value)s\" není k dispozici."
#: forms/fields.py:672 forms/fields.py:734 forms/models.py:1002
#: forms/fields.py:671 forms/fields.py:733 forms/models.py:1002
msgid "Enter a list of values."
msgstr "Vložte seznam hodnot."
@ -4828,18 +4840,18 @@ msgstr[2] "%(size)d bajtů"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-09 14:30+0200\n"
"PO-Revision-Date: 2010-05-09 14:04+0100\n"
"POT-Creation-Date: 2010-08-06 18:35+0200\n"
"PO-Revision-Date: 2010-08-06 18:34+0100\n"
"Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"

View File

@ -4798,18 +4798,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-26 15:49+0200\n"
"PO-Revision-Date: 2008-08-13 22:00+0200\n"
"Last-Translator: Finn Gruwier Larsen<finn@gruwier.dk>\n"
"POT-Creation-Date: 2010-08-07 11:57+0200\n"
"PO-Revision-Date: 2010-08-07 22:00+0200\n"
"Last-Translator: Finn Gruwier Larsen<finngruwierlarsen@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -44,13 +44,42 @@ msgstr "Foretag dit/dine valg og klik "
msgid "Clear all"
msgstr "Fravælg alle"
#: contrib/admin/media/js/actions.js:17
#: contrib/admin/media/js/actions.js:18
#: contrib/admin/media/js/actions.min.js:1
msgid "%(sel)s of %(cnt)s selected"
msgid_plural "%(sel)s of %(cnt)s selected"
msgstr[0] "%(sel)s af %(cnt)s valgt"
msgstr[1] "%(sel)s af %(cnt)s valgt"
#: contrib/admin/media/js/actions.js:109
#: contrib/admin/media/js/actions.min.js:5
msgid ""
"You have unsaved changes on individual editable fields. If you run an "
"action, your unsaved changes will be lost."
msgstr ""
"Du har ugemte ændringer af et eller flere redigerbare felter. Hvis du "
"udfører en handling fra drop-down-menuen, vil du miste disse ændringer."
#: contrib/admin/media/js/actions.js:121
#: contrib/admin/media/js/actions.min.js:6
msgid ""
"You have selected an action, but you haven't saved your changes to "
"individual fields yet. Please click OK to save. You'll need to re-run the "
"action."
msgstr ""
"Du har valgt en handling, men du har ikke gemt dine ændringer til et eller "
"flere felter. Klik venligst OK for at gemme og vælg dernæst handlingen igen."
#: contrib/admin/media/js/actions.js:123
#: contrib/admin/media/js/actions.min.js:6
msgid ""
"You have selected an action, and you haven't made any changes on individual "
"fields. You're probably looking for the Go button rather than the Save "
"button."
msgstr ""
"Du har valgt en handling, og du har ikke udført nogen ændringer på felter. "
"Det, du søger er formentlig Udfør-knappen i stedet for Gem-knappen."
#: contrib/admin/media/js/calendar.js:24
#: contrib/admin/media/js/dateparse.js:32
msgid ""

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-13 15:30+0200\n"
"POT-Creation-Date: 2010-08-06 18:48+0200\n"
"PO-Revision-Date: 2010-04-26 13:53+0100\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: \n"
@ -72,7 +72,7 @@ msgid "Spanish"
msgstr "Spanisch"
#: conf/global_settings.py:57
msgid "Argentinean Spanish"
msgid "Argentinian Spanish"
msgstr "Argentinisches Spanisch"
#: conf/global_settings.py:58
@ -168,98 +168,102 @@ msgid "Macedonian"
msgstr "Mazedonisch"
#: conf/global_settings.py:81
msgid "Malayalam"
msgstr "Malayalam"
#: conf/global_settings.py:82
msgid "Mongolian"
msgstr "Mongolisch"
#: conf/global_settings.py:82
#: conf/global_settings.py:83
msgid "Dutch"
msgstr "Holländisch"
#: conf/global_settings.py:83
#: conf/global_settings.py:84
msgid "Norwegian"
msgstr "Norwegisch"
#: conf/global_settings.py:84
#: conf/global_settings.py:85
msgid "Norwegian Bokmal"
msgstr "Norwegisch (Bokmål)"
#: conf/global_settings.py:85
#: conf/global_settings.py:86
msgid "Norwegian Nynorsk"
msgstr "Norwegisch (Nynorsk)"
#: conf/global_settings.py:86
#: conf/global_settings.py:87
msgid "Polish"
msgstr "Polnisch"
#: conf/global_settings.py:87
#: conf/global_settings.py:88
msgid "Portuguese"
msgstr "Portugiesisch"
#: conf/global_settings.py:88
#: conf/global_settings.py:89
msgid "Brazilian Portuguese"
msgstr "Brasilianisches Portugiesisch"
#: conf/global_settings.py:89
#: conf/global_settings.py:90
msgid "Romanian"
msgstr "Rumänisch"
#: conf/global_settings.py:90
#: conf/global_settings.py:91
msgid "Russian"
msgstr "Russisch"
#: conf/global_settings.py:91
#: conf/global_settings.py:92
msgid "Slovak"
msgstr "Slowakisch"
#: conf/global_settings.py:92
#: conf/global_settings.py:93
msgid "Slovenian"
msgstr "Slowenisch"
#: conf/global_settings.py:93
#: conf/global_settings.py:94
msgid "Albanian"
msgstr "Albanisch"
#: conf/global_settings.py:94
#: conf/global_settings.py:95
msgid "Serbian"
msgstr "Serbisch"
#: conf/global_settings.py:95
#: conf/global_settings.py:96
msgid "Serbian Latin"
msgstr "Serbisch (Latein)"
#: conf/global_settings.py:96
#: conf/global_settings.py:97
msgid "Swedish"
msgstr "Schwedisch"
#: conf/global_settings.py:97
#: conf/global_settings.py:98
msgid "Tamil"
msgstr "Tamilisch"
#: conf/global_settings.py:98
#: conf/global_settings.py:99
msgid "Telugu"
msgstr "Telugisch"
#: conf/global_settings.py:99
#: conf/global_settings.py:100
msgid "Thai"
msgstr "Thailändisch"
#: conf/global_settings.py:100
#: conf/global_settings.py:101
msgid "Turkish"
msgstr "Türkisch"
#: conf/global_settings.py:101
#: conf/global_settings.py:102
msgid "Ukrainian"
msgstr "Ukrainisch"
#: conf/global_settings.py:102
#: conf/global_settings.py:103
msgid "Vietnamese"
msgstr "Vietnamesisch"
#: conf/global_settings.py:103
#: conf/global_settings.py:104
msgid "Simplified Chinese"
msgstr "Vereinfachtes Chinesisch"
#: conf/global_settings.py:104
#: conf/global_settings.py:105
msgid "Traditional Chinese"
msgstr "Traditionelles Chinesisch"
@ -311,15 +315,15 @@ msgstr "Diesen Monat"
msgid "This year"
msgstr "Dieses Jahr"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "Yes"
msgstr "Ja"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "No"
msgstr "Nein"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:469
#: contrib/admin/filterspecs.py:154 forms/widgets.py:478
msgid "Unknown"
msgstr "Unbekannt"
@ -859,7 +863,7 @@ msgstr "Sichern und neu hinzufügen"
msgid "Save and continue editing"
msgstr "Sichern und weiter bearbeiten"
#: contrib/admin/templates/admin/auth/user/add_form.html:5
#: contrib/admin/templates/admin/auth/user/add_form.html:6
msgid ""
"First, enter a username and password. Then, you'll be able to edit more user "
"options."
@ -867,6 +871,10 @@ msgstr ""
"Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere "
"Optionen für den Benutzer geändert werden."
#: contrib/admin/templates/admin/auth/user/add_form.html:8
msgid "Enter a username and password."
msgstr "Bitte einen Benutzernamen und ein Passwort eingeben."
#: contrib/admin/templates/admin/auth/user/change_password.html:28
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
@ -1437,8 +1445,8 @@ msgstr "Mitteilung"
msgid "Logged out"
msgstr "Abgemeldet"
#: contrib/auth/management/commands/createsuperuser.py:23
#: core/validators.py:120 forms/fields.py:428
#: contrib/auth/management/commands/createsuperuser.py:24
#: core/validators.py:120 forms/fields.py:427
msgid "Enter a valid e-mail address."
msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
@ -1506,7 +1514,7 @@ msgid "Email address"
msgstr "E-Mail-Adresse"
#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1109
msgid "URL"
msgstr "Adresse (URL)"
@ -1557,7 +1565,7 @@ msgstr "Kommentar"
msgid "date/time submitted"
msgstr "Datum/Zeit Erstellung"
#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
#: contrib/comments/models.py:60 db/models/fields/__init__.py:904
msgid "IP address"
msgstr "IP-Adresse"
@ -4509,22 +4517,22 @@ msgstr "Sites"
msgid "Enter a valid value."
msgstr "Bitte einen gültigen Wert eingeben."
#: core/validators.py:87 forms/fields.py:529
#: core/validators.py:87 forms/fields.py:528
msgid "Enter a valid URL."
msgstr "Bitte eine gültige Adresse eingeben."
#: core/validators.py:89 forms/fields.py:530
#: core/validators.py:89 forms/fields.py:529
msgid "This URL appears to be a broken link."
msgstr "Diese Adresse scheint nicht gültig zu sein."
#: core/validators.py:123 forms/fields.py:873
#: core/validators.py:123 forms/fields.py:877
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Bitte ein gültiges Kürzel, bestehend aus Buchstaben, Ziffern, Unterstrichen "
"und Bindestrichen, eingeben."
#: core/validators.py:126 forms/fields.py:866
#: core/validators.py:126 forms/fields.py:870
msgid "Enter a valid IPv4 address."
msgstr "Bitte eine gültige IPv4-Adresse eingeben."
@ -4539,12 +4547,12 @@ msgstr ""
"Bitte sicherstellen, dass der Wert %(limit_value)s ist. (Er ist %(show_value)"
"s)"
#: core/validators.py:153 forms/fields.py:205 forms/fields.py:257
#: core/validators.py:153 forms/fields.py:204 forms/fields.py:256
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Dieser Wert muss kleiner oder gleich %(limit_value)s sein."
#: core/validators.py:158 forms/fields.py:206 forms/fields.py:258
#: core/validators.py:158 forms/fields.py:205 forms/fields.py:257
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Dieser Wert muss größer oder gleich %(limit_value)s sein."
@ -4595,13 +4603,13 @@ msgstr "Dieses Feld darf nicht leer sein."
msgid "Field of type: %(field_type)s"
msgstr "Feldtyp: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:852
#: db/models/fields/__init__.py:961 db/models/fields/__init__.py:972
#: db/models/fields/__init__.py:999
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:860
#: db/models/fields/__init__.py:969 db/models/fields/__init__.py:980
#: db/models/fields/__init__.py:1007
msgid "Integer"
msgstr "Ganzzahl"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:850
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:858
msgid "This value must be an integer."
msgstr "Dieser Wert muss eine Ganzzahl sein."
@ -4613,7 +4621,7 @@ msgstr "Dieser Wert muss True oder False sein."
msgid "Boolean (Either True or False)"
msgstr "Boolescher Wert (True oder False)"
#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:982
#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:990
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
@ -4657,44 +4665,44 @@ msgstr "Dezimalzahl"
msgid "E-mail address"
msgstr "E-Mail-Adresse"
#: db/models/fields/__init__.py:799 db/models/fields/files.py:220
#: db/models/fields/__init__.py:807 db/models/fields/files.py:220
#: db/models/fields/files.py:331
msgid "File path"
msgstr "Dateipfad"
#: db/models/fields/__init__.py:822
#: db/models/fields/__init__.py:830
msgid "This value must be a float."
msgstr "Dieser Wert muss eine Gleitkommazahl sein."
#: db/models/fields/__init__.py:824
#: db/models/fields/__init__.py:832
msgid "Floating point number"
msgstr "Gleitkommazahl"
#: db/models/fields/__init__.py:883
#: db/models/fields/__init__.py:891
msgid "Big (8 byte) integer"
msgstr "Große Ganzzahl (8 Byte)"
#: db/models/fields/__init__.py:912
#: db/models/fields/__init__.py:920
msgid "This value must be either None, True or False."
msgstr "Dieser Wert muss None, True oder False sein."
#: db/models/fields/__init__.py:914
#: db/models/fields/__init__.py:922
msgid "Boolean (Either True, False or None)"
msgstr "Boolescher Wert (True, False oder None)"
#: db/models/fields/__init__.py:1005
#: db/models/fields/__init__.py:1013
msgid "Text"
msgstr "Text"
#: db/models/fields/__init__.py:1021
#: db/models/fields/__init__.py:1029
msgid "Time"
msgstr "Zeit"
#: db/models/fields/__init__.py:1025
#: db/models/fields/__init__.py:1033
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Bitte eine gültige Zeit im Format HH:MM[:ss[.uuuuuu]] eingeben."
#: db/models/fields/__init__.py:1109
#: db/models/fields/__init__.py:1125
msgid "XML text"
msgstr "XML-Text"
@ -4707,22 +4715,22 @@ msgstr "Modell %(model)s mit dem Primärschlüssel %(pk)r ist nicht vorhanden."
msgid "Foreign Key (type determined by related field)"
msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
#: db/models/fields/related.py:918
#: db/models/fields/related.py:919
msgid "One-to-one relationship"
msgstr "One-to-one-Beziehung"
#: db/models/fields/related.py:980
#: db/models/fields/related.py:981
msgid "Many-to-many relationship"
msgstr "Many-to-many-Beziehung"
#: db/models/fields/related.py:1000
#: db/models/fields/related.py:1001
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Halten Sie die Strg-Taste (⌘ für Mac) während des Klickens gedrückt, um "
"mehrere Einträge auszuwählen."
#: db/models/fields/related.py:1061
#: db/models/fields/related.py:1062
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -4736,55 +4744,55 @@ msgstr[1] ""
msgid "This field is required."
msgstr "Dieses Feld ist zwingend erforderlich."
#: forms/fields.py:204
#: forms/fields.py:203
msgid "Enter a whole number."
msgstr "Bitte eine ganze Zahl eingeben."
#: forms/fields.py:235 forms/fields.py:256
#: forms/fields.py:234 forms/fields.py:255
msgid "Enter a number."
msgstr "Bitte eine Zahl eingeben."
#: forms/fields.py:259
#: forms/fields.py:258
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Bitte geben Sie nicht mehr als insgesamt %s Ziffern ein."
#: forms/fields.py:260
#: forms/fields.py:259
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein."
#: forms/fields.py:261
#: forms/fields.py:260
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Bitte geben Sie nicht mehr als %s Ziffern vor dem Komma ein."
#: forms/fields.py:323 forms/fields.py:838
#: forms/fields.py:322 forms/fields.py:837
msgid "Enter a valid date."
msgstr "Bitte ein gültiges Datum eingeben."
#: forms/fields.py:351 forms/fields.py:839
#: forms/fields.py:350 forms/fields.py:838
msgid "Enter a valid time."
msgstr "Bitte eine gültige Uhrzeit eingeben."
#: forms/fields.py:377
#: forms/fields.py:376
msgid "Enter a valid date/time."
msgstr "Bitte ein gültiges Datum und Uhrzeit eingeben."
#: forms/fields.py:435
#: forms/fields.py:434
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Es wurde keine Datei übermittelt. Überprüfen Sie das Encoding des Formulars."
#: forms/fields.py:436
#: forms/fields.py:435
msgid "No file was submitted."
msgstr "Es wurde keine Datei übertragen."
#: forms/fields.py:437
#: forms/fields.py:436
msgid "The submitted file is empty."
msgstr "Die ausgewählte Datei ist leer."
#: forms/fields.py:438
#: forms/fields.py:437
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@ -4792,7 +4800,7 @@ msgstr ""
"Bitte sicherstellen, dass der Dateiname maximal %(max)d Zeichen hat. (Er hat "
"%(length)d)."
#: forms/fields.py:473
#: forms/fields.py:472
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4800,13 +4808,13 @@ msgstr ""
"Bitte ein Bild hochladen. Die hochgeladene Datei ist kein Bild oder ist "
"defekt."
#: forms/fields.py:596 forms/fields.py:671
#: forms/fields.py:595 forms/fields.py:670
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl."
#: forms/fields.py:672 forms/fields.py:734 forms/models.py:1002
#: forms/fields.py:671 forms/fields.py:733 forms/models.py:1002
msgid "Enter a list of values."
msgstr "Bitte eine Liste mit Werten eingeben."
@ -4871,18 +4879,18 @@ msgstr[1] "%(size)d Bytes"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4695,17 +4695,17 @@ msgstr[1] ""
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgid "%s KB"
msgstr ""
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgid "%s MB"
msgstr ""
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgid "%s GB"
msgstr ""
#: utils/dateformat.py:42

View File

@ -32,7 +32,7 @@ DATETIME_INPUT_FORMATS = (
'%m/%d/%y %H:%M', # '10/25/06 14:30'
'%m/%d/%y', # '10/25/06'
)
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
DECIMAL_SEPARATOR = u'.'
THOUSAND_SEPARATOR = u','
NUMBER_GROUPING = 3

View File

@ -4689,17 +4689,17 @@ msgstr[1] ""
#: template/defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgid "%s KB"
msgstr ""
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgid "%s MB"
msgstr ""
#: template/defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgid "%s GB"
msgstr ""
#: utils/dateformat.py:42

View File

@ -4832,18 +4832,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-11 08:35-0300\n"
"PO-Revision-Date: 2010-05-17 10:52-0300\n"
"POT-Creation-Date: 2010-08-06 16:06-0300\n"
"PO-Revision-Date: 2010-09-10 16:42-0300\n"
"Last-Translator: Ramiro <rm0@gmx.net>\n"
"Language-Team: Django-I18N <django-i18n@googlegroups.com>\n"
"Language: es_AR\n"
@ -70,7 +70,7 @@ msgid "Spanish"
msgstr "español"
#: conf/global_settings.py:57
msgid "Argentinean Spanish"
msgid "Argentinian Spanish"
msgstr "español de Argentina"
#: conf/global_settings.py:58
@ -166,98 +166,102 @@ msgid "Macedonian"
msgstr "macedonio"
#: conf/global_settings.py:81
msgid "Malayalam"
msgstr "Malayalam"
#: conf/global_settings.py:82
msgid "Mongolian"
msgstr "mongol"
#: conf/global_settings.py:82
#: conf/global_settings.py:83
msgid "Dutch"
msgstr "holandés"
#: conf/global_settings.py:83
#: conf/global_settings.py:84
msgid "Norwegian"
msgstr "noruego"
#: conf/global_settings.py:84
#: conf/global_settings.py:85
msgid "Norwegian Bokmal"
msgstr "bokmål"
#: conf/global_settings.py:85
#: conf/global_settings.py:86
msgid "Norwegian Nynorsk"
msgstr "nynorsk"
#: conf/global_settings.py:86
#: conf/global_settings.py:87
msgid "Polish"
msgstr "polaco"
#: conf/global_settings.py:87
#: conf/global_settings.py:88
msgid "Portuguese"
msgstr "portugués"
#: conf/global_settings.py:88
#: conf/global_settings.py:89
msgid "Brazilian Portuguese"
msgstr "portugués de Brasil"
#: conf/global_settings.py:89
#: conf/global_settings.py:90
msgid "Romanian"
msgstr "rumano"
#: conf/global_settings.py:90
#: conf/global_settings.py:91
msgid "Russian"
msgstr "ruso"
#: conf/global_settings.py:91
#: conf/global_settings.py:92
msgid "Slovak"
msgstr "eslovaco"
#: conf/global_settings.py:92
#: conf/global_settings.py:93
msgid "Slovenian"
msgstr "esloveno"
#: conf/global_settings.py:93
#: conf/global_settings.py:94
msgid "Albanian"
msgstr "albanés"
#: conf/global_settings.py:94
#: conf/global_settings.py:95
msgid "Serbian"
msgstr "serbio"
#: conf/global_settings.py:95
#: conf/global_settings.py:96
msgid "Serbian Latin"
msgstr "Latín de Serbia"
#: conf/global_settings.py:96
#: conf/global_settings.py:97
msgid "Swedish"
msgstr "sueco"
#: conf/global_settings.py:97
#: conf/global_settings.py:98
msgid "Tamil"
msgstr "tamil"
#: conf/global_settings.py:98
#: conf/global_settings.py:99
msgid "Telugu"
msgstr "telugu"
#: conf/global_settings.py:99
#: conf/global_settings.py:100
msgid "Thai"
msgstr "tailandés"
#: conf/global_settings.py:100
#: conf/global_settings.py:101
msgid "Turkish"
msgstr "turco"
#: conf/global_settings.py:101
#: conf/global_settings.py:102
msgid "Ukrainian"
msgstr "ucraniano"
#: conf/global_settings.py:102
#: conf/global_settings.py:103
msgid "Vietnamese"
msgstr "vietnamita"
#: conf/global_settings.py:103
#: conf/global_settings.py:104
msgid "Simplified Chinese"
msgstr "chino simplificado"
#: conf/global_settings.py:104
#: conf/global_settings.py:105
msgid "Traditional Chinese"
msgstr "chino tradicional"
@ -309,15 +313,15 @@ msgstr "Este mes"
msgid "This year"
msgstr "Este año"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "Yes"
msgstr "Sí"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "No"
msgstr "No"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:469
#: contrib/admin/filterspecs.py:154 forms/widgets.py:478
msgid "Unknown"
msgstr "Desconocido"
@ -363,7 +367,7 @@ msgid "Changed %s."
msgstr "Modifica %s."
#: contrib/admin/options.py:559 contrib/admin/options.py:569
#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:844
#: contrib/comments/templates/comments/preview.html:16 db/models/base.py:845
#: forms/models.py:568
msgid "and"
msgstr "y"
@ -855,13 +859,17 @@ msgstr "Guardar y agregar otro"
msgid "Save and continue editing"
msgstr "Guardar y continuar editando"
#: contrib/admin/templates/admin/auth/user/add_form.html:5
#: contrib/admin/templates/admin/auth/user/add_form.html:6
msgid ""
"First, enter a username and password. Then, you'll be able to edit more user "
"options."
msgstr ""
"Primero, introduzca un nombre de usuario y una contraseña. Luego podrá "
"configurar opciones adicionales."
"Primero introduzca un nombre de usuario y una contraseña. Luego podrá "
"configurar opciones adicionales acerca del usuario."
#: contrib/admin/templates/admin/auth/user/add_form.html:8
msgid "Enter a username and password."
msgstr "Introduzca un nombre de usuario y una contraseña."
#: contrib/admin/templates/admin/auth/user/change_password.html:28
#, python-format
@ -873,7 +881,7 @@ msgstr ""
#: contrib/admin/templates/admin/auth/user/change_password.html:35
#: contrib/auth/forms.py:17 contrib/auth/forms.py:61 contrib/auth/forms.py:186
msgid "Password"
msgstr "Contraseña:"
msgstr "Contraseña"
#: contrib/admin/templates/admin/auth/user/change_password.html:41
#: contrib/admin/templates/registration/password_change_form.html:37
@ -1243,7 +1251,7 @@ msgstr "Cambiar contraseña: %s"
#: contrib/auth/forms.py:14 contrib/auth/forms.py:48 contrib/auth/forms.py:60
msgid "Username"
msgstr "Nombre de usuario:"
msgstr "Nombre de usuario"
#: contrib/auth/forms.py:15 contrib/auth/forms.py:49
msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
@ -1435,8 +1443,8 @@ msgstr "mensaje"
msgid "Logged out"
msgstr "Sesión cerrada"
#: contrib/auth/management/commands/createsuperuser.py:23
#: core/validators.py:120 forms/fields.py:428
#: contrib/auth/management/commands/createsuperuser.py:24
#: core/validators.py:120 forms/fields.py:427
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida"
@ -1504,7 +1512,7 @@ msgid "Email address"
msgstr "Dirección de correo electrónico"
#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1109
msgid "URL"
msgstr "URL"
@ -1553,7 +1561,7 @@ msgstr "comentario"
msgid "date/time submitted"
msgstr "fecha/hora de envío"
#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
#: contrib/comments/models.py:60 db/models/fields/__init__.py:904
msgid "IP address"
msgstr "Dirección IP"
@ -4503,20 +4511,20 @@ msgstr "sitios"
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
#: core/validators.py:87 forms/fields.py:529
#: core/validators.py:87 forms/fields.py:528
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
#: core/validators.py:89 forms/fields.py:530
#: core/validators.py:89 forms/fields.py:529
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
#: core/validators.py:123 forms/fields.py:873
#: core/validators.py:123 forms/fields.py:877
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "Introduzca un 'slug' válido consistente de letras, números o guiones."
#: core/validators.py:126 forms/fields.py:866
#: core/validators.py:126 forms/fields.py:870
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida"
@ -4528,15 +4536,15 @@ msgstr "Introduzca sólo dígitos separados por comas."
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asegúrese de que este valor sea %(limit_value)s (actualmente es %(show_value)"
"s)."
"Asegúrese de que este valor sea %(limit_value)s (actualmente es "
"%(show_value)s)."
#: core/validators.py:153 forms/fields.py:205 forms/fields.py:257
#: core/validators.py:153 forms/fields.py:204 forms/fields.py:256
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea menor o igual a %(limit_value)s."
#: core/validators.py:158 forms/fields.py:206 forms/fields.py:258
#: core/validators.py:158 forms/fields.py:205 forms/fields.py:257
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
@ -4544,8 +4552,8 @@ msgstr "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
#: core/validators.py:164
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr ""
"Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene "
"%(show_value)d)."
@ -4553,20 +4561,20 @@ msgstr ""
#: core/validators.py:170
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr ""
"Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
"(tiene %(show_value)d)."
#: db/models/base.py:822
#: db/models/base.py:823
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s "
"determinado."
#: db/models/base.py:837 db/models/base.py:845
#: db/models/base.py:838 db/models/base.py:846
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
@ -4589,13 +4597,13 @@ msgstr "Este campo no puede estar en blanco."
msgid "Field of type: %(field_type)s"
msgstr "Campo tipo: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:852
#: db/models/fields/__init__.py:961 db/models/fields/__init__.py:972
#: db/models/fields/__init__.py:999
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:860
#: db/models/fields/__init__.py:969 db/models/fields/__init__.py:980
#: db/models/fields/__init__.py:1007
msgid "Integer"
msgstr "Entero"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:850
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:858
msgid "This value must be an integer."
msgstr "Este valor debe ser un número entero."
@ -4607,7 +4615,7 @@ msgstr "Este valor debe ser True o False."
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:982
#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:990
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
@ -4651,44 +4659,44 @@ msgstr "Número decimal"
msgid "E-mail address"
msgstr "Dirección de correo electrónico"
#: db/models/fields/__init__.py:799 db/models/fields/files.py:220
#: db/models/fields/__init__.py:807 db/models/fields/files.py:220
#: db/models/fields/files.py:331
msgid "File path"
msgstr "Ruta de archivo"
#: db/models/fields/__init__.py:822
#: db/models/fields/__init__.py:830
msgid "This value must be a float."
msgstr "Este valor debe ser un valor en representación de punto flotante."
#: db/models/fields/__init__.py:824
#: db/models/fields/__init__.py:832
msgid "Floating point number"
msgstr "Número de punto flotante"
#: db/models/fields/__init__.py:883
#: db/models/fields/__init__.py:891
msgid "Big (8 byte) integer"
msgstr "Entero grande (8 bytes)"
#: db/models/fields/__init__.py:912
#: db/models/fields/__init__.py:920
msgid "This value must be either None, True or False."
msgstr "Este valor debe ser None, True o False."
#: db/models/fields/__init__.py:914
#: db/models/fields/__init__.py:922
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
#: db/models/fields/__init__.py:1005
#: db/models/fields/__init__.py:1013
msgid "Text"
msgstr "Texto"
#: db/models/fields/__init__.py:1021
#: db/models/fields/__init__.py:1029
msgid "Time"
msgstr "Hora"
#: db/models/fields/__init__.py:1025
#: db/models/fields/__init__.py:1033
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Introduzca un valor de hora válido en formato HH:MM[:ss[.uuuuuu]]."
#: db/models/fields/__init__.py:1109
#: db/models/fields/__init__.py:1125
msgid "XML text"
msgstr "Texto XML"
@ -4701,22 +4709,22 @@ msgstr "No existe un modelo %(model)s con una clave primaria %(pk)r."
msgid "Foreign Key (type determined by related field)"
msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
#: db/models/fields/related.py:918
#: db/models/fields/related.py:919
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
#: db/models/fields/related.py:980
#: db/models/fields/related.py:981
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
#: db/models/fields/related.py:1000
#: db/models/fields/related.py:1001
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenga presionada \"Control\" (\"Command\" en una Mac) para seleccionar "
"más de uno."
#: db/models/fields/related.py:1061
#: db/models/fields/related.py:1062
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -4732,55 +4740,55 @@ msgstr[1] ""
msgid "This field is required."
msgstr "Este campo es obligatorio."
#: forms/fields.py:204
#: forms/fields.py:203
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
#: forms/fields.py:235 forms/fields.py:256
#: forms/fields.py:234 forms/fields.py:255
msgid "Enter a number."
msgstr "Introduzca un número."
#: forms/fields.py:259
#: forms/fields.py:258
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no existan en total mas de %s dígitos."
#: forms/fields.py:260
#: forms/fields.py:259
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no existan mas de %s lugares decimales."
#: forms/fields.py:261
#: forms/fields.py:260
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no existan mas de %s dígitos antes del punto decimal."
#: forms/fields.py:323 forms/fields.py:838
#: forms/fields.py:322 forms/fields.py:837
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
#: forms/fields.py:351 forms/fields.py:839
#: forms/fields.py:350 forms/fields.py:838
msgid "Enter a valid time."
msgstr "Introduzca un valor de hora válido."
#: forms/fields.py:377
#: forms/fields.py:376
msgid "Enter a valid date/time."
msgstr "Introduzca un valor de fecha/hora válido."
#: forms/fields.py:435
#: forms/fields.py:434
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No se envió un archivo. Verifique el tipo de codificación en el formulario."
#: forms/fields.py:436
#: forms/fields.py:435
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
#: forms/fields.py:437
#: forms/fields.py:436
msgid "The submitted file is empty."
msgstr "El archivo enviado está vacío."
#: forms/fields.py:438
#: forms/fields.py:437
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@ -4788,7 +4796,7 @@ msgstr ""
"Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
"(tiene %(length)d)."
#: forms/fields.py:473
#: forms/fields.py:472
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4796,14 +4804,14 @@ msgstr ""
"Seleccione una imagen válida. El archivo que ha seleccionado no es una "
"imagen o es un un archivo de imagen corrupto."
#: forms/fields.py:596 forms/fields.py:671
#: forms/fields.py:595 forms/fields.py:670
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Seleccione una opción válida. %(value)s no es una de las opciones "
"disponibles."
#: forms/fields.py:672 forms/fields.py:734 forms/models.py:1002
#: forms/fields.py:671 forms/fields.py:733 forms/models.py:1002
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
@ -4871,18 +4879,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-04 22:01-0300\n"
"PO-Revision-Date: 2010-05-04 22:10-0300\n"
"POT-Creation-Date: 2010-08-06 16:09-0300\n"
"PO-Revision-Date: 2010-08-06 15:59-0300\n"
"Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
"Language-Team: Django-I18N <django-i18n@googlegroups.com>\n"
"Language: es_AR\n"
@ -17,45 +17,17 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
#: contrib/admin/media/js/SelectFilter2.js:37
#, perl-format
msgid "Available %s"
msgstr "%s disponibles"
#: contrib/admin/media/js/SelectFilter2.js:45
msgid "Choose all"
msgstr "Seleccionar todos"
#: contrib/admin/media/js/SelectFilter2.js:50
msgid "Add"
msgstr "Agregar"
#: contrib/admin/media/js/SelectFilter2.js:52
msgid "Remove"
msgstr "Eliminar"
#: contrib/admin/media/js/SelectFilter2.js:57
#, perl-format
msgid "Chosen %s"
msgstr "%s elegidos"
#: contrib/admin/media/js/SelectFilter2.js:58
msgid "Select your choice(s) and click "
msgstr "Seleccione los items a agregar y haga click en "
#: contrib/admin/media/js/SelectFilter2.js:63
msgid "Clear all"
msgstr "Eliminar todos"
#: contrib/admin/media/js/actions.js:18
#: contrib/admin/media/js/actions.min.js:1
msgid "%(sel)s of %(cnt)s selected"
msgid_plural "%(sel)s of %(cnt)s selected"
msgstr[0] "%(sel)s de %(cnt)s seleccionado/a"
msgstr[1] "%(sel)s de %(cnt)s seleccionados/as"
#: contrib/admin/media/js/actions.js:109
#: contrib/admin/media/js/actions.min.js:5
msgid ""
"You have unsaved changes on individual editable fields. If you run an "
"action, your unsaved changes will be lost."

View File

@ -4111,18 +4111,18 @@ msgstr[1] "%(size)d baiti"
#: template/defaultfilters.py:800
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:802
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:803
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'd.m.Y'
# TIME_INPUT_FORMATS =
# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' '
THOUSAND_SEPARATOR = u' ' # Non-breaking space
# NUMBER_GROUPING =

View File

@ -3940,18 +3940,18 @@ msgstr[1] ""
#: template/defaultfilters.py:724
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:726
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:727
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:41
msgid "p.m."

View File

@ -3709,17 +3709,17 @@ msgstr[0] "%(size)d بایت"
#: template/defaultfilters.py:739
#, python-format
msgid "%.1f KB"
msgid "%s KB"
msgstr ""
#: template/defaultfilters.py:741
#, python-format
msgid "%.1f MB"
msgid "%s MB"
msgstr ""
#: template/defaultfilters.py:742
#, python-format
msgid "%.1f GB"
msgid "%s GB"
msgstr ""
#: utils/dateformat.py:41

View File

@ -4811,18 +4811,18 @@ msgstr[1] "%(size)d tavua"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f Kt"
msgid "%s KB"
msgstr "%s Kt"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f Mt"
msgid "%s MB"
msgstr "%s Mt"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f Gt"
msgid "%s GB"
msgstr "%s Gt"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'j.n.Y'
# TIME_INPUT_FORMATS =
# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' '
THOUSAND_SEPARATOR = u' ' # Non-breaking space
# NUMBER_GROUPING =

View File

@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-14 11:01+0200\n"
"PO-Revision-Date: 2010-04-17 00:18+0200\n"
"Last-Translator: David Larlet <http://larlet.fr>\n"
"POT-Creation-Date: 2010-08-09 12:11+0200\n"
"PO-Revision-Date: 2010-08-09 14:38+0200\n"
"Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
"Language-Team: French <http://django-fr.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -72,7 +72,7 @@ msgid "Spanish"
msgstr "Espagnol"
#: conf/global_settings.py:57
msgid "Argentinean Spanish"
msgid "Argentinian Spanish"
msgstr "Espagnol argentin"
#: conf/global_settings.py:58
@ -168,98 +168,102 @@ msgid "Macedonian"
msgstr "Macédonien"
#: conf/global_settings.py:81
msgid "Malayalam"
msgstr "Malayâlam"
#: conf/global_settings.py:82
msgid "Mongolian"
msgstr "Mongole"
#: conf/global_settings.py:82
#: conf/global_settings.py:83
msgid "Dutch"
msgstr "Hollandais"
#: conf/global_settings.py:83
#: conf/global_settings.py:84
msgid "Norwegian"
msgstr "Norvégien"
#: conf/global_settings.py:84
#: conf/global_settings.py:85
msgid "Norwegian Bokmal"
msgstr "Norvégien Bokmal"
#: conf/global_settings.py:85
#: conf/global_settings.py:86
msgid "Norwegian Nynorsk"
msgstr "Norvégien Nynorsk"
#: conf/global_settings.py:86
#: conf/global_settings.py:87
msgid "Polish"
msgstr "Polonais"
#: conf/global_settings.py:87
#: conf/global_settings.py:88
msgid "Portuguese"
msgstr "Portugais"
#: conf/global_settings.py:88
#: conf/global_settings.py:89
msgid "Brazilian Portuguese"
msgstr "Portugais brésilien"
#: conf/global_settings.py:89
#: conf/global_settings.py:90
msgid "Romanian"
msgstr "Roumain"
#: conf/global_settings.py:90
#: conf/global_settings.py:91
msgid "Russian"
msgstr "Russe"
#: conf/global_settings.py:91
#: conf/global_settings.py:92
msgid "Slovak"
msgstr "Slovaque"
#: conf/global_settings.py:92
#: conf/global_settings.py:93
msgid "Slovenian"
msgstr "Slovène"
#: conf/global_settings.py:93
#: conf/global_settings.py:94
msgid "Albanian"
msgstr "Albanais"
#: conf/global_settings.py:94
#: conf/global_settings.py:95
msgid "Serbian"
msgstr "Serbe"
#: conf/global_settings.py:95
#: conf/global_settings.py:96
msgid "Serbian Latin"
msgstr "Serbe latin"
#: conf/global_settings.py:96
#: conf/global_settings.py:97
msgid "Swedish"
msgstr "Suédois"
#: conf/global_settings.py:97
#: conf/global_settings.py:98
msgid "Tamil"
msgstr "Tamoul"
#: conf/global_settings.py:98
#: conf/global_settings.py:99
msgid "Telugu"
msgstr "Télougou"
#: conf/global_settings.py:99
#: conf/global_settings.py:100
msgid "Thai"
msgstr "Thaï"
#: conf/global_settings.py:100
#: conf/global_settings.py:101
msgid "Turkish"
msgstr "Turc"
#: conf/global_settings.py:101
#: conf/global_settings.py:102
msgid "Ukrainian"
msgstr "Ukrainien"
#: conf/global_settings.py:102
#: conf/global_settings.py:103
msgid "Vietnamese"
msgstr "Vietnamien"
#: conf/global_settings.py:103
#: conf/global_settings.py:104
msgid "Simplified Chinese"
msgstr "Chinois simplifié"
#: conf/global_settings.py:104
#: conf/global_settings.py:105
msgid "Traditional Chinese"
msgstr "Chinois traditionnel"
@ -311,15 +315,15 @@ msgstr "Ce mois-ci"
msgid "This year"
msgstr "Cette année"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "Yes"
msgstr "Oui"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:469
#: contrib/admin/filterspecs.py:147 forms/widgets.py:478
msgid "No"
msgstr "Non"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:469
#: contrib/admin/filterspecs.py:154 forms/widgets.py:478
msgid "Unknown"
msgstr "Inconnu"
@ -697,7 +701,7 @@ msgid "Filter"
msgstr "Filtre"
#: contrib/admin/templates/admin/delete_confirmation.html:10
#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:302
#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:300
msgid "Delete"
msgstr "Supprimer"
@ -796,7 +800,7 @@ msgstr ""
#: contrib/admin/templates/admin/login.html:19
msgid "Username:"
msgstr "Nom d'utilisateur :"
msgstr "Nom d'utilisateur :"
#: contrib/admin/templates/admin/login.html:22
msgid "Password:"
@ -859,7 +863,7 @@ msgstr "Enregistrer et ajouter un nouveau"
msgid "Save and continue editing"
msgstr "Enregistrer et continuer les modifications"
#: contrib/admin/templates/admin/auth/user/add_form.html:5
#: contrib/admin/templates/admin/auth/user/add_form.html:6
msgid ""
"First, enter a username and password. Then, you'll be able to edit more user "
"options."
@ -867,6 +871,10 @@ msgstr ""
"Saisissez tout d'abord un nom d'utilisateur et un mot de passe. Vous pourrez "
"ensuite modifier plus d'options."
#: contrib/admin/templates/admin/auth/user/add_form.html:8
msgid "Enter a username and password."
msgstr "Saisissez un nom d'utilisateur et un mot de passe."
#: contrib/admin/templates/admin/auth/user/change_password.html:28
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
@ -1441,8 +1449,8 @@ msgstr "message"
msgid "Logged out"
msgstr "Déconnecté"
#: contrib/auth/management/commands/createsuperuser.py:23
#: core/validators.py:120 forms/fields.py:428
#: contrib/auth/management/commands/createsuperuser.py:24
#: core/validators.py:120 forms/fields.py:427
msgid "Enter a valid e-mail address."
msgstr "Entrez une adresse de courriel valide."
@ -1511,7 +1519,7 @@ msgid "Email address"
msgstr "Adresse électronique"
#: contrib/comments/forms.py:95 contrib/flatpages/admin.py:8
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1101
#: contrib/flatpages/models.py:7 db/models/fields/__init__.py:1112
msgid "URL"
msgstr "URL"
@ -1563,7 +1571,7 @@ msgstr "commentaire"
msgid "date/time submitted"
msgstr "date et heure soumises"
#: contrib/comments/models.py:60 db/models/fields/__init__.py:896
#: contrib/comments/models.py:60 db/models/fields/__init__.py:907
msgid "IP address"
msgstr "adresse IP"
@ -4513,26 +4521,26 @@ msgstr "sites"
msgid "Enter a valid value."
msgstr "Saisissez une valeur valide."
#: core/validators.py:87 forms/fields.py:529
#: core/validators.py:87 forms/fields.py:528
msgid "Enter a valid URL."
msgstr "Saisissez une URL valide."
#: core/validators.py:89 forms/fields.py:530
#: core/validators.py:89 forms/fields.py:529
msgid "This URL appears to be a broken link."
msgstr "Cette URL semble être cassée."
#: core/validators.py:123 forms/fields.py:873
#: core/validators.py:123 forms/fields.py:877
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et "
"des traits d'union."
#: core/validators.py:126 forms/fields.py:866
#: core/validators.py:126 forms/fields.py:870
msgid "Enter a valid IPv4 address."
msgstr "Saisissez une adresse IPv4 valide."
#: core/validators.py:129 db/models/fields/__init__.py:572
#: core/validators.py:129 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Saisissez uniquement des chiffres séparés par des virgules."
@ -4543,13 +4551,13 @@ msgstr ""
"Assurez-vous que cette valeur est %(limit_value)s (actuellement %(show_value)"
"s)."
#: core/validators.py:153 forms/fields.py:205 forms/fields.py:257
#: core/validators.py:153 forms/fields.py:204 forms/fields.py:256
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Assurez-vous que cette valeur est inférieure ou égale à %(limit_value)s."
#: core/validators.py:158 forms/fields.py:206 forms/fields.py:258
#: core/validators.py:158 forms/fields.py:205 forms/fields.py:257
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
@ -4602,134 +4610,134 @@ msgstr "Ce champ ne peut pas être vide."
msgid "Field of type: %(field_type)s"
msgstr "Champ de type : %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:852
#: db/models/fields/__init__.py:961 db/models/fields/__init__.py:972
#: db/models/fields/__init__.py:999
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:863
#: db/models/fields/__init__.py:972 db/models/fields/__init__.py:983
#: db/models/fields/__init__.py:1010
msgid "Integer"
msgstr "Entier"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:850
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:861
msgid "This value must be an integer."
msgstr "Cette valeur doit être un entier."
#: db/models/fields/__init__.py:490
#: db/models/fields/__init__.py:493
msgid "This value must be either True or False."
msgstr "Cette valeur doit être soit vraie (True) soit fausse (False)."
#: db/models/fields/__init__.py:492
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
msgstr "Booléen (soit vrai ou faux)"
#: db/models/fields/__init__.py:539 db/models/fields/__init__.py:982
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:993
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Chaîne de caractère (jusqu'à %(max_length)s)"
#: db/models/fields/__init__.py:567
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
msgstr "Des entiers séparés par une virgule"
#: db/models/fields/__init__.py:581
#: db/models/fields/__init__.py:584
msgid "Date (without time)"
msgstr "Date (sans l'heure)"
#: db/models/fields/__init__.py:585
#: db/models/fields/__init__.py:588
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Saisissez une date valide au format AAAA-MM-JJ."
#: db/models/fields/__init__.py:586
#: db/models/fields/__init__.py:589
#, python-format
msgid "Invalid date: %s"
msgstr "Date non valide : %s"
#: db/models/fields/__init__.py:667
#: db/models/fields/__init__.py:670
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr ""
"Saisissez une date et une heure valides au format AAAA-MM-JJ HH:MM[:ss[."
"uuuuuu]]."
#: db/models/fields/__init__.py:669
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
msgstr "Date (avec l'heure)"
#: db/models/fields/__init__.py:735
#: db/models/fields/__init__.py:738
msgid "This value must be a decimal number."
msgstr "Cette valeur doit être un nombre décimal."
#: db/models/fields/__init__.py:737
#: db/models/fields/__init__.py:740
msgid "Decimal number"
msgstr "Nombre décimal"
#: db/models/fields/__init__.py:792
#: db/models/fields/__init__.py:795
msgid "E-mail address"
msgstr "Adresse électronique"
#: db/models/fields/__init__.py:799 db/models/fields/files.py:220
#: db/models/fields/__init__.py:810 db/models/fields/files.py:220
#: db/models/fields/files.py:331
msgid "File path"
msgstr "Chemin vers le fichier"
#: db/models/fields/__init__.py:822
#: db/models/fields/__init__.py:833
msgid "This value must be a float."
msgstr "Cette valeur doit être un nombre réel."
#: db/models/fields/__init__.py:824
#: db/models/fields/__init__.py:835
msgid "Floating point number"
msgstr "Nombre à virgule flottante"
#: db/models/fields/__init__.py:883
#: db/models/fields/__init__.py:894
msgid "Big (8 byte) integer"
msgstr "Grand entier (8 octets)"
#: db/models/fields/__init__.py:912
#: db/models/fields/__init__.py:923
msgid "This value must be either None, True or False."
msgstr "Cette valeur doit être nulle (None), vraie (True) ou fausse (False)."
#: db/models/fields/__init__.py:914
#: db/models/fields/__init__.py:925
msgid "Boolean (Either True, False or None)"
msgstr "Booléen (soit vrai, faux ou nul)"
#: db/models/fields/__init__.py:1005
#: db/models/fields/__init__.py:1016
msgid "Text"
msgstr "Texte"
#: db/models/fields/__init__.py:1021
#: db/models/fields/__init__.py:1032
msgid "Time"
msgstr "Heure"
#: db/models/fields/__init__.py:1025
#: db/models/fields/__init__.py:1036
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Saisissez une heure valide au format HH:MM[:ss[.uuuuuu]]."
#: db/models/fields/__init__.py:1109
#: db/models/fields/__init__.py:1128
msgid "XML text"
msgstr "Texte XML"
#: db/models/fields/related.py:799
#: db/models/fields/related.py:801
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Le modèle %(model)s avec la clef primaire %(pk)r n'existe pas."
#: db/models/fields/related.py:801
#: db/models/fields/related.py:803
msgid "Foreign Key (type determined by related field)"
msgstr "Clé étrangère (type défini par le champ lié)"
#: db/models/fields/related.py:918
#: db/models/fields/related.py:921
msgid "One-to-one relationship"
msgstr "Relation un à un"
#: db/models/fields/related.py:980
#: db/models/fields/related.py:983
msgid "Many-to-many relationship"
msgstr "Relation plusieurs à plusieurs"
#: db/models/fields/related.py:1000
#: db/models/fields/related.py:1003
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Maintenez appuyé « Ctrl », ou « Commande (touche pomme) » sur un Mac, pour en "
"sélectionner plusieurs."
#: db/models/fields/related.py:1061
#: db/models/fields/related.py:1064
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -4743,55 +4751,55 @@ msgstr[1] ""
msgid "This field is required."
msgstr "Ce champ est obligatoire."
#: forms/fields.py:204
#: forms/fields.py:203
msgid "Enter a whole number."
msgstr "Saisissez un nombre entier."
#: forms/fields.py:235 forms/fields.py:256
#: forms/fields.py:234 forms/fields.py:255
msgid "Enter a number."
msgstr "Saisissez un nombre."
#: forms/fields.py:259
#: forms/fields.py:258
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres au total."
#: forms/fields.py:260
#: forms/fields.py:259
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres après la virgule."
#: forms/fields.py:261
#: forms/fields.py:260
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres avant la virgule."
#: forms/fields.py:323 forms/fields.py:838
#: forms/fields.py:322 forms/fields.py:837
msgid "Enter a valid date."
msgstr "Saisissez une date valide."
#: forms/fields.py:351 forms/fields.py:839
#: forms/fields.py:350 forms/fields.py:838
msgid "Enter a valid time."
msgstr "Saisissez une heure valide."
#: forms/fields.py:377
#: forms/fields.py:376
msgid "Enter a valid date/time."
msgstr "Saisissez une date et une heure valides."
#: forms/fields.py:435
#: forms/fields.py:434
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Aucun fichier n'a été soumis. Vérifiez le type d'encodage du formulaire."
#: forms/fields.py:436
#: forms/fields.py:435
msgid "No file was submitted."
msgstr "Aucun fichier n'a été soumis."
#: forms/fields.py:437
#: forms/fields.py:436
msgid "The submitted file is empty."
msgstr "Le fichier soumis est vide."
#: forms/fields.py:438
#: forms/fields.py:437
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@ -4799,7 +4807,7 @@ msgstr ""
"Assurez-vous que ce nom de fichier ne contient pas plus de %(max)d "
"caractères (actuellement %(length)d caractères)."
#: forms/fields.py:473
#: forms/fields.py:472
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4807,17 +4815,17 @@ msgstr ""
"Téléversez une image valide. Le fichier que vous avez transféré n'est pas "
"une image ou bien est corrompu."
#: forms/fields.py:596 forms/fields.py:671
#: forms/fields.py:595 forms/fields.py:670
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Sélectionnez un choix valide. %(value)s n'en fait pas partie."
#: forms/fields.py:672 forms/fields.py:734 forms/models.py:1002
#: forms/fields.py:671 forms/fields.py:733 forms/models.py:1002
msgid "Enter a list of values."
msgstr "Saisissez une liste de valeurs."
# Si « : » est requis, créer un ticket
#: forms/formsets.py:298 forms/formsets.py:300
#: forms/formsets.py:296 forms/formsets.py:298
msgid "Order"
msgstr "Ordre"
@ -4868,31 +4876,31 @@ msgstr "Sélectionnez un choix valide ; %s n'en fait pas partie."
msgid "\"%s\" is not a valid value for a primary key."
msgstr "« %s » n'est pas une valeur correcte pour une clé primaire."
#: template/defaultfilters.py:776
#: template/defaultfilters.py:780
msgid "yes,no,maybe"
msgstr "oui, non, peut-être"
#: template/defaultfilters.py:807
#: template/defaultfilters.py:811
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d octet"
msgstr[1] "%(size)d octets"
#: template/defaultfilters.py:809
#: template/defaultfilters.py:813
#, python-format
msgid "%.1f KB"
msgstr "%.1f Ko"
msgid "%s KB"
msgstr "%s Ko"
#: template/defaultfilters.py:811
#: template/defaultfilters.py:815
#, python-format
msgid "%.1f MB"
msgstr "%.1f Mo"
msgid "%s MB"
msgstr "%s Mo"
#: template/defaultfilters.py:812
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f GB"
msgstr "%.1f Go"
msgid "%s GB"
msgstr "%s Go"
#: utils/dateformat.py:42
msgid "p.m."
@ -5100,7 +5108,7 @@ msgstr "nov."
msgid "Dec."
msgstr "déc."
#: utils/text.py:130
#: utils/text.py:136
msgid "or"
msgstr "ou"

View File

@ -106,17 +106,17 @@ msgstr[1] ""
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f GB"
msgid "%s GB"
msgstr ""
#: template/defaultfilters.py:808
#, python-format
msgid "%.1f KB"
msgid "%s KB"
msgstr ""
#: template/defaultfilters.py:810
#, python-format
msgid "%.1f MB"
msgid "%s MB"
msgstr ""
#: contrib/admin/sites.py:447

View File

@ -4727,18 +4727,18 @@ msgstr[4] "%(size)d bearta"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -2728,18 +2728,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:522
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:524
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:525
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:40
msgid "p.m."

View File

@ -4757,18 +4757,18 @@ msgstr[1] "%(size)d בתים"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -3818,18 +3818,18 @@ msgstr[1] "%(size)d बाइट"
#: template/defaultfilters.py:774
#, python-format
msgid "%.1f KB"
msgstr "%.1f के.बी"
msgid "%s KB"
msgstr "%s के.बी"
#: template/defaultfilters.py:776
#, python-format
msgid "%.1f MB"
msgstr "%.1f एम.बी"
msgid "%s MB"
msgstr "%s एम.बी"
#: template/defaultfilters.py:777
#, python-format
msgid "%.1f GB"
msgstr "%.1f जी.बी"
msgid "%s GB"
msgstr "%s जी.बी"
#: utils/dateformat.py:41
msgid "p.m."

View File

@ -4865,18 +4865,18 @@ msgstr[3] "%(size)d byte-a"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4119,18 +4119,18 @@ msgstr[1] "%(size)d bájt"
#: template/defaultfilters.py:739
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:741
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:742
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:41
msgid "p.m."

View File

@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'Y.m.d.'
# TIME_INPUT_FORMATS =
# DATETIME_INPUT_FORMATS =
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' '
THOUSAND_SEPARATOR = u' ' # Non-breaking space
# NUMBER_GROUPING =

View File

@ -4820,18 +4820,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -3641,18 +3641,18 @@ msgstr[1] "%(size)d bæti"
#: template/defaultfilters.py:739
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:741
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:742
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:41
msgid "p.m."

View File

@ -4816,18 +4816,18 @@ msgstr[1] "%(size)d byte"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4772,18 +4772,18 @@ msgstr[0] "%(size)d バイト"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -3872,18 +3872,18 @@ msgstr[1] "%(size)d ბაიტი"
#: template/defaultfilters.py:747
#, python-format
msgid "%.1f KB"
msgstr "%.1f კბაიტი"
msgid "%s KB"
msgstr "%s კბაიტი"
#: template/defaultfilters.py:749
#, python-format
msgid "%.1f MB"
msgstr "%.1f მბაიტი"
msgid "%s MB"
msgstr "%s მბაიტი"
#: template/defaultfilters.py:750
#, python-format
msgid "%.1f GB"
msgstr "%.1f გბაიტი"
msgid "%s GB"
msgstr "%s გბაიტი"
#: utils/dateformat.py:41
msgid "p.m."

View File

@ -4778,18 +4778,18 @@ msgstr[1] "%(size)d 바이트"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -2853,16 +2853,16 @@ msgstr[1] "%(size)d baitai"
#: template/defaultfilters.py:522
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:524
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:525
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"

View File

@ -4830,18 +4830,18 @@ msgstr[2] "%(size)d baitu"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -32,5 +32,5 @@ DATETIME_INPUT_FORMATS = (
'%d.%m.%y', # '25.10.06'
)
DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' '
THOUSAND_SEPARATOR = u' ' # Non-breaking space
NUMBER_GROUPING = 3

View File

@ -4833,18 +4833,18 @@ msgstr[1] "%(size)d бајти"
#: template/defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgstr "%.1f КБ"
msgid "%s KB"
msgstr "%s КБ"
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgstr "%.1f МБ"
msgid "%s MB"
msgstr "%s МБ"
#: template/defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgstr "%.1f ГБ"
msgid "%s GB"
msgstr "%s ГБ"
#: utils/dateformat.py:42
msgid "p.m."

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -0,0 +1,156 @@
# Translation of Django Js files to malayalam.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Rajeesh Nair <rajeeshrnair@gmail.com>, 2010.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Django SVN\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-05-28 15:32+0530\n"
"PO-Revision-Date: 2010-05-28 15:45+0530\n"
"Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
"Language-Team: Malayalam <ml@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Malayalam\n"
"X-Poedit-Country: INDIA\n"
#: contrib/admin/media/js/SelectFilter2.js:37
#, perl-format
msgid "Available %s"
msgstr "ലഭ്യമായ %s"
#: contrib/admin/media/js/SelectFilter2.js:45
msgid "Choose all"
msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക"
#: contrib/admin/media/js/SelectFilter2.js:50
msgid "Add"
msgstr "പുതിയത് ചേര്‍ക്കൂ"
#: contrib/admin/media/js/SelectFilter2.js:52
msgid "Remove"
msgstr "നീക്കം ചെയ്യൂ"
#: contrib/admin/media/js/SelectFilter2.js:57
#, perl-format
msgid "Chosen %s"
msgstr "തെരഞ്ഞെടുത്ത %s"
#: contrib/admin/media/js/SelectFilter2.js:58
msgid "Select your choice(s) and click "
msgstr "ഉചിതമായത് തെരഞ്ഞെടുത്ത ശേഷം ക്ളിക് ചെയ്യൂ"
#: contrib/admin/media/js/SelectFilter2.js:63
msgid "Clear all"
msgstr "എല്ലാം ക്ളിയര്‍ ചെയ്യൂ"
#: contrib/admin/media/js/actions.js:18
#: contrib/admin/media/js/actions.min.js:1
msgid "%(sel)s of %(cnt)s selected"
msgid_plural "%(sel)s of %(cnt)s selected"
msgstr[0] "%(cnt)sല് %(sel)s തെരഞ്ഞെടുത്തു"
msgstr[1] "%(cnt)sല് %(sel)s എണ്ണം തെരഞ്ഞെടുത്തു"
#: contrib/admin/media/js/actions.js:109
#: contrib/admin/media/js/actions.min.js:5
msgid ""
"You have unsaved changes on individual editable fields. If you run an "
"action, your unsaved changes will be lost."
msgstr "വരുത്തിയ മാറ്റങ്ങള്‍ സേവ് ചെയ്തിട്ടില്ല. ഒരു ആക്ഷന്‍ പ്രയോഗിച്ചാല്‍ സേവ് ചെയ്യാത്ത "
"മാറ്റങ്ങളെല്ലാം നഷ്ടപ്പെടും."
#: contrib/admin/media/js/actions.js:121
#: contrib/admin/media/js/actions.min.js:6
msgid ""
"You have selected an action, but you haven't saved your changes to "
"individual fields yet. Please click OK to save. You'll need to re-run the "
"action."
msgstr ""
"നിങ്ങള്‍ ഒരു ആക്ഷന്‍ തെരഞ്ഞെടുത്തിട്ടുണ്ട്. പക്ഷേ, കളങ്ങളിലെ മാറ്റങ്ങള്‍ ഇനിയും സേവ് ചെയ്യാനുണ്ട്. ആദ്യം സേവ്"
"ചെയ്യാനായി OK ക്ലിക് ചെയ്യുക. അതിനു ശേഷം ആക്ഷന്‍ ഒന്നു കൂടി പ്രയോഗിക്കേണ്ടി വരും."
#: contrib/admin/media/js/actions.js:123
#: contrib/admin/media/js/actions.min.js:6
msgid ""
"You have selected an action, and you haven't made any changes on individual "
"fields. You're probably looking for the Go button rather than the Save "
"button."
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:48
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "Now"
msgstr "ഇപ്പോള്‍"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:52
msgid "Clock"
msgstr "ഘടികാരം (ക്ലോക്ക്)"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:79
msgid "Choose a time"
msgstr "സമയം തെരഞ്ഞെടുക്കൂ"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Midnight"
msgstr "അര്‍ധരാത്രി"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:85
msgid "6 a.m."
msgstr "6 a.m."
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:86
msgid "Noon"
msgstr "ഉച്ച"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:90
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:187
msgid "Cancel"
msgstr "റദ്ദാക്കൂ"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:181
msgid "Today"
msgstr "ഇന്ന്"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:136
msgid "Calendar"
msgstr "കലണ്ടര്‍"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Yesterday"
msgstr "ഇന്നലെ"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
msgid "Tomorrow"
msgstr "നാളെ"

View File

@ -0,0 +1,38 @@
# -*- encoding: utf-8 -*-
# This file is distributed under the same license as the Django package.
#
DATE_FORMAT = 'N j, Y'
TIME_FORMAT = 'P'
DATETIME_FORMAT = 'N j, Y, P'
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'F j'
SHORT_DATE_FORMAT = 'm/d/Y'
SHORT_DATETIME_FORMAT = 'm/d/Y P'
FIRST_DAY_OF_WEEK = 0 # Sunday
DATE_INPUT_FORMATS = (
'%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
# '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
# '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
# '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
# '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
)
TIME_INPUT_FORMATS = (
'%H:%M:%S', # '14:30:59'
'%H:%M', # '14:30'
)
DATETIME_INPUT_FORMATS = (
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
'%Y-%m-%d %H:%M', # '2006-10-25 14:30'
'%Y-%m-%d', # '2006-10-25'
'%m/%d/%Y %H:%M:%S', # '10/25/2006 14:30:59'
'%m/%d/%Y %H:%M', # '10/25/2006 14:30'
'%m/%d/%Y', # '10/25/2006'
'%m/%d/%y %H:%M:%S', # '10/25/06 14:30:59'
'%m/%d/%y %H:%M', # '10/25/06 14:30'
'%m/%d/%y', # '10/25/06'
)
DECIMAL_SEPARATOR = '.'
THOUSAND_SEPARATOR = ','
NUMBER_GROUPING = 3

View File

@ -1357,8 +1357,8 @@ msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
"password form</a>."
msgstr ""
"Нууц үгийнхээ хэлбэр </a>-ийг өөрчлөхдөө '[algo]$[salt]$[hexdigest]' буюу <a "
"href=\"password/\"> хэрэглэнэ үү."
"Нууц үгийнхээ хэлбэр-ийг өөрчлөхдөө '[algo]$[salt]$[hexdigest]' буюу <a "
"href=\"password/\">хэрэглэнэ үү</a>."
#: contrib/auth/models.py:201
msgid "staff status"
@ -4921,18 +4921,18 @@ msgstr[1] "%(size)d байт"
#: template/defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4825,18 +4825,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4139,18 +4139,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:800
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:802
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:803
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4801,18 +4801,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4826,18 +4826,18 @@ msgstr[1] "%(size)d bytes"
#: template/defaultfilters.py:809
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:811
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:812
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4815,18 +4815,18 @@ msgstr[2] "%(size)d bajtów"
#: template/defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgstr "%.1f KB"
msgid "%s KB"
msgstr "%s KB"
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
msgid "%s MB"
msgstr "%s MB"
#: template/defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgstr "%.1f GB"
msgid "%s GB"
msgstr "%s GB"
#: utils/dateformat.py:42
msgid "p.m."

View File

@ -4842,17 +4842,17 @@ msgstr[1] ""
#: template/defaultfilters.py:814
#, python-format
msgid "%.1f KB"
msgid "%s KB"
msgstr ""
#: template/defaultfilters.py:816
#, python-format
msgid "%.1f MB"
msgid "%s MB"
msgstr ""
#: template/defaultfilters.py:817
#, python-format
msgid "%.1f GB"
msgid "%s GB"
msgstr ""
#: utils/dateformat.py:42

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