innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
24,450 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

165 Commits

Author SHA1 Message Date
Jannis Leidel 122086032b Pulled flatpages translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:59:34 +00:00
Jannis Leidel 9d1d1f06db Added Tatar translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:15:31 +00:00
Jannis Leidel e540f27475 Added Swahili translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:14:48 +00:00
Jannis Leidel 830900c24a Added Nepali translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:14:07 +00:00
Jannis Leidel 661139a29e Added Kazakh translation. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:13:24 +00:00
Jannis Leidel e47b92dad7 Added Esperanto to the list of languages. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:12:43 +00:00
Jannis Leidel 0a32209add Pulled the flatpages translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-14 09:00:35 +00:00
Jannis Leidel bf6ccebef7 Updated flatpages base translation files with new strings. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-05 02:24:06 +00:00
Aymeric Augustin 4a3aceed3f Added __future__ import for Python 2.5 forgotten in r17402. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-28 20:37:05 +00:00
Aymeric Augustin 6b16580aaa Fixed #12972 -- Validated that flatpages URLs start and (when appropriate) end with a slash. Thanks jabapyth, claudep and kmtracey. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-28 20:27:23 +00:00
Jannis Leidel 4c376852fe Updated English base translation files in preparation of the alpha release so Transifex can pick them up. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 23:02:28 +00:00
Jannis Leidel 0e9b1041d7 Fixed a broken translation string in the flatpages' forms module. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 23:01:53 +00:00
Carl Meyer 62afd58c87 Fixed #17057 -- Corrected flatpage url uniqueness validation to account for flatpage editing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-17 00:56:32 +00:00
Carl Meyer 3f3010014b Fixed #14678 -- Added validation to catch flatpages with the same URL on the same site. Thanks seler for the report, and joni, graham_king, and j4nu5 for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 15:45:52 +00:00
Ramiro Morales 26b8122087 Fixed #14675 -- Completed removal of `from django.conf.urls.default import *` usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
Jannis Leidel 32bd953e63 Minor renaming for consistency. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-07 17:05:06 +00:00
Jannis Leidel 0b1a061881 Replaced old-style with new-style decorator syntax. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-01 16:46:02 +00:00
Luke Plant 26cda43012 Switched to HTML5 doctype in all Django supplied templates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-20 17:40:53 +00:00
Jannis Leidel 196ac8f8b3 Fixed #6213 -- Updated the flatpages app to only append a slash if the flatpage actually exist. 
The FlatpageFallbackMiddleware (and the view) now only add a trailing slash and redirect if the resulting URL refers to an existing flatpage. Previously requesting /notaflatpageoravalidurl would redirect to /notaflatpageoravalidurl/, which would then raise a 404. Requesting /notaflatpageoravalidurl now will immediately raise a 404. Also, Redirects returned by flatpages are now permanent (301 status code) to match the behaviour of the CommonMiddleware.

Thanks to Steve Losh for the initial work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-20 14:41:47 +00:00
Russell Keith-Magee d60ae0b721 Removed deprecated 'no' translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-02 08:43:43 +00:00
Jannis Leidel 2cb2674048 Copied "Norwegian Bokmål (nb)" translation to old "Norwegian (no)" translation for backwards compatibility. 
This change slightly extends what was decided in #11068 (to not update the "no" translation due to complicated maintenance, but only "nb"). Thanks, Transifex!

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-20 22:16:35 +00:00
Jannis Leidel ada8e2a6fa Pulled translation updates from Transifex again. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-20 22:16:14 +00:00
Ramiro Morales 5347bbd514 Fixed plural forms formula for the Croatian (hr) localization by manually overriding the header of affected .po files and re-generating .mo files, this seems to be a quirck in Transifex export to PO functionality. Thanks bmihelac fot the report. Refs #15634. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-17 22:56:10 +00:00
Jannis Leidel f7c8ce1d39 Pulled flatpages translation updates from Transifex. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-15 20:08:36 +00:00
Ian Kelly f17fc56602 Fixed a bunch more tests that were failing in Oracle due to false assumptions about the primary keys of objects. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 23:46:28 +00:00
Jannis Leidel 90564a156c Fixed Hungarian, Russian, Serbian and Ukranian plural forms introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:07:11 +00:00
Jannis Leidel c11140d04b Fixed plural forms of Irish translation introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:05:10 +00:00
Jannis Leidel 53b2a25396 Fixed plural forms of Welsh translation introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:04:31 +00:00
Jannis Leidel bef353873e Fixed plural forms of Bosnian translation introduced in r15680. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-04 01:03:14 +00:00
Russell Keith-Magee afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Jannis Leidel c6c54bbf66 Updated flatpages translations from transifex.net. Refs #15300. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-01 09:01:01 +00:00
Russell Keith-Magee 7536f63b32 Fixed #14768 -- Added an es_MX locale and initial translation. Thanks to Alonso Bautista Villalobos and the rest of the Mexican translation team. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15433 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-06 06:06:29 +00:00
Jannis Leidel 3238b6866f Added new translation files to formtools contrib app. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-21 18:31:00 +00:00
Alex Gaynor 791cc62d4c Don't mark a TemplateSyntaxError in flatpages as being translatable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 17:54:20 +00:00
Luke Plant 86031bf59d Fixed #14252 - django.contrib.flatpages unit tests assume default value for settings.LOGIN_URL 
Thanks to pmclanahan for report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-13 23:09:56 +00:00
Russell Keith-Magee 72a7167439 Fixed #5192 -- Modified flatpage admin form to allow ~ and . characters in flatpage names. Thanks to marco.giusti@gmail.com for the report, Idan Gazit for summarizing the issue on the ticket, and ctrochalakis for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 12:25:54 +00:00
Russell Keith-Magee e1e2726957 Fixed #6932 -- Added a template tag that gives a list of available flatpages for a given user. Thanks to Dmitri Fedortchenko for the suggestion, and to Mnewman, faldridge and Simon Meers for their work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 11:59:14 +00:00
Russell Keith-Magee 34740625ff Removed a stray DEBUG=True test setting introduced in r13641. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-28 06:12:54 +00:00
Russell Keith-Magee 3f96a7a358 Fixed #14156 -- Modified the way CSRF protection is applied to flatpages so that the flatpage middleware doesn't cause all POSTs resulting in 404s to turn into 403s. Thanks to patrys for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-27 13:55:11 +00:00
Luke Plant def34da85c Fixed #12358 - csrf_token template tag does not work with flatpages. 
Thanks to phretor for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-04 21:47:19 +00:00
Jacob Kaplan-Moss 23f012dbfa Cleaned up a bunch of minor doc stuff: 
* Removed flatpages/redirects README; no other contrib apps have those.
  * Cleaned up top-level README to be more readable.
  * Removed outdated references to old docs (Fixes #8701)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 16:42:13 +00:00
Gary Wilson Jr c2ba59fc1d Removed oldforms, validators, and related code: 
* Removed `Manipulator`, `AutomaticManipulator`, and related classes.
 * Removed oldforms specific bits from model fields:
   * Removed `validator_list` and `core` arguments from constructors.
   * Removed the methods:
     * `get_manipulator_field_names`
     * `get_manipulator_field_objs`
     * `get_manipulator_fields`
     * `get_manipulator_new_data`
     * `prepare_field_objs_and_params`
     * `get_follow`
   * Renamed `flatten_data` method to `value_to_string` for better alignment with its use by the serialization framework, which was the only remaining code using `flatten_data`.
 * Removed oldforms methods from `django.db.models.Options` class: `get_followed_related_objects`, `get_data_holders`, `get_follow`, and `has_field_type`.
 * Removed oldforms-admin specific options from `django.db.models.fields.related` classes: `num_in_admin`, `min_num_in_admin`, `max_num_in_admin`, `num_extra_on_change`, and `edit_inline`.
 * Serialization framework
   * `Serializer.get_string_value` now calls the model fields' renamed `value_to_string` methods.
   * Removed a special-casing of `models.DateTimeField` in `core.serializers.base.Serializer.get_string_value` that's handled by `django.db.models.fields.DateTimeField.value_to_string`.
 * Removed `django.core.validators`:
   * Moved `ValidationError` exception to `django.core.exceptions`.
   * For the couple places that were using validators, brought over the necessary code to maintain the same functionality.
 * Introduced a SlugField form field for validation and to compliment the SlugField model field (refs #8040).
 * Removed an oldforms-style model creation hack (refs #2160).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-27 07:19:44 +00:00
Malcolm Tredinnick d05d724165 Fixed #8376 -- Use request.path and request.path_info at the right moments when 
serving data in the flatpage middleware. Patch from jcassee.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-21 01:40:22 +00:00
Gary Wilson Jr 00bebaf0d1 Refs #7742 -- newforms-admin does not use oldforms `validator_list` argument, made a custom `FlatPageForm` to check the entered URL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-11 04:28:33 +00:00
Jacob Kaplan-Moss d0f57e7c73 Fixed #6213: flatpage view now correctly redirects if settings.APPEND_SLASH. Thanks, crankycoder. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-05 17:45:31 +00:00
Brian Rosner a19ed8aea3 Merged the newforms-admin branch into trunk. 
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 23:54:34 +00:00
Malcolm Tredinnick 4b93eed185 Fixed #4081 -- Allow empty content in flatpages. 
Patch from ctrochalakis and Matt Croydon.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-30 13:05:47 +00:00
Adrian Holovaty cc64abfc1d Fixed #7329 -- Added list_display Admin options to FlatPage and Redirect models. Also changed list_filter for FlatPage. Thanks for the patch, benspaulding 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 03:47:38 +00:00
Gary Wilson Jr 3a662052ec Django code styling fixes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-29 16:42:39 +00:00
Gary Wilson Jr 0c222b9533 Fixed #6879 -- Made string in `contrib.flatpages` translatable, thanks ctrochalakis. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-29 15:54:43 +00:00
Malcolm Tredinnick 356662cf74 Implemented auto-escaping of variable output in templates. Fully controllable by template authors and it's possible to write filters and templates that simulataneously work in both auto-escaped and non-auto-escaped environments if you need to. Fixed #2359 
See documentation in templates.txt and templates_python.txt for how everything
works.

Backwards incompatible if you're inserting raw HTML output via template variables.

Based on an original design from Simon Willison and with debugging help from Michael Radziej.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-11-14 12:58:53 +00:00
Gary Wilson Jr 212ee65be7 Fixed #2101 -- Renamed `maxlength` argument to `max_length` for oldforms `FormField`s and db model `Field`s. This is fully backwards compatible at the moment since the legacy `maxlength` argument is still supported. Using `maxlength` will, however, issue a `PendingDeprecationWarning` when used. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-05 05:14:46 +00:00
Malcolm Tredinnick 953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Russell Keith-Magee aebd5f94a2 Fixed #3845 -- Added index to URL attribute of flatpages model. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-29 11:46:26 +00:00
Adrian Holovaty 34609438bb Fixed #2581 -- Added populate_xheaders() call to flatpage view. Thanks for the patch, dummy@habmalnefrage.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-23 02:05:05 +00:00
Adrian Holovaty 6f8e9be24a Fixed #2525 -- Fixed typo in contrib/flatpages/README.TXT. Thanks, dummy@habmalnefrage.de 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-08-11 22:04:42 +00:00
Malcolm Tredinnick 51705f60b1 Fixed #2332 -- Introduced is_authenticated() method on User and AnonymousUser classes. Recommended its use over is_anonymous in the docs. Changed internal Django use to match this recommendation. Thanks to SmileyChris and Gary Wilson for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-19 02:09:26 +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 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 412db6c929 Fixed #1837 -- Gave FlatPage a str 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-11 14:38:27 +00:00
Adrian Holovaty f69cf70ed8 MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-05-02 01:31:56 +00:00
Adrian Holovaty 09f32294e8 Fixed #845 -- flatpages middleware no longer throws 404 exception for DEBUG=True. Thanks, Hugo 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-20 04:55:57 +00:00
Adrian Holovaty da33b656ce Added README.TXT to contrib.redirects and contrib.flatpages 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-12 00:09:20 +00:00
Adrian Holovaty e0ae394e64 Small bugfix to flatpages URLconf from [1166] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-11 05:13:57 +00:00
Adrian Holovaty 1b035c35d9 BACKWARDS-INCOMPATIBLE CHANGE -- Moved flatpages and redirects to standalone apps in django.contrib that are NOT installed by default. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for full migration information. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2005-11-11 04:45:05 +00:00