Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merged revisions 4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,43…

…88,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 <whosaysni@gmail.com>.
........
  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 <marijn@metronomo.cl>.
........
  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 <stava@telcotec.se>.
........
  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 <cgrady@the-magi.us>.
........
  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 <jshaffer2112@gmail.com>.
........
  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 <szekeres@iii.hu>.
........
  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 <carl@personnelware.com>.
........
  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 <bugs@bergstroem.nu>.
........
  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 <gonzalemario@gmail.com>.
........
  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 <fenner@gmail.com> 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 <jshaffer2112@gmail.com>.
........
  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 <gonzalemario@gmail.com>.
........
  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 <form> 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 </p>' 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
  • Loading branch information...
commit 83861364dd31063d8ff9169514c5f90a0c224482 1 parent a704a38
@freakboy3742 freakboy3742 authored
Showing with 10,511 additions and 7,479 deletions.
  1. +16 −3 AUTHORS
  2. +9 −3 django/bin/make-messages.py
  3. +2 −0  django/conf/__init__.py
  4. +0 −1  django/conf/global_settings.py
  5. BIN  django/conf/locale/de/LC_MESSAGES/djangojs.mo
  6. +8 −8 django/conf/locale/de/LC_MESSAGES/djangojs.po
  7. BIN  django/conf/locale/es/LC_MESSAGES/django.mo
  8. +1,853 −1,840 django/conf/locale/es/LC_MESSAGES/django.po
  9. BIN  django/conf/locale/es/LC_MESSAGES/djangojs.mo
  10. +45 −38 django/conf/locale/es/LC_MESSAGES/djangojs.po
  11. BIN  django/conf/locale/es_AR/LC_MESSAGES/django.mo
  12. +2,161 −2,102 django/conf/locale/es_AR/LC_MESSAGES/django.po
  13. BIN  django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo
  14. +11 −11 django/conf/locale/es_AR/LC_MESSAGES/djangojs.po
  15. BIN  django/conf/locale/fr/LC_MESSAGES/django.mo
  16. +658 −419 django/conf/locale/fr/LC_MESSAGES/django.po
  17. BIN  django/conf/locale/fr/LC_MESSAGES/djangojs.mo
  18. +7 −7 django/conf/locale/fr/LC_MESSAGES/djangojs.po
  19. BIN  django/conf/locale/sv/LC_MESSAGES/django.mo
  20. +703 −680 django/conf/locale/sv/LC_MESSAGES/django.po
  21. BIN  django/conf/locale/zh_CN/LC_MESSAGES/django.mo
  22. +2,068 −1,310 django/conf/locale/zh_CN/LC_MESSAGES/django.po
  23. +0 −1  django/conf/project_template/settings.py
  24. +5 −4 django/contrib/admin/media/js/admin/RelatedObjectLookups.js
  25. +6 −6 django/contrib/admin/media/js/urlify.js
  26. +1 −1  django/contrib/admin/models.py
  27. +4 −2 django/contrib/admin/templatetags/admin_list.py
  28. +1 −1  django/contrib/admin/views/main.py
  29. +2 −0  django/contrib/auth/__init__.py
  30. +10 −10 django/contrib/auth/forms.py
  31. +23 −10 django/contrib/auth/models.py
  32. +19 −0 django/contrib/auth/tests.py
  33. +4 −4 django/contrib/comments/models.py
  34. +2 −0  django/contrib/comments/templatetags/comments.py
  35. +3 −3 django/contrib/comments/views/comments.py
  36. +3 −3 django/contrib/contenttypes/models.py
  37. +2 −1  django/contrib/databrowse/plugins/fieldchoices.py
  38. +1 −1  django/contrib/databrowse/templates/databrowse/calendar_day.html
  39. +1 −1  django/contrib/databrowse/templates/databrowse/calendar_month.html
  40. +1 −1  django/contrib/databrowse/templates/databrowse/choice_detail.html
  41. +1 −1  django/contrib/databrowse/templates/databrowse/choice_list.html
  42. +1 −1  django/contrib/databrowse/templates/databrowse/homepage.html
  43. +1 −1  django/contrib/databrowse/templates/databrowse/model_detail.html
  44. +5 −5 django/contrib/databrowse/templates/databrowse/object_detail.html
  45. +3 −3 django/contrib/flatpages/models.py
  46. +25 −0 django/contrib/localflavor/cl/cl_regions.py
  47. +11 −1 django/contrib/localflavor/cl/forms.py
  48. +1 −2  django/contrib/localflavor/no/forms.py
  49. 0  django/contrib/localflavor/sk/__init__.py
  50. +41 −0 django/contrib/localflavor/sk/forms.py
  51. +87 −0 django/contrib/localflavor/sk/sk_districts.py
  52. +16 −0 django/contrib/localflavor/sk/sk_regions.py
  53. +2 −2 django/contrib/redirects/models.py
  54. +8 −2 django/contrib/sessions/middleware.py
  55. +1 −1  django/contrib/sessions/models.py
  56. +25 −3 django/contrib/sites/models.py
  57. +13 −7 django/contrib/syndication/feeds.py
  58. +1 −1  django/contrib/syndication/views.py
  59. +3 −2 django/core/cache/backends/filebased.py
  60. +14 −3 django/core/cache/backends/locmem.py
  61. +11 −5 django/core/cache/backends/memcached.py
  62. +2 −1  django/core/handlers/modpython.py
  63. +2 −1  django/core/handlers/wsgi.py
  64. +72 −84 django/core/management.py
  65. +6 −1 django/core/serializers/base.py
  66. +2 −2 django/core/serializers/xml_serializer.py
  67. +8 −2 django/core/servers/basehttp.py
  68. +30 −23 django/core/urlresolvers.py
  69. +14 −9 django/core/validators.py
  70. +3 −4 django/db/backends/ado_mssql/creation.py
  71. +3 −4 django/db/backends/mysql/creation.py
  72. +3 −4 django/db/backends/mysql_old/creation.py
  73. +2 −3 django/db/backends/oracle/creation.py
  74. +3 −4 django/db/backends/postgresql/creation.py
  75. +2 −5 django/db/backends/postgresql_psycopg2/introspection.py
  76. +3 −4 django/db/backends/sqlite3/creation.py
  77. +1 −1  django/db/backends/sqlite3/introspection.py
  78. +9 −5 django/db/models/__init__.py
  79. +4 −4 django/db/models/base.py
  80. +67 −10 django/db/models/fields/__init__.py
  81. +29 −1 django/db/models/fields/related.py
  82. +1 −5 django/db/models/manager.py
  83. +17 −9 django/db/models/query.py
  84. +3 −4 django/http/__init__.py
  85. +1 −1  django/middleware/common.py
  86. +2 −3 django/middleware/http.py
  87. +1 −1  django/newforms/extras/widgets.py
  88. +73 −30 django/newforms/fields.py
  89. +18 −18 django/newforms/forms.py
  90. +14 −8 django/newforms/models.py
  91. +40 −12 django/newforms/widgets.py
  92. +62 −58 django/oldforms/__init__.py
  93. +45 −15 django/shortcuts/__init__.py
  94. +2 −2 django/template/__init__.py
  95. +1 −1  django/template/defaultfilters.py
  96. +22 −9 django/template/defaulttags.py
  97. +15 −4 django/template/loaders/app_directories.py
  98. +9 −3 django/template/loaders/filesystem.py
  99. +4 −3 django/test/client.py
  100. +93 −36 django/test/simple.py
  101. +9 −5 django/test/testcases.py
  102. +5 −1 django/test/utils.py
  103. +23 −0 django/utils/_os.py
  104. +9 −8 django/utils/cache.py
  105. +1 −1  django/utils/dateformat.py
  106. +4 −3 django/utils/decorators.py
  107. +0 −1  django/utils/encoding.py
  108. +3 −2 django/utils/feedgenerator.py
  109. +7 −5 django/utils/functional.py
  110. +23 −22 django/utils/html.py
  111. +5 −2 django/utils/http.py
  112. +67 −0 django/utils/maxlength.py
  113. +2 −4 django/utils/timesince.py
  114. +1 −1  docs/add_ons.txt
  115. +1 −4 docs/api_stability.txt
  116. +20 −6 docs/authentication.txt
  117. +1 −1  docs/cache.txt
  118. +29 −15 docs/contributing.txt
  119. +1 −1  docs/databases.txt
  120. +94 −13 docs/db-api.txt
  121. +19 −5 docs/distributions.txt
  122. +13 −0 docs/django-admin.txt
  123. +1 −1  docs/email.txt
  124. +3 −0  docs/faq.txt
  125. +1 −1  docs/fastcgi.txt
  126. +5 −5 docs/forms.txt
  127. +1 −1  docs/i18n.txt
  128. +16 −12 docs/install.txt
  129. +8 −0 docs/middleware.txt
  130. +183 −62 docs/model-api.txt
  131. +2 −2 docs/modpython.txt
  132. +147 −11 docs/newforms.txt
  133. +13 −11 docs/overview.txt
  134. +1 −1  docs/release_notes_0.95.txt
  135. +1 −1  docs/request_response.txt
  136. +1 −1  docs/sitemaps.txt
  137. +23 −5 docs/sites.txt
  138. +4 −4 docs/static_files.txt
  139. +47 −3 docs/syndication_feeds.txt
  140. +77 −24 docs/templates.txt
  141. +2 −2 docs/templates_python.txt
  142. +59 −15 docs/testing.txt
  143. +25 −25 docs/tutorial01.txt
  144. +4 −4 docs/tutorial02.txt
  145. +3 −2 docs/tutorial03.txt
  146. +18 −3 docs/tutorial04.txt
  147. +4 −4 docs/url_dispatch.txt
  148. +1 −1  tests/modeltests/basic/models.py
  149. +2 −2 tests/modeltests/choices/models.py
  150. +3 −3 tests/modeltests/custom_columns/models.py
  151. +5 −5 tests/modeltests/custom_managers/models.py
  152. +1 −1  tests/modeltests/custom_methods/models.py
  153. +4 −4 tests/modeltests/custom_pk/models.py
  154. +1 −1  tests/modeltests/field_defaults/models.py
  155. +1 −1  tests/modeltests/fixtures/models.py
  156. +4 −4 tests/modeltests/generic_relations/models.py
  157. +2 −2 tests/modeltests/get_latest/models.py
  158. +26 −5 tests/modeltests/get_object_or_404/models.py
  159. +2 −2 tests/modeltests/get_or_create/models.py
  160. +23 −23 tests/modeltests/invalid_models/models.py
  161. +17 −9 tests/modeltests/lookup/models.py
  162. +1 −1  tests/modeltests/m2m_and_m2o/models.py
  163. +4 −4 tests/modeltests/m2m_intermediary/models.py
  164. +2 −2 tests/modeltests/m2m_multiple/models.py
  165. +1 −1  tests/modeltests/m2m_recursive/models.py
  166. +1 −1  tests/modeltests/m2o_recursive/models.py
  167. +1 −1  tests/modeltests/m2o_recursive2/models.py
  168. +4 −4 tests/modeltests/manipulators/models.py
  169. +2 −2 tests/modeltests/many_to_many/models.py
  170. +3 −3 tests/modeltests/many_to_one/models.py
  171. +2 −2 tests/modeltests/many_to_one_null/models.py
  172. +27 −5 tests/modeltests/model_forms/models.py
  173. +2 −2 tests/modeltests/model_inheritance/models.py
  174. +2 −2 tests/modeltests/mutually_referential/models.py
  175. +6 −6 tests/modeltests/one_to_one/models.py
  176. +1 −1  tests/modeltests/or_lookups/models.py
  177. +1 −1  tests/modeltests/ordering/models.py
  178. +1 −1  tests/modeltests/pagination/models.py
  179. +2 −2 tests/modeltests/properties/models.py
  180. +8 −8 tests/modeltests/reserved_names/models.py
  181. +3 −3 tests/modeltests/reverse_lookup/models.py
  182. +2 −2 tests/modeltests/save_delete_hooks/models.py
  183. +8 −8 tests/modeltests/select_related/models.py
  184. +3 −3 tests/modeltests/serializers/models.py
  185. +3 −4 tests/modeltests/str/models.py
  186. +18 −0 tests/modeltests/test_client/fixtures/testdata.json
  187. +18 −0 tests/modeltests/test_client/models.py
  188. +20 −0 tests/modeltests/test_client/tests.py
  189. +1 −2  tests/modeltests/test_client/views.py
  190. +2 −2 tests/modeltests/transactions/models.py
  191. +1 −1  tests/modeltests/validation/models.py
  192. +1 −1  tests/regressiontests/bug639/models.py
  193. +25 −16 tests/regressiontests/cache/tests.py
  194. +1 −1  tests/regressiontests/datatypes/models.py
  195. +11 −0 tests/regressiontests/fixtures_regress/fixtures/pretty.xml
  196. +20 −3 tests/regressiontests/fixtures_regress/models.py
  197. +42 −7 tests/regressiontests/forms/localflavor.py
  198. +106 −23 tests/regressiontests/forms/tests.py
  199. +1 −1  tests/regressiontests/initial_sql_regress/models.py
  200. +36 −36 tests/regressiontests/invalid_admin_options/models.py
  201. +3 −3 tests/regressiontests/many_to_one_regress/models.py
  202. 0  tests/regressiontests/maxlength/__init__.py
  203. 0  tests/regressiontests/maxlength/models.py
  204. +160 −0 tests/regressiontests/maxlength/tests.py
  205. 0  tests/regressiontests/model_fields/__init__.py
  206. 0  tests/regressiontests/model_fields/models.py
  207. +18 −0 tests/regressiontests/model_fields/tests.py
  208. +1 −1  tests/regressiontests/model_regress/models.py
  209. +2 −2 tests/regressiontests/null_queries/models.py
  210. +3 −3 tests/regressiontests/one_to_one_regress/models.py
  211. +26 −11 tests/regressiontests/serializers_regress/models.py
  212. +17 −11 tests/regressiontests/serializers_regress/tests.py
  213. +6 −6 tests/regressiontests/string_lookup/models.py
  214. +49 −4 tests/regressiontests/templates/tests.py
  215. +3 −1 tests/regressiontests/templates/urls.py
  216. +41 −0 tests/regressiontests/test_client_regress/models.py
  217. +1 −1  tests/regressiontests/test_client_regress/views.py
  218. 0  tests/regressiontests/utils/__init__.py
  219. +1 −0  tests/regressiontests/utils/models.py
  220. +115 −0 tests/regressiontests/utils/tests.py
  221. +7 −6 tests/runtests.py
View
19 AUTHORS
@@ -57,10 +57,12 @@ answer newbie questions, and generally made Django that much better:
Ned Batchelder <http://www.nedbatchelder.com/>
Shannon -jj Behrens <http://jjinux.blogspot.com/>
Esdras Beleza <linux@esdrasbeleza.com>
+ Chris Bennett <chrisrbennett@yahoo.com>
James Bennett
Ben <afternoon@uk2.net>
Paul Bissex <http://e-scribe.com/>
Simon Blanchard
+ Matt Boersma <ogghead@gmail.com>
boobsd@gmail.com
Andrew Brehaut <http://brehaut.net/blog>
brut.alll@gmail.com
@@ -94,10 +96,12 @@ answer newbie questions, and generally made Django that much better:
Maximillian Dornseif <md@hudora.de>
Jeremy Dunck <http://dunck.us/>
Andrew Durdin <adurdin@gmail.com>
+ dusk@woofle.net
Andy Dustman <farcepest@gmail.com>
Clint Ecker
enlight
Enrico <rico.bl@gmail.com>
+ A. Murat Eren <meren@pardus.org.tr>
Ludvig Ericson <ludvig.ericson@gmail.com>
Dirk Eschler <dirk.eschler@gmx.net>
Marc Fargas <telenieko@telenieko.com>
@@ -114,7 +118,7 @@ answer newbie questions, and generally made Django that much better:
glin@seznam.cz
martin.glueck@gmail.com
GomoX <gomo@datafull.com>
- Mario Gonzalez <gonzalemario @t gmail.com>
+ Mario Gonzalez <gonzalemario@gmail.com>
Simon Greenhill <dev@simon.net.nz>
Owen Griffiths
Espen Grindhaug <http://grindhaug.org/>
@@ -141,7 +145,8 @@ answer newbie questions, and generally made Django that much better:
junzhang.jn@gmail.com
Antti Kaihola <http://akaihola.blogspot.com/>
Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
- ian.g.kelly@gmail.com
+ Ian G. Kelly <ian.g.kelly@gmail.com>
+ Ben Khoo <khoobks@westnet.com.au>
Garth Kidd <http://www.deadlybloodyserious.com/>
kilian <kilian.cavalotti@lip6.fr>
Sune Kirkeby <http://ibofobi.dk/>
@@ -153,6 +158,7 @@ answer newbie questions, and generally made Django that much better:
Martin Kosír <martin@martinkosir.net>
Meir Kriheli <http://mksoft.co.il/>
Bruce Kroeze <http://coderseye.com/>
+ 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 <waylan@gmail.com>
limodou
+ Philip Lindborg <philip.lindborg@gmail.com>
Matt McClanahan <http://mmcc.cx/>
Martin Maney <http://www.chipy.org/Martin_Maney>
masonsimon+django@gmail.com
Manuzhai
Petar Marić <http://www.petarmaric.com/>
Nuno Mariz <nmariz@gmail.com>
- marijn@metronomo.cl
+ Marijn Vriens <marijn@metronomo.cl>
mark@junklight.com
Yasushi Masuda <whosaysni@gmail.com>
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 <andreas.mock@web.de>
Reza Mohammadi <reza@zeerak.ir>
Eric Moritz <http://eric.themoritzfamily.com/>
mrmachine <real.human@mrmachine.net>
@@ -207,6 +215,7 @@ answer newbie questions, and generally made Django that much better:
plisk
Daniel Poelzleithner <http://poelzi.org/>
polpak@yahoo.com
+ Johann Queuniet <johann.queuniet@adh.naellia.eu>
J. Rademaker
Michael Radziej <mir@noris.de>
Ramiro Morales <rm0@gmx.net>
@@ -216,12 +225,14 @@ answer newbie questions, and generally made Django that much better:
rhettg@gmail.com
Henrique Romano <onaiort@gmail.com>
Armin Ronacher
+ Brian Rosner <brosner@gmail.com>
Oliver Rutherfurd <http://rutherfurd.net/>
Ivan Sagalaev (Maniac) <http://www.softwaremaniacs.org/>
Vinay Sajip <vinay_sajip@yahoo.co.uk>
David Schein
scott@staplefish.com
serbaut@gmail.com
+ John Shaffer <jshaffer2112@gmail.com>
Pete Shinners <pete@shinners.org>
Jozko Skrablin <jozko.skrablin@gmail.com>
SmileyChris <smileychris@gmail.com>
@@ -232,6 +243,8 @@ answer newbie questions, and generally made Django that much better:
Vasiliy Stavenko <stavenko@gmail.com>
Thomas Steinacher <http://www.eggdrop.ch/>
nowell strite
+ Sundance
+ SuperJared
Radek Švarz <http://www.svarz.cz/translate/>
Swaroop C H <http://www.swaroopch.info>
Aaron Swartz <http://www.aaronsw.com/>
View
12 django/bin/make-messages.py
@@ -9,6 +9,7 @@
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:
View
2  django/conf/__init__.py
@@ -37,6 +37,8 @@ def __setattr__(self, name, value):
# __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):
View
1  django/conf/global_settings.py
@@ -30,7 +30,6 @@
# 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
View
BIN  django/conf/locale/de/LC_MESSAGES/djangojs.mo
Binary file not shown
View
16 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 <dirk.eschler@gmx.net>\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 "Verfügbare %s"
+msgstr "Verfügbare %s"
#: contrib/admin/media/js/SelectFilter2.js:41
msgid "Choose all"
-msgstr "Alles auswählen"
+msgstr "Alles auswählen"
#: contrib/admin/media/js/SelectFilter2.js:46
msgid "Add"
-msgstr "Hinzufügen"
+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 "Ausgewählte %s"
+msgstr "Ausgewählte %s"
#: contrib/admin/media/js/SelectFilter2.js:54
msgid "Select your choice(s) and click "
-msgstr "Gewünschte Auswahl treffen und "
+msgstr "Gewünschte Auswahl treffen und "
#: contrib/admin/media/js/SelectFilter2.js:59
msgid "Clear all"
-msgstr "Alles abwählen"
+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 März 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
View
BIN  django/conf/locale/es/LC_MESSAGES/django.mo
Binary file not shown
View
3,693 django/conf/locale/es/LC_MESSAGES/django.po
1,853 additions, 1,840 deletions not shown
View
BIN  django/conf/locale/es/LC_MESSAGES/djangojs.mo
Binary file not shown
View
83 django/conf/locale/es/LC_MESSAGES/djangojs.po
@@ -1,26 +1,41 @@
# Spanish translation for the django-admin JS files.
# Copyright (C)
# This file is distributed under the same license as the PACKAGE package.
-# Jorge Gajon <gajon@gajon.org>, 2005.
#
msgid ""
msgstr ""
"Project-Id-Version: Django JavaScript 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-09 11:51+0100\n"
-"PO-Revision-Date: 2005-12-06 21:32+0100\n"
+"POT-Creation-Date: 2007-07-14 13:47-0500\n"
+"PO-Revision-Date: 2007-07-14 13:41-0500\n"
"Last-Translator: Jorge Gajon <gajon@gajon.org>\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/calendar.js:24
+#: contrib/admin/media/js/dateparse.js:32
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre "
+"Noviembre Diciembre"
+
+#: contrib/admin/media/js/calendar.js:25
+msgid "S M T W T F S"
+msgstr "D L M M J V S"
+
+#: contrib/admin/media/js/dateparse.js:33
+msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
+msgstr "Domingo Lunes Martes Miércoles Jueves Viernes Sábado"
+
#: contrib/admin/media/js/SelectFilter2.js:33
#, perl-format
msgid "Available %s"
msgstr "%s Disponibles"
#: contrib/admin/media/js/SelectFilter2.js:41
-#, fuzzy
msgid "Choose all"
msgstr "Selecciona todos"
@@ -45,66 +60,58 @@ msgstr "Haz tus elecciones y da click en "
msgid "Clear all"
msgstr "Elimina todos"
-#: contrib/admin/media/js/dateparse.js:26
-#: contrib/admin/media/js/calendar.js:24
-msgid ""
-"January February March April May June July August September October November "
-"December"
-msgstr ""
-"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre "
-"Noviembre Diciembre"
-
-#: contrib/admin/media/js/dateparse.js:27
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Domingo Lunes Martes Miércoles Jueves Viernes Sábado"
-
-#: contrib/admin/media/js/calendar.js:25
-msgid "S M T W T F S"
-msgstr "D L M M J V S"
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:45
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:80
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
msgid "Now"
msgstr "Ahora"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:48
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
msgid "Clock"
msgstr "Reloj"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:77
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
msgid "Choose a time"
msgstr "Elige una hora"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
msgid "Midnight"
msgstr "Medianoche"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
msgid "6 a.m."
msgstr "6 a.m."
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
-msgstr "Mediodía"
+msgstr "Mediodía"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:87
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:168
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
msgid "Cancel"
msgstr "Cancelar"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:111
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:162
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
msgid "Today"
msgstr "Hoy"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:114
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
msgid "Calendar"
msgstr "Calendario"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:160
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
msgid "Yesterday"
msgstr "Ayer"
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:164
+#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
-msgstr "Mañana"
+msgstr "Mañana"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
+msgid "Show"
+msgstr "Mostrar"
+
+#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
+msgid "Hide"
+msgstr "Esconder"
View
BIN  django/conf/locale/es_AR/LC_MESSAGES/django.mo
Binary file not shown
View
4,263 django/conf/locale/es_AR/LC_MESSAGES/django.po
2,161 additions, 2,102 deletions not shown
View
BIN  django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo
Binary file not shown
View
22 django/conf/locale/es_AR/LC_MESSAGES/djangojs.po
@@ -1,17 +1,17 @@
-# Argentinean spanish translation for the django-admin JS files, based on
-# Spanish translation work by Jorge Gajon.
-# This file is distributed under the same license as the Django package.
-# Copyright (C) Ramiro Morales <rm0@gmx.net>, 2006,2007.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR
#
msgid ""
msgstr ""
-"Project-Id-Version: Django JavaScript 1.0\n"
+"Project-Id-Version: Django Javascript 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-25 17:48-0300\n"
-"PO-Revision-Date: 2007-02-25 17:55-0300\n"
+"POT-Creation-Date: 2007-07-14 13:45-0300\n"
+"PO-Revision-Date: 2007-07-14 14:36-0300\n"
"Last-Translator: Ramiro Morales <rm0@gmx.net>\n"
+"Language-Team: Django-I18N <django-i18n@googlegroups.com>\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
@@ -55,7 +55,7 @@ msgstr ""
#: contrib/admin/media/js/dateparse.js:33
msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr "Domingo Lunes Martes Miércoles Jueves Viernes Sábado"
+msgstr "Domingo Lunes Martes Miércoles Jueves Viernes Sábado"
#: contrib/admin/media/js/calendar.js:25
msgid "S M T W T F S"
@@ -93,7 +93,7 @@ msgstr "6 a.m."
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
msgid "Noon"
-msgstr "Mediodía"
+msgstr "Mediodía"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
@@ -115,4 +115,4 @@ msgstr "Ayer"
#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
msgid "Tomorrow"
-msgstr "Mañana"
+msgstr "Mañana"
View
BIN  django/conf/locale/fr/LC_MESSAGES/django.mo
Binary file not shown
View
1,077 django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,128 +7,132 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-22 09:06+0200\n"
+"POT-Creation-Date: 2007-07-08 16:03+0200\n"
"PO-Revision-Date: 2006-05-08 15:12+0200\n"
-"Last-Translator: Baptiste Goupil <baptiste.goupil_at_google_email.com>\n"
+"Last-Translator: Baptiste <baptiste.goupil_at_google_email.com>\n"
"Language-Team: français <fr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: oldforms/__init__.py:357 db/models/fields/__init__.py:114
-#: db/models/fields/__init__.py:271 db/models/fields/__init__.py:607
-#: db/models/fields/__init__.py:618 newforms/models.py:178
-#: newforms/fields.py:80 newforms/fields.py:376 newforms/fields.py:452
-#: newforms/fields.py:463
+#: oldforms/__init__.py:369 db/models/fields/__init__.py:125
+#: db/models/fields/__init__.py:282 db/models/fields/__init__.py:679
+#: db/models/fields/__init__.py:690 newforms/models.py:188
+#: newforms/fields.py:87 newforms/fields.py:444 newforms/fields.py:523
+#: newforms/fields.py:534
msgid "This field is required."
msgstr "Ce champ est obligatoire."
-#: oldforms/__init__.py:392
+#: oldforms/__init__.py:404
#, python-format
msgid "Ensure your text is less than %s character."
msgid_plural "Ensure your text is less than %s characters."
msgstr[0] "Assurez-vous que votre texte fait moins de %s caractère."
msgstr[1] "Assurez-vous que votre texte fait moins de %s caractères."
-#: oldforms/__init__.py:397
+#: oldforms/__init__.py:409
msgid "Line breaks are not allowed here."
msgstr "Les retours à la ligne ne sont pas autorisés ici."
-#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610
+#: oldforms/__init__.py:507 oldforms/__init__.py:581 oldforms/__init__.py:620
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Sélectionnez un choix valide ; '%(data)s' n'est pas dans %(choices)s."
-#: oldforms/__init__.py:577 newforms/widgets.py:180
-#: contrib/admin/filterspecs.py:150
+#: oldforms/__init__.py:587 newforms/widgets.py:181
+#: contrib/admin/filterspecs.py:152
msgid "Unknown"
msgstr "Inconnu"
-#: oldforms/__init__.py:577 newforms/widgets.py:180
-#: contrib/admin/filterspecs.py:143
+#: oldforms/__init__.py:587 newforms/widgets.py:181
+#: contrib/admin/filterspecs.py:145
msgid "Yes"
msgstr "Oui"
-#: oldforms/__init__.py:577 newforms/widgets.py:180
-#: contrib/admin/filterspecs.py:143
+#: oldforms/__init__.py:587 newforms/widgets.py:181
+#: contrib/admin/filterspecs.py:145
msgid "No"
msgstr "Non"
-#: oldforms/__init__.py:672 core/validators.py:174 core/validators.py:445
+#: oldforms/__init__.py:682 core/validators.py:178 core/validators.py:456
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: oldforms/__init__.py:674
+#: oldforms/__init__.py:684
msgid "The submitted file is empty."
msgstr "Le fichier soumis est vide."
-#: oldforms/__init__.py:730
+#: oldforms/__init__.py:740
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Entrez un nombre entier entre -32 768 et 32 767."
-#: oldforms/__init__.py:740
+#: oldforms/__init__.py:750
msgid "Enter a positive number."
msgstr "Entrez un nombre entier positif."
-#: oldforms/__init__.py:750
+#: oldforms/__init__.py:760
msgid "Enter a whole number between 0 and 32,767."
msgstr "Entrez un nombre entier entre 0 et 32 767."
-#: db/models/manipulators.py:302
+#: db/models/manipulators.py:304
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
-#: db/models/manipulators.py:303
+#: db/models/manipulators.py:305
msgid "and"
msgstr "et"
-#: db/models/fields/__init__.py:41
+#: db/models/fields/__init__.py:46
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "%(optname)s avec le champ %(fieldname)s existe déjà."
-#: db/models/fields/__init__.py:364
+#: db/models/fields/__init__.py:377
msgid "This value must be an integer."
msgstr "Cette valeur doit être un entier."
-#: db/models/fields/__init__.py:399
+#: db/models/fields/__init__.py:412
msgid "This value must be either True or False."
msgstr "Cette valeur doit être soit Vraie soit Fausse."
-#: db/models/fields/__init__.py:420
+#: db/models/fields/__init__.py:433
msgid "This field cannot be null."
msgstr "Ce champ ne peut pas être vide."
-#: db/models/fields/__init__.py:454 core/validators.py:148
+#: db/models/fields/__init__.py:467 core/validators.py:152
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Entrez une date valide au format AAAA-MM-JJ."
-#: db/models/fields/__init__.py:523 core/validators.py:157
+#: db/models/fields/__init__.py:536 core/validators.py:161
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Entrez une date et une heure valide au format AAAA-MM-JJ HH:MM."
-#: db/models/fields/__init__.py:627
+#: db/models/fields/__init__.py:596
+msgid "This value must be a decimal number."
+msgstr "Cette valeur doit être un nombre décimal."
+
+#: db/models/fields/__init__.py:699
msgid "Enter a valid filename."
msgstr "Entrez un nom de fichier valide."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:824
msgid "This value must be either None, True or False."
msgstr "Cette valeur doit être Nulle, Vraie ou Fausse."
-#: db/models/fields/related.py:53
+#: db/models/fields/related.py:55
#, python-format
msgid "Please enter a valid %s."
msgstr "Entrez un %s valide."
-#: db/models/fields/related.py:624
+#: db/models/fields/related.py:623
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Maintenez \"Contrôle (ctrl)\", ou \"Commande (touche pomme)\" sur un Mac, "
"pour en sélectionner plusieurs."
-#: db/models/fields/related.py:668
+#: db/models/fields/related.py:667
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -146,366 +150,376 @@ msgid "Bengali"
msgstr "Indien"
#: conf/global_settings.py:41
+msgid "Bulgarian"
+msgstr "Bulgare"
+
+#: conf/global_settings.py:42
msgid "Catalan"
msgstr "Catalan"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Czech"
msgstr "Tchèque"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Welsh"
msgstr "Gallois"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Danish"
msgstr "Dannois"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
msgid "German"
msgstr "Allemand"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
msgid "Greek"
msgstr "Grec"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
msgid "English"
msgstr "Anglais"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
msgid "Spanish"
msgstr "Espagnol"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
msgid "Argentinean Spanish"
msgstr "Espagnol Argentin"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
+msgid "Persian"
+msgstr "Perse"
+
+#: conf/global_settings.py:52
msgid "Finnish"
-msgstr "Dannois"
+msgstr "Finlandais"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:53
msgid "French"
msgstr "Français"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:54
msgid "Galician"
msgstr "Galicien"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:55
msgid "Hungarian"
msgstr "Hongrois"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:56
msgid "Hebrew"
-msgstr "Israélien"
+msgstr "Hébreu"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:57
msgid "Icelandic"
msgstr "Islandais"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:58
msgid "Italian"
msgstr "Italien"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:59
msgid "Japanese"
msgstr "Japonais"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:60
+msgid "Korean"
+msgstr "Coréen"
+
+#: conf/global_settings.py:61
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
msgid "Latvian"
msgstr "Letton"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
msgid "Macedonian"
msgstr "Macédonien"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
msgid "Dutch"
-msgstr "Néerlandais"
+msgstr "Hollandais"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
msgid "Norwegian"
msgstr "Norvégien"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
msgid "Polish"
msgstr "Polonais"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
msgid "Portugese"
-msgstr ""
+msgstr "Portugais"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
msgid "Brazilian"
msgstr "Brésilien"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
msgid "Romanian"
msgstr "Roumain"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:70
msgid "Russian"
msgstr "Russe"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:71
msgid "Slovak"
msgstr "Slovaque"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:72
msgid "Slovenian"
msgstr "Slovaque"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:73
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:74
msgid "Swedish"
msgstr "Suédois"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:75
msgid "Tamil"
msgstr "Tamoul"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:76
msgid "Telugu"
msgstr "Télougou"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:77
msgid "Turkish"
msgstr "Turc"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:78
msgid "Ukrainian"
msgstr "Ukrainien"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:79
msgid "Simplified Chinese"
msgstr "Chinois simplifié"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:80
msgid "Traditional Chinese"
msgstr "Chinois traditionnel"
-#: core/validators.py:64
+#: core/validators.py:68
msgid "This value must contain only letters, numbers and underscores."
-msgstr ""
-"Ce champ ne doit contenir que des lettres, des nombres et des tirets bas "
-"('_')."
+msgstr "Ce champ ne doit contenir que des lettres, des nombres et des"
+"tirets bas _."
-#: core/validators.py:68
+#: core/validators.py:72
msgid ""
"This value must contain only letters, numbers, underscores, dashes or "
"slashes."
msgstr ""
-"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas ('_') "
-"et des '/'."
+"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _,"
+"des traits d'union, et des '/'."
-#: core/validators.py:72
+#: core/validators.py:76
msgid "This value must contain only letters, numbers, underscores or hyphens."
msgstr ""
-"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas ('_') "
-"et des '-'."
+"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _"
+"et des traits d'union."
-#: core/validators.py:76
+#: core/validators.py:80
msgid "Uppercase letters are not allowed here."
msgstr "Les lettres majuscules ne sont pas autorisées ici."
-#: core/validators.py:80
+#: core/validators.py:84
msgid "Lowercase letters are not allowed here."
msgstr "Les lettres minuscules ne sont pas autorisées ici."
-#: core/validators.py:87
+#: core/validators.py:91
msgid "Enter only digits separated by commas."
msgstr "Saisissez uniquement des chiffres séparés par des virgules."
-#: core/validators.py:99
+#: core/validators.py:103
msgid "Enter valid e-mail addresses separated by commas."
msgstr "Entrez des adresses de courriel valides séparées par des virgules."
-#: core/validators.py:103
+#: core/validators.py:107
msgid "Please enter a valid IP address."
msgstr "Entrez une adresse IP valide."
-#: core/validators.py:107
+#: core/validators.py:111
msgid "Empty values are not allowed here."
msgstr "Vous ne pouvez pas laisser ce champ vide."
-#: core/validators.py:111
+#: core/validators.py:115
msgid "Non-numeric characters aren't allowed here."
msgstr "Les caractères non numériques ne sont pas autorisés ici."
-#: core/validators.py:115
+#: core/validators.py:119
msgid "This value can't be comprised solely of digits."
msgstr "Cette valeur ne peut pas être composé uniquement de chiffres."
-#: core/validators.py:120 newforms/fields.py:128
+#: core/validators.py:124 newforms/fields.py:135
msgid "Enter a whole number."
msgstr "Entrez un nombre entier."
-#: core/validators.py:124
+#: core/validators.py:128
msgid "Only alphabetical characters are allowed here."
msgstr "Seules les lettres de l'alphabet sont autorisées ici."
-#: core/validators.py:139
+#: core/validators.py:143
msgid "Year must be 1900 or later."
msgstr "L'année doit être supérieure à 1900."
-#: core/validators.py:143
+#: core/validators.py:147
#, python-format
msgid "Invalid date: %s"
-msgstr "Date invalide&amp;nbsp;: %s"
+msgstr "Date invalide : %s"
-#: core/validators.py:153
+#: core/validators.py:157
msgid "Enter a valid time in HH:MM format."
msgstr "Entrez une heure valide au format HH:MM."
-#: core/validators.py:162 newforms/fields.py:271
+#: core/validators.py:166 newforms/fields.py:339
msgid "Enter a valid e-mail address."
msgstr "Entrez une adresse de courriel valide."
-#: core/validators.py:178
+#: core/validators.py:182
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Envoyez une image valide. Le fichier que vous avez transferé n'est pas une "
-"image ou bien est une image corrompue."
+"image ou bien est corrompu."
-#: core/validators.py:185
+#: core/validators.py:189
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "L'URL %s ne pointe pas vers une image valide."
-#: core/validators.py:189
+#: core/validators.py:193
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr ""
"Les numéros de téléphone doivent être au format XXX-XXX-XXXX. \"%s\" est "
"incorrect."
-#: core/validators.py:197
+#: core/validators.py:201
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "L'URL %s ne pointe pas vers une vidéo QuickTime valide."
-#: core/validators.py:201
+#: core/validators.py:205
msgid "A valid URL is required."
msgstr "Une URL valide est requise."
-#: core/validators.py:215
+#: core/validators.py:219
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
"%s"
msgstr ""
-"Du HTML valide est requis. Les erreurs sont les suivantes&amp;nbsp;:\n"
+"Du HTML valide est requis. Les erreurs sont les suivantes :\n"
"%s"
-#: core/validators.py:222
+#: core/validators.py:226
#, python-format
msgid "Badly formed XML: %s"
-msgstr "XML mal formé&amp;nbsp;: %s"
+msgstr "XML mal formé : %s"
-#: core/validators.py:239
+#: core/validators.py:243
#, python-format
msgid "Invalid URL: %s"
-msgstr "URL invalide&amp;nbsp;: %s"
+msgstr "URL invalide : %s"
-#: core/validators.py:244 core/validators.py:246
+#: core/validators.py:248 core/validators.py:250
#, python-format
msgid "The URL %s is a broken link."
msgstr "L'URL %s est un lien cassé."
-#: core/validators.py:252
+#: core/validators.py:256
msgid "Enter a valid U.S. state abbreviation."
-msgstr "Entrez une abréviation d'état américain valide."
+msgstr "Entrez une abréviation d'État Américain valide."
-#: core/validators.py:266
+#: core/validators.py:270
#, 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] "Attention à votre langage ! Le mot %s n'est pas autorisé ici."
msgstr[1] "Attention à votre langage ! Les mots %s ne sont pas autorisés ici."
-#: core/validators.py:273
+#: core/validators.py:277
#, python-format
msgid "This field must match the '%s' field."
msgstr "Ce champ doit correspondre au champ '%s'."
-#: core/validators.py:292
+#: core/validators.py:296
msgid "Please enter something for at least one field."
-msgstr "Saisissez au moins une valeur dans un des champs s'il vous plaît."
+msgstr "Veuillez saisir quelque chose dans au moins un des champs."
-#: core/validators.py:301 core/validators.py:312
+#: core/validators.py:305 core/validators.py:316
msgid "Please enter both fields or leave them both empty."
-msgstr ""
-"Renseignez chacun des champs ou laissez les deux vides s'il vous plaît."
+msgstr "Veuillez renseigner les deux champs ou les laisser tous les deux vides."
-#: core/validators.py:320
+#: core/validators.py:324
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Ce champ doit être renseigné si %(field)s vaut %(value)s"
-#: core/validators.py:333
+#: core/validators.py:337
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Ce champ doit être renseigné si %(field)s ne vaut pas %(value)s"
-#: core/validators.py:352
+#: core/validators.py:356
msgid "Duplicate values are not allowed."
-msgstr "Des valeurs identiques ne sont pas autorisées."
+msgstr "Les valeurs identiques ne sont pas autorisées."
-#: core/validators.py:367
+#: core/validators.py:371
#, python-format
msgid "This value must be between %(lower)s and %(upper)s."
msgstr "Cette valeur doit être comprise entre %(lower)s et %(upper)s."
-#: core/validators.py:369
+#: core/validators.py:373
#, python-format
msgid "This value must be at least %s."
msgstr "Cette valeur doit être au moins %s."
-#: core/validators.py:371
+#: core/validators.py:375
#, python-format
msgid "This value must be no more than %s."
msgstr "Cette valeur ne doit pas dépasser %s."
-#: core/validators.py:407
+#: core/validators.py:411
#, python-format
msgid "This value must be a power of %s."
msgstr "Cette valeur doit être une puissance de %s."
-#: core/validators.py:418
+#: core/validators.py:420
msgid "Please enter a valid decimal number."
-msgstr "Saisissez un nombre décimal valide s'il vous plaît."
+msgstr "Veuillez saisir un nombre décimal valide."
-#: core/validators.py:422
+#: core/validators.py:426
#, 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] ""
-"Saisissez un nombre décimal valide avec au plus %s chiffre s'il vous plaît."
+"Veuillez saisir un nombre décimal valide avec au plus %s chiffre."
msgstr[1] ""
-"Saisissez un nombre décimal valide avec au plus %s chiffres s'il vous plaît."
+"Veuillez saisir un nombre décimal valide avec au plus %s chiffres."
-#: core/validators.py:425
+#: core/validators.py:429
#, 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] "Veuillez saisir un nombre décimal valide avec au plus %s chiffre."
-msgstr[1] "Veuillez saisir un nombre décimal valide avec au plus %s chiffres."
+msgstr[0] "Veuillez saisir un nombre décimal valide avec une partie entière de %s chiffre au plus."
+msgstr[1] "Veuillez saisir un nombre décimal valide avec une partie entière de %s chiffres au plus."
-#: core/validators.py:428
+#: core/validators.py:432
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -513,32 +527,36 @@ msgid_plural ""
msgstr[0] "Veuillez saisir un nombre décimal valide avec au plus %s décimale."
msgstr[1] "Veuillez saisir un nombre décimal valide avec au plus %s décimales."
-#: core/validators.py:438
+#: core/validators.py:440
+msgid "Please enter a valid floating point number."
+msgstr "Veuillez entrer un nombre à virgule flottante valide."
+
+#: core/validators.py:449
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr ""
-"Vérifiez que le fichier transféré fait au moins une taille de %s octets."
+"Vérifiez que le fichier transféré fait au moins %s octets."
-#: core/validators.py:439
+#: core/validators.py:450
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr ""
-"Vérifiez que le fichier transféré fait au plus une taille de %s octets."
+"Vérifiez que le fichier transféré fait au plus %s octets."
-#: core/validators.py:456
+#: core/validators.py:467
msgid "The format for this field is wrong."
msgstr "Le format de ce champ est mauvais."
-#: core/validators.py:471
+#: core/validators.py:482
msgid "This field is invalid."
msgstr "Ce champ est invalide."
-#: core/validators.py:507
+#: core/validators.py:518
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Impossible de récupérer quoi que ce soit depuis %s."
-#: core/validators.py:510
+#: core/validators.py:521
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@@ -546,16 +564,16 @@ msgstr ""
"L'entête Content-Type '%(contenttype)s', renvoyée par l'url %(url)s n'est "
"pas valide."
-#: core/validators.py:543
+#: core/validators.py:554
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
"\"%(start)s\".)"
msgstr ""
-"Veuillez fermer le tag %(tag)s de la ligne %(line)s. (La ligne débutant par "
+"Veuillez fermer le tag %(tag)s à la ligne %(line)s. (Ligne débutant par "
"\"%(start)s\".)"
-#: core/validators.py:547
+#: core/validators.py:558
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -564,7 +582,7 @@ msgstr ""
"Du texte commençant à la ligne %(line)s n'est pas autorisé dans ce contexte. "
"(Ligne débutant par \"%(start)s\".)"
-#: core/validators.py:552
+#: core/validators.py:563
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -573,7 +591,7 @@ msgstr ""
"\"%(attr)s\" ligne %(line)s n'est pas un attribut valide. (Ligne débutant "
"par \"%(start)s\".)"
-#: core/validators.py:557
+#: core/validators.py:568
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -582,7 +600,7 @@ msgstr ""
"\"<%(tag)s>\" ligne %(line)s n'est pas un tag valide. (Ligne débutant par \"%"
"(start)s\".)"
-#: core/validators.py:561
+#: core/validators.py:572
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -591,7 +609,7 @@ msgstr ""
"Un tag, ou un ou plusieurs attributs, de la ligne %(line)s est manquant. "
"(Ligne débutant par \"%(start)s\".)"
-#: core/validators.py:566
+#: core/validators.py:577
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -615,64 +633,83 @@ msgstr "L'objet %(verbose_name)s a été mis à jour avec succès."
msgid "The %(verbose_name)s was deleted."
msgstr "L'objet %(verbose_name)s a été supprimé."
-#: newforms/models.py:165 newforms/fields.py:362
+#: newforms/models.py:175 newforms/fields.py:432
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Sélectionnez un choix valide. Ce choix ne fait pas partie de ceux "
"disponibles."
-#: newforms/models.py:182 newforms/fields.py:380 newforms/fields.py:456
+#: newforms/models.py:192 newforms/fields.py:448 newforms/fields.py:527
msgid "Enter a list of values."
-msgstr "Entrez une liste de valeur."
+msgstr "Entrez une liste de valeurs."
-#: newforms/models.py:188 newforms/fields.py:389
+#: newforms/models.py:198 newforms/fields.py:457
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Sélectionnez un choix valide ; %s n'en fait pas partie."
+msgstr "Sélectionnez un choix valide; %s n'en fait pas partie."
-#: newforms/fields.py:103 newforms/fields.py:256
+#: newforms/fields.py:110 newforms/fields.py:324
#, python-format
msgid "Ensure this value has at most %d characters."
-msgstr "Assurez-vous que cette valeur fait moins de %d caractère."
+msgstr "Assurez-vous que cette valeur fait moins de %d caractères."
-#: newforms/fields.py:105 newforms/fields.py:258
+#: newforms/fields.py:112 newforms/fields.py:326
#, python-format
msgid "Ensure this value has at least %d characters."
-msgstr "Assurez-vous que cette valeur fait au moins %d caractère."
+msgstr "Assurez-vous que cette valeur fait plus de %d caractères."
-#: newforms/fields.py:130
+#: newforms/fields.py:137 newforms/fields.py:160 newforms/fields.py:192
#, python-format
msgid "Ensure this value is less than or equal to %s."
-msgstr "Assurez-vous que cette valeur soit plus petite ou égale à %s."
+msgstr "Assurez-vous que cette valeur soit inférieure ou égale à %s."
-#: newforms/fields.py:132
+#: newforms/fields.py:139 newforms/fields.py:162 newforms/fields.py:194
#, python-format
msgid "Ensure this value is greater than or equal to %s."
-msgstr "Assurez-vous que cette valeur soit plus grande ou égale à %s."
+msgstr "Assurez-vous que cette valeur soit supérieure ou égale à %s."
+
+#: newforms/fields.py:158 newforms/fields.py:186
+msgid "Enter a number."
+msgstr "Entrez un nombre."
+
+#: newforms/fields.py:196
+#, 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."
+
+#: newforms/fields.py:198
+#, 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."
+
+#: newforms/fields.py:200
+#, 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."
-#: newforms/fields.py:165
+#: newforms/fields.py:233 newforms/fields.py:567
msgid "Enter a valid date."
msgstr "Entrez une date valide."
-#: newforms/fields.py:192
+#: newforms/fields.py:260 newforms/fields.py:569
msgid "Enter a valid time."
msgstr "Entrez une heure valide."
-#: newforms/fields.py:228
+#: newforms/fields.py:296
msgid "Enter a valid date/time."
msgstr "Entrez une date et une heure valides."
-#: newforms/fields.py:242
+#: newforms/fields.py:310
msgid "Enter a valid value."
msgstr "Entrez une valeur valide."
-#: newforms/fields.py:289 newforms/fields.py:311
+#: newforms/fields.py:357 newforms/fields.py:379
msgid "Enter a valid URL."
msgstr "Entrez une URL valide."
-#: newforms/fields.py:313
+#: newforms/fields.py:381
msgid "This URL appears to be a broken link."
-msgstr "L'URL est un lien cassé."
+msgstr "Cette URL semble être cassée."
#: contrib/humanize/templatetags/humanize.py:17
msgid "th"
@@ -756,8 +793,8 @@ msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
-"Ceci doit être un chemin absolu, sans nom de domaine. Par exemple: '/events/"
-"search/'."
+"Ceci doit être un chemin absolu, sans nom de domaine. Par exemple: '/evenements/"
+"rechercher/'."
#: contrib/redirects/models.py:9
msgid "redirect to"
@@ -836,7 +873,7 @@ msgstr "date et heure soumises"
msgid "is public"
msgstr "est public"
-#: contrib/comments/models.py:85 contrib/admindocs/views.py:304
+#: contrib/comments/models.py:85 contrib/admindocs/views.py:305
msgid "IP address"
msgstr "adresse IP"
@@ -877,7 +914,7 @@ msgstr ""
#: contrib/comments/models.py:158
msgid "person's name"
-msgstr "nom"
+msgstr "nom de la personne"
#: contrib/comments/models.py:161
msgid "ip address"
@@ -961,25 +998,25 @@ msgstr "suppressions de modérateur"
msgid "Moderator deletion by %r"
msgstr "Suppression de modérateur par %r"
-#: contrib/comments/views/karma.py:19
+#: contrib/comments/views/karma.py:20
msgid "Anonymous users cannot vote"
msgstr "Les utilisateurs anonymes ne peuvent pas voter"
-#: contrib/comments/views/karma.py:23
+#: contrib/comments/views/karma.py:24
msgid "Invalid comment ID"
-msgstr "ID de commentaire invalide"
+msgstr "Identifiant de commentaire invalide"
-#: contrib/comments/views/karma.py:25
+#: contrib/comments/views/karma.py:26
msgid "No voting for yourself"
msgstr "Impossible de voter pour soi-même"
-#: contrib/comments/views/comments.py:27
+#: contrib/comments/views/comments.py:28
msgid ""
"This rating is required because you've entered at least one other rating."
msgstr ""
-"Ce votre est nécéssaire parceque vous avez saisi au moins un autre vote."
+"Ce vote est nécessaire car vous avez saisi au moins un autre vote."
-#: contrib/comments/views/comments.py:111
+#: contrib/comments/views/comments.py:112
#, python-format
msgid ""
"This comment was posted by a user who has posted fewer than %(count)s "
@@ -993,67 +1030,67 @@ msgid_plural ""
"%(text)s"
msgstr[0] ""
"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s "
-"commentaire&amp;nbsp;:\n"
+"commentaire :\n"
"\n"
"%(text)s"
msgstr[1] ""
"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s "
-"commentaires&amp;nbsp;:\n"
+"commentaires :\n"
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:116
+#: contrib/comments/views/comments.py:117
#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
"\n"
"%(text)s"
msgstr ""
-"Ce commentaire a été posté par un utilisateur imprécis&amp;nbsp;:\n"
+"Ce commentaire a été posté par un utilisateur imprécis :\n"
"\n"
"%(text)s"
-#: contrib/comments/views/comments.py:188
-#: contrib/comments/views/comments.py:280
+#: contrib/comments/views/comments.py:189
+#: contrib/comments/views/comments.py:281
msgid "Only POSTs are allowed"
msgstr "Seuls les POSTs sont autorisés"
-#: contrib/comments/views/comments.py:192
-#: contrib/comments/views/comments.py:284
+#: contrib/comments/views/comments.py:193
+#: contrib/comments/views/comments.py:285
msgid "One or more of the required fields wasn't submitted"
msgstr "Un ou plusieurs champs requis n'ont pas été remplis"
-#: contrib/comments/views/comments.py:196
-#: contrib/comments/views/comments.py:286
+#: contrib/comments/views/comments.py:197
+#: contrib/comments/views/comments.py:287
msgid "Somebody tampered with the comment form (security violation)"
msgstr ""
"Quelqu'un a trafiqué le formulaire de commentaire (violation des règles de "
"sécurité)"
-#: contrib/comments/views/comments.py:206
-#: contrib/comments/views/comments.py:292
+#: contrib/comments/views/comments.py:207
+#: contrib/comments/views/comments.py:293
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
msgstr ""
-"Ce formulaire de commentaire avait un paramètre cible invalide ; l'ID de "
+"Ce formulaire de commentaire avait un paramètre cible invalide; l'identifiant de "
"l'objet était invalide"
-#: contrib/comments/views/comments.py:257
-#: contrib/comments/views/comments.py:321
+#: contrib/comments/views/comments.py:258
+#: contrib/comments/views/comments.py:322
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
-"Le formulaire de commentaire ne proposait ni les options de prévisualisation "
-"ni d'envoi"
+"Le formulaire de commentaire ne proposait ni la prévisualisation "
+"ni l'envoi"
#: contrib/comments/templates/comments/freeform.html:4
msgid "Your name:"
-msgstr "Votre nom&amp;nbsp;:"
+msgstr "Votre nom :"
#: contrib/comments/templates/comments/freeform.html:5
#: contrib/comments/templates/comments/form.html:28
msgid "Comment:"
-msgstr "Commentaire&amp;nbsp;:"
+msgstr "Commentaire :"
#: contrib/comments/templates/comments/freeform.html:10
#: contrib/comments/templates/comments/form.html:35
@@ -1095,7 +1132,7 @@ msgstr "Mot de passe"
#: contrib/comments/templates/comments/form.html:8
msgid "Forgotten your password?"
-msgstr "Mot de passe oublié?"
+msgstr "Mot de passe oublié ?"
#: contrib/comments/templates/comments/form.html:12
msgid "Ratings"
@@ -1131,65 +1168,65 @@ msgstr "site"
msgid "sites"
msgstr "sites"
-#: contrib/admin/filterspecs.py:40
+#: contrib/admin/filterspecs.py:42
#, python-format
msgid ""
"<h3>By %s:</h3>\n"
"<ul>\n"
msgstr ""
-"<h3>Par %s&amp;nbsp;:</h3>\n"
+"<h3>Par %s&nbsp;:</h3>\n"
"<ul>\n"
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169
+#: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90
+#: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171
msgid "All"
msgstr "Tout"
-#: contrib/admin/filterspecs.py:109
+#: contrib/admin/filterspecs.py:111
msgid "Any date"
msgstr "Toutes les dates"
-#: contrib/admin/filterspecs.py:110
+#: contrib/admin/filterspecs.py:112
msgid "Today"
msgstr "Aujourd'hui"
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:115
msgid "Past 7 days"
msgstr "Les 7 derniers jours"
-#: contrib/admin/filterspecs.py:115
+#: contrib/admin/filterspecs.py:117
msgid "This month"
msgstr "Ce mois-ci"
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:119
msgid "This year"
msgstr "Cette année"
-#: contrib/admin/options.py:307 contrib/admin/views/auth.py:19
+#: contrib/admin/options.py:323 contrib/admin/views/auth.py:20
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "L'objet %(name)s \"%(obj)s\" a été ajouté avec succès."
-#: contrib/admin/options.py:311 contrib/admin/options.py:363
-#: contrib/admin/views/auth.py:24
+#: contrib/admin/options.py:327 contrib/admin/options.py:385
+#: contrib/admin/views/auth.py:25
msgid "You may edit it again below."
msgstr "Vous pouvez continuez de l'éditez ci-dessous."
-#: contrib/admin/options.py:321 contrib/admin/options.py:372
+#: contrib/admin/options.py:337 contrib/admin/options.py:394
#, python-format
msgid "You may add another %s below."
msgstr "Vous pouvez ajouter un autre %s ci-dessous."
-#: contrib/admin/options.py:358
+#: contrib/admin/options.py:380
msgid "No fields changed."
msgstr "Aucun champ modifié."
-#: contrib/admin/options.py:361
+#: contrib/admin/options.py:383
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "L'objet %(name)s \"%(obj)s\" a été modifié avec succès."
-#: contrib/admin/options.py:369
+#: contrib/admin/options.py:391
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -1197,69 +1234,69 @@ msgstr ""
"L'objet %(name)s \"%(obj)s\" a été ajouté avec succès.Vous pouvez continuez "
"de l'éditez ci-dessous."
-#: contrib/admin/options.py:408
+#: contrib/admin/options.py:437
#, python-format
msgid "Add %s"
msgstr "Ajouter %s"
-#: contrib/admin/options.py:468
+#: contrib/admin/options.py:504
#, python-format
msgid "Change %s"
msgstr "Changement %s"
-#: contrib/admin/options.py:494
+#: contrib/admin/options.py:531
msgid "Database error"
msgstr "Erreur de base de données"
-#: contrib/admin/options.py:539
+#: contrib/admin/options.py:576
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "L'objet %(name)s \"%(obj)s\" a été supprimé avec succès."
-#: contrib/admin/options.py:542
+#: contrib/admin/options.py:579
msgid "Are you sure?"
msgstr "Êtes-vous sûr ?"
-#: contrib/admin/options.py:564
+#: contrib/admin/options.py:601
#, python-format
msgid "Change history: %s"
-msgstr "Historique des changements&amp;nbsp;: %s"
+msgstr "Historique des changements : %s"
-#: contrib/admin/models.py:16
+#: contrib/admin/models.py:17
msgid "action time"
msgstr "heure de l'action"
-#: contrib/admin/models.py:19
+#: contrib/admin/models.py:20
msgid "object id"
msgstr "id de l'objet"
-#: contrib/admin/models.py:20
+#: contrib/admin/models.py:21
msgid "object repr"
msgstr "représentation de l'objet"
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "action flag"
msgstr "indicateur de l'action"
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "change message"
msgstr "message de modification"
-#: contrib/admin/models.py:25
+#: contrib/admin/models.py:26
msgid "log entry"
msgstr "entrée d'historique"
-#: contrib/admin/models.py:26
+#: contrib/admin/models.py:27
msgid "log entries"
msgstr "entrées d'historique"
-#: contrib/admin/widgets.py:43
+#: contrib/admin/widgets.py:44
msgid "Date:"
-msgstr "Date&amp;nbsp;:"
+msgstr "Date :"
-#: contrib/admin/widgets.py:43
+#: contrib/admin/widgets.py:44
msgid "Time:"
-msgstr "Heure&amp;nbsp;:"
+msgstr "Heure :"
#: contrib/admin/sites.py:13 contrib/admin/views/decorators.py:10
#: contrib/auth/forms.py:60
@@ -1267,7 +1304,7 @@ msgid ""
"Please enter a correct username and password. Note that both fields are case-"
"sensitive."
msgstr ""
-"Saisissez s'il vous plaît un nom d'utilisateur et un mot de passe valide. "
+"Veuillez saisir un nom d'utilisateur et un mot de passe valide. "
"Remarquez que chacun de ces champs est sensible à la casse (différenciation "
"des majuscules/minuscules)."
@@ -1281,16 +1318,16 @@ msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
-"Votre session a expiré, connectez-vous de nouveau s'il vous plaît. Ne vous "
-"inquiétez pas, votre travail précédement éffectué a été sauvé."
+"Veuillez vous reconnecter, car votre session a expiré. Ne vous "
+"inquiétez pas, votre soumission a été enregistrée."
#: contrib/admin/sites.py:193 contrib/admin/views/decorators.py:69
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
-"Il semblerait que votre navigateur n'accepte pas les cookies. Activez-les, "
-"rechargez cette page et rééssayez s'il vous plaît."
+"Il semblerait que votre navigateur n'accepte pas les cookies. Veuillez"
+"les activer, recharger cette page, puis rééssayer."
#: contrib/admin/sites.py:207 contrib/admin/views/decorators.py:83
msgid "Usernames cannot contain the '@' character."
@@ -1302,54 +1339,54 @@ msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"Votre courriel n'est pas votre nom d'utilisateur. Essayez '%s' à la place."
-#: contrib/admin/sites.py:263 contrib/admin/views/main.py:136
+#: contrib/admin/sites.py:276 contrib/admin/views/main.py:143
msgid "Site administration"
msgstr "Gestion du site"
-#: contrib/admin/templatetags/admin_list.py:247
+#: contrib/admin/templatetags/admin_list.py:252
msgid "All dates"
msgstr "Toutes les dates"
-#: contrib/admin/views/auth.py:30
+#: contrib/admin/views/auth.py:31
msgid "Add user"
msgstr "Ajouter l'utilisateur"
-#: contrib/admin/views/auth.py:55
+#: contrib/admin/views/auth.py:56
msgid "Password changed successfully."
msgstr "Mot de passe modifié avec succés"