Commit Graph

1356 Commits

Author SHA1 Message Date
Adrian Holovaty dba1f95e12 Added check_for_language and to_locale to utils.translation.trans_null
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 02:55:42 +00:00
Malcolm Tredinnick 04e83a0517 Fixed another title string that needed escaping (these strings do need
escaping, because they can be created from object strings, in part).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 01:17:17 +00:00
Malcolm Tredinnick 24fa22883a Fixed #2346 -- Escaped string output in titles in admin interface. Thanks Gary
Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3342 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 01:03:01 +00:00
Malcolm Tredinnick 49bb884d0b Fixed #2345 -- escaped object titles in breadcrumb display in admin. Thanks
Gary Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 01:00:09 +00:00
Malcolm Tredinnick 2175c99825 Fixed #2344 -- Filtered some object string representations through the escape
filter.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 00:49:18 +00:00
Adrian Holovaty 0a2e8daaaf Fixed bug in manipulator_valid_rel_key -- it assumed the related object was related by the primary-key field, whereas this didn't work with ForeignKeys to non-primary-key fields
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-13 21:31:53 +00:00
Adrian Holovaty 085b74406f Fixed #2301 -- Fixed HTML problem with list_display_links. Thanks, kilian
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 19:08:24 +00:00
Adrian Holovaty 78adbd9434 Added get_language_bidi to django.utils.translation.trans_nuill. Refs #2203
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 14:08:42 +00:00
Adrian Holovaty f3a586a557 Fixed #2326 -- Fixed exception catching in django.contrib.auth.models. Thanks, mir@noris.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 14:03:24 +00:00
Adrian Holovaty 33f47ae30a Added local 'qn' variable for backend.quote_name in django.db.models.query.delete_objects
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 04:11:40 +00:00
Adrian Holovaty cfcd4a5875 Added local 'qn' variable for backend.quote_name in django.db.models.query.fill_table_cache
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 03:35:17 +00:00
Adrian Holovaty 98597be786 Removed references to LOOKUP_SEPARATOR in django.db.models.query.lookup_inner
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 03:29:12 +00:00
Adrian Holovaty 9a0e56dbb5 Removed unnecessary 'except: raise' in django.db.models.query.lookup_inner
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 03:27:29 +00:00
Adrian Holovaty a17a9d1474 Added local 'qn' variable for backend.quote_name in django.db.models.query.lookup_inner
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 03:27:10 +00:00
Adrian Holovaty c262e19670 Renamed 'clause' variable to 'lookup_type' in django.db.models.query.lookup_inner
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 03:21:59 +00:00
Adrian Holovaty b4b9edc5e5 Fixed #1614 -- get_sql(), lookup_inner() and parse_lookup() no longer return a 'tables' parameter, because 'tables' was never getting assigned, anywhere.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3317 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 02:32:53 +00:00
Georg Bauer 8c399ba5b6 fixed #2302: added arabic translation. thx Ahmad Alhashemi.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-10 14:14:00 +00:00
Malcolm Tredinnick 927d87d732 Fixed #2320 -- corrected numerous errors in the custom tag examples in
python_templates.txt. Also fixed an argument parsing error for such tags.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-10 10:48:08 +00:00
Adrian Holovaty c1847294b8 Fixed #2301 -- Added list_display_links option to 'class Admin', which regulates which fields in the change list have links. Thanks, kilian
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-10 04:16:26 +00:00
Adrian Holovaty 5ce4a56a7c Fixed bug in utils.translation.trans_null -- get_date_formats and get_partial_date_formats weren't returning tuples properly
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-10 04:08:45 +00:00
Adrian Holovaty b98972e1c9 Fixed #2312 -- E-mail validator now accepts TLDs up to 6 characters long
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-10 02:32:54 +00:00
Adrian Holovaty 9a588aa4b4 Fixed #2317 -- Fixed help_text for FlatPage.template_name field to match magic-removal template names. Thanks, md@hudora.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-09 22:35:08 +00:00
Adrian Holovaty 78c91dd7df Made two small changes to comments in django.db.models.query
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-08 14:17:45 +00:00
Adrian Holovaty 18eb7ecb13 Fixed #2310 -- Changed trans_null.py to use settings.LANGUAGE_CODE instead of hard-coded 'en'
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-08 13:58:33 +00:00
Adrian Holovaty df4331f3e9 Fixed #2303 -- Fixed bug in [3269] with regard to True and False special-casing in template system
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 22:20:07 +00:00
Adrian Holovaty 83c6fff22a Fixed #2142 -- Fixed JavaScript warnings in admin JS. Thanks, mike.capp@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 04:11:10 +00:00
Adrian Holovaty de9630c60e Fixed #2258 -- Accounted for the case of a missing threading library in django.utils.synch. Thanks, scott@clued-in.co.uk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3286 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 04:07:41 +00:00
Adrian Holovaty 49e5f5450d Fixed #2272 -- Improved SQLite database introspection. Thanks, dne@mayonnaise.net
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 04:06:00 +00:00
Adrian Holovaty 84dda1990f Fixed #2267 -- Admin docs now show help text for fields. Thanks, vidar
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 04:00:44 +00:00
Adrian Holovaty 4b11b43d0b Fixed #2283 -- Fixed XHTML-strict validation error in comment templates
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 03:57:50 +00:00
Adrian Holovaty 16c5cec9c1 Fixed #2290 -- Escaped HTML in admin messages. Thanks, Sean
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-07 03:56:15 +00:00
Malcolm Tredinnick c63dcdda37 Fixed another problem where we were creating a class twice via two import
paths. Self-referential relations (e.g. ForeignKey('self')) were still slipping
through the net. Refs #1796.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-06 13:25:12 +00:00
Malcolm Tredinnick e8ef80c130 Fixed #2278 -- Fixed some argument parsing problems with the PostgreSQL
dbshell. Also added in the process name to the arg list so that the output of
'ps' looks sensible.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-05 10:12:58 +00:00
Malcolm Tredinnick c2556874d4 Fixed #1980, #2155 -- made date, time and datetime html2python methods a bit
more consistent in their return values. All three now return None when the
passed in string cannot be converted to the required object (this is assumed
elsewhere).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-05 07:09:53 +00:00
Malcolm Tredinnick 5404e6e93b Fixed #2285 -- Tweaked the error message after model errors at "syncdb" time so
that we don't report an app name of "None".


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-05 05:11:20 +00:00
Malcolm Tredinnick a778c9de47 Fixed #1578 -- fixed a corner-case where we still wanting core=True attributes
on a model that was not being edited inline.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 10:48:07 +00:00
Russell Keith-Magee 4a30eff1ff Trivial indentation fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 06:44:01 +00:00
Russell Keith-Magee 5ac919b711 Refs #2202 -- Cleaned up technique of splitting arguments, based upon a suggestion from SmileyChris.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 06:31:26 +00:00
Russell Keith-Magee b9d9351e85 Fixes #2202 -- Added ability to customize output of pluralize filter to handle irregular cases (walrus/walruses, cherry/cherries). Thanks to gid for the suggestion and the initial patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 06:18:39 +00:00
Adrian Holovaty ec4a143a40 Made django/utils/translation.py into a package django/utils/translation, which is loaded lazily depending on the value of settings.USE_I18N.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 03:58:45 +00:00
Adrian Holovaty a25fe3b65e Changed admin/templates/admin/index.html to make <caption> translatable
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 03:57:07 +00:00
Russell Keith-Magee 4d29cae467 Refs #1400 -- Variable resolver now converts literal strings 'False' and 'True' into booleans when used as template arguments. This is point 2 from ticket #1400. Thanks Kieren Holland.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 03:44:56 +00:00
Russell Keith-Magee 6b383afd39 Fixes #1338, Refs #1400, #2237 -- Modified variable resolution to allow template 'if' statements to work if TEMPLATE_STRING_IF_INVALID is set. Modified unit tests to force the use of this variable, so that returning '' isn't confused with an actual failure.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 03:21:44 +00:00
Georg Bauer 009f224e57 fixed #2241: typos in french translation (manually snarfed from the diff, please send .po files next time!)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-03 16:07:37 +00:00
Georg Bauer 86b340656c fixed #2279: updated galician translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-03 16:05:54 +00:00
Adrian Holovaty 435e8910ae Small edits to comments in contrib/auth/__init__.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-03 02:12:59 +00:00
Russell Keith-Magee 08cac47ba0 Removed stray references to (now deprecated) !__ne query type.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-01 05:41:48 +00:00
Adrian Holovaty cc26eb49a8 Removed unneeded import of ngettext from django.db.models.fields.__init__
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-01 03:51:03 +00:00
Adrian Holovaty ec23edfc7f Formatting fix for [3248]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-01 03:21:32 +00:00
Adrian Holovaty 31eb140b5a Optimized JavaScript in django/views/i18n.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-01 03:17:18 +00:00
Russell Keith-Magee cd7b54aab0 Fixes #2271 -- Added code to imply !__exact on any query argument that doesn't finish with a known query term.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3248 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-01 03:14:33 +00:00
Adrian Holovaty 4a324ba7ac Added USE_I18N setting, which lets you turn off internationalization overhead with a single setting. Defaults to True. Currently only affects the admin i18n JavaScript, but I'll be adding other optimizations.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-01 03:09:14 +00:00
Russell Keith-Magee c81d69354a Fixed #2217 -- Allowed raw objects to be used in __exact and __in query terms. Existing use of primary keys in query terms is preserved.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-01 01:14:41 +00:00
Jacob Kaplan-Moss 0ad8863692 restructuredtext filter now passes settings from {{{RESTRUCTUREDTEXT_FILTER_SETTINGS}}} into docutils. See http://docutils.sourceforge.net/docs/user/config.html#html4css1-writer for what these settings are.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-30 20:19:05 +00:00
Adrian Holovaty 2673aa366a Fixed #2275 -- Added footer hook to admin base.html template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-30 19:21:02 +00:00
Adrian Holovaty 127a3f002d Negligible spacing change to django/db/models/loading.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-30 19:13:00 +00:00
Adrian Holovaty 0d14498ee0 Improved DateField.to_python() to catch invalid dates like Feb. 31
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-30 18:57:23 +00:00
Jacob Kaplan-Moss c9032ab07f Added a JSON serializer, a few more tests, and a couple more lines of docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-29 16:42:49 +00:00
Jacob Kaplan-Moss f44e7acb17 Added Bob Ippolito's simplejson (http://undefined.org/python/#simplejson) as {{{django.auth.simplejson}}}. This is version 1.3 of simplejson. Thanks to Bob for his code and his permission to include it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 20:59:49 +00:00
Jacob Kaplan-Moss aab3a418ac Merged multi-auth branch to trunk. See the authentication docs for the ramifications of this change. Many, many thanks to Joseph Kocherhans for the hard work!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 16:37:02 +00:00
Jacob Kaplan-Moss 4ea7a11659 Added initial cut at serialization framework, along with some basic tests and a stab at some docs. This is all a bit rough right now, so expect some bumps.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 16:00:37 +00:00
Malcolm Tredinnick 414bc24e81 Fixed #1754, #2211, #2192 -- allow date filtering comparisons to use strings as
well as date objects. Fixed a couple of admin crashes as well.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 11:37:17 +00:00
Malcolm Tredinnick d6c95e93a7 Fixed #1812 -- permit apps without models (without disguising other errors).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 01:53:30 +00:00
Adrian Holovaty 54e5b9aa21 Fixed #2196 -- Fixed AttributeError in method_set_order. Thanks, fonso
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 01:16:32 +00:00
Adrian Holovaty 5d7af7b1a9 Fixed #2246 -- Changed textile templatetag in contrib.markup to use DEFAULT_CHARSET setting
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-28 01:08:04 +00:00
Jacob Kaplan-Moss 48562965b9 Added {{{Manager.create()}}} method to create and save an object in a single step.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-27 20:36:25 +00:00
Russell Keith-Magee 2adbe11678 Fixes #2216 -- Added extra tests for model validity, and cleaned up warning messages for existing tests. Models are now invalid if the query string required to access a field (or related object) would clash with the name of another field (or related object). Previous tests only checked the accessor names, not the query string.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-27 15:21:43 +00:00
Adrian Holovaty e923ed2a83 Fixed #2158 -- Added title_template and description_template hooks to Feed class in syndication framework.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 23:19:03 +00:00
Adrian Holovaty 6dc719312d Fixed #2157 -- Admin doc views now work if django.contrib.sites isn't installed
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 23:01:46 +00:00
Malcolm Tredinnick 919df8b8c7 Fixed another path where imports were creating two instances of a model's
class. Refs #1796, #2232.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 16:20:58 +00:00
Georg Bauer e19112b47c fixed #2198: updated argentinan translations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 12:24:22 +00:00
Georg Bauer b5a8169f8e fixed #1560: javascript translations for zh_CN
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 12:22:04 +00:00
Malcolm Tredinnick db366b4a78 Fixed #1796 -- implemented more robust normalisation for module filenames
before comparing them. Ivan Saglaev found a case where r3202 did not work
properly.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 09:01:07 +00:00
Adrian Holovaty 2837455878 Fixed #2168 -- Made comment templates more accessible
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-26 00:48:12 +00:00
Malcolm Tredinnick fd702fe034 Fixed #1796 -- only load a single copy of each model, even when it is
referenced via different import paths. Solves a problem with many-to-many
relations being set up incorrectly. Thanks to Curtis Thompson, Luke Plant and
Simon Willison for some excellent debugging of the problem. Refs #2232 (may
also have fixed that).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-25 14:49:34 +00:00
Russell Keith-Magee 23c24fc08b Fixes #1812 -- Added model validity checks to ensure that models.py exists, and has been successfully imported for all INSTALLED_APPS. Previous behaviour was to silently ignore empty/problem models, which resulted in the display of an admin page that doesn't display a supposedly installed model. Thanks to Ian Holsman for the original report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-25 04:24:15 +00:00
Russell Keith-Magee dc473309ef Fixed #1661 -- Added logic for string-form model references in the 'to' argument of OneToOneFields. Includes regression test.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-23 08:16:36 +00:00
Russell Keith-Magee 6cbdbffc80 Added comments to clarify the string->field name resolution logic.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-23 07:43:33 +00:00
Russell Keith-Magee 0d4b5b9b4a Fixed #1662 -- Added resolver for string-form model references for models that have already been loaded, with tests to validate both forward and backward referenced model names. Light refactoring of model loading to make regression tests behave more like normal model loading. Also clarifies the text of some validation errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-23 04:37:00 +00:00
Jacob Kaplan-Moss bc2d8cdbc6 Fixed #2199: deleting objects with generic foreign keys in the admin now works. Thanks, Jay Parlar
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-22 18:44:06 +00:00
Adrian Holovaty 10229c4a1e Changed default 500 view NOT to use RequestContext, to lessen the chance that the 500 view would raise an error in itself
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-22 16:28:40 +00:00
Malcolm Tredinnick ae1234f2a2 Fixed #2163 -- Corrected typo when handling datetimes with timezones in the timesince filter. Thanks, Alex Dedul.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-21 11:11:03 +00:00
Malcolm Tredinnick 239adf83d3 Fixed #2053 -- added an optional comparison argument to the "timesince" filter.
Added a "timeuntil" filter that works analogously. Thanks, john@sneeu.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-21 06:56:08 +00:00
Malcolm Tredinnick b70a687777 Fixed #2031 -- Don't try to remove microseconds on date objects (only datetime)
for MySQL. Refs #316.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-21 04:13:48 +00:00
Malcolm Tredinnick ba22f55aa2 Fixed #1928 -- Correctly create foreign key references when there are multiple
keys on multiple models. Based on a patch from Geert Vanderkelen and some
diagnosis from hornero.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-21 03:39:47 +00:00
Adrian Holovaty dc4f726df9 Fixed #688 -- Changed default 404 and 500 views to use RequestContext
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 14:07:48 +00:00
Malcolm Tredinnick 92571b0d48 Fixed #2119 -- fixed problems with splitting SQL statements into separate
statements. Uses a patch from eaw@woudy.org and some contributions from
jpellerin@gmail.com. Also fixes #2034 and #1935.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 08:00:44 +00:00
Malcolm Tredinnick 3e97535907 Fixed #2161 -- handle trailing newlines in initial SQL data. Includes
regression test. Thanks to russellm.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 07:12:45 +00:00
Adrian Holovaty 32228d2031 Added django/core/servers/fastcgi.py and manage.py 'runfcgi' option. Thanks, jcrasta@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 05:24:19 +00:00
Adrian Holovaty a4b11826a7 Tightened up code in django.contrib.contenttypes.models.ContentTypeManager.get_for_model() to use get_or_create()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 04:47:07 +00:00
Adrian Holovaty fb1c01b103 Fixed #1802 -- Fixed database integrity error when creating permission objects after renaming a model
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 04:44:27 +00:00
Adrian Holovaty 37addba352 Converted request.META['REQUEST_METHOD'] calls to request.method, throughout the Django codebase
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 04:34:13 +00:00
Adrian Holovaty f67b629ada Fixed comma splice in auth.User model docstring
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 04:14:10 +00:00
Adrian Holovaty f2aab5b913 Fixed #1964 -- Fixed bug in fetching the dimensions of an ImageField. Thanks, Armin Ronacher
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 04:12:27 +00:00
Malcolm Tredinnick b2e5c4ef02 Fixed #1422 -- Docstring improvements for the models in the admin app. Thanks
akaihola.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 04:07:32 +00:00
Adrian Holovaty 7aec348677 Fixed #2078 -- Improved HttpResponseRedirect and HttpResponsePermanentRedirect to percent-encode non-ASCII characters in the Location header. Thanks, Andrey
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 04:06:16 +00:00
Adrian Holovaty 6b730e1e92 Fixed #2102 -- Template system 'for' loops now support generators. Thanks, dbm-django@mclachlan.com.au
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 03:58:16 +00:00
Adrian Holovaty 136752ca9a Added 'method' attribute to HttpRequest objects
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 03:48:31 +00:00
Adrian Holovaty a09682fd63 Fixed #2185 -- Changed django.views.decorators.http.require_http_methods decorator to use HttpResponseNotAllowed instead of HttpResponseForbidden
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 03:17:57 +00:00
Adrian Holovaty 551a0272e6 Fixed #2189 -- Optimized auth.User.get_all_permissions() to use select_related behind the scenes to avoid multiple queries. Thanks, konrad@gwu.edu
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 03:08:48 +00:00
Adrian Holovaty 496d651546 Fixed #2190 -- Now allowing NullBooleanField to be given None
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 03:06:14 +00:00
Malcolm Tredinnick a8a133cc6c Fixed #1857 -- Fixed get_previous_by_FIELD and get_next_by_FIELD to work
properly with keyword arguments. Patch from tom@jerakeen.org.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-20 02:17:14 +00:00
Georg Bauer 1a1b1aa5db fixed #2172: updated russian translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 13:48:11 +00:00
Georg Bauer 9496c2be83 fixed #2180: updated polish translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 13:45:58 +00:00
Georg Bauer 3213f84e59 fixed #2165: updated hebrew translations
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 13:45:04 +00:00
Malcolm Tredinnick 2da4c4111e Fixed #1856 -- install content-type entries and auth permissions for
models regardless of the presence of an inner Admin class. Patch from Mathew
Flanagan.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 12:50:53 +00:00
Malcolm Tredinnick c6dc7089a1 Refs #1834 -- Documented include_admin_script tag in admin interface. Thanks to
Matias Hermanrud Fjeld.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 12:35:38 +00:00
Malcolm Tredinnick 271083cf7c Fixed #1756 -- Permit selecting no file in a FilePathField with blank = True.
Thanks to Adam Endicott for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 12:30:43 +00:00
Malcolm Tredinnick 1fc3b3229a Fixed #1683 -- Permit initialising models using settable properties as well as
field names.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 02:34:32 +00:00
Malcolm Tredinnick 214d88ce86 Fixed #1646 -- Added HttpResponseNotAllowed, as suggested by Ian Holsman.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 02:04:37 +00:00
Malcolm Tredinnick a93b1f7ac3 Fixed #1473 -- Added support for categories back into syndication feeds
(was accidently removed in r1994). Thanks, k.shaposhnikov@gmail.com


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 01:38:06 +00:00
Malcolm Tredinnick c0ea3284d7 Fixed #1088 - Correctly detect when a float with too many digits before the
decimal point is passed in.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-19 01:09:00 +00:00
Adrian Holovaty c8f1d0a84e Fixed #2186 -- Fixed i18n variable substitution in admin/templates/registration/password_reset_email.html. Thanks, md@hudora.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-18 17:32:15 +00:00
Malcolm Tredinnick 75a8a32f86 Fixed #2181 -- allow '{' and '}' to be escaped via {% templatetag ... %}.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-18 04:12:55 +00:00
Adrian Holovaty d599052a15 Added AllValuesFilterSpec to admin changelist filters, which lets you put any arbitrary field in Admin.list_filter. To determine the list of all available choices, Django does a SELECT DISTINCT. Note this is backwards-incompatible for people who have defined and registered their own FilterSpecs, because each FilterSpec now takes a 'model' parameter.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-16 19:42:06 +00:00
Adrian Holovaty 72307a6eee Fixed typo in docstring in db/transaction.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-16 19:35:57 +00:00
Jacob Kaplan-Moss bca5327b21 Added generic foreign key support to Django. Much thanks to Ian Holsman and
Luke Plant -- most of this code is theirs.  Documentation is to follow; for now
see the example/unit test.  Fixes #529.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-16 19:18:30 +00:00
Malcolm Tredinnick 062bae3bb3 Fixed the detection of when a custom manager is required because an 'objects'
field already exists.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-15 14:05:33 +00:00
Malcolm Tredinnick 28e643743f Fixed #2164 -- Create correct SQL when pk column name is not the same as the
attribute name. Thanks, Russell Cloran.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-15 11:28:28 +00:00
Adrian Holovaty 8938d5eeb3 Fixed #2152 -- Now HTML-escaping user.first_name in admin/base.html template
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-14 14:56:19 +00:00
Malcolm Tredinnick d5377fc813 Fixed #2153 -- display debugging template even if no stack frame is found.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-14 11:44:56 +00:00
Adrian Holovaty 93974e00d3 Fixed #2148 -- Now escaping ForeignKey fields correctly in Django admin change-list pages. Thanks, rushman@mail.ru
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-13 23:18:15 +00:00
Jacob Kaplan-Moss efcb5912e4 Fixed #2147: file uploads within the update_object generic view now works. Thanks, parlar.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-13 21:47:40 +00:00
Adrian Holovaty 15437d7a88 Fixed #2139 -- Changed Redirect repr to str
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-12 16:20:05 +00:00
Georg Bauer 4fcb72d306 fixed #2128: updated BiDi support
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-12 14:52:51 +00:00
Georg Bauer ece252ed0f fixed #2113: fixed 'pl' translation of date formats
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-12 14:49:05 +00:00
Georg Bauer 395cc62c78 fixed #2018: updated 'sk' translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-12 14:45:28 +00:00
Malcolm Tredinnick 686c5a2f88 Fixed the empty model saving case so that it retrieves the primary key id. Also
updated the tests to test this case.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-12 12:49:14 +00:00
Malcolm Tredinnick bff39bfb8c Fixed #2127 -- Made datetime filters fail silently when passed empty strings or
None. Thanks, Gary Wilson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-11 00:33:44 +00:00
Malcolm Tredinnick 7e2b888a2d Fixed #2108 -- allow saving of empty models, rather than just dropping them.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 15:14:06 +00:00
Adrian Holovaty 29f55c8dbb Fixed #2106 -- Made collapse-block JavaScript translatable. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 05:04:10 +00:00
Adrian Holovaty 2abfd5dd58 Fixed #2109 -- Convert old-style classes to new-style classes throughout Django. Thanks, Nicola Larosa
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 05:00:13 +00:00
Adrian Holovaty 5edd1335b2 Added django.template.Token.split_contents() and used it to add support for strings with spaces in {% ifchanged %}
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 04:29:10 +00:00
Adrian Holovaty 0f0560a9ac Changed django.utils.text.smart_split to return strings, not tuples
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 04:26:23 +00:00
Adrian Holovaty a88e0ec5c6 Fixed #2116 -- Added ul_class parameter to CheckboxSelectMultipleField. Thanks, Jorge Gajon
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 04:08:17 +00:00
Adrian Holovaty 3aa6b0556f Solved the POST-data-lost-after-redirect problem by raising RuntimeError when DEBUG=True in the CommonMiddleware
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 03:47:18 +00:00
Adrian Holovaty e5cd46d6d1 Fixed #2026 -- Added support for 'and' in template 'if' tags, added dozens of unit tests and updated docs. Thanks, ckknight
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 03:33:21 +00:00
Malcolm Tredinnick 89920e058f Fixed #2108 -- do not try to save an empty model.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-08 00:13:52 +00:00
Adrian Holovaty a1c9c52533 Added django.utils.text.smart_split. Thanks, ckknight
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 06:08:23 +00:00
Adrian Holovaty 22da62f239 Fixed #1503 -- Improved model validator to throw an error if a model doesn't manually define a primary key and has a field named 'id', which conflicts with the auto-primary-key convention. Thanks, mir@noris.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 04:22:42 +00:00
Adrian Holovaty 0b92bd11db Removed legacy deprecated_args check from django.core.management
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 04:15:18 +00:00
Adrian Holovaty b78b1b98ff Small improvement to django.template.resolve_variable -- isdigit() instead of 0123456789
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 04:12:39 +00:00
Adrian Holovaty 3db34ce73e Fixed #2100 -- Made some remaining parts of the admin changelist translatable. Thanks, ramiro
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 03:17:58 +00:00
Adrian Holovaty 1926428a55 Fixed #2098 -- Loosened validation for model 'ordering' parameter by allowing periods. Thanks, Alex Dedul
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 02:47:53 +00:00
Adrian Holovaty f3f002b161 Fixed #1697 and #2095 -- Made 'choices' parameter accept any iterable
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 02:46:08 +00:00
Adrian Holovaty b3a6348bc2 Added Manager.get_or_create()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-07 00:09:29 +00:00
Georg Bauer 7e88ec5271 fixed #2089: added language bidirectional support and updated the admin to use it. thanks meir@mksoft!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-06 15:22:53 +00:00
Georg Bauer 05b1a70dab fixed #2090: fixed bad charset header in po file
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-06 15:13:16 +00:00
Jacob Kaplan-Moss 86d585a0a1 Backed out [3088] which was a premature commit with a message meant for another term window :)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-06 12:30:26 +00:00
Jacob Kaplan-Moss 0909c97e60 BNW: Added modpython handler to autosettings
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-06-06 12:20:45 +00:00