mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

queryset-refactor: Fixed a couple of differences between trunk and this branch that were caused by merge errors.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-12-05 09:40:16 +00:00
parent 0d7b6884df
commit 3dce17ddc4
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -254,7 +254,6 @@ answer newbie questions, and generally made Django that much better:
phil@produxion.net phil@produxion.net
phil.h.smith@gmail.com phil.h.smith@gmail.com
Gustavo Picon Gustavo Picon
pigletto
Luke Plant <http://lukeplant.me.uk/> Luke Plant <http://lukeplant.me.uk/>
plisk plisk
Mihai Preda <mihai_preda@yahoo.com> Mihai Preda <mihai_preda@yahoo.com>
@ -335,7 +334,6 @@ answer newbie questions, and generally made Django that much better:
wam-djangobug@wamber.net wam-djangobug@wamber.net
Wang Chun <wangchun@exoweb.net> Wang Chun <wangchun@exoweb.net>
Filip Wasilewski <filip.wasilewski@gmail.com> Filip Wasilewski <filip.wasilewski@gmail.com>
Filip Wasilewski <filip.wasilewski@gmail.com>
Dan Watson <http://theidioteque.net/> Dan Watson <http://theidioteque.net/>
Chris Wesseling <Chris.Wesseling@cwi.nl> Chris Wesseling <Chris.Wesseling@cwi.nl>
James Wheare <django@sparemint.com> James Wheare <django@sparemint.com>

1
README
View File

@ -34,4 +34,3 @@ To contribute to Django:
* Check out http://www.djangoproject.com/community/ for information * Check out http://www.djangoproject.com/community/ for information
about getting involved. about getting involved.

BIN
django/conf/locale/en/LC_MESSAGES/django.mo
View File

Binary file not shown.

BIN
django/conf/locale/en/LC_MESSAGES/djangojs.mo
View File

Binary file not shown.

2
tests/regressiontests/forms/tests.py
View File

@ -2,6 +2,7 @@
from extra import tests as extra_tests from extra import tests as extra_tests
from fields import tests as fields_tests from fields import tests as fields_tests
from forms import tests as form_tests from forms import tests as form_tests
from error_messages import tests as custom_error_message_tests
from localflavor.ar import tests as localflavor_ar_tests from localflavor.ar import tests as localflavor_ar_tests
from localflavor.au import tests as localflavor_au_tests from localflavor.au import tests as localflavor_au_tests
from localflavor.br import tests as localflavor_br_tests from localflavor.br import tests as localflavor_br_tests
@ -30,6 +31,7 @@ __test__ = {
'extra_tests': extra_tests, 'extra_tests': extra_tests,
'fields_tests': fields_tests, 'fields_tests': fields_tests,
'form_tests': form_tests, 'form_tests': form_tests,
'custom_error_message_tests': custom_error_message_tests,
'localflavor_ar_tests': localflavor_ar_tests, 'localflavor_ar_tests': localflavor_ar_tests,
'localflavor_au_tests': localflavor_au_tests, 'localflavor_au_tests': localflavor_au_tests,
'localflavor_br_tests': localflavor_br_tests, 'localflavor_br_tests': localflavor_br_tests,

7
tests/regressiontests/forms/util.py
View File

@ -42,4 +42,11 @@ u''
# Can take a mixture in a list. # Can take a mixture in a list.
>>> print ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages >>> print ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages
<ul class="errorlist"><li>First error.</li><li>Not π.</li><li>Error.</li></ul> <ul class="errorlist"><li>First error.</li><li>Not π.</li><li>Error.</li></ul>
>>> class VeryBadError:
... def __unicode__(self): return u"A very bad error."
# Can take a non-string.
>>> print ValidationError(VeryBadError()).messages
<ul class="errorlist"><li>A very bad error.</li></ul>
""" """