Permalink
Browse files

gis: Merged 6672-6783 vis svnmerge from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 85ce45b commit 23384af79b2f43f08e8395d0a84a57c2a98df392 @jdunck jdunck committed Dec 1, 2007
Showing with 6,852 additions and 3,937 deletions.
  1. +4 −0 AUTHORS
  2. +0 −1 README
  3. +2 −3 django/bin/compile-messages.py
  4. +2 −0 django/conf/global_settings.py
  5. BIN django/conf/locale/en/LC_MESSAGES/django.mo
  6. +2,596 −1,473 django/conf/locale/en/LC_MESSAGES/django.po
  7. BIN django/conf/locale/en/LC_MESSAGES/djangojs.mo
  8. +29 −20 django/conf/locale/en/LC_MESSAGES/djangojs.po
  9. BIN django/conf/locale/pl/LC_MESSAGES/django.mo
  10. +3,022 −2,037 django/conf/locale/pl/LC_MESSAGES/django.po
  11. +2 −2 django/contrib/admin/media/css/base.css
  12. +14 −0 django/contrib/admin/media/js/admin/RelatedObjectLookups.js
  13. +1 −1 django/contrib/admin/templates/admin/field_line.html
  14. +1 −1 django/contrib/admin/templates/admin_doc/template_filter_index.html
  15. +1 −1 django/contrib/admin/templates/admin_doc/template_tag_index.html
  16. +2 −2 django/contrib/admin/templates/admin_doc/view_index.html
  17. +3 −1 django/contrib/admin/templatetags/admin_list.py
  18. +1 −1 django/contrib/admin/templatetags/admin_modify.py
  19. +4 −5 django/contrib/admin/views/main.py
  20. +5 −5 django/contrib/comments/models.py
  21. +13 −0 django/contrib/comments/tests.py
  22. +1 −0 django/contrib/formtools/models.py
  23. +1 −1 django/contrib/formtools/preview.py
  24. +12 −0 django/contrib/formtools/test_urls.py
  25. +93 −0 django/contrib/formtools/tests.py
  26. +2 −0 django/contrib/localflavor/ca/ca_provinces.py
  27. +5 −6 django/core/cache/backends/base.py
  28. +6 −1 django/core/cache/backends/locmem.py
  29. +27 −22 django/core/management/__init__.py
  30. +6 −7 django/core/management/base.py
  31. +1 −1 django/core/paginator.py
  32. +6 −7 django/core/servers/basehttp.py
  33. +2 −2 django/db/models/base.py
  34. +1 −1 django/db/models/fields/__init__.py
  35. +2 −2 django/db/models/fields/subclassing.py
  36. +18 −5 django/middleware/cache.py
  37. +11 −7 django/middleware/gzip.py
  38. +2 −1 django/newforms/extras/widgets.py
  39. +7 −6 django/newforms/fields.py
  40. +22 −15 django/newforms/models.py
  41. +16 −9 django/newforms/widgets.py
  42. +16 −8 django/template/__init__.py
  43. +4 −1 django/template/defaultfilters.py
  44. +2 −1 django/template/loader_tags.py
  45. +19 −13 django/templatetags/i18n.py
  46. +3 −3 django/test/testcases.py
  47. +34 −9 django/utils/cache.py
  48. +43 −33 django/utils/datastructures.py
  49. +15 −4 django/utils/html.py
  50. +0 −2 django/utils/safestring.py
  51. +5 −1 django/utils/translation/trans_null.py
  52. +13 −9 django/utils/translation/trans_real.py
  53. +7 −1 django/utils/tzinfo.py
  54. +6 −6 django/views/debug.py
  55. +6 −2 django/views/i18n.py
  56. +2 −1 django/views/static.py
  57. +1 −1 docs/authentication.txt
  58. +23 −11 docs/cache.txt
  59. +5 −5 docs/custom_model_fields.txt
  60. +40 −30 docs/databases.txt
  61. +4 −4 docs/django-admin.txt
  62. +7 −0 docs/flatpages.txt
  63. +3 −3 docs/i18n.txt
  64. +16 −9 docs/install.txt
  65. +1 −2 docs/middleware.txt
  66. +2 −2 docs/model-api.txt
  67. +6 −7 docs/modpython.txt
  68. +38 −8 docs/newforms.txt
  69. +1 −1 docs/release_notes_0.96.txt
  70. +7 −5 docs/settings.txt
  71. +16 −5 docs/syndication_feeds.txt
  72. +36 −4 docs/templates.txt
  73. +102 −55 docs/templates_python.txt
  74. +1 −1 docs/tutorial01.txt
  75. +1 −1 docs/unicode.txt
  76. +1 −1 docs/url_dispatch.txt
  77. +10 −0 tests/modeltests/field_subclassing/models.py
  78. +73 −0 tests/modeltests/model_forms/models.py
  79. +2 −1 tests/modeltests/pagination/models.py
  80. +29 −1 tests/regressiontests/cache/tests.py
  81. +12 −0 tests/regressiontests/datastructures/tests.py
  82. +4 −0 tests/regressiontests/dateformat/tests.py
  83. +2 −0 tests/regressiontests/defaultfilters/tests.py
  84. +45 −0 tests/regressiontests/forms/error_messages.py
  85. +14 −0 tests/regressiontests/forms/fields.py
  86. +4 −0 tests/regressiontests/forms/localflavor/ca.py
  87. +4 −0 tests/regressiontests/forms/models.py
  88. +61 −0 tests/regressiontests/forms/widgets.py
  89. +13 −1 tests/regressiontests/i18n/tests.py
  90. +35 −9 tests/regressiontests/templates/filters.py
  91. +39 −20 tests/regressiontests/templates/tests.py
  92. +7 −3 tests/regressiontests/templates/unicode.py
  93. +51 −0 tests/regressiontests/utils/datastructures.py
  94. +8 −5 tests/regressiontests/utils/tests.py
  95. +1 −1 tests/regressiontests/utils/timesince.py
  96. +9 −1 tests/regressiontests/views/tests/static.py
View
@@ -71,6 +71,7 @@ answer newbie questions, and generally made Django that much better:
Jonathan Buchanan <jonathan.buchanan@gmail.com>
Trevor Caira <trevor@caira.com>
Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
+ Graham Carlyle <graham.carlyle@maplecroft.net>
Antonio Cavedoni <http://cavedoni.com/>
C8E
cedric@terramater.net
@@ -100,6 +101,7 @@ answer newbie questions, and generally made Django that much better:
Alex Dedul
deric@monowerks.com
Max Derkachev <mderk@yandex.ru>
+ Rajesh Dhawan <rajesh.dhawan@gmail.com>
Sander Dijkhuis <sander.dijkhuis@gmail.com>
Jordan Dimov <s3x3y1@gmail.com>
dne@mayonnaise.net
@@ -187,6 +189,7 @@ answer newbie questions, and generally made Django that much better:
krzysiek.pawlik@silvermedia.pl
Joseph Kocherhans
konrad@gwu.edu
+ knox <christobzr@gmail.com>
kurtiss@meetro.com
lakin.wecker@gmail.com
Nick Lane <nick.lane.au@gmail.com>
@@ -272,6 +275,7 @@ answer newbie questions, and generally made Django that much better:
Vinay Sajip <vinay_sajip@yahoo.co.uk>
David Schein
scott@staplefish.com
+ Ilya Semenov <semenov@inetss.com>
serbaut@gmail.com
John Shaffer <jshaffer2112@gmail.com>
Pete Shinners <pete@shinners.org>
View
1 README
@@ -34,4 +34,3 @@ To contribute to Django:
* Check out http://www.djangoproject.com/community/ for information
about getting involved.
-
@@ -11,11 +11,10 @@
def compile_messages(locale=None):
- basedirs = [os.path.join('conf', 'locale'), 'locale']
+ basedirs = (os.path.join('conf', 'locale'), 'locale')
if os.environ.get('DJANGO_SETTINGS_MODULE'):
from django.conf import settings
- if hasattr(settings, 'LOCALE_PATHS'):
- basedirs += settings.LOCALE_PATHS
+ basedirs += settings.LOCALE_PATHS
# Gather existing directories.
basedirs = set(map(os.path.abspath, filter(os.path.isdir, basedirs)))
@@ -90,6 +90,8 @@
# to load the internationalization machinery.
USE_I18N = True
+LOCALE_PATHS = ()
+
# Not-necessarily-technical managers of the site. They get broken link
# notifications and other various e-mails.
MANAGERS = ADMINS
Binary file not shown.
Oops, something went wrong.

0 comments on commit 23384af

Please sign in to comment.