Permalink
Browse files

newforms-admin: Merged from trunk up to [6952].

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 3f494f1 commit f4c7a0dcb66d21987837ba6d4b4f192b15d39816 @jkocherhans jkocherhans committed Dec 19, 2007
Showing with 1,609 additions and 976 deletions.
  1. +3 −0 AUTHORS
  2. +3 −1 django/conf/__init__.py
  3. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  4. +198 −194 django/conf/locale/ca/LC_MESSAGES/django.po
  5. BIN django/conf/locale/nl/LC_MESSAGES/django.mo
  6. +34 −39 django/conf/locale/nl/LC_MESSAGES/django.po
  7. +7 −0 django/contrib/admin/media/js/urlify.js
  8. +1 −1 django/contrib/admin/templatetags/admin_list.py
  9. +1 −1 django/contrib/auth/models.py
  10. +12 −0 django/contrib/auth/tests.py
  11. +21 −21 django/contrib/contenttypes/generic.py
  12. +3 −2 django/contrib/databrowse/datastructures.py
  13. +19 −9 django/contrib/localflavor/ar/forms.py
  14. +10 −4 django/contrib/localflavor/au/forms.py
  15. +32 −15 django/contrib/localflavor/br/forms.py
  16. +57 −43 django/contrib/localflavor/ca/forms.py
  17. +17 −8 django/contrib/localflavor/ch/forms.py
  18. +9 −4 django/contrib/localflavor/cl/forms.py
  19. +11 −7 django/contrib/localflavor/de/forms.py
  20. +30 −19 django/contrib/localflavor/es/forms.py
  21. +10 −5 django/contrib/localflavor/fi/forms.py
  22. +10 −4 django/contrib/localflavor/fr/forms.py
  23. +10 −4 django/contrib/localflavor/in_/forms.py
  24. +7 −3 django/contrib/localflavor/is_/forms.py
  25. +17 −11 django/contrib/localflavor/it/forms.py
  26. +5 −3 django/contrib/localflavor/jp/forms.py
  27. +32 −24 django/contrib/localflavor/nl/forms.py
  28. +13 −8 django/contrib/localflavor/no/forms.py
  29. +14 −4 django/contrib/localflavor/pe/forms.py
  30. +24 −13 django/contrib/localflavor/pl/forms.py
  31. +5 −3 django/contrib/localflavor/sk/forms.py
  32. +25 −7 django/contrib/localflavor/uk/forms.py
  33. +22 −9 django/contrib/localflavor/us/forms.py
  34. +12 −10 django/contrib/localflavor/za/forms.py
  35. +11 −2 django/contrib/sessions/backends/file.py
  36. +8 −0 django/contrib/sessions/tests.py
  37. +74 −36 django/core/cache/backends/filebased.py
  38. +31 −28 django/core/cache/backends/locmem.py
  39. +34 −46 django/core/management/__init__.py
  40. +2 −0 django/core/management/base.py
  41. +9 −3 django/core/management/commands/dumpdata.py
  42. +10 −7 django/core/management/commands/loaddata.py
  43. +3 −0 django/core/management/sql.py
  44. +5 −0 django/core/serializers/__init__.py
  45. +4 −0 django/core/serializers/base.py
  46. +2 −0 django/core/serializers/json.py
  47. +3 −1 django/core/serializers/python.py
  48. +17 −1 django/core/serializers/pyyaml.py
  49. +14 −2 django/core/servers/basehttp.py
  50. +2 −2 django/db/__init__.py
  51. +19 −0 django/db/backends/oracle/base.py
  52. +10 −6 django/db/models/fields/__init__.py
  53. +14 −1 django/http/__init__.py
  54. +2 −2 django/newforms/fields.py
  55. +25 −22 django/newforms/models.py
  56. +29 −3 django/template/defaultfilters.py
  57. +1 −1 django/template/defaulttags.py
  58. +35 −9 django/test/utils.py
  59. +11 −11 django/utils/html.py
  60. +8 −10 django/utils/maxlength.py
  61. +26 −18 django/views/debug.py
  62. +2 −1 django/views/static.py
  63. +14 −6 docs/add_ons.txt
  64. +3 −3 docs/authentication.txt
  65. +4 −3 docs/contributing.txt
  66. +6 −2 docs/custom_model_fields.txt
  67. +4 −5 docs/databases.txt
  68. +7 −0 docs/django-admin.txt
  69. +7 −0 docs/form_for_model.txt
  70. +6 −8 docs/install.txt
  71. +104 −108 docs/localflavor.txt
  72. +12 −11 docs/middleware.txt
  73. +1 −1 docs/model-api.txt
  74. +17 −14 docs/modelforms.txt
  75. +1 −1 docs/newforms.txt
  76. +16 −4 docs/request_response.txt
  77. +1 −1 docs/sessions.txt
  78. +13 −4 docs/settings.txt
  79. +5 −3 docs/syndication_feeds.txt
  80. +37 −26 docs/templates.txt
  81. +2 −2 docs/templates_python.txt
  82. +28 −21 docs/testing.txt
  83. +17 −13 tests/modeltests/generic_relations/models.py
  84. +31 −25 tests/modeltests/model_forms/models.py
  85. +38 −0 tests/modeltests/serializers/models.py
  86. +51 −7 tests/regressiontests/cache/tests.py
  87. +12 −0 tests/regressiontests/defaultfilters/tests.py
  88. +4 −4 tests/regressiontests/forms/localflavor/cl.py
  89. +21 −8 tests/regressiontests/forms/localflavor/uk.py
  90. +37 −1 tests/regressiontests/httpwrappers/tests.py
  91. +3 −3 tests/regressiontests/maxlength/tests.py
  92. +10 −0 tests/regressiontests/model_regress/models.py
  93. +2 −2 tests/regressiontests/templates/filters.py
  94. +1 −0 tests/regressiontests/views/media/file.unknown
  95. +6 −2 tests/regressiontests/views/tests/static.py
  96. +3 −0 tests/runtests.py
View
@@ -131,6 +131,7 @@ answer newbie questions, and generally made Django that much better:
Matthew Flanagan <http://wadofstuff.blogspot.com>
Eric Floehr <eric@intellovations.com>
Vincent Foley <vfoleybourgon@yahoo.ca>
+ Rudolph Froger <rfroger@estrate.nl>
Jorge Gajon <gajon@gajon.org>
gandalf@owca.info
Marc Garcia <marc.garcia@accopensys.com>
@@ -306,6 +307,7 @@ answer newbie questions, and generally made Django that much better:
Georgi Stanojevski <glisha@gmail.com>
Vasiliy Stavenko <stavenko@gmail.com>
Thomas Steinacher <http://www.eggdrop.ch/>
+ Johan C. Stöver <johan@nilling.nl>
nowell strite
Thomas Stromberg <tstromberg@google.com>
Sundance
@@ -333,6 +335,7 @@ answer newbie questions, and generally made Django that much better:
tt@gurgle.no
Amit Upadhyay
Geert Vanderkelen
+ I.S. van Oostveen <v.oostveen@idca.nl>
viestards.lists@gmail.com
George Vilches <gav@thataddress.com>
Vlado <vlado@labath.org>
@@ -52,7 +52,9 @@ def _import_settings(self):
if not settings_module: # If it's set but is an empty string.
raise KeyError
except KeyError:
- raise ImportError, "Environment variable %s is undefined so settings cannot be imported." % ENVIRONMENT_VARIABLE # NOTE: This is arguably an EnvironmentError, but that causes problems with Python's interactive help
+ # NOTE: This is arguably an EnvironmentError, but that causes
+ # problems with Python's interactive help.
+ raise ImportError("Settings cannot be imported, because environment variable %s is undefined." % ENVIRONMENT_VARIABLE)
self._target = Settings(settings_module)
Binary file not shown.
Oops, something went wrong.

0 comments on commit f4c7a0d

Please sign in to comment.