/django

Permalink
Browse files

gis: Merged revisions 7643-7662,7667-7668,7672-7682,7686-7693,7695-76… 

…98,7700-7702,7704-7706,7710,7712-7729,7731-7732,7738-7758,7760-7766 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
@jbronn
jbronn committed Jun 26, 2008
1 parent 9fcc6c3 commit aef8a8305d2190b00386b8b1603deb03a2949f5b
Unified Split
Showing with 11,114 additions and 2,651 deletions.
  1. +3 −0 AUTHORS
  2. +1 −1 LICENSE
  3. +2 −0 django/bin/profiling/gather_profile_stats.py
  4. +2 −0 django/conf/global_settings.py
  5. BIN django/conf/locale/ca/LC_MESSAGES/django.mo
  6. +162 −154 django/conf/locale/ca/LC_MESSAGES/django.po
  7. BIN django/conf/locale/de/LC_MESSAGES/django.mo
  8. +415 −675 django/conf/locale/de/LC_MESSAGES/django.po
  9. BIN django/conf/locale/de/LC_MESSAGES/djangojs.mo
  10. +35 −38 django/conf/locale/de/LC_MESSAGES/djangojs.po
  11. BIN django/conf/locale/es/LC_MESSAGES/django.mo
  12. +129 −130 django/conf/locale/es/LC_MESSAGES/django.po
  13. BIN django/conf/locale/et/LC_MESSAGES/django.mo
  14. +4,340 −0 django/conf/locale/et/LC_MESSAGES/django.po
  15. BIN django/conf/locale/et/LC_MESSAGES/djangojs.mo
  16. +115 −0 django/conf/locale/et/LC_MESSAGES/djangojs.po
  17. BIN django/conf/locale/he/LC_MESSAGES/django.mo
  18. +933 −500 django/conf/locale/he/LC_MESSAGES/django.po
  19. BIN django/conf/locale/hr/LC_MESSAGES/django.mo
  20. +622 −613 django/conf/locale/hr/LC_MESSAGES/django.po
  21. BIN django/conf/locale/hr/LC_MESSAGES/djangojs.mo
  22. +1 −1 django/conf/locale/hr/LC_MESSAGES/djangojs.po
  23. BIN django/conf/locale/lt/LC_MESSAGES/django.mo
  24. +2,868 −0 django/conf/locale/lt/LC_MESSAGES/django.po
  25. BIN django/conf/locale/lt/LC_MESSAGES/djangojs.mo
  26. +116 −0 django/conf/locale/lt/LC_MESSAGES/djangojs.po
  27. BIN django/conf/locale/pl/LC_MESSAGES/django.mo
  28. +117 −109 django/conf/locale/pl/LC_MESSAGES/django.po
  29. +14 −9 django/contrib/auth/views.py
  30. +2 −1 django/contrib/flatpages/models.py
  31. +4 −0 django/contrib/formtools/tests.py
  32. +1 −1 django/contrib/formtools/wizard.py
  33. +6 −6 django/contrib/localflavor/ar/forms.py
  34. +2 −2 django/contrib/localflavor/au/forms.py
  35. +1 −1 django/contrib/localflavor/br/forms.py
  36. +3 −3 django/contrib/localflavor/ca/forms.py
  37. +3 −3 django/contrib/localflavor/ch/forms.py
  38. +4 −4 django/contrib/localflavor/cl/forms.py
  39. +3 −3 django/contrib/localflavor/de/forms.py
  40. +1 −1 django/contrib/localflavor/es/forms.py
  41. +3 −3 django/contrib/localflavor/fi/forms.py
  42. +2 −2 django/contrib/localflavor/fr/forms.py
  43. +3 −3 django/contrib/localflavor/is_/forms.py
  44. +5 −5 django/contrib/localflavor/it/forms.py
  45. +2 −2 django/contrib/localflavor/jp/forms.py
  46. +1 −1 django/contrib/localflavor/nl/forms.py
  47. +3 −3 django/contrib/localflavor/no/forms.py
  48. +5 −5 django/contrib/localflavor/pe/forms.py
  49. +1 −1 django/contrib/localflavor/pl/forms.py
  50. +2 −2 django/contrib/localflavor/sk/forms.py
  51. +2 −2 django/contrib/localflavor/uk/forms.py
  52. +1 −1 django/contrib/localflavor/uk/uk_regions.py
  53. +3 −3 django/contrib/localflavor/us/forms.py
  54. +1 −0 django/contrib/redirects/models.py
  55. +25 −5 django/contrib/sessions/backends/base.py
  56. +2 −1 django/contrib/sessions/backends/cache.py
  57. +4 −2 django/contrib/sessions/backends/db.py
  58. +10 −6 django/contrib/sessions/backends/file.py
  59. +1 −1 django/contrib/sessions/middleware.py
  60. +7 −2 django/contrib/sessions/models.py
  61. +60 −0 django/contrib/sessions/tests.py
  62. +1 −0 django/contrib/sites/management.py
  63. +9 −0 django/contrib/sites/models.py
  64. +13 −0 django/contrib/sites/tests.py
  65. +5 −2 django/core/management/commands/loaddata.py
  66. +1 −1 django/core/management/commands/sql.py
  67. +1 −1 django/core/management/commands/sqlall.py
  68. +1 −1 django/core/management/commands/sqlclear.py
  69. +1 −1 django/core/management/commands/sqlcustom.py
  70. +1 −1 django/core/management/commands/sqlflush.py
  71. +1 −1 django/core/management/commands/sqlindexes.py
  72. +1 −1 django/core/management/commands/sqlreset.py
  73. +1 −1 django/core/management/commands/sqlsequencereset.py
  74. +11 −2 django/core/management/commands/startapp.py
  75. +5 −7 django/core/management/commands/startproject.py
  76. +8 −2 django/core/management/commands/syncdb.py
  77. +1 −1 django/core/servers/basehttp.py
  78. +1 −1 django/core/urlresolvers.py
  79. +9 −1 django/db/backends/__init__.py
  80. +1 −0 django/db/backends/mysql/base.py
  81. +1 −0 django/db/backends/mysql_old/base.py
  82. +3 −1 django/db/backends/oracle/base.py
  83. +8 −4 django/db/backends/oracle/creation.py
  84. +9 −10 django/db/models/base.py
  85. +19 −17 django/db/models/fields/__init__.py
  86. +6 −3 django/db/models/fields/related.py
  87. +8 −6 django/db/models/loading.py
  88. +7 −4 django/db/models/options.py
  89. +127 −19 django/db/models/query.py
  90. +50 −22 django/db/models/sql/query.py
  91. +5 −3 django/db/models/sql/subqueries.py
  92. +1 −1 django/middleware/common.py
  93. +0 −1 django/newforms/fields.py
  94. +13 −12 django/newforms/models.py
  95. +12 −4 django/newforms/widgets.py
  96. +13 −11 django/template/defaulttags.py
  97. +10 −6 django/template/loader_tags.py
  98. +14 −11 django/templatetags/cache.py
  99. +1 −1 django/utils/cache.py
  100. +31 −0 django/utils/datastructures.py
  101. +26 −26 django/utils/html.py
  102. +1 −2 django/views/defaults.py
  103. +11 −0 docs/cache.txt
  104. +64 −36 docs/contributing.txt
  105. +5 −5 docs/db-api.txt
  106. +15 −8 docs/django-admin.txt
  107. +2 −4 docs/form_preview.txt
  108. +34 −4 docs/model-api.txt
  109. +7 −0 docs/modelforms.txt
  110. +14 −0 docs/newforms.txt
  111. +2 −2 docs/sessions.txt
  112. +11 −3 docs/settings.txt
  113. +2 −2 docs/templates.txt
  114. +4 −3 docs/templates_python.txt
  115. +2 −2 docs/tutorial01.txt
  116. +9 −3 extras/django_bash_completion
  117. +2 −2 setup.py
  118. +1 −0 tests/modeltests/delete/__init__.py
  119. +179 −0 tests/modeltests/delete/models.py
  120. +42 −3 tests/modeltests/model_inheritance/models.py
  121. +8 −0 tests/regressiontests/datastructures/tests.py
  122. +22 −1 tests/regressiontests/defaultfilters/tests.py
  123. +10 −10 tests/regressiontests/forms/forms.py
  124. +2 −2 tests/regressiontests/forms/regressions.py
  125. +9 −9 tests/regressiontests/forms/widgets.py
  126. +18 −4 tests/regressiontests/model_inheritance_regress/models.py
  127. +89 −6 tests/regressiontests/queries/models.py
  128. +13 −13 tests/regressiontests/templates/loaders.py
  129. +51 −36 tests/regressiontests/templates/tests.py
  130. +1 −0 tests/regressiontests/urlpatterns_reverse/tests.py
View
3 AUTHORS
@@ -65,6 +65,7 @@ answer newbie questions, and generally made Django that much better:
Mikaël Barbero <mikael.barbero nospam at nospam free.fr>
Jiri Barton
Ned Batchelder <http://www.nedbatchelder.com/>
+ batiste@dosimple.ch
Shannon -jj Behrens <http://jjinux.blogspot.com/>
Esdras Beleza <linux@esdrasbeleza.com>
Chris Bennett <chrisrbennett@yahoo.com>
@@ -228,6 +229,7 @@ answer newbie questions, and generally made Django that much better:
Nicola Larosa <nico@teknico.net>
Rune Rønde Laursen <runerl@skjoldhoej.dk>
Eugene Lazutkin <http://lazutkin.com/blog/>
+ lcordier@point45.com
Jeong-Min Lee <falsetru@gmail.com>
Jannis Leidel <jl@websushi.org>
Christopher Lenz <http://www.cmlenz.net/>
@@ -374,6 +376,7 @@ answer newbie questions, and generally made Django that much better:
Wang Chun <wangchun@exoweb.net>
Filip Wasilewski <filip.wasilewski@gmail.com>
Dan Watson <http://theidioteque.net/>
+ Joel Watts <joel@joelwatts.com>
Chris Wesseling <Chris.Wesseling@cwi.nl>
James Wheare <django@sparemint.com>
charly.wilhelm@gmail.com
View
2 LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005, the Lawrence Journal-World
+Copyright (c) Django Software Foundation.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
View
2 django/bin/profiling/gather_profile_stats.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
"""
gather_profile_stats.py /path/to/dir/of/profiles
View
2 django/conf/global_settings.py
@@ -52,6 +52,7 @@
('el', gettext_noop('Greek')),
('en', gettext_noop('English')),
('es', gettext_noop('Spanish')),
+ ('et', gettext_noop('Estonian')),
('es-ar', gettext_noop('Argentinean Spanish')),
('eu', gettext_noop('Basque')),
('fa', gettext_noop('Persian')),
@@ -70,6 +71,7 @@
('km', gettext_noop('Khmer')),
('kn', gettext_noop('Kannada')),
('lv', gettext_noop('Latvian')),
+ ('lt', gettext_noop('Lithuanian')),
('mk', gettext_noop('Macedonian')),
('nl', gettext_noop('Dutch')),
('no', gettext_noop('Norwegian')),
View
BIN django/conf/locale/ca/LC_MESSAGES/django.mo
Binary file not shown.
Oops, something went wrong.

0 comments on commit aef8a83

Please sign in to comment.