[Changeset] r9329 - in django/branches/releases/1.0.X: . docs/topics/http

[noreply]

Author: kmtracey
Date: 2008-11-01 23:23:28 -0500 (Sat, 01 Nov 2008)
New Revision: 9329

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/topics/http/urls.txt
Log:
[1.0.X] Fixed #9495 -- Corrected typo in urls doc. Thanks seemant. 

[9328] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9323
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9328

Modified: django/branches/releases/1.0.X/docs/topics/http/urls.txt
===
--- django/branches/releases/1.0.X/docs/topics/http/urls.txt2008-11-02 
04:17:59 UTC (rev 9328)
+++ django/branches/releases/1.0.X/docs/topics/http/urls.txt2008-11-02 
04:23:28 UTC (rev 9329)
@@ -554,7 +554,7 @@
 using the same view and parameters. Then, you can use this name in reverse URL
 matching.
 
-Here's the above example, rewritten to used named URL patterns::
+Here's the above example, rewritten to use named URL patterns::
 
 urlpatterns = patterns('',
 url(r'/archive/(\d{4})/$', archive, name="full-archive"),


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9328 - django/trunk/docs/topics/http

[noreply]

Author: kmtracey
Date: 2008-11-01 23:17:59 -0500 (Sat, 01 Nov 2008)
New Revision: 9328

Modified:
   django/trunk/docs/topics/http/urls.txt
Log:
Fixed #9495 -- Corrected typo in urls doc.  Thanks seemant.


Modified: django/trunk/docs/topics/http/urls.txt
===
--- django/trunk/docs/topics/http/urls.txt  2008-11-01 22:26:44 UTC (rev 
9327)
+++ django/trunk/docs/topics/http/urls.txt  2008-11-02 04:17:59 UTC (rev 
9328)
@@ -554,7 +554,7 @@
 using the same view and parameters. Then, you can use this name in reverse URL
 matching.
 
-Here's the above example, rewritten to used named URL patterns::
+Here's the above example, rewritten to use named URL patterns::
 
 urlpatterns = patterns('',
 url(r'/archive/(\d{4})/$', archive, name="full-archive"),


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Django] #9496: reverse() function doesn't seem to take account of the includer urlconf

[Django]

#9496: reverse() function doesn't seem to take account of the includer urlconf
---+
 Reporter:  seemant|   Owner:  nobody
   Status:  new|   Milestone:
Component:  Uncategorized  | Version:  1.0   
 Keywords: |   Stage:  Unreviewed
Has_patch:  0  |  
---+
 I have a urlconf being included from the top-level urlconf.  the one being
 included is named, and I'm trying to get the reverse() function to work
 with the named one.  It fails with the posted exception.  I '''think'''
 this is wrong behaviour.  Forgive my unorthodox use if this is the correct
 behaviour.

 {{{
 urls.py:
 (r'^blog/', include('kulleen.blog.urls.blogs')),
 (r'^(?P[\w]+)/blog/', include('kulleen.blog.urls.blogs')),

 blog/urls/blogs.py:
 url(
 r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$',
 'object_detail',
 dict(
 blog_dict,
 slug_field='slug',
 template_object_name = 'entry',
 ),
 name='entry_view',
 ),


 exception:
 In [1]: from blog.models import Entry

 In [2]: e = Entry.objects.all()[65]

 In [3]: e.get_absolute_url()
 ---
 NoReverseMatchTraceback (most recent call
 last)

 /home/seemant/Projects/websites/kulleen/ in ()

 /usr/lib64/python2.5/site-packages/django/utils/functional.pyc in
 _curried(*moreargs, **morekwargs)
  53 def curry(_curried_func, *args, **kwargs):
  54 def _curried(*moreargs, **morekwargs):
 ---> 55 return _curried_func(*(args+moreargs), **dict(kwargs,
 **morekwargs))
  56 return _curried
  57

 /usr/lib64/python2.5/site-packages/django/db/models/base.pyc in
 get_absolute_url(opts, func, self, *args, **kwargs)
 509
 510 def get_absolute_url(opts, func, self, *args, **kwargs):
 --> 511 return settings.ABSOLUTE_URL_OVERRIDES.get('%s.%s' %
 (opts.app_label, opts.module_name), func)(self, *args, **kwargs)
 512
 513

 /home/seemant/Projects/websites/kulleen/blog/models.pyc in
 get_absolute_url(self)
  49 'month': self.pub_date.strftime('%b').lower(),
  50 'day': self.pub_date.strftime('%d'),
 ---> 51 'slug': self.slug
  52 }
  53 )

 /usr/lib64/python2.5/site-packages/django/core/urlresolvers.pyc in
 reverse(viewname, urlconf, args, kwargs, prefix)
 250 prefix = get_script_prefix()
 251 return iri_to_uri(u'%s%s' % (prefix,
 get_resolver(urlconf).reverse(viewname,
 --> 252 *args, **kwargs)))
 253
 254 def clear_url_caches():

 /usr/lib64/python2.5/site-packages/django/core/urlresolvers.pyc in
 reverse(self, lookup_view, *args, **kwargs)
 239 return candidate
 240 raise NoReverseMatch("Reverse for '%s' with arguments '%s'
 and keyword "
 --> 241 "arguments '%s' not found." % (lookup_view, args,
 kwargs))
 242
 243 def resolve(path, urlconf=None):

 NoReverseMatch: Reverse for 'entry_view' with arguments '()' and keyword
 arguments '{'member': u'seemant', 'year': 2006, 'slug': u'the-master-
 cleanse-day-2', 'day': '03', 'month': 'dec'}' not found.
 }}}

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Django] #9495: Grammar fix on urls documentation page.

[Django]

#9495: Grammar fix on urls documentation page.
---+
 Reporter:  seemant|   Owner:  nobody
   Status:  new|   Milestone:
Component:  Documentation  | Version:  1.0   
 Keywords: |   Stage:  Unreviewed
Has_patch:  0  |  
---+
 On the docs page,
 http://docs.djangoproject.com/en/dev/topics/http/urls/#id2

 {{{ Here's the above example, rewritten to used named URL patterns: }}}

 should be:

 {{{ Here's the above example, rewritten to use named URL patterns: }}}

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #2037: Doesn't make sense to have a blank option in dropdowns for non-nullable, non-blankable fields with defaults

[Django]

#2037: Doesn't make sense to have a blank option in dropdowns for non-nullable,
non-blankable fields with defaults
---+
  Reporter:  Joeboy| Owner:  nobody
Status:  closed| Milestone:
 Component:  django.contrib.admin  |   Version:  SVN   
Resolution:  fixed |  Keywords:
 Stage:  Accepted  | Has_patch:  1 
Needs_docs:  0 |   Needs_tests:  0 
Needs_better_patch:  1 |  
---+
Changes (by kmtracey):

  * status:  new => closed
  * resolution:  => fixed

Comment:

 r6733 accomplished what was being asked for here.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #9494: Revision 9297 causes crash

[Django]

#9494: Revision 9297 causes crash
+---
  Reporter:  Fugazi | Owner:  brosner
Status:  closed | Milestone: 
 Component:  Uncategorized  |   Version:  SVN
Resolution:  fixed  |  Keywords: 
 Stage:  Accepted   | Has_patch:  0  
Needs_docs:  0  |   Needs_tests:  0  
Needs_better_patch:  0  |  
+---
Comment (by Fugazi):

 Change works fine. Thank you brosner.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9327 - in django/branches/releases/1.0.X: django/forms tests/modeltests/model_formsets

[noreply]

Author: brosner
Date: 2008-11-01 17:26:44 -0500 (Sat, 01 Nov 2008)
New Revision: 9327

Modified:
   django/branches/releases/1.0.X/django/forms/models.py
   django/branches/releases/1.0.X/tests/modeltests/model_formsets/models.py
Log:
[1.0.X] Fixed #9494 -- Ensure the foreign key in an inline formset is always 
present on the forms. Thanks Fugazi for the report.

Backport of r9326 from trunk

Modified: django/branches/releases/1.0.X/django/forms/models.py
===
--- django/branches/releases/1.0.X/django/forms/models.py   2008-11-01 
22:25:41 UTC (rev 9326)
+++ django/branches/releases/1.0.X/django/forms/models.py   2008-11-01 
22:26:44 UTC (rev 9327)
@@ -539,6 +539,13 @@
 # enforce a max_num=1 when the foreign key to the parent model is unique.
 if fk.unique:
 max_num = 1
+if fields is not None:
+fields = list(fields)
+fields.append(fk.name)
+else:
+# get all the fields for this model that will be generated.
+fields = fields_for_model(model, fields, exclude, 
formfield_callback).keys()
+fields.append(fk.name)
 kwargs = {
 'form': form,
 'formfield_callback': formfield_callback,

Modified: 
django/branches/releases/1.0.X/tests/modeltests/model_formsets/models.py
===
--- django/branches/releases/1.0.X/tests/modeltests/model_formsets/models.py
2008-11-01 22:25:41 UTC (rev 9326)
+++ django/branches/releases/1.0.X/tests/modeltests/model_formsets/models.py
2008-11-01 22:26:44 UTC (rev 9327)
@@ -696,6 +696,21 @@
 >>> formset.errors
 [{'__all__': [u'Revision with this Repository and Revision already exists.']}]
 
+# unique_together with inlineformset_factory with overridden form fields
+# Also see #9494
+
+>>> FormSet = inlineformset_factory(Repository, Revision, 
fields=('revision',), extra=1)
+>>> data = {
+... 'revision_set-TOTAL_FORMS': '1',
+... 'revision_set-INITIAL_FORMS': '0',
+... 'revision_set-0-repository': repository.pk,
+... 'revision_set-0-revision': '146239817507f148d448db38840db7c3cbf47c76',
+... 'revision_set-0-DELETE': '',
+... }
+>>> formset = FormSet(data, instance=repository)
+>>> formset.is_valid()
+False
+
 # Use of callable defaults (see bug #7975).
 
 >>> person = Person.objects.create(name='Ringo')


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9326 - in django/trunk: django/forms tests/modeltests/model_formsets

[noreply]

Author: brosner
Date: 2008-11-01 17:25:41 -0500 (Sat, 01 Nov 2008)
New Revision: 9326

Modified:
   django/trunk/django/forms/models.py
   django/trunk/tests/modeltests/model_formsets/models.py
Log:
Fixed #9494 -- Ensure the foreign key in an inline formset is always present on 
the forms. Thanks Fugazi for the report.

Modified: django/trunk/django/forms/models.py
===
--- django/trunk/django/forms/models.py 2008-11-01 21:07:02 UTC (rev 9325)
+++ django/trunk/django/forms/models.py 2008-11-01 22:25:41 UTC (rev 9326)
@@ -539,6 +539,13 @@
 # enforce a max_num=1 when the foreign key to the parent model is unique.
 if fk.unique:
 max_num = 1
+if fields is not None:
+fields = list(fields)
+fields.append(fk.name)
+else:
+# get all the fields for this model that will be generated.
+fields = fields_for_model(model, fields, exclude, 
formfield_callback).keys()
+fields.append(fk.name)
 kwargs = {
 'form': form,
 'formfield_callback': formfield_callback,

Modified: django/trunk/tests/modeltests/model_formsets/models.py
===
--- django/trunk/tests/modeltests/model_formsets/models.py  2008-11-01 
21:07:02 UTC (rev 9325)
+++ django/trunk/tests/modeltests/model_formsets/models.py  2008-11-01 
22:25:41 UTC (rev 9326)
@@ -696,6 +696,21 @@
 >>> formset.errors
 [{'__all__': [u'Revision with this Repository and Revision already exists.']}]
 
+# unique_together with inlineformset_factory with overridden form fields
+# Also see #9494
+
+>>> FormSet = inlineformset_factory(Repository, Revision, 
fields=('revision',), extra=1)
+>>> data = {
+... 'revision_set-TOTAL_FORMS': '1',
+... 'revision_set-INITIAL_FORMS': '0',
+... 'revision_set-0-repository': repository.pk,
+... 'revision_set-0-revision': '146239817507f148d448db38840db7c3cbf47c76',
+... 'revision_set-0-DELETE': '',
+... }
+>>> formset = FormSet(data, instance=repository)
+>>> formset.is_valid()
+False
+
 # Use of callable defaults (see bug #7975).
 
 >>> person = Person.objects.create(name='Ringo')


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #9217: Logout should accept a next parameter

[Django]

#9217: Logout should accept a next parameter
+---
  Reporter:  italomaia  | Owner:  nobody  
Status:  closed | Milestone:  post-1.0
 Component:  Uncategorized  |   Version:  1.0 
Resolution:  invalid|  Keywords:  
 Stage:  Unreviewed | Has_patch:  0   
Needs_docs:  0  |   Needs_tests:  0   
Needs_better_patch:  0  |  
+---
Comment (by italomaia):

 Well, i had to hardcode next_page.

 /path/to/redirect <= bad
 reverse('codename_to_path') <= good

 That's what i meant.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9325 - django/branches/releases/1.0.X/django/conf/locale/es_AR/LC_MESSAGES

[noreply]

Author: ramiro
Date: 2008-11-01 16:07:02 -0500 (Sat, 01 Nov 2008)
New Revision: 9325

Modified:
   django/branches/releases/1.0.X/django/conf/locale/es_AR/LC_MESSAGES/django.mo
   django/branches/releases/1.0.X/django/conf/locale/es_AR/LC_MESSAGES/django.po
Log:
[1.0.X] Updated Argentinian spanish translation.

Modified: 
django/branches/releases/1.0.X/django/conf/locale/es_AR/LC_MESSAGES/django.mo
===
(Binary files differ)

Modified: 
django/branches/releases/1.0.X/django/conf/locale/es_AR/LC_MESSAGES/django.po
===
--- 
django/branches/releases/1.0.X/django/conf/locale/es_AR/LC_MESSAGES/django.po   
2008-11-01 20:55:13 UTC (rev 9324)
+++ 
django/branches/releases/1.0.X/django/conf/locale/es_AR/LC_MESSAGES/django.po   
2008-11-01 21:07:02 UTC (rev 9325)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-02 18:31-0300\n"
-"PO-Revision-Date: 2008-09-02 18:34-0300\n"
+"POT-Creation-Date: 2008-11-01 18:37-0200\n"
+"PO-Revision-Date: 2008-11-01 19:01-0200\n"
 "Last-Translator: Ramiro Morales <[EMAIL PROTECTED]>\n"
 "Language-Team: Django-I18N <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@
 msgstr "polaco"
 
 #: conf/global_settings.py:79
-msgid "Portugese"
+msgid "Portuguese"
 msgstr "portugués"
 
 #: conf/global_settings.py:80
@@ -220,40 +220,40 @@
 "Por %s:\n"
 "\n"
 
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "Todos/as"
 
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "Cualquier fecha"
 
-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "Hoy"
 
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "Últimos 7 días"
 
-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "Este mes"
 
-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "Este año"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "Yes"
 msgstr "Sí"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "No"
 msgstr "No"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:391
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -295,7 +295,7 @@
 msgstr "Modifica %s."
 
 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:278
 msgid "and"
 msgstr "y"
 
@@ -346,30 +346,30 @@
 "Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente "
 "abajo."
 
-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "Agregar %s"
 
-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "Error de base de datos"
 
-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"."
 
-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "¿Está seguro?"
 
-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "Historia de modificaciones: %s"
@@ -383,11 +383,11 @@
 "Por favor introduzca un nombre de usuario y una contraseña correctos. Note "
 "que ambos campos son sensibles a mayúsculas/minúsculas."
 
-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Por favor, identifíquese de nuevo porque su sesión ha caducado."
 
-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -395,29 +395,29 @@
 "Parece que su navegador no está configurado para aceptar cookies. Por favor "
 "actívelas, recargue esta página, e inténtelo de nuevo."
 
-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249 contrib/admin/si

Re: [Django] #9494: Revision 9297 causes crash

[Django]

#9494: Revision 9297 causes crash
+---
  Reporter:  Fugazi | Owner:  brosner
Status:  assigned   | Milestone: 
 Component:  Uncategorized  |   Version:  SVN
Resolution: |  Keywords: 
 Stage:  Accepted   | Has_patch:  0  
Needs_docs:  0  |   Needs_tests:  0  
Needs_better_patch:  0  |  
+---
Changes (by brosner):

  * status:  new => assigned
  * needs_better_patch:  => 0
  * needs_tests:  => 0
  * owner:  nobody => brosner
  * needs_docs:  => 0
  * stage:  Unreviewed => Accepted

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9324 - in django/branches/releases/1.0.X: . docs/intro

[noreply]

Author: kmtracey
Date: 2008-11-01 15:55:13 -0500 (Sat, 01 Nov 2008)
New Revision: 9324

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/intro/install.txt
Log:
[1.0.X] Fixed #9337 -- Use a link to Jython that actually works. Thanks 
admackin. 

[9323] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9321
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9323

Modified: django/branches/releases/1.0.X/docs/intro/install.txt
===
--- django/branches/releases/1.0.X/docs/intro/install.txt   2008-11-01 
20:51:54 UTC (rev 9323)
+++ django/branches/releases/1.0.X/docs/intro/install.txt   2008-11-01 
20:55:13 UTC (rev 9324)
@@ -24,7 +24,7 @@
 If you use Jython_ (a Python implementation for the Java platform), you'll
 need to follow a few additional steps. See :ref:`howto-jython` for details.
 
-.. _jython: http://jython.org/
+.. _jython: http://www.jython.org/
 
 You can verify that Python's installed by typing ``python`` from your shell; 
you should see something like::
 


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9323 - django/trunk/docs/intro

[noreply]

Author: kmtracey
Date: 2008-11-01 15:51:54 -0500 (Sat, 01 Nov 2008)
New Revision: 9323

Modified:
   django/trunk/docs/intro/install.txt
Log:
Fixed #9337 -- Use a link to Jython that actually works.  Thanks admackin.


Modified: django/trunk/docs/intro/install.txt
===
--- django/trunk/docs/intro/install.txt 2008-11-01 20:42:17 UTC (rev 9322)
+++ django/trunk/docs/intro/install.txt 2008-11-01 20:51:54 UTC (rev 9323)
@@ -24,7 +24,7 @@
 If you use Jython_ (a Python implementation for the Java platform), you'll
 need to follow a few additional steps. See :ref:`howto-jython` for details.
 
-.. _jython: http://jython.org/
+.. _jython: http://www.jython.org/
 
 You can verify that Python's installed by typing ``python`` from your shell; 
you should see something like::
 


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Django] #9494: Revision 9297 causes crash

[Django]

#9494: Revision 9297 causes crash
---+
 Reporter:  Fugazi |   Owner:  nobody
   Status:  new|   Milestone:
Component:  Uncategorized  | Version:  SVN   
 Keywords: |   Stage:  Unreviewed
Has_patch:  0  |  
---+
 Since revision 9297, I have KeyError in Admin. Bug appears when Inline
 have fieldsets.
 http://dpaste.com/88174/

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9322 - in django/branches/releases/1.0.X: . django/contrib/localflavor/at django/contrib/localflavor/ro django/contrib/localflavor/us

[noreply]

Author: kmtracey
Date: 2008-11-01 15:42:17 -0500 (Sat, 01 Nov 2008)
New Revision: 9322

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/django/contrib/localflavor/at/__init__.py
   django/branches/releases/1.0.X/django/contrib/localflavor/at/at_states.py
   django/branches/releases/1.0.X/django/contrib/localflavor/at/forms.py
   django/branches/releases/1.0.X/django/contrib/localflavor/ro/__init__.py
   django/branches/releases/1.0.X/django/contrib/localflavor/ro/forms.py
   django/branches/releases/1.0.X/django/contrib/localflavor/ro/ro_counties.py
   django/branches/releases/1.0.X/django/contrib/localflavor/us/models.py
Log:
[1.0.X] Fixed #9354 -- Set missing svn:eol-style property on some localflavor 
.py files. Thanks Semmel.

[9321] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9318
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9321


Property changes on: 
django/branches/releases/1.0.X/django/contrib/localflavor/at/__init__.py
___
Name: svn:eol-style
   + native


Property changes on: 
django/branches/releases/1.0.X/django/contrib/localflavor/at/at_states.py
___
Name: svn:eol-style
   + native


Property changes on: 
django/branches/releases/1.0.X/django/contrib/localflavor/at/forms.py
___
Name: svn:eol-style
   + native


Property changes on: 
django/branches/releases/1.0.X/django/contrib/localflavor/ro/__init__.py
___
Name: svn:eol-style
   + native


Property changes on: 
django/branches/releases/1.0.X/django/contrib/localflavor/ro/forms.py
___
Name: svn:eol-style
   + native


Property changes on: 
django/branches/releases/1.0.X/django/contrib/localflavor/ro/ro_counties.py
___
Name: svn:eol-style
   + native


Property changes on: 
django/branches/releases/1.0.X/django/contrib/localflavor/us/models.py
___
Name: svn:eol-style
   + native


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9321 - in django/trunk/django/contrib/localflavor: at ro us

[noreply]

Author: kmtracey
Date: 2008-11-01 15:33:52 -0500 (Sat, 01 Nov 2008)
New Revision: 9321

Modified:
   django/trunk/django/contrib/localflavor/at/__init__.py
   django/trunk/django/contrib/localflavor/at/at_states.py
   django/trunk/django/contrib/localflavor/at/forms.py
   django/trunk/django/contrib/localflavor/ro/__init__.py
   django/trunk/django/contrib/localflavor/ro/forms.py
   django/trunk/django/contrib/localflavor/ro/ro_counties.py
   django/trunk/django/contrib/localflavor/us/models.py
Log:
Fixed #9354 -- Set missing svn:eol-style property on some localflavor .py 
files. Thanks Semmel.



Property changes on: django/trunk/django/contrib/localflavor/at/__init__.py
___
Name: svn:eol-style
   + native


Property changes on: django/trunk/django/contrib/localflavor/at/at_states.py
___
Name: svn:eol-style
   + native


Property changes on: django/trunk/django/contrib/localflavor/at/forms.py
___
Name: svn:eol-style
   + native


Property changes on: django/trunk/django/contrib/localflavor/ro/__init__.py
___
Name: svn:eol-style
   + native


Property changes on: django/trunk/django/contrib/localflavor/ro/forms.py
___
Name: svn:eol-style
   + native


Property changes on: django/trunk/django/contrib/localflavor/ro/ro_counties.py
___
Name: svn:eol-style
   + native


Property changes on: django/trunk/django/contrib/localflavor/us/models.py
___
Name: svn:eol-style
   + native


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9320 - django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES

[noreply]

Author: toxik
Date: 2008-11-01 15:32:17 -0500 (Sat, 01 Nov 2008)
New Revision: 9320

Modified:
   django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/django.mo
   django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/django.po
   django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/djangojs.mo
   django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/djangojs.po
Log:
Updated Swedish translations.


Modified: 
django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/django.mo
===
(Binary files differ)

Modified: 
django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/django.po
===
--- django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/django.po  
2008-11-01 20:17:10 UTC (rev 9319)
+++ django/branches/releases/1.0.X/django/conf/locale/sv/LC_MESSAGES/django.po  
2008-11-01 20:32:17 UTC (rev 9320)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 04:36+0200\n"
+"POT-Creation-Date: 2008-11-01 20:51+0100\n"
 "PO-Revision-Date: 2008-05-26 11:15+0200\n"
 "Last-Translator: Ludvig Ericson <[EMAIL PROTECTED]>\n"
 "Language-Team: Django I18N <[EMAIL PROTECTED]>\n"
@@ -158,7 +158,7 @@
 msgstr "Polska"
 
 #: conf/global_settings.py:79
-msgid "Portugese"
+msgid "Portuguese"
 msgstr "Portugisiska"
 
 #: conf/global_settings.py:80
@@ -222,40 +222,40 @@
 "Av %s:\n"
 "\n"
 
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "Alla"
 
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "Alla datum"
 
-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "Idag"
 
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "Senaste 7 dagarna"
 
-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "Denna månad"
 
-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "Detta år"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "Yes"
 msgstr "Ja"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "No"
 msgstr "Nej"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:391
 msgid "Unknown"
 msgstr "Okänt"
 
@@ -297,7 +297,7 @@
 msgstr "Ändrade %s."
 
 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:278
 msgid "and"
 msgstr "och"
 
@@ -347,30 +347,30 @@
 msgstr ""
 "%(name)s \"%(obj)s\" lades till. Du kan redigera objektet igen nedanför."
 
-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "Lägg till %s"
 
-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "Ändra %s"
 
-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "Databasfel"
 
-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" togs bort."
 
-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "Ändringshistorik: %s"
@@ -384,11 +384,11 @@
 "Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja "
 "mellan gemener och versaler."
 
-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Var god logga in igen, eftersom din session har förfallit."
 
-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -396,27 +396,27 @@
 "Det verkar som att din webläsare inte är konfigurerad att acceptera cookies. "
 "Aktivera cookies, ladda om denna sida och försök igen."
 
-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
 #: contrib/admin/vie

[Changeset] r9319 - in django/branches/releases/1.0.X: . docs/topics

[noreply]

Author: kmtracey
Date: 2008-11-01 15:17:10 -0500 (Sat, 01 Nov 2008)
New Revision: 9319

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/topics/serialization.txt
Log:
[1.0.X] Fixed #9374 -- Added missing close paren in serialization doc. Thanks 
jordy. 

[9318] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9316
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9318

Modified: django/branches/releases/1.0.X/docs/topics/serialization.txt
===
--- django/branches/releases/1.0.X/docs/topics/serialization.txt
2008-11-01 20:14:36 UTC (rev 9318)
+++ django/branches/releases/1.0.X/docs/topics/serialization.txt
2008-11-01 20:17:10 UTC (rev 9319)
@@ -30,7 +30,7 @@
 data = xml_serializer.getvalue()
 
 This is useful if you want to serialize data directly to a file-like object
-(which includes an :class:`~django.http.HttpResponse` ::
+(which includes an :class:`~django.http.HttpResponse`)::
 
 out = open("file.xml", "w")
 xml_serializer.serialize(SomeModel.objects.all(), stream=out)


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9318 - django/trunk/docs/topics

[noreply]

Author: kmtracey
Date: 2008-11-01 15:14:36 -0500 (Sat, 01 Nov 2008)
New Revision: 9318

Modified:
   django/trunk/docs/topics/serialization.txt
Log:
Fixed #9374 -- Added missing close paren in serialization doc.  Thanks jordy.


Modified: django/trunk/docs/topics/serialization.txt
===
--- django/trunk/docs/topics/serialization.txt  2008-11-01 19:47:09 UTC (rev 
9317)
+++ django/trunk/docs/topics/serialization.txt  2008-11-01 20:14:36 UTC (rev 
9318)
@@ -30,7 +30,7 @@
 data = xml_serializer.getvalue()
 
 This is useful if you want to serialize data directly to a file-like object
-(which includes an :class:`~django.http.HttpResponse` ::
+(which includes an :class:`~django.http.HttpResponse`)::
 
 out = open("file.xml", "w")
 xml_serializer.serialize(SomeModel.objects.all(), stream=out)


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9317 - in django/branches/releases/1.0.X: . docs/topics/http

[noreply]

Author: kmtracey
Date: 2008-11-01 14:47:09 -0500 (Sat, 01 Nov 2008)
New Revision: 9317

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
Log:
[1.0.X] Fixed #9441 -- Corrected typo in file upload settings doc. Thanks gsf.

[9316] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9314
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9316

Modified: django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
===
--- django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
2008-11-01 19:45:03 UTC (rev 9316)
+++ django/branches/releases/1.0.X/docs/topics/http/file-uploads.txt
2008-11-01 19:47:09 UTC (rev 9317)
@@ -132,7 +132,7 @@
 
 :setting:`FILE_UPLOAD_TEMP_DIR`
 The directory where uploaded files larger than
-:setting:`FILE_UPLOAD_TEMP_DIR` will be stored.
+:setting:`FILE_UPLOAD_MAX_MEMORY_SIZE` will be stored.
 
 Defaults to your system's standard temporary directory (i.e. ``/tmp`` 
on
 most Unix-like systems).


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9316 - django/trunk/docs/topics/http

[noreply]

Author: kmtracey
Date: 2008-11-01 14:45:03 -0500 (Sat, 01 Nov 2008)
New Revision: 9316

Modified:
   django/trunk/docs/topics/http/file-uploads.txt
Log:
Fixed #9441 -- Corrected typo in file upload settings doc. Thanks gsf.


Modified: django/trunk/docs/topics/http/file-uploads.txt
===
--- django/trunk/docs/topics/http/file-uploads.txt  2008-11-01 19:21:46 UTC 
(rev 9315)
+++ django/trunk/docs/topics/http/file-uploads.txt  2008-11-01 19:45:03 UTC 
(rev 9316)
@@ -132,7 +132,7 @@
 
 :setting:`FILE_UPLOAD_TEMP_DIR`
 The directory where uploaded files larger than
-:setting:`FILE_UPLOAD_TEMP_DIR` will be stored.
+:setting:`FILE_UPLOAD_MAX_MEMORY_SIZE` will be stored.
 
 Defaults to your system's standard temporary directory (i.e. ``/tmp`` 
on
 most Unix-like systems).


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9315 - in django/branches/releases/1.0.X: . docs/howto

[noreply]

Author: kmtracey
Date: 2008-11-01 14:21:46 -0500 (Sat, 01 Nov 2008)
New Revision: 9315

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/howto/custom-model-fields.txt
Log:
[1.0.X] Fixed #9412 -- Corrected a couple of typos in the custom model field 
doc. Thanks carljm.

[9314] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9312
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9314

Modified: django/branches/releases/1.0.X/docs/howto/custom-model-fields.txt
===
--- django/branches/releases/1.0.X/docs/howto/custom-model-fields.txt   
2008-11-01 19:20:00 UTC (rev 9314)
+++ django/branches/releases/1.0.X/docs/howto/custom-model-fields.txt   
2008-11-01 19:21:46 UTC (rev 9315)
@@ -437,7 +437,7 @@
 
 You only need to override this method if you want to preprocess the value
 somehow, just before saving. For example, Django's
-`:class:`~django.db.models.DateTimeField` uses this method to set the attribute
+:class:`~django.db.models.DateTimeField` uses this method to set the attribute
 correctly in the case of :attr:`~django.db.models.Field.auto_now` or
 :attr:`~django.db.models.Field.auto_now_add`.
 
@@ -569,7 +569,7 @@
 .. method:: value_to_string(self, obj)
 
 This method is used by the serializers to convert the field into a string for
-output. Calling :meth:``Field._get_val_from_obj(obj)`` is the best way to get 
the
+output. Calling :meth:`Field._get_val_from_obj(obj)` is the best way to get the
 value to serialize. For example, since our ``HandField`` uses strings for its
 data storage anyway, we can reuse some existing conversion code::
 


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9314 - django/trunk/docs/howto

[noreply]

Author: kmtracey
Date: 2008-11-01 14:20:00 -0500 (Sat, 01 Nov 2008)
New Revision: 9314

Modified:
   django/trunk/docs/howto/custom-model-fields.txt
Log:
Fixed #9412 -- Corrected a couple of typos in the custom model field doc.  
Thanks carljm.


Modified: django/trunk/docs/howto/custom-model-fields.txt
===
--- django/trunk/docs/howto/custom-model-fields.txt 2008-11-01 19:05:46 UTC 
(rev 9313)
+++ django/trunk/docs/howto/custom-model-fields.txt 2008-11-01 19:20:00 UTC 
(rev 9314)
@@ -437,7 +437,7 @@
 
 You only need to override this method if you want to preprocess the value
 somehow, just before saving. For example, Django's
-`:class:`~django.db.models.DateTimeField` uses this method to set the attribute
+:class:`~django.db.models.DateTimeField` uses this method to set the attribute
 correctly in the case of :attr:`~django.db.models.Field.auto_now` or
 :attr:`~django.db.models.Field.auto_now_add`.
 
@@ -569,7 +569,7 @@
 .. method:: value_to_string(self, obj)
 
 This method is used by the serializers to convert the field into a string for
-output. Calling :meth:``Field._get_val_from_obj(obj)`` is the best way to get 
the
+output. Calling :meth:`Field._get_val_from_obj(obj)` is the best way to get the
 value to serialize. For example, since our ``HandField`` uses strings for its
 data storage anyway, we can reuse some existing conversion code::
 


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #9493: Formsets with data that violates unique constraints across forms are not marked invalid

[Django]

#9493: Formsets with data that violates unique constraints across forms are not
marked invalid
---+
  Reporter:  Alex  | Owner:  brosner
Status:  assigned  | Milestone: 
 Component:  Forms |   Version:  1.0
Resolution:|  Keywords: 
 Stage:  Accepted  | Has_patch:  0  
Needs_docs:  0 |   Needs_tests:  0  
Needs_better_patch:  0 |  
---+
Comment (by brosner):

 #8882 was really the original problem, but since that ticket grew a bit
 too big, lets use this ticket to track this individual problem.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #9493: Formsets with data that violates unique constraints across forms are not marked invalid

[Django]

#9493: Formsets with data that violates unique constraints across forms are not
marked invalid
---+
  Reporter:  Alex  | Owner:  brosner
Status:  assigned  | Milestone: 
 Component:  Forms |   Version:  1.0
Resolution:|  Keywords: 
 Stage:  Accepted  | Has_patch:  0  
Needs_docs:  0 |   Needs_tests:  0  
Needs_better_patch:  0 |  
---+
Changes (by brosner):

  * status:  new => assigned
  * needs_better_patch:  => 0
  * needs_tests:  => 0
  * summary:  Formsets with data that violates unique constraints across
  forms are not mared invalid => Formsets with
  data that violates unique constraints across
  forms are not marked invalid
  * owner:  Alex => brosner
  * needs_docs:  => 0
  * stage:  Unreviewed => Accepted

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #8882: Inline model formsets break validation for unique and unique_together with foreign keys

[Django]

#8882: Inline model formsets break validation for unique and unique_together 
with
foreign keys
--+-
  Reporter:  [EMAIL PROTECTED]  | Owner:  brosner 
Status:  closed   | Milestone:  
 Component:  Forms|   Version:  1.0 
Resolution:  fixed|  Keywords:  model-validation
 Stage:  Accepted | Has_patch:  0   
Needs_docs:  0|   Needs_tests:  0   
Needs_better_patch:  0|  
--+-
Changes (by brosner):

  * status:  reopened => closed
  * resolution:  => fixed

Comment:

 I suppose the problem that Alex was patching was indeed described here.
 There were really *two* issues hidden in this ticket (including all the
 tickets marked as duplicates). I fixed the one where the foreign key is
 involved in unique_together didn't work before. Lets not make this more
 confusing that it needs to be. To isolate the issues lets open new
 tickets. It will be much easier to track. Alex Gaynor has opened #9493 to
 track the issue mrts brought up in the reopen. It is a valid issue.

 Fugazi, like I said above, lets open a new ticket with *detailed*
 information about the problem please. #9025 has absolutely nothing to do
 with any of this.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Django] #9493: Formsets with data that violates unique constraints across forms are not mared invalid

[Django]

#9493: Formsets with data that violates unique constraints across forms are not
mared invalid
---+
 Reporter:  Alex   |   Owner:  Alex  
   Status:  new|   Milestone:
Component:  Forms  | Version:  1.0   
 Keywords: |   Stage:  Unreviewed
Has_patch:  0  |  
---+
 If I have a form with a unique ```name``` field, and I submit data that is
 a dupe of something in the db, it fails validation, however if I have a
 formset and I submit the same data 2x in the same formset, it passes
 validation and fails at the save level.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9313 - in django/branches/releases/1.0.X: . docs/howto docs/intro docs/ref docs/ref/contrib docs/ref/templates docs/topics docs/topics/http

[noreply]

Author: kmtracey
Date: 2008-11-01 14:05:46 -0500 (Sat, 01 Nov 2008)
New Revision: 9313

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt
   django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
   django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
   django/branches/releases/1.0.X/docs/intro/tutorial03.txt
   django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
   django/branches/releases/1.0.X/docs/ref/generic-views.txt
   django/branches/releases/1.0.X/docs/ref/request-response.txt
   django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
   django/branches/releases/1.0.X/docs/topics/email.txt
   django/branches/releases/1.0.X/docs/topics/http/sessions.txt
Log:
[1.0.X] Fixed #9487 -- Corrected several links into the Python docs that were 
broken by the recent Python docs refactor. 

[9312] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9310
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9312

Modified: django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt
===
--- django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt  
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/howto/custom-template-tags.txt  
2008-11-01 19:05:46 UTC (rev 9313)
@@ -344,7 +344,7 @@
 
 The time is {% current_time "%Y-%m-%d %I:%M %p" %}.
 
-.. _`strftime syntax`: 
http://www.python.org/doc/current/lib/module-time.html#l2h-1941
+.. _`strftime syntax`: http://docs.python.org/library/time.html#time.strftime
 
 The parser for this function should grab the parameter and create a ``Node``
 object::

Modified: django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
===
--- django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/howto/outputting-csv.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -8,7 +8,7 @@
 using Django views. To do this, you can either use the `Python CSV library`_ or
 the Django template system.
 
-.. _Python CSV library: http://www.python.org/doc/current/lib/module-csv.html
+.. _Python CSV library: http://docs.python.org/library/csv.html
 
 Using the Python CSV library
 

Modified: django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
===
--- django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/howto/outputting-pdf.txt
2008-11-01 19:05:46 UTC (rev 9313)
@@ -131,7 +131,7 @@
 response.write(pdf)
 return response
 
-.. _cStringIO: http://www.python.org/doc/current/lib/module-cStringIO.html
+.. _cStringIO: http://docs.python.org/library/stringio.html#module-cStringIO
 
 Further resources
 =

Modified: django/branches/releases/1.0.X/docs/intro/tutorial03.txt
===
--- django/branches/releases/1.0.X/docs/intro/tutorial03.txt2008-11-01 
19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/intro/tutorial03.txt2008-11-01 
19:05:46 UTC (rev 9313)
@@ -128,7 +128,7 @@
 time the URLconf module is loaded. They're super fast.
 
 .. _Wikipedia's entry: http://en.wikipedia.org/wiki/Regular_expression
-.. _Python documentation: http://www.python.org/doc/current/lib/module-re.html
+.. _Python documentation: http://docs.python.org/library/re.html
 
 Write your first view
 =

Modified: django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt
===
--- django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt 
2008-11-01 19:02:09 UTC (rev 9312)
+++ django/branches/releases/1.0.X/docs/ref/contrib/syndication.txt 
2008-11-01 19:05:46 UTC (rev 9313)
@@ -928,7 +928,7 @@
 
 
 .. _django/utils/feedgenerator.py: 
http://code.djangoproject.com/browser/django/trunk/django/utils/feedgenerator.py
-.. _Python datetime object: 
http://www.python.org/doc/current/lib/module-datetime.html
+.. _Python datetime object: 
http://docs.python.org/library/datetime.html#datetime-objects
 
 Custom feed generators
 --

Modified: django/branches/releases/1.0.X/docs/ref/generic-views.txt
===
--- django/branches/releases/1.0.X/doc

[Changeset] r9312 - in django/trunk/docs: howto intro ref ref/contrib ref/templates topics topics/http

[noreply]

Author: kmtracey
Date: 2008-11-01 14:02:09 -0500 (Sat, 01 Nov 2008)
New Revision: 9312

Modified:
   django/trunk/docs/howto/custom-template-tags.txt
   django/trunk/docs/howto/outputting-csv.txt
   django/trunk/docs/howto/outputting-pdf.txt
   django/trunk/docs/intro/tutorial03.txt
   django/trunk/docs/ref/contrib/syndication.txt
   django/trunk/docs/ref/generic-views.txt
   django/trunk/docs/ref/request-response.txt
   django/trunk/docs/ref/templates/builtins.txt
   django/trunk/docs/topics/email.txt
   django/trunk/docs/topics/http/sessions.txt
Log:
Fixed #9487 -- Corrected several links into the Python docs that were broken by 
the recent Python docs refactor.


Modified: django/trunk/docs/howto/custom-template-tags.txt
===
--- django/trunk/docs/howto/custom-template-tags.txt2008-11-01 18:07:47 UTC 
(rev 9311)
+++ django/trunk/docs/howto/custom-template-tags.txt2008-11-01 19:02:09 UTC 
(rev 9312)
@@ -344,7 +344,7 @@
 
 The time is {% current_time "%Y-%m-%d %I:%M %p" %}.
 
-.. _`strftime syntax`: 
http://www.python.org/doc/current/lib/module-time.html#l2h-1941
+.. _`strftime syntax`: http://docs.python.org/library/time.html#time.strftime
 
 The parser for this function should grab the parameter and create a ``Node``
 object::

Modified: django/trunk/docs/howto/outputting-csv.txt
===
--- django/trunk/docs/howto/outputting-csv.txt  2008-11-01 18:07:47 UTC (rev 
9311)
+++ django/trunk/docs/howto/outputting-csv.txt  2008-11-01 19:02:09 UTC (rev 
9312)
@@ -8,7 +8,7 @@
 using Django views. To do this, you can either use the `Python CSV library`_ or
 the Django template system.
 
-.. _Python CSV library: http://www.python.org/doc/current/lib/module-csv.html
+.. _Python CSV library: http://docs.python.org/library/csv.html
 
 Using the Python CSV library
 

Modified: django/trunk/docs/howto/outputting-pdf.txt
===
--- django/trunk/docs/howto/outputting-pdf.txt  2008-11-01 18:07:47 UTC (rev 
9311)
+++ django/trunk/docs/howto/outputting-pdf.txt  2008-11-01 19:02:09 UTC (rev 
9312)
@@ -131,7 +131,7 @@
 response.write(pdf)
 return response
 
-.. _cStringIO: http://www.python.org/doc/current/lib/module-cStringIO.html
+.. _cStringIO: http://docs.python.org/library/stringio.html#module-cStringIO
 
 Further resources
 =

Modified: django/trunk/docs/intro/tutorial03.txt
===
--- django/trunk/docs/intro/tutorial03.txt  2008-11-01 18:07:47 UTC (rev 
9311)
+++ django/trunk/docs/intro/tutorial03.txt  2008-11-01 19:02:09 UTC (rev 
9312)
@@ -128,7 +128,7 @@
 time the URLconf module is loaded. They're super fast.
 
 .. _Wikipedia's entry: http://en.wikipedia.org/wiki/Regular_expression
-.. _Python documentation: http://www.python.org/doc/current/lib/module-re.html
+.. _Python documentation: http://docs.python.org/library/re.html
 
 Write your first view
 =

Modified: django/trunk/docs/ref/contrib/syndication.txt
===
--- django/trunk/docs/ref/contrib/syndication.txt   2008-11-01 18:07:47 UTC 
(rev 9311)
+++ django/trunk/docs/ref/contrib/syndication.txt   2008-11-01 19:02:09 UTC 
(rev 9312)
@@ -928,7 +928,7 @@
 
 
 .. _django/utils/feedgenerator.py: 
http://code.djangoproject.com/browser/django/trunk/django/utils/feedgenerator.py
-.. _Python datetime object: 
http://www.python.org/doc/current/lib/module-datetime.html
+.. _Python datetime object: 
http://docs.python.org/library/datetime.html#datetime-objects
 
 Custom feed generators
 --

Modified: django/trunk/docs/ref/generic-views.txt
===
--- django/trunk/docs/ref/generic-views.txt 2008-11-01 18:07:47 UTC (rev 
9311)
+++ django/trunk/docs/ref/generic-views.txt 2008-11-01 19:02:09 UTC (rev 
9312)
@@ -406,7 +406,7 @@
   is ``'object'`` by default. If ``template_object_name`` is ``'foo'``,
   this variable's name will be ``foo_list``.
 
-.. _strftime docs: 
http://www.python.org/doc/current/lib/module-time.html#l2h-1941
+.. _strftime docs: http://docs.python.org/library/time.html#time.strftime
 
 ``django.views.generic.date_based.archive_week``
 

Modified: django/trunk/docs/ref/request-response.txt
===
--- django/trunk/docs/ref/request-response.txt  2008-11-01 18:07:47 UTC (rev 
9311)
+++ django/trunk/docs/ref/request-response.txt  2008-11-01 19:02:09 UTC (rev 
9312)
@@ -499,7 +499,7 @@
   calendars.lawrence.com. Otherwise, a cookie will only be readable by
   the domain that set it.
 
-.. _`cookie Morsel`: 
http://www.python.org

Re: [Django] #9487: Links to Python docs broken after Python docs refactor

[Django]

#9487: Links to Python docs broken after Python docs refactor
+---
  Reporter:  freejoe76  | Owner:  kmtracey
Status:  assigned   | Milestone:  
 Component:  Documentation  |   Version:  1.0 
Resolution: |  Keywords:  
 Stage:  Accepted   | Has_patch:  0   
Needs_docs:  0  |   Needs_tests:  0   
Needs_better_patch:  0  |  
+---
Changes (by kmtracey):

  * owner:  nobody => kmtracey
  * status:  new => assigned
  * summary:  Link on "Outputting CSV with Django" to python.org's CSV
  information returns a 404 => Links to Python
  docs broken after Python docs refactor

Comment:

 There are actually about a dozen links in Django docs to Python docs, and
 most likely now return 404 after their docs refactor.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9311 - in django/branches/releases/1.0.X: . docs/intro

[noreply]

Author: kmtracey
Date: 2008-11-01 13:07:47 -0500 (Sat, 01 Nov 2008)
New Revision: 9311

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/intro/whatsnext.txt
Log:
[1.0.X] Fixed #9491 -- Added a missing 'are' in what to read next. Thanks 
mh983. 

[9310] from trunk.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9308
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9310

Modified: django/branches/releases/1.0.X/docs/intro/whatsnext.txt
===
--- django/branches/releases/1.0.X/docs/intro/whatsnext.txt 2008-11-01 
18:04:36 UTC (rev 9310)
+++ django/branches/releases/1.0.X/docs/intro/whatsnext.txt 2008-11-01 
18:07:47 UTC (rev 9311)
@@ -26,7 +26,7 @@
 =
 
 Django's got a *lot* of documentation -- almost 200,000 words -- so finding 
what
-you need can sometimes be tricky. A few good places to start the :ref:`search`
+you need can sometimes be tricky. A few good places to start are the 
:ref:`search`
 and the :ref:`genindex`.
 
 Or you can just browse around!


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9310 - django/trunk/docs/intro

[noreply]

Author: kmtracey
Date: 2008-11-01 13:04:36 -0500 (Sat, 01 Nov 2008)
New Revision: 9310

Modified:
   django/trunk/docs/intro/whatsnext.txt
Log:
Fixed #9491 -- Added a missing 'the' in what to read next.  Thanks mh983.


Modified: django/trunk/docs/intro/whatsnext.txt
===
--- django/trunk/docs/intro/whatsnext.txt   2008-11-01 17:18:17 UTC (rev 
9309)
+++ django/trunk/docs/intro/whatsnext.txt   2008-11-01 18:04:36 UTC (rev 
9310)
@@ -26,7 +26,7 @@
 =
 
 Django's got a *lot* of documentation -- almost 200,000 words -- so finding 
what
-you need can sometimes be tricky. A few good places to start the :ref:`search`
+you need can sometimes be tricky. A few good places to start are the 
:ref:`search`
 and the :ref:`genindex`.
 
 Or you can just browse around!


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #8882: Inline model formsets break validation for unique and unique_together with foreign keys

[Django]

#8882: Inline model formsets break validation for unique and unique_together 
with
foreign keys
--+-
  Reporter:  [EMAIL PROTECTED]  | Owner:  brosner 
Status:  reopened | Milestone:  
 Component:  Forms|   Version:  1.0 
Resolution:   |  Keywords:  model-validation
 Stage:  Accepted | Has_patch:  0   
Needs_docs:  0|   Needs_tests:  0   
Needs_better_patch:  0|  
--+-
Comment (by Fugazi):

 This revision causes bug: http://dpaste.com/88174/.
 Bug appears when Inline have fieldsets. In the same time, can you add
 this: [http://code.djangoproject.com/ticket/9025] ?
 Thank you.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9309 - django/branches/releases/1.0.X

[noreply]

Author: kmtracey
Date: 2008-11-01 12:18:17 -0500 (Sat, 01 Nov 2008)
New Revision: 9309

Modified:
   django/branches/releases/1.0.X/
Log:
[1.0.X] Updated svnmerge metadata to indicate all non-blocked trunk changes 
have been merged.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9291
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9308


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #9460: Template blocks for submit buttons in admin's change view

[Django]

#9460: Template blocks for submit buttons in admin's change view
---+
  Reporter:  kosmik| Owner:  nobody 
 
Status:  new   | Milestone: 
 
 Component:  Contrib apps  |   Version:  1.0
 
Resolution:|  Keywords:  admin, submit, buttons, 
template
 Stage:  Unreviewed| Has_patch:  1  
 
Needs_docs:  0 |   Needs_tests:  0  
 
Needs_better_patch:  0 |  
---+
Comment (by kosmik):

 Which parts in particular would you to have inside their own blocks? I
 looked at the template but didn't see any places where further blocks
 would help. Maybe it would be possible for you to create a patch yourself?
 That's almost easier than trying to explain the required changes to me or
 someone else.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9308 - django/branches/releases/1.0.X

[noreply]

Author: kmtracey
Date: 2008-11-01 12:02:17 -0500 (Sat, 01 Nov 2008)
New Revision: 9308

Modified:
   django/branches/releases/1.0.X/
Log:
[1.0.X] Block admin css refactor changesets from svnmerge consideration.



Property changes on: django/branches/releases/1.0.X
___
Name: svnmerge-blocked
   - /django/trunk:9098,9103,9110,9112,9145,9152,9157,9160,9188,9248,9263,9278
   + 
/django/trunk:9098,9103,9110,9112,9145,9152,9157,9160,9188,9248,9263,9278,9299-9300,9303-9304


--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Django] #9492: Invalid XHTML in admin/base.html template

[Django]

#9492: Invalid XHTML in admin/base.html template
--+-
 Reporter:  dc|   Owner:  nobody
   Status:  new   |   Milestone:
Component:  django.contrib.admin  | Version:  1.0   
 Keywords:|   Stage:  Unreviewed
Has_patch:  0 |  
--+-
 Changeset [9300] have made
 [source:django/trunk/django/contrib/admin/templates/admin/base.html
 admin/base.html] template invalid XHTML. Problem is in conditional tags:
 {{{
 
 }}}

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #8882: Inline model formsets break validation for unique and unique_together with foreign keys

[Django]

#8882: Inline model formsets break validation for unique and unique_together 
with
foreign keys
--+-
  Reporter:  [EMAIL PROTECTED]  | Owner:  brosner 
Status:  reopened | Milestone:  
 Component:  Forms|   Version:  1.0 
Resolution:   |  Keywords:  model-validation
 Stage:  Accepted | Has_patch:  0   
Needs_docs:  0|   Needs_tests:  0   
Needs_better_patch:  0|  
--+-
Changes (by mrts):

  * status:  closed => reopened
  * resolution:  fixed =>

Comment:

 brosner, the fix is unfortunately insufficient. Alex's patch is also
 needed, but as that deals with `unique` checks only, `unique_together`
 checks need still to be added to it.

 Try the testcase that I've reported above.

 I'll examine the code hopefully tomorrow and write a patch.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #3400: [patch] Support for lookup separator with list_filter admin option

[Django]

#3400: [patch] Support for lookup separator with list_filter admin option
---+
  Reporter:  [EMAIL PROTECTED]  | Owner:  nobody
  
Status:  new   | Milestone: 
 
 Component:  django.contrib.admin  |   Version:  newforms-admin 
 
Resolution:|  Keywords:  nfa-someday 
list_filter FilterSpec nfa-changelist ep2008
 Stage:  Accepted  | Has_patch:  1  
 
Needs_docs:  0 |   Needs_tests:  0  
 
Needs_better_patch:  1 |  
---+
Comment (by cornbread):

 Does this patch include a way to add sort_by as well?

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #5176: Bug in django.utils.cache._generate_cache_key(request, headerlist, key_prefix)

[Django]

#5176: Bug in django.utils.cache._generate_cache_key(request, headerlist,
key_prefix)
---+
  Reporter:  Eratothene| Owner:  nobody   
Status:  reopened  | Milestone:   
 Component:  Cache system  |   Version:  SVN  
Resolution:|  Keywords:  cache session
 Stage:  Accepted  | Has_patch:  1
Needs_docs:  0 |   Needs_tests:  1
Needs_better_patch:  0 |  
---+
Changes (by clint):

 * cc: [EMAIL PROTECTED] (added)

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

Re: [Django] #4992: Alter cache key based on GET parameters

[Django]

#4992: Alter cache key based on GET parameters
-+--
  Reporter:  anonymous   | Owner:  nobody  
Status:  reopened| Milestone:  post-1.0
 Component:  Cache system|   Version:  SVN 
Resolution:  |  Keywords:  
 Stage:  Design decision needed  | Has_patch:  0   
Needs_docs:  0   |   Needs_tests:  0   
Needs_better_patch:  0   |  
-+--
Comment (by Daniel Pope <[EMAIL PROTECTED]>):

 Restricting this to a subset of the GET parameters would only reduce the
 number of duplicate copies in the cache. As such I think it's more
 beneficial to provide transparent caching with a simple decorator API. The
 reason we need to use {{{request.get_full_path()}}} is that the current
 behaviour allows Django to serve the wrong page for requests with a query
 string. Trying to reduce the number of duplicate entries in the cache to
 the bare minimum is more of a wishlist item.

 Rather than building all of the possible ways you could generate cache
 keys into decorators, why not just allow {{{cache_page}}} to take a
 callable?

 eg.

 {{{
 @cache_page(key=lambda request: request.path)
 def slashdot_this(request):
   ...
 }}}

 This should still default to {{{request.get_full_path()}}} so that the
 default behaviour works for all views.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---

[Changeset] r9307 - django/branches/releases/1.0.X/django/conf/locale/de/LC_MESSAGES

[noreply]

Author: jezdez
Date: 2008-11-01 08:14:30 -0500 (Sat, 01 Nov 2008)
New Revision: 9307

Modified:
   django/branches/releases/1.0.X/django/conf/locale/de/LC_MESSAGES/django.mo
   django/branches/releases/1.0.X/django/conf/locale/de/LC_MESSAGES/django.po
Log:
[1.0.X] Updated German translation

Modified: 
django/branches/releases/1.0.X/django/conf/locale/de/LC_MESSAGES/django.mo
===
(Binary files differ)

Modified: 
django/branches/releases/1.0.X/django/conf/locale/de/LC_MESSAGES/django.po
===
--- django/branches/releases/1.0.X/django/conf/locale/de/LC_MESSAGES/django.po  
2008-11-01 13:08:17 UTC (rev 9306)
+++ django/branches/releases/1.0.X/django/conf/locale/de/LC_MESSAGES/django.po  
2008-11-01 13:14:30 UTC (rev 9307)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 20:01+0200\n"
+"POT-Creation-Date: 2008-11-01 14:11+0100\n"
 "PO-Revision-Date: 2008-08-28 22:58+0100\n"
 "Last-Translator: Jannis Leidel <[EMAIL PROTECTED]>\n"
 "Language-Team: \n"
@@ -160,7 +160,7 @@
 msgstr "Polnisch"
 
 #: conf/global_settings.py:79
-msgid "Portugese"
+msgid "Portuguese"
 msgstr "Portugiesisch"
 
 #: conf/global_settings.py:80
@@ -224,40 +224,40 @@
 "Nach %s:\n"
 "\n"
 
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "Alle"
 
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "Alle Daten"
 
-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "Heute"
 
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "Letzte 7 Tage"
 
-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "Diesen Monat"
 
-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "Dieses Jahr"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "Yes"
 msgstr "Ja"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:391
 msgid "No"
 msgstr "Nein"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:391
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -299,7 +299,7 @@
 msgstr "%s geändert."
 
 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:278
 msgid "and"
 msgstr "und"
 
@@ -350,30 +350,30 @@
 "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt "
 "geändert werden."
 
-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "%s ändern"
 
-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "Datenbankfehler"
 
-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht."
 
-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "Änderungsgeschichte: %s"
@@ -387,11 +387,11 @@
 "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder "
 "berücksichtigen die Groß-/Kleinschreibung."
 
-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Bitte melden Sie sich erneut an, da Ihre Sitzung abgelaufen ist."
 
-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -399,29 +399,29 @@
 "Ihr Browser scheint keine Cookies zu akzeptieren. Bitte aktivieren Sie diese "
 "und laden Sie die Seite neu."
 
-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten

[Changeset] r9306 - django/trunk/django/conf/locale/de/LC_MESSAGES

[noreply]

Author: jezdez
Date: 2008-11-01 08:08:17 -0500 (Sat, 01 Nov 2008)
New Revision: 9306

Modified:
   django/trunk/django/conf/locale/de/LC_MESSAGES/django.mo
   django/trunk/django/conf/locale/de/LC_MESSAGES/django.po
Log:
Removed unnecessary strings from German translation

Modified: django/trunk/django/conf/locale/de/LC_MESSAGES/django.mo
===
(Binary files differ)

Modified: django/trunk/django/conf/locale/de/LC_MESSAGES/django.po
===
--- django/trunk/django/conf/locale/de/LC_MESSAGES/django.po2008-11-01 
13:00:09 UTC (rev 9305)
+++ django/trunk/django/conf/locale/de/LC_MESSAGES/django.po2008-11-01 
13:08:17 UTC (rev 9306)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-01 13:57+0100\n"
+"POT-Creation-Date: 2008-11-01 14:02+0100\n"
 "PO-Revision-Date: 2008-08-28 22:58+0100\n"
 "Last-Translator: Jannis Leidel <[EMAIL PROTECTED]>\n"
 "Language-Team: \n"
@@ -4235,237 +4235,3 @@
 #, python-format
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s wurde gelöscht."
-
-#~ msgid ""
-#~ "This value must contain only letters, numbers, underscores or hyphens."
-#~ msgstr ""
-#~ "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Bindestriche "
-#~ "enthalten."
-
-#~ msgid "Uppercase letters are not allowed here."
-#~ msgstr "Großbuchstaben sind hier nicht erlaubt."
-
-#~ msgid "Lowercase letters are not allowed here."
-#~ msgstr "Kleinbuchstaben sind hier nicht erlaubt."
-
-#~ msgid "Enter valid e-mail addresses separated by commas."
-#~ msgstr "Bitte mit Komma getrennte, gültige E-Mail-Adressen eingeben."
-
-#~ msgid "Please enter a valid IP address."
-#~ msgstr "Bitte eine gültige IP-Adresse eingeben."
-
-#~ msgid "Empty values are not allowed here."
-#~ msgstr "Dieses Feld darf nicht leer sein."
-
-#~ msgid "Non-numeric characters aren't allowed here."
-#~ msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt."
-
-#~ msgid "This value can't be comprised solely of digits."
-#~ msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen."
-
-#~ msgid "Only alphabetical characters are allowed here."
-#~ msgstr "Nur alphabetische Zeichen sind hier erlaubt."
-
-#~ msgid "Enter a valid time in HH:MM format."
-#~ msgstr "Bitte eine gültige Zeit im Format SS:MM eingeben."
-
-#~ msgid "Enter a valid date/time in -MM-DD HH:MM format."
-#~ msgstr ""
-#~ "Bitte eine gültige Datums- und Zeitangabe im Format -MM-TT SS:MM "
-#~ "eingeben."
-
-#~ msgid "The URL %s does not point to a valid image."
-#~ msgstr "Die URL %s zeigt nicht auf ein gültiges Bild."
-
-#~ msgid "Phone numbers must be in XXX-XXX- format. \"%s\" is invalid."
-#~ msgstr ""
-#~ "Telefonnummern müssen das Format XXX-XXX- haben. \"%s\" ist ungültig."
-
-#~ msgid "The URL %s does not point to a valid QuickTime video."
-#~ msgstr "Die URL %s zeigt nicht auf ein gültiges QuickTime-Video."
-
-#~ msgid "A valid URL is required."
-#~ msgstr "Eine gültige URL ist erforderlich."
-
-#~ msgid ""
-#~ "Valid HTML is required. Specific errors are:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Bitte gültiges HTML eingeben. Fehler sind:\n"
-#~ "%s"
-
-#~ msgid "Badly formed XML: %s"
-#~ msgstr "Ungültiges XML: %s"
-
-#~ msgid "Invalid URL: %s"
-#~ msgstr "Ungültige URL: %s"
-
-#~ msgid "The URL %s is a broken link."
-#~ msgstr "Die URL %s funktioniert nicht."
-
-#~ msgid "Enter a valid U.S. state abbreviation."
-#~ msgstr "Bitte eine gültige Abkürzung für einen US-Staat eingeben."
-
-#~ msgid "This field must match the '%s' field."
-#~ msgstr "Dieses Feld muss zum Feld '%s' passen."
-
-#~ msgid "Please enter something for at least one field."
-#~ msgstr "Bitte mindestens eines der Felder ausfüllen."
-
-#~ msgid "Please enter both fields or leave them both empty."
-#~ msgstr "Bitte entweder beide Felder ausfüllen, oder beide leer lassen."
-
-#~ msgid "This field must be given if %(field)s is %(value)s"
-#~ msgstr ""
-#~ "Dieses Feld muss gefüllt sein, wenn Feld %(field)s den Wert %(value)s hat."
-
-#~ msgid "This field must be given if %(field)s is not %(value)s"
-#~ msgstr ""
-#~ "Dieses Feld muss gefüllt sein, wenn Feld %(field)s nicht %(value)s ist."
-
-#~ msgid "Duplicate values are not allowed."
-#~ msgstr "Doppelte Werte sind hier nicht erlaubt."
-
-#~ msgid "This value must be between %(lower)s and %(upper)s."
-#~ msgstr "Dieser Wert muss zwischen %(lower)s und %(upper)s sein."
-
-#~ msgid "This value must be at least %s."
-#~ msgstr "Dieser Wert muss mindestens %s sein."
-
-#~ msgid "This value must be no more than %s."
-#~ msgstr "Dieser Wert darf maximal %s sein."
-
-#~ msgid "This value must be a power of %s."
-#~ msgstr "Dieser Wert muss eine Potenz von %s sein."
-
-#~ msgid "Please enter a valid decimal number."
-#~ msgstr "Bitte eine gültige Dezimalzahl eingeben."
-
-#~ msgid "Please enter a valid decimal number with at most %s total digit

[Changeset] r9305 - django/trunk/django/conf/locale/de/LC_MESSAGES

[noreply]

Author: jezdez
Date: 2008-11-01 08:00:09 -0500 (Sat, 01 Nov 2008)
New Revision: 9305

Modified:
   django/trunk/django/conf/locale/de/LC_MESSAGES/django.mo
   django/trunk/django/conf/locale/de/LC_MESSAGES/django.po
Log:
Updated German translation

Modified: django/trunk/django/conf/locale/de/LC_MESSAGES/django.mo
===
(Binary files differ)

Modified: django/trunk/django/conf/locale/de/LC_MESSAGES/django.po
===
--- django/trunk/django/conf/locale/de/LC_MESSAGES/django.po2008-10-31 
23:52:31 UTC (rev 9304)
+++ django/trunk/django/conf/locale/de/LC_MESSAGES/django.po2008-11-01 
13:00:09 UTC (rev 9305)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-03 20:01+0200\n"
+"POT-Creation-Date: 2008-11-01 13:57+0100\n"
 "PO-Revision-Date: 2008-08-28 22:58+0100\n"
 "Last-Translator: Jannis Leidel <[EMAIL PROTECTED]>\n"
 "Language-Team: \n"
@@ -160,7 +160,7 @@
 msgstr "Polnisch"
 
 #: conf/global_settings.py:79
-msgid "Portugese"
+msgid "Portuguese"
 msgstr "Portugiesisch"
 
 #: conf/global_settings.py:80
@@ -224,40 +224,40 @@
 "Nach %s:\n"
 "\n"
 
-#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91
+#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172
 msgid "All"
 msgstr "Alle"
 
-#: contrib/admin/filterspecs.py:113
+#: contrib/admin/filterspecs.py:112
 msgid "Any date"
 msgstr "Alle Daten"
 
-#: contrib/admin/filterspecs.py:114
+#: contrib/admin/filterspecs.py:113
 msgid "Today"
 msgstr "Heute"
 
-#: contrib/admin/filterspecs.py:117
+#: contrib/admin/filterspecs.py:116
 msgid "Past 7 days"
 msgstr "Letzte 7 Tage"
 
-#: contrib/admin/filterspecs.py:119
+#: contrib/admin/filterspecs.py:118
 msgid "This month"
 msgstr "Diesen Monat"
 
-#: contrib/admin/filterspecs.py:121
+#: contrib/admin/filterspecs.py:120
 msgid "This year"
 msgstr "Dieses Jahr"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
 msgid "Yes"
 msgstr "Ja"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:146 forms/widgets.py:390
 msgid "No"
 msgstr "Nein"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
+#: contrib/admin/filterspecs.py:153 forms/widgets.py:390
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -299,7 +299,7 @@
 msgstr "%s geändert."
 
 #: contrib/admin/options.py:338 contrib/admin/options.py:348
-#: forms/models.py:275
+#: contrib/comments/templates/comments/preview.html:15 forms/models.py:278
 msgid "and"
 msgstr "und"
 
@@ -350,30 +350,30 @@
 "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt "
 "geändert werden."
 
-#: contrib/admin/options.py:536
+#: contrib/admin/options.py:528
 #, python-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: contrib/admin/options.py:614
+#: contrib/admin/options.py:606
 #, python-format
 msgid "Change %s"
 msgstr "%s ändern"
 
-#: contrib/admin/options.py:646
+#: contrib/admin/options.py:638
 msgid "Database error"
 msgstr "Datenbankfehler"
 
-#: contrib/admin/options.py:696
+#: contrib/admin/options.py:688
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht."
 
-#: contrib/admin/options.py:703
+#: contrib/admin/options.py:695
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: contrib/admin/options.py:732
+#: contrib/admin/options.py:724
 #, python-format
 msgid "Change history: %s"
 msgstr "Änderungsgeschichte: %s"
@@ -387,11 +387,11 @@
 "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder "
 "berücksichtigen die Groß-/Kleinschreibung."
 
-#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40
 msgid "Please log in again, because your session has expired."
 msgstr "Bitte melden Sie sich erneut an, da Ihre Sitzung abgelaufen ist."
 
-#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -399,29 +399,29 @@
 "Ihr Browser scheint keine Cookies zu akzeptieren. Bitte aktivieren Sie diese "
 "und laden Sie die Seite neu."
 
-#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/sites.py:249 contrib/admin/sites.py:255
 #: contrib/admin/views/decorators.py:66
 msgid "Usernames cannot contain the '@' character."
 msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten."
 
-#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62
+#: contrib/admin/sites.py:252 contrib/ad

Re: [Django] #4992: Alter cache key based on GET parameters

[Django]

#4992: Alter cache key based on GET parameters
-+--
  Reporter:  anonymous   | Owner:  nobody  
Status:  reopened| Milestone:  post-1.0
 Component:  Cache system|   Version:  SVN 
Resolution:  |  Keywords:  
 Stage:  Design decision needed  | Has_patch:  0   
Needs_docs:  0   |   Needs_tests:  0   
Needs_better_patch:  0   |  
-+--
Comment (by PeterKz):

 Design-wise it would be great if the developer could be in control of
 which parameters that require a new cache item. After all, it is the
 developer who knows which parameters are likely to influence the result
 returned to the client. The currenct view cache decorator could be
 complemented like this:

 Vary by the entire URL (should be default behaviour):

 {{{
 @cache_page(60 * 15)
 @vary_by_param("*")
 def slashdot_this(request):
 ...
 }}}


 Only vary by values for parameter a and b (ignore everything else):

 {{{
 @cache_page(60 * 15)
 @vary_by_param(["a","b"])
 def slashdot_this(request):
 ...
 }}}

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~--~~~~--~~--~--~---