From 83861364dd31063d8ff9169514c5f90a0c224482 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 7 Aug 2007 13:43:49 +0000 Subject: [PATCH] Merged revisions 4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-4643,4653-4655,4657,4669,4673-4675,4694-4696,4713-4714,4720-4723,4725-4732,4735-4741,4750,4755,4758,4769-4770,4776-4777,4783-4795,4798,4805-4808,4810,4813-4815,4817,4824,4836,4838-4843,4851-4855,4869,4872,4882-4884,4906,4916,4935-4936,4940-4944,4946-4953,4962-4963,4969,4971-4973,4990,4994-4997,5000-5003,5006-5008,5013-5014,5019-5024,5026-5036,5046-5047,5054-5059,5062,5079,5081-5083,5090,5100-5101,5114,5122-5123,5126,5128,5134-5136,5148-5149,5151,5157,5174,5178,5183-5185,5192-5195,5197-5200,5203,5205,5208,5214,5223-5224,5226-5227,5229-5230,5235-5236,5238-5244,5246-5249,5251,5254-5262,5266-5280,5282-5284,5286,5301,5307,5309-5310,5312,5314-5317,5319-5332,5334-5345,5372-5378,5381-5382,5384,5386,5388-5390,5393-5397,5399-5400,5416,5419-5430,5440-5441,5444-5448,5461-5464,5467,5473-5481,5487-5489,5491-5492,5498-5499,5507-5510,5512,5527,5529,5531-5535,5540-5541,5546,5570,5572-5574,5576-5578,5580-5581,5583-5589,5591,5595-5597,5601-5608,5613,5626-5826 via svnmerge from http://code.djangoproject.com/svn/django/trunk ........ r5626 | russellm | 2007-07-07 10:16:23 +0800 (Sat, 07 Jul 2007) | 2 lines Added some uncredited authors that worked on the Oracle branch. ........ r5629 | mtredinnick | 2007-07-08 01:15:54 +0800 (Sun, 08 Jul 2007) | 8 lines Changed HttpRequest.path to be a Unicode object. It has already been URL-decoded by the time we see it anyway, so keeping it as a UTF-8 bytestring was causing unnecessary problems. Also added handling for non-ASCII URL fragments in feed creation (the portion that was outside the control of the Feed class was messed up). ........ r5630 | mtredinnick | 2007-07-08 02:24:27 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4772 -- Fixed reverse URL creation to work with non-ASCII arguments. Also included a test for non-ASCII strings in URL patterns, although that already worked correctly. ........ r5631 | mtredinnick | 2007-07-08 02:39:23 +0800 (Sun, 08 Jul 2007) | 3 lines Corrected misleading comment from [5619]. Not sure what I was smoking at the time. ........ r5632 | mtredinnick | 2007-07-08 08:39:32 +0800 (Sun, 08 Jul 2007) | 5 lines Fixed reverse URL lookup using functions when the original URL pattern was a string. This is now just as fragile as it was prior to [5609], but works in a few cases that people were relying on, apparently. ........ r5636 | mtredinnick | 2007-07-08 19:22:53 +0800 (Sun, 08 Jul 2007) | 4 lines Fixed #4798-- Made sure that function keyword arguments are strings (for the keywords themselves) when using Unicode URL patterns. ........ r5638 | gwilson | 2007-07-10 10:34:42 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4817 -- Removed leading forward slashes from some urlconf examples in the documentation. ........ r5639 | gwilson | 2007-07-10 10:45:11 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4814 -- Fixed some whitespace issues in tutorial01, thanks John Shaffer. ........ r5640 | gwilson | 2007-07-10 11:26:26 +0800 (Tue, 10 Jul 2007) | 2 lines Fixed #4812 -- Fixed an octal escape in regular expression that is used in the `isValidEmail` validator, thanks batchman@free.fr. ........ r5641 | mtredinnick | 2007-07-10 20:02:06 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4823 -- Fixed a Python 2.3 incompatibility from [5636] (it was even demonstrated by existing tests, so I really screwed this up). ........ r5642 | mtredinnick | 2007-07-10 20:03:36 +0800 (Tue, 10 Jul 2007) | 3 lines Fixed #4804 -- Fixed a problem when validating choice lists with non-ASCII data. Thanks, django@vonposer.de. ........ r5643 | mtredinnick | 2007-07-10 20:33:55 +0800 (Tue, 10 Jul 2007) | 4 lines Fixed #3760 -- Added the ability to manually set feed- and item-level id elements in Atom feeds. This is fully backwards compatible. Based on a patch from spark343@cs.ubc.ca. ........ r5644 | mtredinnick | 2007-07-11 14:55:12 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4815 -- Fixed decoding of request parameters when the input encoding is not UTF-8. Thanks, Jordan Dimov. ........ r5645 | mtredinnick | 2007-07-11 15:00:27 +0800 (Wed, 11 Jul 2007) | 3 lines Fixed #4802 -- Updated French translation. Combined contribution from baptiste.goupil@gmail.com and rocherl@club-internet.fr. ........ r5646 | mtredinnick | 2007-07-11 15:12:50 +0800 (Wed, 11 Jul 2007) | 2 lines Fixed #4753 -- Small update to Spanish translation from Mario Gonzalez. ........ r5649 | jacob | 2007-07-12 08:33:44 +0800 (Thu, 12 Jul 2007) | 1 line Fixed #4615: corrected reverse URL resolution examples in tutorial 4. Thanks for the patch, simeonf. ........ r5650 | adrian | 2007-07-12 12:43:29 +0800 (Thu, 12 Jul 2007) | 1 line Added 'New in Django development version' note to docs/syndication_feeds.txt changes from [5643] ........ r5651 | adrian | 2007-07-12 12:44:45 +0800 (Thu, 12 Jul 2007) | 1 line Edited changes to docs/tutorial04.txt from [5649] ........ r5652 | adrian | 2007-07-12 13:23:47 +0800 (Thu, 12 Jul 2007) | 1 line Added helpful error message to SiteManager.get_current() if the user hasn't set SITE_ID ........ r5653 | adrian | 2007-07-12 13:28:04 +0800 (Thu, 12 Jul 2007) | 1 line Added RequestSite class to sites framework ........ r5654 | adrian | 2007-07-12 13:29:32 +0800 (Thu, 12 Jul 2007) | 1 line Improved syndication feed framework to use RequestSite if the sites framework is not installed -- i.e., the sites framework is no longer required to use the syndication feed framework. This is backwards incompatible if anybody has subclassed Feed and overridden __init__(), because the second parameter is now expected to be an HttpRequest object instead of request.path ........ r5658 | russellm | 2007-07-12 15:45:35 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4459 -- Added 'raw' argument to save method, to override any pre-save processing, and modified serializers to use a raw-save. This enables serialization of DateFields with auto_now/auto_now_add. Also modified serializers to invoke save() directly on the model baseclass, to avoid any (potentially order-dependent, data modifying) behavior in a custom save() method. ........ r5659 | russellm | 2007-07-12 19:24:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3770 -- Remove null=True tag from OneToOne serialization test. OneToOne fields can't have a value of null. ........ r5660 | russellm | 2007-07-12 19:27:38 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #3768 -- Disabled NullBooleanField PK serialization test. We can't and don't test null PK values. ........ r5662 | russellm | 2007-07-12 20:33:24 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4837 -- Updated Debian packaging details. Thanks for the suggestion, Yasushi Masuda . ........ r5663 | russellm | 2007-07-12 20:44:05 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4808 -- Added Chilean regions in localflavor. Thanks, Marijn Vriens . ........ r5664 | russellm | 2007-07-12 20:48:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4745 -- Updated docs to point out that 0 is not a valid SITE_ID when running the tests. Thanks for the suggestion, Lars Stavholm . ........ r5665 | russellm | 2007-07-12 20:50:02 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4763 -- Minor typo in cache documentations. Thanks, dan@coffeecode.net. ........ r5666 | russellm | 2007-07-12 20:55:28 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4627 -- Added details on MacPorts packaging of Django. Thanks, Paul Bissex. ........ r5667 | russellm | 2007-07-12 21:23:11 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4640 -- Fixed import to stringfilter in docs. Proposed solution to move stringfilter into django.template.__init__ introduces a circular import problem. ........ r5668 | russellm | 2007-07-12 21:32:00 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4722 -- Clarified discussion about PYTHONPATH in modpython docs. Thanks for the suggestion, Collin Grady . ........ r5669 | russellm | 2007-07-12 21:37:59 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4755 -- Modified newforms MultipleChoiceField to use list comprehension, rather than iteration. ........ r5670 | russellm | 2007-07-12 21:41:27 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4764 -- Added reference to Locale middleware in middleware docs. Thanks, dan@coffeecode.net. ........ r5671 | russellm | 2007-07-12 21:55:19 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4768 -- Converted timesince and dateformat to use explicit floor division (pre-emptive avoidance of Python 3000 compatibility problem), and removed a redundant millisecond check. Thanks, John Shaffer . ........ r5672 | russellm | 2007-07-12 22:00:13 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4775 -- Added some missing Hungarian accents to the urlify.js LATIN_MAP. Thanks, Pistahh . ........ r5673 | russellm | 2007-07-12 22:05:16 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4502 -- Clarified reference to view in tutorial. Thanks for the suggestion, Carl Karsten . ........ r5674 | russellm | 2007-07-12 22:11:41 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4522 -- Clarified the allowed filter arguments on the time and date filters. Thanks for the suggestion, admackin@gmail.com. ........ r5675 | russellm | 2007-07-12 22:21:51 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4525 -- Fixed mistaken documentation on arguments to runfcgi. Thanks, Johan Bergstrom . ........ r5676 | russellm | 2007-07-12 22:41:32 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4538 -- Split the installation instructions to differentiate between installing a distribution package and installing an official release. Thanks to Carl Karsten for the idea, and Paul Bissex for the patch. ........ r5677 | russellm | 2007-07-12 23:26:37 +0800 (Thu, 12 Jul 2007) | 2 lines Fixed #4526 -- Modified the test Client login method to fail when a user is inactive. Thanks, marcin@elksoft.pl. ........ r5678 | russellm | 2007-07-13 13:03:33 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #3505 -- Added handling for the error raised when the user forgets the comma in a single element tuple when defining AUTHENTICATION_BACKENDS. Thanks for the help identifying this problem, Mario Gonzalez . ........ r5679 | mtredinnick | 2007-07-13 16:52:07 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #2591 -- Fixed a problem with inspectdb with psycopg2 (only). Patch from Gary Wilson. ........ r5680 | mtredinnick | 2007-07-13 17:09:59 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4807 -- Fixed a couple of corner cases in decimal form input validation. Based on a suggestion from Chriss Moffit. ........ r5681 | mtredinnick | 2007-07-13 17:14:51 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4839 -- Added __repr__ methods to URL classes that show the pattern they contain. Thanks, Thomas G?\195?\188ttler. ........ r5682 | mtredinnick | 2007-07-13 18:56:30 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4842 -- Added slightly more robust error reporting. Thanks, Thomas G?\195?\188ttler. ........ r5683 | mtredinnick | 2007-07-13 19:05:01 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4846 -- Fixed some Python 2.3 encoding problems in the admin interface. Based on a patch from daybreaker12@gmail.com. ........ r5684 | mtredinnick | 2007-07-13 20:03:20 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4861 -- Removed some duplicated logic from the newforms RegexField by making it a subclass of CharField. Thanks, Collin Grady. ........ r5685 | mtredinnick | 2007-07-13 21:15:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4865 -- Replaced a stray generator comprehension with a list comprehension so that we don't break Python 2.3. ........ r5686 | mtredinnick | 2007-07-13 22:13:35 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4469 -- Added slightly more informative error messages to max- and min-length newform validation. Based on a patch from A. Murat Eren. ........ r5687 | mtredinnick | 2007-07-13 22:14:47 +0800 (Fri, 13 Jul 2007) | 2 lines Added author credit for [5686]. Refs #4469. ........ r5688 | mtredinnick | 2007-07-13 22:33:46 +0800 (Fri, 13 Jul 2007) | 3 lines Fixed #4484 -- Fixed APPEND_SLASH handling to handle an empty path value. Thanks, VesselinK. ........ r5689 | mtredinnick | 2007-07-13 22:40:39 +0800 (Fri, 13 Jul 2007) | 2 lines Fixed #4556 -- Stylistic changes to [5500]. Thanks, glin@seznam.cz. ........ r5690 | gwilson | 2007-07-14 04:36:01 +0800 (Sat, 14 Jul 2007) | 2 lines Refs #2591 -- Removed int conversion and try/except since the value in the single-item list is already an int. I overlooked this in my original patch, which was applied in [5679]. ........ r5691 | adrian | 2007-07-14 05:20:07 +0800 (Sat, 14 Jul 2007) | 1 line Documented the 'commit' argument to save() methods on forms created via form_for_model() or form_for_instance() ........ r5692 | mtredinnick | 2007-07-14 13:27:22 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4869 -- Added a note that syncdb does not alter existing tables. Thanks, James Bennett. ........ r5693 | mtredinnick | 2007-07-14 20:48:24 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4863 -- Removed comment references to a no-longer present link. Pointed out by Thomas G?\195?\188ttler. ........ r5694 | mtredinnick | 2007-07-14 21:14:28 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed #4862 -- Fixed invalid Javascript creation in popup windows in admin. ........ r5695 | mtredinnick | 2007-07-14 21:39:41 +0800 (Sat, 14 Jul 2007) | 2 lines Fixed a problem with translatable strings from [5686]. ........ r5696 | mtredinnick | 2007-07-14 22:47:14 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4731 -- Changed management.setup_environ() so that it no longer assumes the settings module is called "settings". Patch from SmileyChris. ........ r5697 | mtredinnick | 2007-07-14 22:50:35 +0800 (Sat, 14 Jul 2007) | 3 lines Fixed #4870 -- Removed unneeded import and fixed a docstring in an example. Thanks, Collin Grady. ........ r5698 | adrian | 2007-07-15 00:58:54 +0800 (Sun, 15 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5658] ........ r5699 | adrian | 2007-07-15 01:04:30 +0800 (Sun, 15 Jul 2007) | 1 line Negligible capitalization fix in test/client.py docstring ........ r5700 | russellm | 2007-07-15 12:41:59 +0800 (Sun, 15 Jul 2007) | 2 lines Clarified the documentation on the steps that happen during a save, and how raw save affects those steps. ........ r5701 | gwilson | 2007-07-15 13:03:28 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4310 -- Fixed a regular expression bug in `strip_entities` function and added tests for several `django.utils.html` functions. Based on patch from Brian Harring. ........ r5702 | gwilson | 2007-07-15 13:11:06 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #4877 -- Fixed typo in testing documentation, patch from John Shaffer. ........ r5703 | gwilson | 2007-07-15 14:24:54 +0800 (Sun, 15 Jul 2007) | 2 lines Fixed #3012 -- Changed the locmem cache backend to use pickle instead of deepcopy to make it compatible with iterators (which cannot be copied). Patch from Sundance. ........ r5704 | gwilson | 2007-07-15 14:29:45 +0800 (Sun, 15 Jul 2007) | 2 lines Changed imports to adhere to PEP 8. ........ r5705 | mtredinnick | 2007-07-15 17:39:13 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4880 -- Updated Spanish translation (includes re-encoding to UTF-8). Thanks, Jorge Gajon. ........ r5706 | mtredinnick | 2007-07-15 17:46:42 +0800 (Sun, 15 Jul 2007) | 3 lines Fixed #4882 -- Updated Argentinean Spanish translation (includes re-encoding to UTF-8). Thanks, Ramiro Morales. ........ r5707 | mtredinnick | 2007-07-15 18:08:05 +0800 (Sun, 15 Jul 2007) | 3 lines Re-encoded djangojs.po for French and German locales to UTF-8. These were the last two non-UTF-8 PO files. ........ r5708 | mtredinnick | 2007-07-15 18:10:44 +0800 (Sun, 15 Jul 2007) | 6 lines Fixed #4734 -- Changed message extraction to permit non-ACSII msgid strings. Thanks, krzysiek.pawlik@silvermedia.pl. This is slightly backwards-incompatible for translators: PO files are now assumed to be in UTF-8 encoding. ........ r5709 | adrian | 2007-07-16 03:34:21 +0800 (Mon, 16 Jul 2007) | 1 line Edited docs/db-api.txt changes from [5700] ........ r5710 | adrian | 2007-07-16 05:16:32 +0800 (Mon, 16 Jul 2007) | 1 line Improved docs/templates.txt section on the 'regroup' tag ........ r5711 | mtredinnick | 2007-07-16 11:48:03 +0800 (Mon, 16 Jul 2007) | 2 lines Updated AUTHORS for [5708]. ........ r5712 | mtredinnick | 2007-07-16 11:50:22 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4199 -- Changed date formatting in HTTP expires header to be spec compliant. Thanks, Chris Bennett. ........ r5713 | mtredinnick | 2007-07-16 12:45:45 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4884 -- Fixed an initialisation problem when assigned to settings before accessing them. Thanks, Noam Raphael. ........ r5714 | mtredinnick | 2007-07-16 12:47:52 +0800 (Mon, 16 Jul 2007) | 2 lines Fixed #4806 -- Updated Simplified Chinese translation. Thanks, limodou. ........ r5715 | mtredinnick | 2007-07-16 12:54:49 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4887 -- Fixed another place where template tag arguments are used directly as function keyword args. Thanks, Brian Rosner. ........ r5716 | gwilson | 2007-07-16 13:00:18 +0800 (Mon, 16 Jul 2007) | 2 lines Refs #3012 -- Removed iterator from `test_data_types` cache test that I added in [5703]. Iterators cannot be pickled either. Left the rest of [5703] there though since it fixed another issue that was causing the `test_data_types` cache test to fail with the `locmem` cache backend, the fact that functions cannot be copied. ........ r5717 | gwilson | 2007-07-16 13:28:13 +0800 (Mon, 16 Jul 2007) | 2 lines Cleaned up a couple unused imports and fixed docstrings to follow Python Style Guide. ........ r5718 | mtredinnick | 2007-07-16 17:36:10 +0800 (Mon, 16 Jul 2007) | 3 lines Fixed #4845 -- Fixed some problems with Unicode usage and caching. Thanks, Jeremy Dunck. ........ r5719 | gwilson | 2007-07-16 21:47:43 +0800 (Mon, 16 Jul 2007) | 2 lines Removed unused variable and changed comments about `permalink` decorator into a docstring. ........ r5720 | gwilson | 2007-07-17 06:29:09 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4851 -- Fixed description of an example query in `db-api` docs. ........ r5721 | mtredinnick | 2007-07-17 12:22:11 +0800 (Tue, 17 Jul 2007) | 2 lines Fixed #4898 -- Fixed a precendence problem when constructing HTTP Date header. ........ r5722 | mtredinnick | 2007-07-17 18:25:43 +0800 (Tue, 17 Jul 2007) | 3 lines Fixed #4899 -- Fixed a problem with PO file header generation caused by [5708]. Thanks, Ramiro Morales. ........ r5723 | mtredinnick | 2007-07-19 17:23:45 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #4917 -- Updated Swedish translation. Thanks, Pilip Lindborg. ........ r5724 | mtredinnick | 2007-07-19 17:24:36 +0800 (Thu, 19 Jul 2007) | 2 lines Fixed #3925 -- Added Slovak localflavor items. Thanks, Martin Kos?\195?\173r. ........ r5725 | adrian | 2007-07-20 14:28:56 +0800 (Fri, 20 Jul 2007) | 1 line Added a db_type() method to the database Field class. This is a hook for calculating the database column type for a given Field. Also converted all management.py CREATE TABLE statements to use db_type(), which made that code cleaner. The Field.get_internal_type() hook still exists, but we should consider removing it at some point, because db_type() is more general. Also added docs -- the beginnings of docs on how to create custom database Field classes. This is backwards-compatible. ........ r5726 | adrian | 2007-07-20 14:34:26 +0800 (Fri, 20 Jul 2007) | 1 line Simplified the indent level in management.py _get_sql_model_create() by using a 'continue' statement rather than nesting everything in an 'if' ........ r5727 | russellm | 2007-07-20 20:07:58 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4558 -- Modified XML serializer to handle whitespace better around None tags. Thanks to Bill Fenner for the report and fix. ........ r5728 | russellm | 2007-07-20 20:15:02 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4897 -- Fixed minor typo in doctest comment. ........ r5729 | russellm | 2007-07-20 21:57:49 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #3782 -- Added support for the suite() method recommended by the Python unittest docs. Thanks for the suggestion, rene.puls@repro-mayr.de. ........ r5730 | russellm | 2007-07-20 22:07:54 +0800 (Fri, 20 Jul 2007) | 2 lines Refs #3782 -- Added documentation note that suite() handling is only in development version. ........ r5731 | russellm | 2007-07-20 22:32:20 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4901 -- Modified assertContains to provide a default check of 'any instances of text in content'. Thanks for the suggestion, nis@superlativ.dk. ........ r5732 | russellm | 2007-07-20 22:42:57 +0800 (Fri, 20 Jul 2007) | 2 lines Fixed #4738 -- Modified the prompt that is displayed when a test database cannot be created. The existing prompt was misleading if the issue wasn't a pre-existing database. Thanks for the suggestion, John Shaffer . ........ r5733 | adrian | 2007-07-20 23:40:54 +0800 (Fri, 20 Jul 2007) | 1 line Fixed negligible typo in docstring in tests/regressiontests/test_client_regress/models.py from [5731] ........ r5736 | adrian | 2007-07-21 05:24:30 +0800 (Sat, 21 Jul 2007) | 1 line Added some additional docs to docs/model-api.txt db_type() section ........ r5738 | russellm | 2007-07-21 11:30:38 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4304 -- Modified sys.exit to os._exit to make sure development server quits when an error occurs attempting to bind to the requested port (e.g., if another server is already running). Thanks, Mario Gonzalez . ........ r5739 | russellm | 2007-07-21 12:36:28 +0800 (Sat, 21 Jul 2007) | 2 lines Minor fix to allow for count=0 in assertContains. ........ r5740 | russellm | 2007-07-21 13:15:19 +0800 (Sat, 21 Jul 2007) | 2 lines Added test cases for change [5739]. ........ r5741 | russellm | 2007-07-21 13:17:20 +0800 (Sat, 21 Jul 2007) | 2 lines Fixed #4402 -- Modified test client to allow multi-valued inputs on GET requests. Thanks for the suggestion, eddymul@gmail.com. ........ r5743 | gwilson | 2007-07-22 10:18:36 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4945 -- Removed unused `GET_ITERATOR_CHUNK_SIZE` definition from manager.py. `GET_ITERATOR_CHUNK_SIZE` is already defined in query.py. Thanks zigiDev@mac.com. ........ r5744 | gwilson | 2007-07-22 11:09:24 +0800 (Sun, 22 Jul 2007) | 2 lines Added docstrings to shortcuts module and functions. ........ r5745 | gwilson | 2007-07-22 11:12:50 +0800 (Sun, 22 Jul 2007) | 2 lines Shortcut functions do not accept `QuerySet` objects, yet :) ........ r5746 | gwilson | 2007-07-22 11:41:11 +0800 (Sun, 22 Jul 2007) | 2 lines Fixed #4373 -- Modified the get_object_or_404/get_list_or_404 shortcuts to also accept `QuerySet`s. Thanks SuperJared. ........ r5747 | gwilson | 2007-07-22 11:45:03 +0800 (Sun, 22 Jul 2007) | 2 lines Corrected typo in [5746]. ........ r5750 | gwilson | 2007-07-23 12:45:01 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #4952 -- Fixed the `get_template_sources` functions of the `app_directories` and `filesystem` template loaders to not return paths outside of given template directories. Both functions now make use of a new `safe_join` utility function. Thanks to SmileyChris for help with the patch. ........ r5752 | russellm | 2007-07-23 20:14:32 +0800 (Mon, 23 Jul 2007) | 2 lines Fixed #3771 -- Modified the test runner to observe the --noinput argument controlling script interactivity. This means that test scripts can now be put in a buildbot environment. This is a backwards incompatible change for anyone that has written a custom test runner. Thanks for the suggestion, moof@metamoof.net. ........ r5753 | russellm | 2007-07-23 21:52:59 +0800 (Mon, 23 Jul 2007) | 2 lines Added documentation for a test runner argument that has always been present, but was undocumented. ........ r5756 | adrian | 2007-07-25 11:12:31 +0800 (Wed, 25 Jul 2007) | 1 line Changed docstring additions from [5744] to use active verbs ('returns' instead of 'return') ........ r5757 | adrian | 2007-07-25 11:15:05 +0800 (Wed, 25 Jul 2007) | 1 line Added 'New in Django development version' to docs/db-api.txt change from [5746] ........ r5758 | adrian | 2007-07-25 11:18:17 +0800 (Wed, 25 Jul 2007) | 1 line Changed safe_join() docstring from [5750] to use active verbs. See also [5756] ........ r5764 | gwilson | 2007-07-26 13:01:53 +0800 (Thu, 26 Jul 2007) | 2 lines Fixed #4971 -- Fixed some escaping and quoting problems in the databrowse contrib app. Based on patch from Johann Queuniet. ........ r5765 | adrian | 2007-07-27 01:16:34 +0800 (Fri, 27 Jul 2007) | 1 line Added section to docs/contributing.txt about docstring coding style ........ r5766 | mtredinnick | 2007-07-27 06:59:34 +0800 (Fri, 27 Jul 2007) | 2 lines Added support for database cache table in test database. ........ r5767 | adrian | 2007-07-28 05:53:02 +0800 (Sat, 28 Jul 2007) | 1 line Added unit test that confirms a bug in ValuesQuerySets that have extra(select) specified. If the select dictionary has several fields, Django assigns the wrong values to the select-field names ........ r5768 | adrian | 2007-07-28 06:07:42 +0800 (Sat, 28 Jul 2007) | 1 line Fixed bug with using values() and extra(select) in the same QuerySet, with a select dictionary containing more than a few elements. This bug was identified in unit test from [5767]. The problem was that we were relying on the dictionary's .items() ordering, which is undefined ........ r5769 | russellm | 2007-07-28 12:02:52 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4460 -- Added the ability to be more specific in the test cases that are executed. This is a backwards incompatible change for any user with a custom test runner. See the wiki for details. ........ r5770 | russellm | 2007-07-28 15:27:53 +0800 (Sat, 28 Jul 2007) | 2 lines Fixed #4995 -- Fixed some problems in documentation ReST formatting. Thanks, Simon G. ........ r5771 | simon | 2007-07-29 02:30:40 +0800 (Sun, 29 Jul 2007) | 1 line After discussing with Malcolm, added set_unusable_password() and has_usable_password() methods to the User object, plus tests and updated documentation ........ r5774 | adrian | 2007-07-30 02:21:16 +0800 (Mon, 30 Jul 2007) | 1 line Added 'New in Django development version' to changes in docs/authentication.txt from [5771] ........ r5778 | gwilson | 2007-07-31 01:25:35 +0800 (Tue, 31 Jul 2007) | 4 lines Fixed call to `ugettext`, which is imported as `_`. Changed raise to conform to PEP 3109 and wrapped the long line. Added beginnings of tests for model fields. ........ r5782 | gwilson | 2007-08-01 13:41:32 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #4228 -- Removed hardcoding of `RadioFieldRenderer` in the `RadioSelect` Widget so that the display of `RadioSelect`s can be more easily customized. `BoundField.__unicode__` also no longer special cases `RadioSelect` since `RadioSelect.render()` now returns a string like every other Widget. ........ r5783 | gwilson | 2007-08-01 13:52:18 +0800 (Wed, 01 Aug 2007) | 2 lines Fixed #5037 -- Fixed use of wrong field type in a db-api docs example, thanks ubernostrum. ........ r5796 | gwilson | 2007-08-04 11:19:14 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5078 -- Fixed several broken links to the syndication documentation. ........ r5797 | gwilson | 2007-08-04 11:36:58 +0800 (Sat, 04 Aug 2007) | 2 lines Changed the 0.95 release notes to point to the 0.95 documentation index. ........ r5798 | gwilson | 2007-08-04 11:39:24 +0800 (Sat, 04 Aug 2007) | 2 lines Changed several documentation links to be relative. ........ r5799 | gwilson | 2007-08-04 22:41:49 +0800 (Sat, 04 Aug 2007) | 2 lines Refs #3397 -- Corrected the Exception that is caught when ordering by non-fields (added in [4596]), thanks glin@seznam.cz. ........ r5800 | gwilson | 2007-08-04 22:52:13 +0800 (Sat, 04 Aug 2007) | 2 lines Fixed #5083 -- Fixed typo in newforms documentation, thanks Rik. ........ r5801 | gwilson | 2007-08-05 12:39:52 +0800 (Sun, 05 Aug 2007) | 2 lines Refs #5089 -- Added file name to poll detail template examples in the tutorial. ........ r5802 | gwilson | 2007-08-05 12:42:26 +0800 (Sun, 05 Aug 2007) | 2 lines Changed some more links to be relative in the documentation. I had a couple unsaved files that didn't get in with [5798]. ........ r5803 | gwilson | 2007-08-05 13:14:46 +0800 (Sun, 05 Aug 2007) | 2 lines Fixed #2101 -- Renamed `maxlength` argument to `max_length` for oldforms `FormField`s and db model `Field`s. This is fully backwards compatible at the moment since the legacy `maxlength` argument is still supported. Using `maxlength` will, however, issue a `PendingDeprecationWarning` when used. ........ r5804 | russellm | 2007-08-05 15:39:36 +0800 (Sun, 05 Aug 2007) | 2 lines Fixed #4001 -- Added dynamic save_m2m method() to forms created with form_for_model and form_for_instance on save(commit=False). ........ r5807 | adrian | 2007-08-06 12:36:43 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5074 -- Added link to audio clip of 'Django' pronunciation ........ r5808 | adrian | 2007-08-06 12:52:14 +0800 (Mon, 06 Aug 2007) | 1 line Edited docs/newforms.txt changes from [5804] ........ r5809 | adrian | 2007-08-06 13:04:27 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5082 -- Enabled tab completion in 'django-admin.py shell' for objects that were imported into the global namespace at runtime. Thanks, dusk@woofle.net ........ r5810 | adrian | 2007-08-06 13:06:15 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5077 -- django/utils/encoding.py no longer imports settings, as it doesn't use that module. Thanks, Collin Grady ........ r5811 | adrian | 2007-08-06 13:07:38 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5071 -- Fixed 'global name ugettext is not defined' error in django.core.validators. Thanks, Marco Bonetti ........ r5812 | adrian | 2007-08-06 13:13:06 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5064 -- Fixed potentially confusing sentence in docs/authentication.txt. Thanks, Collin Grady ........ r5813 | adrian | 2007-08-06 13:16:35 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5053 -- Added 'action' attribute to
tags that didn't have that attribute in docs/newforms.txt examples. Perfectionism appreciated, trickyb ........ r5814 | adrian | 2007-08-06 13:27:58 +0800 (Mon, 06 Aug 2007) | 1 line Added a closing

' to a code example in docs/email.txt ........ r5815 | adrian | 2007-08-06 13:28:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #5006 -- Fixed incorrect/outdated docstring for the 'if' template tag. Thanks, Thomas Petazzoni ........ r5816 | adrian | 2007-08-06 13:33:18 +0800 (Mon, 06 Aug 2007) | 1 line Added note to docs/model-api.txt about help_text not being escaped in the admin interface ........ r5817 | adrian | 2007-08-06 13:34:45 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4985 -- Clarified location of HttpResponse in docs/request_response.txt. Thanks for raising the issue, rainer.mansfeld@romulo.de ........ r5818 | adrian | 2007-08-06 13:37:17 +0800 (Mon, 06 Aug 2007) | 1 line Fixed #4980 -- Removed 'forms' from the 'not considered stable and will be rewritten' section of docs/api_stability.txt. They've already been rewritten. ........ r5819 | russellm | 2007-08-06 21:58:56 +0800 (Mon, 06 Aug 2007) | 2 lines Fixed #3297 -- Implemented FileField and ImageField for newforms. Thanks to the many users that contributed to and tested this patch. ........ r5820 | russellm | 2007-08-06 22:17:10 +0800 (Mon, 06 Aug 2007) | 2 lines Added note that FileField and ImageField are only in development version. There are also some minor backwards compatibility issues with the changes introduced in [5819] - see the wiki for details. ........ r5823 | adrian | 2007-08-07 04:27:04 +0800 (Tue, 07 Aug 2007) | 1 line Fixed British spelling of 'customize' and 'behavior' in Manager.get_query_set() docstring ........ r5824 | adrian | 2007-08-07 10:18:36 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5105 -- Fixed two ReST errors in docs/newforms.txt. Thanks, Ramiro Morales ........ r5825 | adrian | 2007-08-07 10:33:11 +0800 (Tue, 07 Aug 2007) | 1 line Fixed #5097 -- Made various updates and corrections to the documentation. Thanks, Nicola Larosa ........ r5826 | russellm | 2007-08-07 19:20:15 +0800 (Tue, 07 Aug 2007) | 2 lines Removed a redundant directory join during FileField form saving. Thanks to David Danier's eagle eyes for picking up this one. ........ git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5828 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 19 +- django/bin/make-messages.py | 12 +- django/conf/__init__.py | 2 + django/conf/global_settings.py | 1 - django/conf/locale/de/LC_MESSAGES/djangojs.mo | Bin 1569 -> 1571 bytes django/conf/locale/de/LC_MESSAGES/djangojs.po | 16 +- django/conf/locale/es/LC_MESSAGES/django.mo | Bin 47156 -> 49337 bytes django/conf/locale/es/LC_MESSAGES/django.po | 3625 ++++++------ django/conf/locale/es/LC_MESSAGES/djangojs.mo | Bin 1427 -> 1561 bytes django/conf/locale/es/LC_MESSAGES/djangojs.po | 83 +- .../conf/locale/es_AR/LC_MESSAGES/django.mo | Bin 44251 -> 49719 bytes .../conf/locale/es_AR/LC_MESSAGES/django.po | 5241 +++++++++-------- .../conf/locale/es_AR/LC_MESSAGES/djangojs.mo | Bin 1576 -> 1633 bytes .../conf/locale/es_AR/LC_MESSAGES/djangojs.po | 22 +- django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 46214 -> 49591 bytes django/conf/locale/fr/LC_MESSAGES/django.po | 1087 ++-- django/conf/locale/fr/LC_MESSAGES/djangojs.mo | Bin 1533 -> 1533 bytes django/conf/locale/fr/LC_MESSAGES/djangojs.po | 14 +- django/conf/locale/sv/LC_MESSAGES/django.mo | Bin 45632 -> 47968 bytes django/conf/locale/sv/LC_MESSAGES/django.po | 1637 ++--- .../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 30798 -> 41991 bytes .../conf/locale/zh_CN/LC_MESSAGES/django.po | 3738 +++++++----- django/conf/project_template/settings.py | 1 - .../media/js/admin/RelatedObjectLookups.js | 9 +- django/contrib/admin/media/js/urlify.js | 12 +- django/contrib/admin/models.py | 2 +- .../contrib/admin/templatetags/admin_list.py | 6 +- django/contrib/admin/views/main.py | 2 +- django/contrib/auth/__init__.py | 2 + django/contrib/auth/forms.py | 20 +- django/contrib/auth/models.py | 33 +- django/contrib/auth/tests.py | 19 + django/contrib/comments/models.py | 8 +- .../contrib/comments/templatetags/comments.py | 2 + django/contrib/comments/views/comments.py | 6 +- django/contrib/contenttypes/models.py | 6 +- .../databrowse/plugins/fieldchoices.py | 3 +- .../templates/databrowse/calendar_day.html | 2 +- .../templates/databrowse/calendar_month.html | 2 +- .../templates/databrowse/choice_detail.html | 2 +- .../templates/databrowse/choice_list.html | 2 +- .../templates/databrowse/homepage.html | 2 +- .../templates/databrowse/model_detail.html | 2 +- .../templates/databrowse/object_detail.html | 10 +- django/contrib/flatpages/models.py | 6 +- django/contrib/localflavor/cl/cl_regions.py | 25 + django/contrib/localflavor/cl/forms.py | 12 +- django/contrib/localflavor/no/forms.py | 3 +- django/contrib/localflavor/sk/__init__.py | 0 django/contrib/localflavor/sk/forms.py | 41 + django/contrib/localflavor/sk/sk_districts.py | 87 + django/contrib/localflavor/sk/sk_regions.py | 16 + django/contrib/redirects/models.py | 4 +- django/contrib/sessions/middleware.py | 10 +- django/contrib/sessions/models.py | 2 +- django/contrib/sites/models.py | 28 +- django/contrib/syndication/feeds.py | 20 +- django/contrib/syndication/views.py | 2 +- django/core/cache/backends/filebased.py | 5 +- django/core/cache/backends/locmem.py | 17 +- django/core/cache/backends/memcached.py | 16 +- django/core/handlers/modpython.py | 3 +- django/core/handlers/wsgi.py | 3 +- django/core/management.py | 156 +- django/core/serializers/base.py | 7 +- django/core/serializers/xml_serializer.py | 4 +- django/core/servers/basehttp.py | 10 +- django/core/urlresolvers.py | 53 +- django/core/validators.py | 23 +- django/db/backends/ado_mssql/creation.py | 7 +- django/db/backends/mysql/creation.py | 7 +- django/db/backends/mysql_old/creation.py | 7 +- django/db/backends/oracle/creation.py | 5 +- django/db/backends/postgresql/creation.py | 7 +- .../postgresql_psycopg2/introspection.py | 7 +- django/db/backends/sqlite3/creation.py | 7 +- django/db/backends/sqlite3/introspection.py | 2 +- django/db/models/__init__.py | 14 +- django/db/models/base.py | 8 +- django/db/models/fields/__init__.py | 77 +- django/db/models/fields/related.py | 30 +- django/db/models/manager.py | 6 +- django/db/models/query.py | 26 +- django/http/__init__.py | 7 +- django/middleware/common.py | 2 +- django/middleware/http.py | 5 +- django/newforms/extras/widgets.py | 2 +- django/newforms/fields.py | 103 +- django/newforms/forms.py | 36 +- django/newforms/models.py | 22 +- django/newforms/widgets.py | 52 +- django/oldforms/__init__.py | 120 +- django/shortcuts/__init__.py | 60 +- django/template/__init__.py | 4 +- django/template/defaultfilters.py | 2 +- django/template/defaulttags.py | 33 +- django/template/loaders/app_directories.py | 19 +- django/template/loaders/filesystem.py | 12 +- django/test/client.py | 7 +- django/test/simple.py | 129 +- django/test/testcases.py | 14 +- django/test/utils.py | 6 +- django/utils/_os.py | 23 + django/utils/cache.py | 17 +- django/utils/dateformat.py | 2 +- django/utils/decorators.py | 7 +- django/utils/encoding.py | 1 - django/utils/feedgenerator.py | 5 +- django/utils/functional.py | 12 +- django/utils/html.py | 45 +- django/utils/http.py | 7 +- django/utils/maxlength.py | 67 + django/utils/timesince.py | 6 +- docs/add_ons.txt | 2 +- docs/api_stability.txt | 5 +- docs/authentication.txt | 26 +- docs/cache.txt | 2 +- docs/contributing.txt | 44 +- docs/databases.txt | 2 +- docs/db-api.txt | 107 +- docs/distributions.txt | 24 +- docs/django-admin.txt | 13 + docs/email.txt | 2 +- docs/faq.txt | 3 + docs/fastcgi.txt | 2 +- docs/forms.txt | 10 +- docs/i18n.txt | 2 +- docs/install.txt | 28 +- docs/middleware.txt | 8 + docs/model-api.txt | 245 +- docs/modpython.txt | 4 +- docs/newforms.txt | 158 +- docs/overview.txt | 24 +- docs/release_notes_0.95.txt | 2 +- docs/request_response.txt | 2 +- docs/sitemaps.txt | 2 +- docs/sites.txt | 28 +- docs/static_files.txt | 8 +- docs/syndication_feeds.txt | 50 +- docs/templates.txt | 101 +- docs/templates_python.txt | 4 +- docs/testing.txt | 74 +- docs/tutorial01.txt | 50 +- docs/tutorial02.txt | 8 +- docs/tutorial03.txt | 5 +- docs/tutorial04.txt | 21 +- docs/url_dispatch.txt | 8 +- tests/modeltests/basic/models.py | 2 +- tests/modeltests/choices/models.py | 4 +- tests/modeltests/custom_columns/models.py | 6 +- tests/modeltests/custom_managers/models.py | 10 +- tests/modeltests/custom_methods/models.py | 2 +- tests/modeltests/custom_pk/models.py | 8 +- tests/modeltests/field_defaults/models.py | 2 +- tests/modeltests/fixtures/models.py | 2 +- tests/modeltests/generic_relations/models.py | 8 +- tests/modeltests/get_latest/models.py | 4 +- tests/modeltests/get_object_or_404/models.py | 31 +- tests/modeltests/get_or_create/models.py | 4 +- tests/modeltests/invalid_models/models.py | 46 +- tests/modeltests/lookup/models.py | 24 +- tests/modeltests/m2m_and_m2o/models.py | 2 +- tests/modeltests/m2m_intermediary/models.py | 8 +- tests/modeltests/m2m_multiple/models.py | 4 +- tests/modeltests/m2m_recursive/models.py | 2 +- tests/modeltests/m2o_recursive/models.py | 2 +- tests/modeltests/m2o_recursive2/models.py | 2 +- tests/modeltests/manipulators/models.py | 8 +- tests/modeltests/many_to_many/models.py | 4 +- tests/modeltests/many_to_one/models.py | 6 +- tests/modeltests/many_to_one_null/models.py | 4 +- tests/modeltests/model_forms/models.py | 32 +- tests/modeltests/model_inheritance/models.py | 4 +- .../modeltests/mutually_referential/models.py | 4 +- tests/modeltests/one_to_one/models.py | 12 +- tests/modeltests/or_lookups/models.py | 2 +- tests/modeltests/ordering/models.py | 2 +- tests/modeltests/pagination/models.py | 2 +- tests/modeltests/properties/models.py | 4 +- tests/modeltests/reserved_names/models.py | 16 +- tests/modeltests/reverse_lookup/models.py | 6 +- tests/modeltests/save_delete_hooks/models.py | 4 +- tests/modeltests/select_related/models.py | 16 +- tests/modeltests/serializers/models.py | 6 +- tests/modeltests/str/models.py | 7 +- .../test_client/fixtures/testdata.json | 18 + tests/modeltests/test_client/models.py | 18 + tests/modeltests/test_client/tests.py | 20 + tests/modeltests/test_client/views.py | 3 +- tests/modeltests/transactions/models.py | 4 +- tests/modeltests/validation/models.py | 2 +- tests/regressiontests/bug639/models.py | 2 +- tests/regressiontests/cache/tests.py | 41 +- tests/regressiontests/datatypes/models.py | 2 +- .../fixtures_regress/fixtures/pretty.xml | 11 + .../fixtures_regress/models.py | 23 +- tests/regressiontests/forms/localflavor.py | 49 +- tests/regressiontests/forms/tests.py | 129 +- .../initial_sql_regress/models.py | 2 +- .../invalid_admin_options/models.py | 72 +- .../many_to_one_regress/models.py | 6 +- tests/regressiontests/maxlength/__init__.py | 0 tests/regressiontests/maxlength/models.py | 0 tests/regressiontests/maxlength/tests.py | 160 + .../regressiontests/model_fields/__init__.py | 0 tests/regressiontests/model_fields/models.py | 0 tests/regressiontests/model_fields/tests.py | 18 + tests/regressiontests/model_regress/models.py | 2 +- tests/regressiontests/null_queries/models.py | 4 +- .../one_to_one_regress/models.py | 6 +- .../serializers_regress/models.py | 37 +- .../serializers_regress/tests.py | 28 +- tests/regressiontests/string_lookup/models.py | 12 +- tests/regressiontests/templates/tests.py | 53 +- tests/regressiontests/templates/urls.py | 4 +- .../test_client_regress/models.py | 41 + .../test_client_regress/views.py | 2 +- tests/regressiontests/utils/__init__.py | 0 tests/regressiontests/utils/models.py | 1 + tests/regressiontests/utils/tests.py | 115 + tests/runtests.py | 13 +- 221 files changed, 11278 insertions(+), 8246 deletions(-) create mode 100644 django/contrib/auth/tests.py create mode 100644 django/contrib/localflavor/cl/cl_regions.py create mode 100644 django/contrib/localflavor/sk/__init__.py create mode 100644 django/contrib/localflavor/sk/forms.py create mode 100644 django/contrib/localflavor/sk/sk_districts.py create mode 100644 django/contrib/localflavor/sk/sk_regions.py create mode 100644 django/utils/_os.py create mode 100644 django/utils/maxlength.py create mode 100644 tests/modeltests/test_client/tests.py create mode 100644 tests/regressiontests/fixtures_regress/fixtures/pretty.xml create mode 100644 tests/regressiontests/maxlength/__init__.py create mode 100644 tests/regressiontests/maxlength/models.py create mode 100644 tests/regressiontests/maxlength/tests.py create mode 100644 tests/regressiontests/model_fields/__init__.py create mode 100644 tests/regressiontests/model_fields/models.py create mode 100644 tests/regressiontests/model_fields/tests.py create mode 100644 tests/regressiontests/utils/__init__.py create mode 100644 tests/regressiontests/utils/models.py create mode 100644 tests/regressiontests/utils/tests.py diff --git a/AUTHORS b/AUTHORS index 6758ac29f2..d2c799ad3e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -57,10 +57,12 @@ answer newbie questions, and generally made Django that much better: Ned Batchelder Shannon -jj Behrens Esdras Beleza + Chris Bennett James Bennett Ben Paul Bissex Simon Blanchard + Matt Boersma boobsd@gmail.com Andrew Brehaut brut.alll@gmail.com @@ -94,10 +96,12 @@ answer newbie questions, and generally made Django that much better: Maximillian Dornseif Jeremy Dunck Andrew Durdin + dusk@woofle.net Andy Dustman Clint Ecker enlight Enrico + A. Murat Eren Ludvig Ericson Dirk Eschler Marc Fargas @@ -114,7 +118,7 @@ answer newbie questions, and generally made Django that much better: glin@seznam.cz martin.glueck@gmail.com GomoX - Mario Gonzalez + Mario Gonzalez Simon Greenhill Owen Griffiths Espen Grindhaug @@ -141,7 +145,8 @@ answer newbie questions, and generally made Django that much better: junzhang.jn@gmail.com Antti Kaihola Ben Dean Kawamura - ian.g.kelly@gmail.com + Ian G. Kelly + Ben Khoo Garth Kidd kilian Sune Kirkeby @@ -153,6 +158,7 @@ answer newbie questions, and generally made Django that much better: Martin Kosír Meir Kriheli Bruce Kroeze + krzysiek.pawlik@silvermedia.pl Joseph Kocherhans konrad@gwu.edu kurtiss@meetro.com @@ -167,13 +173,14 @@ answer newbie questions, and generally made Django that much better: lerouxb@gmail.com Waylan Limberg limodou + Philip Lindborg Matt McClanahan Martin Maney masonsimon+django@gmail.com Manuzhai Petar Marić Nuno Mariz - marijn@metronomo.cl + Marijn Vriens mark@junklight.com Yasushi Masuda mattycakes@gmail.com @@ -183,6 +190,7 @@ answer newbie questions, and generally made Django that much better: mikko@sorl.net mitakummaa@gmail.com mmarshall + Andreas Mock Reza Mohammadi Eric Moritz mrmachine @@ -207,6 +215,7 @@ answer newbie questions, and generally made Django that much better: plisk Daniel Poelzleithner polpak@yahoo.com + Johann Queuniet J. Rademaker Michael Radziej Ramiro Morales @@ -216,12 +225,14 @@ answer newbie questions, and generally made Django that much better: rhettg@gmail.com Henrique Romano Armin Ronacher + Brian Rosner Oliver Rutherfurd Ivan Sagalaev (Maniac) Vinay Sajip David Schein scott@staplefish.com serbaut@gmail.com + John Shaffer Pete Shinners Jozko Skrablin SmileyChris @@ -232,6 +243,8 @@ answer newbie questions, and generally made Django that much better: Vasiliy Stavenko Thomas Steinacher nowell strite + Sundance + SuperJared Radek Švarz Swaroop C H Aaron Swartz diff --git a/django/bin/make-messages.py b/django/bin/make-messages.py index 3e5acb70cb..e824611ca3 100755 --- a/django/bin/make-messages.py +++ b/django/bin/make-messages.py @@ -9,6 +9,7 @@ import re import os import sys import getopt +from itertools import dropwhile pythonize_re = re.compile(r'\n\s*//') @@ -103,8 +104,8 @@ def make_messages(): open(os.path.join(dirpath, '%s.py' % file), "wb").write(templatize(src)) thefile = '%s.py' % file if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) - cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( - os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) + cmd = 'xgettext -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( + domain, os.path.join(dirpath, thefile)) (stdin, stdout, stderr) = os.popen3(cmd, 'b') msgs = stdout.read() errors = stderr.read() @@ -116,13 +117,18 @@ def make_messages(): old = '#: '+os.path.join(dirpath, thefile)[2:] new = '#: '+os.path.join(dirpath, file)[2:] msgs = msgs.replace(old, new) + if os.path.exists(potfile): + # Strip the header + msgs = '\n'.join(dropwhile(len, msgs.split('\n'))) + else: + msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8') if msgs: open(potfile, 'ab').write(msgs) if thefile != file: os.unlink(os.path.join(dirpath, thefile)) if os.path.exists(potfile): - (stdin, stdout, stderr) = os.popen3('msguniq "%s"' % potfile, 'b') + (stdin, stdout, stderr) = os.popen3('msguniq --to-code=utf-8 "%s"' % potfile, 'b') msgs = stdout.read() errors = stderr.read() if errors: diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 021ecc8131..f28da2d764 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -37,6 +37,8 @@ class LazySettings(object): # __setattr__(), which would be an infinite loop. self.__dict__['_target'] = value else: + if self._target is None: + self._import_settings() setattr(self._target, name, value) def _import_settings(self): diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 2a7df569fb..33f7aebb6b 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -30,7 +30,6 @@ TIME_ZONE = 'America/Chicago' # Language code for this installation. All choices can be found here: # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes -# http://blogs.law.harvard.edu/tech/stories/storyReader$15 LANGUAGE_CODE = 'en-us' # Languages we provide translations for, out of the box. The language name diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.mo b/django/conf/locale/de/LC_MESSAGES/djangojs.mo index 9f39c16444ba716738690d4f46f7261636da4712..896847bb993eca04f09f40785492b05cdd3f454e 100644 GIT binary patch delta 282 zcmZ3;vzTYXoq9z^28K3f1_o9J28I90_l6=(?1CkX8WFD}XfEVjyh|F-dQ4QL3^Clwy1L+Gu8i*KpfVx2j2muL@LnJrPWPHKIm06sxYhht(scSg7 zjYW^^PkL$|Ls)82+Mme>SoGwdWaI$(j-|!vspUX+NveWsF@s}HPHM42Vp92&$pWm( Rj87(;vX(LanY@;@3;;jkFu4E# diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.po b/django/conf/locale/de/LC_MESSAGES/djangojs.po index 3c0852ebac..936dcb454f 100644 --- a/django/conf/locale/de/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/de/LC_MESSAGES/djangojs.po @@ -11,21 +11,21 @@ msgstr "" "PO-Revision-Date: 2005-12-04 13:21+0100\n" "Last-Translator: Dirk Eschler \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format msgid "Available %s" -msgstr "Verfgbare %s" +msgstr "Verfügbare %s" #: contrib/admin/media/js/SelectFilter2.js:41 msgid "Choose all" -msgstr "Alles auswhlen" +msgstr "Alles auswählen" #: contrib/admin/media/js/SelectFilter2.js:46 msgid "Add" -msgstr "Hinzufgen" +msgstr "Hinzufügen" #: contrib/admin/media/js/SelectFilter2.js:48 msgid "Remove" @@ -34,15 +34,15 @@ msgstr "Entfernen" #: contrib/admin/media/js/SelectFilter2.js:53 #, perl-format msgid "Chosen %s" -msgstr "Ausgewhlte %s" +msgstr "Ausgewählte %s" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " -msgstr "Gewnschte Auswahl treffen und " +msgstr "Gewünschte Auswahl treffen und " #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" -msgstr "Alles abwhlen" +msgstr "Alles abwählen" #: contrib/admin/media/js/dateparse.js:26 #: contrib/admin/media/js/calendar.js:24 @@ -50,7 +50,7 @@ msgid "" "January February March April May June July August September October November " "December" msgstr "" -"Januar Februar Mrz April Mai Juni Juli August September Oktober November " +"Januar Februar März April Mai Juni Juli August September Oktober November " "Dezember" #: contrib/admin/media/js/dateparse.js:27 diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index d1c1edab1e2c030f9babe32708b0ca1ca4674f55..4b8254b95aa46375506ede0cb98821452f236c3f 100644 GIT binary patch delta 19356 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 diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index ea15352d4d..4dcc433098 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -6,735 +6,1698 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-06-29 10:15-0400\n" -"PO-Revision-Date: 2007-02-24 18:02-0600\n" +"POT-Creation-Date: 2007-07-14 13:46-0500\n" +"PO-Revision-Date: 2007-07-14 13:00-0500\n" "Last-Translator: Mario Gonzalez \n" "Language-Team: Castellano \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: oldforms/__init__.py:357 db/models/fields/__init__.py:126 -#: db/models/fields/__init__.py:283 db/models/fields/__init__.py:680 -#: db/models/fields/__init__.py:691 newforms/models.py:185 -#: newforms/fields.py:87 newforms/fields.py:444 newforms/fields.py:522 -#: newforms/fields.py:533 -msgid "This field is required." -msgstr "Este campo es obligatorio." - -#: oldforms/__init__.py:392 -#, python-format -msgid "Ensure your text is less than %s character." -msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "Asegrese de que su texto tiene menos de %s carcter." -msgstr[1] "Asegrese de que su texto tiene menos de %s caracteres." - -#: oldforms/__init__.py:397 -msgid "Line breaks are not allowed here." -msgstr "No se permiten saltos de lnea." - -#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610 -#, python-format -msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "Escoja una opcin vlida; '%(data)s' no est en %(choices)s." - -#: oldforms/__init__.py:577 newforms/widgets.py:181 -#: contrib/admin/filterspecs.py:150 -msgid "Unknown" -msgstr "Desconocido" - -#: oldforms/__init__.py:577 newforms/widgets.py:181 -#: contrib/admin/filterspecs.py:143 -msgid "Yes" -msgstr "S" - -#: oldforms/__init__.py:577 newforms/widgets.py:181 -#: contrib/admin/filterspecs.py:143 -msgid "No" -msgstr "No" - -#: oldforms/__init__.py:672 core/validators.py:175 core/validators.py:453 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "" -"No se ha enviado ningn fichero. Compruebe el tipo de codificacin en el " -"formulario." - -#: oldforms/__init__.py:674 -msgid "The submitted file is empty." -msgstr "El fichero enviado est vaco." - -#: oldforms/__init__.py:730 -msgid "Enter a whole number between -32,768 and 32,767." -msgstr "Introduzca un nmero entero entre -32,768 y 32,767." - -#: oldforms/__init__.py:740 -msgid "Enter a positive number." -msgstr "Introduzca un nmero positivo." - -#: oldforms/__init__.py:750 -msgid "Enter a whole number between 0 and 32,767." -msgstr "Introduzca un nmero entero entre 0 y 32,767." - -#: db/models/manipulators.py:307 +#: db/models/manipulators.py:309 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "%(object)s de este %(type)s ya existen en este %(field)s." -#: db/models/manipulators.py:308 contrib/admin/views/main.py:340 -#: contrib/admin/views/main.py:342 contrib/admin/views/main.py:344 +#: db/models/manipulators.py:310 contrib/admin/views/main.py:342 +#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346 msgid "and" msgstr "y" -#: db/models/fields/__init__.py:46 -#, python-format -msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "Ya existe %(optname)s con este %(fieldname)s." - -#: db/models/fields/__init__.py:378 -msgid "This value must be an integer." -msgstr "Este valor debe ser un entero." - -#: db/models/fields/__init__.py:413 -msgid "This value must be either True or False." -msgstr "Este valor debe ser Verdadero o Falso." - -#: db/models/fields/__init__.py:434 -msgid "This field cannot be null." -msgstr "Este campo no puede estar vaco." - -#: db/models/fields/__init__.py:468 core/validators.py:149 -msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "Introduzca una fecha vlida en formato AAAA-MM-DD." - -#: db/models/fields/__init__.py:537 core/validators.py:158 -msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -msgstr "Introduzca una fecha/hora vlida en formato AAAA-MM-DD HH:MM." - -#: db/models/fields/__init__.py:597 -msgid "This value must be a decimal number." -msgstr "Este valor debe ser un entero." - -#: db/models/fields/__init__.py:700 -msgid "Enter a valid filename." -msgstr "Introduzca un nombre de fichero vlido" - -#: db/models/fields/__init__.py:825 -msgid "This value must be either None, True or False." -msgstr "Este valor debe ser Verdadero o Falso." - -#: db/models/fields/related.py:54 +#: db/models/fields/related.py:55 #, python-format msgid "Please enter a valid %s." -msgstr "Por favor, introduzca un %s vlido." +msgstr "Por favor, introduzca un %s válido." -#: db/models/fields/related.py:640 +#: db/models/fields/related.py:641 msgid "Separate multiple IDs with commas." -msgstr "Separe mltiples IDs con comas." +msgstr "Separe múltiples IDs con comas." -#: db/models/fields/related.py:642 +#: db/models/fields/related.py:643 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar " -"ms de uno." +"más de uno." -#: db/models/fields/related.py:689 +#: db/models/fields/related.py:690 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" "Please enter valid %(self)s IDs. The values %(value)r are invalid." msgstr[0] "" -"Por favor, introduzca IDs de %(self)s vlidos. El valor %(value)r no es " -"vlido." +"Por favor, introduzca IDs de %(self)s válidos. El valor %(value)r no es " +"válido." msgstr[1] "" -"Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son " -"vlidos." +"Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son " +"válidos." + +#: db/models/fields/__init__.py:47 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "Ya existe %(optname)s con este %(fieldname)s." + +#: db/models/fields/__init__.py:127 db/models/fields/__init__.py:284 +#: db/models/fields/__init__.py:681 db/models/fields/__init__.py:692 +#: oldforms/__init__.py:369 newforms/fields.py:92 newforms/fields.py:440 +#: newforms/fields.py:516 newforms/fields.py:527 newforms/models.py:187 +msgid "This field is required." +msgstr "Este campo es obligatorio." + +#: db/models/fields/__init__.py:379 +msgid "This value must be an integer." +msgstr "Este valor debe ser un entero." + +#: db/models/fields/__init__.py:414 +msgid "This value must be either True or False." +msgstr "Este valor debe ser Verdadero o Falso." + +#: db/models/fields/__init__.py:435 +msgid "This field cannot be null." +msgstr "Este campo no puede estar vacío." + +#: db/models/fields/__init__.py:469 core/validators.py:155 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "Introduzca una fecha válida en formato AAAA-MM-DD." + +#: db/models/fields/__init__.py:538 core/validators.py:164 +msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." +msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM." + +#: db/models/fields/__init__.py:598 +msgid "This value must be a decimal number." +msgstr "Este valor debe ser un entero." + +#: db/models/fields/__init__.py:701 +msgid "Enter a valid filename." +msgstr "Introduzca un nombre de fichero válido" + +#: db/models/fields/__init__.py:826 +msgid "This value must be either None, True or False." +msgstr "Este valor debe ser Verdadero o Falso." + +#: conf/global_settings.py:38 +msgid "Arabic" +msgstr "Árabe" #: conf/global_settings.py:39 -msgid "Arabic" -msgstr "rabe" +msgid "Bengali" +msgstr "Bengalí" #: conf/global_settings.py:40 -msgid "Bengali" -msgstr "Bengal" +msgid "Bulgarian" +msgstr "Búlgaro" #: conf/global_settings.py:41 -msgid "Bulgarian" -msgstr "Blgaro" +msgid "Catalan" +msgstr "Catalán" #: conf/global_settings.py:42 -msgid "Catalan" -msgstr "Cataln" - -#: conf/global_settings.py:43 msgid "Czech" msgstr "Checo" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Welsh" -msgstr "Gals" +msgstr "Galés" + +#: conf/global_settings.py:44 +msgid "Danish" +msgstr "Danés" #: conf/global_settings.py:45 -msgid "Danish" -msgstr "Dans" +msgid "German" +msgstr "Alemán" #: conf/global_settings.py:46 -msgid "German" -msgstr "Alemn" - -#: conf/global_settings.py:47 msgid "Greek" msgstr "Griego" -#: conf/global_settings.py:48 +#: conf/global_settings.py:47 msgid "English" -msgstr "Ingls" +msgstr "Inglés" + +#: conf/global_settings.py:48 +msgid "Spanish" +msgstr "Español" #: conf/global_settings.py:49 -msgid "Spanish" -msgstr "Espaol" +msgid "Argentinean Spanish" +msgstr "Español Argentino" #: conf/global_settings.py:50 -msgid "Argentinean Spanish" -msgstr "Espaol Argentino" +msgid "Persian" +msgstr "Persa" #: conf/global_settings.py:51 -#, fuzzy -msgid "Persian" -msgstr "Serbio" +msgid "Finnish" +msgstr "Finés" #: conf/global_settings.py:52 -msgid "Finnish" -msgstr "Fins" +msgid "French" +msgstr "Francés" #: conf/global_settings.py:53 -msgid "French" -msgstr "Francs" - -#: conf/global_settings.py:54 msgid "Galician" msgstr "Gallego" -#: conf/global_settings.py:55 +#: conf/global_settings.py:54 msgid "Hungarian" -msgstr "Hngaro" +msgstr "Húngaro" -#: conf/global_settings.py:56 +#: conf/global_settings.py:55 msgid "Hebrew" msgstr "Hebreo" -#: conf/global_settings.py:57 +#: conf/global_settings.py:56 msgid "Icelandic" -msgstr "Islands" +msgstr "Islandés" -#: conf/global_settings.py:58 +#: conf/global_settings.py:57 msgid "Italian" msgstr "Italiano" -#: conf/global_settings.py:59 +#: conf/global_settings.py:58 msgid "Japanese" -msgstr "Japons" +msgstr "Japonés" -#: conf/global_settings.py:60 +#: conf/global_settings.py:59 msgid "Korean" msgstr "Koreano" -#: conf/global_settings.py:61 +#: conf/global_settings.py:60 msgid "Kannada" msgstr "Kannada" -#: conf/global_settings.py:62 +#: conf/global_settings.py:61 msgid "Latvian" msgstr "Latvio" -#: conf/global_settings.py:63 +#: conf/global_settings.py:62 msgid "Macedonian" msgstr "Macedonio" -#: conf/global_settings.py:64 +#: conf/global_settings.py:63 msgid "Dutch" -msgstr "Alemn" +msgstr "Alemán" -#: conf/global_settings.py:65 +#: conf/global_settings.py:64 msgid "Norwegian" msgstr "Noruego" -#: conf/global_settings.py:66 +#: conf/global_settings.py:65 msgid "Polish" msgstr "Polaco" -#: conf/global_settings.py:67 +#: conf/global_settings.py:66 msgid "Portugese" -msgstr "Portugs" +msgstr "Portugés" + +#: conf/global_settings.py:67 +msgid "Brazilian" +msgstr "Brasileño" #: conf/global_settings.py:68 -msgid "Brazilian" -msgstr "Brasileo" - -#: conf/global_settings.py:69 msgid "Romanian" msgstr "Rumano" -#: conf/global_settings.py:70 +#: conf/global_settings.py:69 msgid "Russian" msgstr "Ruso" -#: conf/global_settings.py:71 +#: conf/global_settings.py:70 msgid "Slovak" msgstr "Eslovaco" -#: conf/global_settings.py:72 +#: conf/global_settings.py:71 msgid "Slovenian" msgstr "Esloveno" -#: conf/global_settings.py:73 +#: conf/global_settings.py:72 msgid "Serbian" msgstr "Serbio" -#: conf/global_settings.py:74 +#: conf/global_settings.py:73 msgid "Swedish" msgstr "Sueco" -#: conf/global_settings.py:75 +#: conf/global_settings.py:74 msgid "Tamil" msgstr "Tamil" -#: conf/global_settings.py:76 +#: conf/global_settings.py:75 msgid "Telugu" -msgstr "" +msgstr "Telugu" -#: conf/global_settings.py:77 +#: conf/global_settings.py:76 msgid "Turkish" msgstr "Turco" -#: conf/global_settings.py:78 +#: conf/global_settings.py:77 msgid "Ukrainian" msgstr "Ucraniano" -#: conf/global_settings.py:79 +#: conf/global_settings.py:78 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: conf/global_settings.py:80 +#: conf/global_settings.py:79 msgid "Traditional Chinese" msgstr "Chino tradicional" -#: core/validators.py:65 +#: core/validators.py:71 msgid "This value must contain only letters, numbers and underscores." -msgstr "Este valor debe contener slo letras, nmeros y guiones bajos." +msgstr "Este valor debe contener sólo letras, números y guiones bajos." -#: core/validators.py:69 +#: core/validators.py:75 msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." msgstr "" -"Este valor debe contener letras, nmeros, guiones bajos o barras solamente." +"Este valor debe contener letras, números, guiones bajos o barras solamente." -#: core/validators.py:73 +#: core/validators.py:79 msgid "This value must contain only letters, numbers, underscores or hyphens." -msgstr "Este valor debe contener slo letras, nmeros, guiones bajos o medios." +msgstr "Este valor debe contener sólo letras, números, guiones bajos o medios." -#: core/validators.py:77 +#: core/validators.py:83 msgid "Uppercase letters are not allowed here." -msgstr "No se admiten letras maysculas." +msgstr "No se admiten letras mayúsculas." -#: core/validators.py:81 +#: core/validators.py:87 msgid "Lowercase letters are not allowed here." -msgstr "No se admiten letras minsculas." +msgstr "No se admiten letras minúsculas." -#: core/validators.py:88 +#: core/validators.py:94 msgid "Enter only digits separated by commas." -msgstr "Introduzca slo dgitos separados por comas." +msgstr "Introduzca sólo dígitos separados por comas." -#: core/validators.py:100 +#: core/validators.py:106 msgid "Enter valid e-mail addresses separated by commas." -msgstr "Introduzca direcciones de correo vlidas separadas por comas." +msgstr "Introduzca direcciones de correo válidas separadas por comas." -#: core/validators.py:104 +#: core/validators.py:110 msgid "Please enter a valid IP address." -msgstr "Por favor introduzca una direccin IP vlida." +msgstr "Por favor introduzca una dirección IP válida." -#: core/validators.py:108 +#: core/validators.py:114 msgid "Empty values are not allowed here." -msgstr "No se admiten valores vacos." +msgstr "No se admiten valores vacíos." -#: core/validators.py:112 +#: core/validators.py:118 msgid "Non-numeric characters aren't allowed here." -msgstr "No se admiten caracteres no numricos." +msgstr "No se admiten caracteres no numéricos." -#: core/validators.py:116 +#: core/validators.py:122 msgid "This value can't be comprised solely of digits." -msgstr "Este valor no puede comprender slo dgitos." +msgstr "Este valor no puede comprender sólo dígitos." -#: core/validators.py:121 newforms/fields.py:135 +#: core/validators.py:127 newforms/fields.py:141 msgid "Enter a whole number." -msgstr "Introduzca un nmero entero." +msgstr "Introduzca un número entero." -#: core/validators.py:125 +#: core/validators.py:131 msgid "Only alphabetical characters are allowed here." -msgstr "Slo se admiten caracteres alfabticos." +msgstr "Sólo se admiten caracteres alfabéticos." -#: core/validators.py:140 +#: core/validators.py:146 msgid "Year must be 1900 or later." -msgstr "El ao debe ser 1900 o posterior." +msgstr "El año debe ser 1900 o posterior." -#: core/validators.py:144 +#: core/validators.py:150 +#, python-format msgid "Invalid date: %s" -msgstr "Fecha no vlida: %s" +msgstr "Fecha no válida: %s" -#: core/validators.py:154 +#: core/validators.py:160 msgid "Enter a valid time in HH:MM format." -msgstr "Introduzca una hora vlida en formato HH:MM." +msgstr "Introduzca una hora válida en formato HH:MM." -#: core/validators.py:163 newforms/fields.py:339 +#: core/validators.py:169 newforms/fields.py:335 msgid "Enter a valid e-mail address." -msgstr "Introduzca una direccin de correo electrnico vlida" +msgstr "Introduzca una dirección de correo electrónico válida" -#: core/validators.py:179 +#: core/validators.py:181 core/validators.py:461 oldforms/__init__.py:682 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "" +"No se ha enviado ningún fichero. Compruebe el tipo de codificación en el " +"formulario." + +#: core/validators.py:185 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -"Enve una imagen vlida. El fichero que ha enviado no era una imagen o se " +"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se " "trataba de una imagen corrupta." -#: core/validators.py:186 +#: core/validators.py:192 #, python-format msgid "The URL %s does not point to a valid image." -msgstr "La URL %s no apunta a una imagen vlida." +msgstr "La URL %s no apunta a una imagen válida." -#: core/validators.py:190 +#: core/validators.py:196 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -"Los nmeros de telfono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es " -"vlido." +"Los números de teléfono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es " +"válido." -#: core/validators.py:198 +#: core/validators.py:204 #, python-format msgid "The URL %s does not point to a valid QuickTime video." -msgstr "La URL %s no apunta a un vdeo QuickTime vlido." +msgstr "La URL %s no apunta a un vídeo QuickTime válido." -#: core/validators.py:202 +#: core/validators.py:208 msgid "A valid URL is required." -msgstr "Se precisa una URL vlida." +msgstr "Se precisa una URL válida." -#: core/validators.py:216 +#: core/validators.py:222 #, python-format msgid "" "Valid HTML is required. Specific errors are:\n" "%s" msgstr "" -"Se precisa HTML vlido. Los errores especficos son:\n" +"Se precisa HTML válido. Los errores específicos son:\n" "%s" -#: core/validators.py:223 +#: core/validators.py:229 #, python-format msgid "Badly formed XML: %s" msgstr "XML mal formado: %s" -#: core/validators.py:240 +#: core/validators.py:246 #, python-format msgid "Invalid URL: %s" -msgstr "URL no vlida: %s" +msgstr "URL no válida: %s" -#: core/validators.py:245 core/validators.py:247 +#: core/validators.py:251 core/validators.py:253 #, python-format msgid "The URL %s is a broken link." msgstr "La URL %s es un enlace roto." -#: core/validators.py:253 +#: core/validators.py:259 msgid "Enter a valid U.S. state abbreviation." -msgstr "Introduzca una abreviatura vlida de estado de los EEUU." +msgstr "Introduzca una abreviatura válida de estado de los EEUU." -#: core/validators.py:267 +#: core/validators.py:273 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." -msgstr[0] "Cuida tu vocabulario! Aqu no admitimos la palabra %s." -msgstr[1] "Cuida tu vocabulario! Aqu no admitimos las palabras %s." +msgstr[0] "¡Cuida tu vocabulario! Aquí no admitimos la palabra %s." +msgstr[1] "¡Cuida tu vocabulario! Aquí no admitimos las palabras %s." -#: core/validators.py:274 +#: core/validators.py:280 #, python-format msgid "This field must match the '%s' field." msgstr "Este campo debe concordar con el campo '%s'." -#: core/validators.py:293 +#: core/validators.py:299 msgid "Please enter something for at least one field." msgstr "Por favor, introduzca algo en al menos un campo." -#: core/validators.py:302 core/validators.py:313 +#: core/validators.py:308 core/validators.py:319 msgid "Please enter both fields or leave them both empty." -msgstr "Por favor, rellene ambos campos o deje ambos vacos." +msgstr "Por favor, rellene ambos campos o deje ambos vacíos." -#: core/validators.py:321 +#: core/validators.py:327 #, python-format msgid "This field must be given if %(field)s is %(value)s" msgstr "Se debe proporcionar este campo si %(field)s es %(value)s" -#: core/validators.py:334 +#: core/validators.py:340 #, python-format msgid "This field must be given if %(field)s is not %(value)s" msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s" -#: core/validators.py:353 +#: core/validators.py:359 msgid "Duplicate values are not allowed." msgstr "No se admiten valores duplicados." -#: core/validators.py:368 +#: core/validators.py:374 #, python-format msgid "This value must be between %(lower)s and %(upper)s." msgstr "Este valor debe estar entre %(lower)s y %(upper)s." -#: core/validators.py:370 +#: core/validators.py:376 #, python-format msgid "This value must be at least %s." -msgstr "Este valor debe ser como mnimo %s." +msgstr "Este valor debe ser como mínimo %s." -#: core/validators.py:372 +#: core/validators.py:378 #, python-format msgid "This value must be no more than %s." msgstr "Este valor no debe ser mayor que %s." -#: core/validators.py:408 +#: core/validators.py:414 #, python-format msgid "This value must be a power of %s." msgstr "Este valor debe ser una potencia de %s." -#: core/validators.py:417 +#: core/validators.py:424 msgid "Please enter a valid decimal number." -msgstr "Por favor, introduzca un nmero decimal vlido." +msgstr "Por favor, introduzca un número decimal válido." -#: core/validators.py:423 +#: core/validators.py:431 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" "Please enter a valid decimal number with at most %s total digits." msgstr[0] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito en " +"Por favor, introduzca un número decimal válido con a lo más %s dígito en " "total." msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos en " +"Por favor, introduzca un número decimal válido con a lo más %s dígitos en " "total." -#: core/validators.py:426 +#: core/validators.py:434 #, python-format msgid "" "Please enter a valid decimal number with a whole part of at most %s digit." msgid_plural "" "Please enter a valid decimal number with a whole part of at most %s digits." msgstr[0] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito en su " +"Por favor, introduzca un número decimal válido con a lo más %s dígito en su " "parte entera." msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos en su " +"Por favor, introduzca un número decimal válido con a lo más %s dígitos en su " "parte entera." -#: core/validators.py:429 +#: core/validators.py:437 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." msgid_plural "" "Please enter a valid decimal number with at most %s decimal places." msgstr[0] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito " +"Por favor, introduzca un número decimal válido con a lo más %s dígito " "decimal." msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos " +"Por favor, introduzca un número decimal válido con a lo más %s dígitos " "decimales." -#: core/validators.py:437 -#, fuzzy +#: core/validators.py:445 msgid "Please enter a valid floating point number." -msgstr "Por favor, introduzca un nmero decimal vlido." +msgstr "Por favor, introduzca un número decimal válido." -#: core/validators.py:446 +#: core/validators.py:454 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "Asegrese de que el fichero que enva tiene al menos %s bytes." +msgstr "Asegúrese de que el fichero que envía tiene al menos %s bytes." -#: core/validators.py:447 +#: core/validators.py:455 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "Asegrese de que el fichero que enva tiene como mximo %s bytes." +msgstr "Asegúrese de que el fichero que envía tiene como máximo %s bytes." -#: core/validators.py:464 +#: core/validators.py:472 msgid "The format for this field is wrong." msgstr "El formato de este campo es incorrecto." -#: core/validators.py:479 +#: core/validators.py:487 msgid "This field is invalid." -msgstr "Este campo no es vlido." +msgstr "Este campo no es válido." -#: core/validators.py:515 +#: core/validators.py:523 #, python-format msgid "Could not retrieve anything from %s." msgstr "No pude obtener nada de %s." -#: core/validators.py:518 +#: core/validators.py:526 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" -"La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s', que no " -"es vlida." +"La URL %(url)s devolvió la cabecera Content-Type '%(contenttype)s', que no " +"es válida." -#: core/validators.py:551 +#: core/validators.py:559 #, python-format msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" msgstr "" -"Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea " +"Por favor, cierre la etiqueta %(tag)s de la línea %(line)s. (La línea " "empieza por \"%(start)s\".)" -#: core/validators.py:555 +#: core/validators.py:563 #, python-format msgid "" "Some text starting on line %(line)s is not allowed in that context. (Line " "starts with \"%(start)s\".)" msgstr "" -"Parte del texto que comienza en la lnea %(line)s no est permitido en ese " -"contexto. (La lnea empieza por \"%(start)s\".)" +"Parte del texto que comienza en la línea %(line)s no está permitido en ese " +"contexto. (La línea empieza por \"%(start)s\".)" -#: core/validators.py:560 +#: core/validators.py:568 #, python-format msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" msgstr "" -"El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea " +"El \"%(attr)s\" de la línea %(line)s no es un atributo válido. (La línea " "empieza por \"%(start)s\".)" -#: core/validators.py:565 +#: core/validators.py:573 #, python-format msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" msgstr "" -"La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea " +"La \"<%(tag)s>\" de la línea %(line)s no es una etiqueta válida. (La línea " "empieza por \"%(start)s\".)" -#: core/validators.py:569 +#: core/validators.py:577 #, python-format msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" msgstr "" -"A una etiqueta de la lnea %(line)s le faltan uno o ms atributos " -"requeridos. (La lnea empieza por \"%(start)s\".)" +"A una etiqueta de la línea %(line)s le faltan uno o más atributos " +"requeridos. (La línea empieza por \"%(start)s\".)" -#: core/validators.py:574 +#: core/validators.py:582 #, python-format msgid "" "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " "starts with \"%(start)s\".)" msgstr "" -"El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es " -"vlido. (La lnea empieza por \"%(start)s\".)" +"El atributo \"%(attr)s\" de la línea %(line)s tiene un valor que no es " +"válido. (La línea empieza por \"%(start)s\".)" -#: views/generic/create_update.py:43 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:138 +msgid "The two password fields didn't match." +msgstr "Las dos contraseñas no coinciden." + +#: contrib/auth/forms.py:25 +msgid "A user with that username already exists." +msgstr "Ya existe un usuario con este nombre." + +#: contrib/auth/forms.py:53 +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "" +"Tu navegador de internet parece no tener las cookies habilitadas. Las " +"cookies se necesitan para poder ingresar." + +#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10 +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "" +"Por favor, introduzca un correcto nombre de usuario y contraseña. Note que " +"ambos campos son sensibles a mayúsculas/minúsculas." + +#: contrib/auth/forms.py:62 +msgid "This account is inactive." +msgstr "Esta cuenta está inactiva." + +#: contrib/auth/forms.py:84 +msgid "" +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" +msgstr "" +"Esta dirección de correo electrónico no tiene una cuenta de usuario " +"asociada. ¿Está seguro de que se ha registrado?" + +#: contrib/auth/forms.py:117 +msgid "The two 'new password' fields didn't match." +msgstr "" +"Las contraseñas introducidas en los campos 'nueva contraseña' no coinciden." + +#: contrib/auth/forms.py:124 +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "" +"Tu contraseña antigua es incorrecta. Por favor, vuelve a introducirla " +"correctamente." + +#: contrib/auth/models.py:51 contrib/auth/models.py:71 +msgid "name" +msgstr "nombre" + +#: contrib/auth/models.py:53 +msgid "codename" +msgstr "nombre en código" + +#: contrib/auth/models.py:56 +msgid "permission" +msgstr "permiso" + +#: contrib/auth/models.py:57 contrib/auth/models.py:72 +msgid "permissions" +msgstr "permisos" + +#: contrib/auth/models.py:75 +msgid "group" +msgstr "grupo" + +#: contrib/auth/models.py:76 contrib/auth/models.py:116 +msgid "groups" +msgstr "grupos" + +#: contrib/auth/models.py:106 +msgid "username" +msgstr "nombre de usuario" + +#: contrib/auth/models.py:106 +msgid "" +"Required. 30 characters or fewer. Alphanumeric characters only (letters, " +"digits and underscores)." +msgstr "" +"Requerido. 30 caracteres o menos. Sólo caracteres alfanuméricos (letras, " +"dígitos y guiones bajos)." + +#: contrib/auth/models.py:107 +msgid "first name" +msgstr "nombre" + +#: contrib/auth/models.py:108 +msgid "last name" +msgstr "apellidos" + +#: contrib/auth/models.py:109 +msgid "e-mail address" +msgstr "dirección de correo" + +#: contrib/auth/models.py:110 +msgid "password" +msgstr "clave" + +#: contrib/auth/models.py:110 +msgid "" +"Use '[algo]$[salt]$[hexdigest]' or use the change " +"password form." +msgstr "" +"Use'[algo]$[sal]$[hash hexadecimal]' o use el " +"formulario para cambiar la contraseña." + +#: contrib/auth/models.py:111 +msgid "staff status" +msgstr "es staff" + +#: contrib/auth/models.py:111 +msgid "Designates whether the user can log into this admin site." +msgstr "Indica si el usuario puede entrar en este sitio de administración." + +#: contrib/auth/models.py:112 +msgid "active" +msgstr "activo" + +#: contrib/auth/models.py:112 +msgid "" +"Designates whether this user can log into the Django admin. Unselect this " +"instead of deleting accounts." +msgstr "" +"Indica si el usuario puede entrar en este sitio de administración. Desmarque " +"esto en lugar de borrar la cuenta." + +#: contrib/auth/models.py:113 +msgid "superuser status" +msgstr "es superusuario" + +#: contrib/auth/models.py:113 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" +"Indica que este usuario tiene todos los permisos sin asignárselos " +"explícitamente." + +#: contrib/auth/models.py:114 +msgid "last login" +msgstr "Último registro" + +#: contrib/auth/models.py:115 +msgid "date joined" +msgstr "fecha de creación" + +#: contrib/auth/models.py:117 +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Además de los permisos asignados manualmente, este usuario también tendrá " +"todos los permisos de los grupos en los que esté." + +#: contrib/auth/models.py:118 +msgid "user permissions" +msgstr "permisos" + +#: contrib/auth/models.py:122 +msgid "user" +msgstr "usuario" + +#: contrib/auth/models.py:123 +msgid "users" +msgstr "usuarios" + +#: contrib/auth/models.py:129 +msgid "Personal info" +msgstr "Información personal" + +#: contrib/auth/models.py:130 +msgid "Permissions" +msgstr "Permisos" + +#: contrib/auth/models.py:131 +msgid "Important dates" +msgstr "Fechas importantes" + +#: contrib/auth/models.py:132 +msgid "Groups" +msgstr "Grupos" + +#: contrib/auth/models.py:274 +msgid "message" +msgstr "mensaje" + +#: contrib/auth/views.py:41 +msgid "Logged out" +msgstr "Sesión terminada" + +#: contrib/admin/models.py:17 +msgid "action time" +msgstr "hora de acción" + +#: contrib/admin/models.py:20 +msgid "object id" +msgstr "id de objeto" + +#: contrib/admin/models.py:21 +msgid "object repr" +msgstr "repr de objeto" + +#: contrib/admin/models.py:22 +msgid "action flag" +msgstr "marca de acción" + +#: contrib/admin/models.py:23 +msgid "change message" +msgstr "mensaje de cambio" + +#: contrib/admin/models.py:26 +msgid "log entry" +msgstr "entrada de registro" + +#: contrib/admin/models.py:27 +msgid "log entries" +msgstr "entradas de registro" + +#: contrib/admin/filterspecs.py:42 #, python-format -msgid "The %(verbose_name)s was created successfully." -msgstr "El %(verbose_name)s se ha creado correctamente." +msgid "" +"

By %s:

\n" +"