Carl Meyer
67dceeef44
Remove a couple unused imports.
2012-09-08 14:30:11 -06:00
Carl Meyer
307706d082
Fixed #18545 -- Make the 'no DJANGO_SETTINGS_MODULE' error message more useful.Thanks Nick Coghlan for the report, and Malcolm Tredinnick for review.
2012-09-08 14:26:33 -06:00
Claude Paroz
22f85b9057
Fixed #18824 -- Allow deleting a setting from overriden settings
2012-09-04 09:41:12 +02:00
Tim Graham
f7142b6111
Fixed #9920 - Clarfied empty string vs. localhost in settings database host.
...
Thanks chromano for the draft patch.
2012-09-01 09:03:05 -04:00
Claude Paroz
ab2f65bb7f
Removed obsolete __members__ definitions
...
This was useful for pre-Python 2.6 support. See commit c6e8e5d9
.
2012-08-21 11:20:22 +02:00
Alex Gaynor
4c97101b1f
remove a bunch of unnescesarry iterkeys() calls
2012-08-08 07:33:15 -07:00
Aymeric Augustin
ee191715ea
[py3] Fixed access to dict keys/values/items.
2012-08-07 12:00:22 +02:00
Simon Meers
10f979fd92
Fixed #18700 -- Added URL reversal for i18n set_language view.
2012-08-04 20:57:12 +10:00
Claude Paroz
a55cde8ab1
Fixed #18363 -- Improved Galician date and time format strings
...
Thanks Guttorm Flatabø for the report and the initial patch, and
Fran Dieguez for the review.
2012-08-03 09:35:39 +02:00
Claude Paroz
8fbfd21719
Fixed #18684 -- Added Finnish DATETIME_FORMAT
...
Thanks Guttorm Flatabø for the report and the initial patch.
2012-08-03 09:26:11 +02:00
Aymeric Augustin
3cb2457f46
[py3] Replaced basestring by six.string_types.
2012-07-22 09:29:54 +02:00
kspi
581a36245c
Correct Lithuanian short date format.
2012-07-04 22:43:31 +03:00
Claude Paroz
db87016b1a
Fixed #12493 -- Deprecated auto-correction of TEMPLATE_DIRS
2012-06-30 15:06:42 +02:00
Claude Paroz
35f9c2c07a
Cleaned up locale-related encoding issues
2012-06-12 14:23:41 +02:00
Claude Paroz
4a103086d5
Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
...
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
Aymeric Augustin
17f3e9258e
Fixed #18397 -- Avoided referencing lawrence.com.
...
This commit includes multiple small related changes, see the ticket
for a full discussion.
2012-06-07 11:50:20 +02:00
Aymeric Augustin
e84f79f051
Fixed #18042 -- Advanced deprecation warnings.
...
Thanks Ramiro for the patch.
2012-05-03 15:27:01 +02:00
Claude Paroz
3904b74a3f
Fixed #18013 -- Use the new 'as' syntax for exceptions.
...
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
Claude Paroz
eefb00f301
Fixed #18220 -- Removed the CACHE_BACKEND setting, as per official deprecation timeline.
...
Thanks Ramiro Morales for the review.
2012-04-29 20:47:36 +02:00
Aymeric Augustin
9ed6e08ff9
Removed deprecated URLField.verify_exists.
...
The deprecation schedule was slightly accelerated because of possible security ramifications.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 13:55:03 +00:00
Aymeric Augustin
fbfaa35fb0
Required that the MEDIA_URL and STATIC_URL settings end with a slash, per the deprecation timeline.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 13:01:59 +00:00
Aymeric Augustin
9e11ff2665
Prevented Django from running with an empty secret key. Refs #17800 .
...
This accelerated deprecation schedule was documented in r17617.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 11:44:57 +00:00
Aymeric Augustin
00ec03fd44
Fixed #17733 -- Discouraged setting TIME_ZONE to None when USE_TZ is True. Thanks berdario for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-26 14:17:13 +00:00
Jannis Leidel
1fe7155823
Pulled core translations updates from Transifex. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 02:35:22 +00:00
Jannis Leidel
4219e2b7f8
Fixed #17920 -- Actually pass the full path of a newly created project or app in the template context as mentioned in the startproject docs. Many thanks to Preston Holmes for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-21 22:29:32 +00:00
Carl Meyer
e41fcdd4d9
Actually warn on empty SECRET_KEY instead of raising a warning as an exception.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-15 16:50:29 +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
f8446024bc
Pulled the core translations updates from Transifex. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-14 08:51:40 +00:00
Claude Paroz
78638a9a51
Replaced http by https in djangoproject.com links
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 17:53:31 +00:00
Jannis Leidel
b403e43c51
Updated core base translation files with new strings. Refs #17822 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 02:23:17 +00:00
Paul McMillan
10e671efaa
Modified the error when SECRET_KEY is missing to be a DeprecationWarning.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 03:48:26 +00:00
Aymeric Augustin
4557058083
Fixed #17800 -- Prevented Django from starting without a SECRET_KEY, since that opens a variety of security problems. Thanks PaulM for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-01 21:38:45 +00:00
Paul McMillan
413e37481d
Fixes #17777 and makes tests run again.
...
Adds a salted MD5 hasher for backwards compatibility.
Thanks gunnar@g10f.de for the report.
Also fixes a bug preventing the hasher tests from being run during
contrib tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-29 20:12:16 +00:00
Chris Beaven
3ac0961e1e
Don't let ALLOWED_INCLUDE_ROOTS be accidentally set to a string rather than a tuple. Thanks to Florian Apolloner for pointing this out.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22 00:42:19 +00:00
Aymeric Augustin
8d221e554c
Fixed #17674 -- DECIMAL_SEPARATOR and THOUSAND_SEPARATOR were swapped in the Croatian locale. Thanks deni for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 09:36:58 +00:00
Adrian Holovaty
c1bdfd6f6f
Changed various non-breaking space characters from [17478] to use the code representation rather than the actual character, which is too hard to overlook because it just looks like a space
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-17 20:23:42 +00:00
Jannis Leidel
c007de5b79
Fixed #17670 -- Correct Italian short localization formats. Thanks, masterjakul.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-11 10:17:45 +00:00
Jannis Leidel
c1acda6d8f
Updated a few localization formats to stop the changes done in r17473 from breaking the tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-10 01:13:29 +00:00
Jannis Leidel
75c60e8053
Fixed #17217 -- Use non breaking spaces for format localization in which spaces are used. Thanks, Claude Paroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17478 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-09 18:58:17 +00:00
Jannis Leidel
3db80c4c05
Fixed #17017 -- Updated British English date formats to follow common standards. Thanks, sebastian.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 18:44:42 +00:00
Aymeric Augustin
e5999ce234
Fixed #17440 -- Used a more natural default date format in the Italian locale. Thanks rm_ and tekNico.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 12:41:24 +00:00
Paul McMillan
dce820ff70
Renovated password hashing. Many thanks to Justine Tunney for help with the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 03:46:06 +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
a9a0f0b03f
Fixed #17042 -- Extended startproject and startapp management commands to better handle custom app and project templates. Many thanks to Preston Holmes for his initial patch and Alex Gaynor, Carl Meyer, Donald Stufft, Jacob Kaplan-Moss and Julien Phalip for code reviewing.
...
* Added ability to pass the project or app directory path as the second argument
* Added ``--template`` option for specifying custom project and app templates
* Cleaned up admin_scripts tests a little while I was there
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-22 22:38:02 +00:00
Adrian Holovaty
20c8aa2a20
Fixed various dodgy behaviours
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 17:37:24 +00:00
Adrian Holovaty
61f0aff811
Fixed #14597 -- Added a SECURE_PROXY_SSL_HEADER setting for cases when you're behind a proxy that 'swallows' the fact that a request is HTTPS
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-16 22:06:06 +00:00
Aymeric Augustin
7872fc0dab
Fixed #16247 -- Removed wildcard expansion of application names in INSTALLED_APPS.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-27 20:13:37 +00:00
Paul McMillan
4d975b4f88
Fixed #16847 . Session Cookies now default to httponly = True.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-21 22:03:03 +00:00
Aymeric Augustin
9b1cb755a2
Added support for time zones. Thanks Luke Plant for the review. Fixed #2626 .
...
For more information on this project, see this thread:
http://groups.google.com/group/django-developers/browse_thread/thread/cf0423bbb85b1bbf
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 13:01:06 +00:00
Carl Meyer
145a77edc9
Fixed #16360 -- Added WSGI entrypoint to startproject layout, and enabled internal servers (runserver and runfcgi) to use an externally-defined WSGI application. Thanks to Armin Ronacher, Jannis Leidel, Alex Gaynor, ptone, and Jacob Kaplan-Moss.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-22 04:30:10 +00:00
Carl Meyer
38f1fe3b35
Fixed #15372 -- Switched to a startproject default layout that allows us to avoid sys.path hacks.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-13 05:56:15 +00:00
Carl Meyer
29def3e52c
Fixed #16873 - Added dummy database backend in default settings, so that just importing django.db doesn't trigger ImproperlyConfigured if there is no DATABASES setting.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-08 19:23:37 +00:00
Aymeric Augustin
510ea906f7
Fixed #17012 - Removed references to the 'hasNoProfanities' validator. Refs #8794 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-07 08:35:20 +00:00
Carl Meyer
343004c4de
Fixed #16568 -- Added RequireDebugFalse filter to prevent sending 500 error emails when DEBUG is True in projects with no explicit LOGGING setting. Thanks to Andreas Pelme for report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-16 16:41:38 +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
Russell Keith-Magee
893cea211a
Added protection against spoofing of X_FORWARDED_HOST headers. A security announcement will be made shortly.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-10 00:46:38 +00:00
Alex Gaynor
d036b87126
Remove no-longer-valid references to the DATABASE_* settings, the legacy code for them was already removed.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-09 17:14:47 +00:00
Jannis Leidel
414c762c3a
Fixed #16349 -- Fixed Brazilian localization formats. Thanks, Claude Paroz, semente and Guiljerme Gondim.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-08 13:24:49 +00:00
Jannis Leidel
1ca6e9b9e2
Fixed #9847 -- Added 403 response handler. Many thanks to kgrandis, adamnelson, vkryachko, fvox13 and Chris Beaven.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:15:31 +00:00
Jannis Leidel
bce890ace4
Fixed #16584 -- Fixed a bunch of typos in code comments. Thanks, Bernhard Essl.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:14:15 +00:00
Jannis Leidel
c59a635624
Fixed #16520 -- Fixed typo in Hungarian localization formats introduced in r16429. Thanks, slink.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-29 09:39:42 +00:00
Jannis Leidel
38a2444277
Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location.
...
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.
Thanks to Jacob for the review and general help.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-30 09:06:19 +00:00
Carl Meyer
43503b093a
Fixed #16288 -- Enabled django.request exception logger regardless of DEBUG setting.
...
Thanks Matt Bennett for report and draft patch; Vinay Sajip and Russell Keith-Magee for review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-22 06:01:44 +00:00
Jannis Leidel
98a69a2c0a
Fixed #16076 -- Updated Hungarian l10n formats. Thanks, slink.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-17 15:39:21 +00:00
Jannis Leidel
896e3c69c7
Fixed #11585 -- Added ability to translate and prefix URL patterns with a language code as an alternative method for language discovery. Many thanks to Orne Brocaar for his initial work and Carl Meyer for feedback.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-15 17:29:10 +00:00
Andrew Godwin
dce278673a
Fixed #9459 : forms.HiddenInput and DateTime field loses microseconds. Thanks to mt.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-09 17:03:45 +00:00
Luke Plant
45e55b9143
Fixed #14614 - filtering of sensitive information in 500 error reports.
...
This adds a flexible mechanism for filtering what request/traceback
information is shown in 500 error emails and logs. It also applies
screening to some views known to be sensitive e.g. views that handle
passwords.
Thanks to oaylanc for the report and many thanks to Julien Phalip for the
patch and the rest of the work on this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16339 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-08 22:18:46 +00:00
Alex Gaynor
06279e454a
Fix the staticfiles_tests and django.conf to not think that None meant a lazy object hadn't been evaluated. Thanks to Jannis for informing me that I broke the test suite (if you were harmed by this I'll buy you a cookie). Sorry.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-01 20:45:47 +00:00
Luke Plant
524c5fa07a
Fixed #14261 - Added clickjacking protection (X-Frame-Options header)
...
Many thanks to rniemeyer for the patch!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-30 22:27:47 +00:00
Jannis Leidel
f60d428463
Fixed #12417 -- Added signing functionality, including signing cookies. Many thanks to Simon, Stephan, Paul and everyone else involved.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-21 14:41:14 +00:00
Luke Plant
8cbcf1d3a6
Fixed #14134 - ability to set cookie 'path' and 'secure' attributes of CSRF cookie
...
Thanks to cfattarsi for the report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-09 23:00:22 +00:00
Luke Plant
171df93170
Fixed #15954 - New IGNORABLE_404_URLS setting that allows more powerful filtering of 404s to ignore
...
Thanks to aaugustin for implementing this.
(Technically this doesn't fix the original report, as we've decided against
having *any* default values, but the new feature makes it possible, and the
docs have an example addressing #15954 ).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-05 20:49:26 +00:00
Jannis Leidel
0fa8bd3d92
Fixed #15920 -- Removed COMMENTS_BANNED_USERS_GROUP setting in favor of the established comments app customization. Thanks, Daniel Lindsley.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-29 15:11:17 +00:00
Jannis Leidel
22892c31f6
Removed superfluous settings that were forgotten when the comments app was refactored.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-29 15:11:08 +00:00
Adrian Holovaty
f8495d2371
Fixed #15822 -- Removed references to the v1 postgresql backend (which has been removed). Thanks for the patch, aaugustin
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-17 20:45:06 +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
Russell Keith-Magee
5d5149cd18
Advanced deprecation of user-based messages and the LegacyFallbackStorage in contrib.messages.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:36:04 +00:00
Russell Keith-Magee
98d3a09338
Advanced deprecation for MEDIA_URL and STATIC_URL without a trailing slash.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:32:21 +00:00
Adrian Holovaty
94af19c43f
Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-01 16:10:22 +00:00
Jannis Leidel
365f501793
Fixed #15726 -- Fixed the name of a file of the Mexican Spanish translation added in r15433.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-31 08:35:34 +00:00
Luke Plant
6a25d90e49
Removed totally unused setting.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 22:19:14 +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
10e1f5d1d2
Refined changes to Polish localization format file made in r13298 and r13327 by using non-breaking space. Refs #13577 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:36 +00:00
Jannis Leidel
d83cf4066c
Fixed mistake introduced in r15838 regarding naming of Mexican Spanish.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:29 +00:00
Jannis Leidel
b46cbc49c2
Fixed #15608 -- Added Nicaraguan Spanish locale (format file only). Thanks, fitoria.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 22:13:24 +00:00
Jannis Leidel
ad4118be44
Fixed #15598 -- Updated static URL helper to be no-op on non-local prefixes. Thanks, traff.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:21 +00:00
Jannis Leidel
5050e30507
Fixed #15563 -- Update the LANG_INFO dictionary with newly added translations az, es-mx and ur. Thanks, lasko.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:13:18 +00:00
Jannis Leidel
0b468d79b0
Pulled core translation updates from Transifex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15 20:05:03 +00:00
Adrian Holovaty
dd3313bf6d
Fixed #10654 -- Removed 'Does it have syntax errors' from the ImportError in django/conf/__init__.py. Evidently syntax errors raise a SyntaxError. Thanks, gutworth and alexr
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14 23:06:06 +00:00
Russell Keith-Magee
7f363eb6dc
Fixed #15553 -- Updated Macedonian locale. Thanks to vasiliyeah for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 00:31:48 +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
Jannis Leidel
4eb060516c
Added Azerbaijani and Urdu to list of supported languages and added initial core translations. Refs #15300 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:50:18 +00:00
Jannis Leidel
8a94108110
Fixed #15300 -- Updated core translations from transifex.net.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-01 08:50:02 +00:00
Jannis Leidel
ada08cd6d8
Fixed #15314 -- Added tests for the static URL pattern function added in r15530 and made sure the **kwargs are passed to the view correctly. Thanks for the report and initial patch, Bruno Renié.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-16 12:50:57 +00:00
Jannis Leidel
a26034ffbf
Fixes #15270 -- Moved back the serve view to django.views.static due to dependency conflicts with the contrib app staticfiles (reverts parts of r14293). Added a helper function that generates URL patterns for serving static and media files during development. Thanks to Carl for reviewing the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 01:42:26 +00:00
Ramiro Morales
a797b7dba0
Fixed #14130 -- Made manage.py error reporting more useful when the settings.py file triggers import errors (in new projects). Thanks Setok for the report, mk and steph for their work.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-13 01:56:12 +00:00
Jannis Leidel
ff4a24af51
Fixed whitespace errors in settings modules.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 19:11:42 +00:00
Russell Keith-Magee
f6d4e5b08a
Fixed #13833 -- Corrected the Indonesian localization. Thanks to rodin for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 13:11:33 +00:00
Russell Keith-Magee
1291888153
Fixed #15227 -- Updated Slovenian localization. Thanks to Gasper Zejn.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-06 06:07:06 +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
Carl Meyer
0ffa39f744
Refs #14675 - Added import of url() function in project template urls.py, added commented sample named url, and converted existing sample patterns to use url().
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 17:37:25 +00:00
Russell Keith-Magee
4306501da7
Fixed #15217 -- Made the CACHE_BACKEND deprecation warning more selective, so it doesn't catch the default case. Thanks to adamv for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04 14:27:43 +00:00
Carl Meyer
a158873488
We have always been at war with 'import *'.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-03 04:55:43 +00:00
Carl Meyer
76fb2bb0e2
Fixed some documentation and default-settings.py comments that were misleading about the purpose of STATIC_ROOT, and removed an unused import.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:28:07 +00:00
Alex Gaynor
9a317938ef
Fixed #15154 -- removed doctests from the tests.py generated with createapp.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 03:22:16 +00:00
Jannis Leidel
5d2ea792ec
Fixed #15151 -- Removed fuzzy markers from translation strings introduced in r15280.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 08:37:35 +00:00
Jannis Leidel
ef3d7bda32
Updated all existing translations after changes to filesize translation strings made in [15290].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 09:44:22 +00:00
Jannis Leidel
07b92cd489
Fixed #9988 (again) -- Updated list of Associated Press months names to use a translation context. Thanks, Claude Paroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15280 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 22:25:50 +00:00
Jannis Leidel
de8565e1c4
Removed app translation strings from core translation files.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 19:35:41 +00:00
Jannis Leidel
544ab30ed7
Fixed #6218 -- Made MEDIA_URL and STATIC_URL require a trailing slash to ensure there is a consistent way to combine paths in templates. Thanks to Michael Toomim, Chris Heisel and Chris Beaven.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:33:11 +00:00
Russell Keith-Magee
673e6fc7fb
Fixed #11675 -- Added support for the PyLibMC cache library. In order to support this, and clean up some other 1.3 caching additions, this patch also includes some changes to the way caches are defined. This means you can now have multiple caches, in the same way you have multiple databases. A huge thanks to Jacob Burch for the work on the PyLibMC backend, and to Jannis for his work on the cache definition changes.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:19:19 +00:00
Jarek Zgoda
689234890c
Fixed #14906 : lost context-based translations for Polish
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-15 14:48:19 +00:00
Jarek Zgoda
f7f7587958
Polish translation update
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-14 11:53:18 +00:00
Jannis Leidel
2478f8588e
Updated date format strings of languages that require alternate month names. Refs #14570 because it uses the new format character added for this purpose. Thank you, shell_dweller.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-13 13:52:21 +00:00
Jannis Leidel
9ab85e05e2
Fixed #4030 -- Added ability to translate language names. Thanks to Antti Kaihola and Ramiro Morales for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:02:45 +00:00
Jannis Leidel
5fa1169f33
Fixed #14821 -- Documented the differences in formatting syntax in formats modules. Thanks, Claude.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 23:02:10 +00:00
Jannis Leidel
462d3115a3
Fixed #5672 -- Allow the separator in the get_text_list utility function to be translated. Thanks, Claude.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12 22:53:49 +00:00
Russell Keith-Magee
b5754e60b4
Fixed #14663 -- Corrected Norwegian locale format strings. Thanks to nfg for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 04:28:17 +00:00
Russell Keith-Magee
19afc46c33
Fixed #12158 -- Corrected Swedish translation for "Go". Thanks to skorpan for the report, and claudep for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-04 04:27:45 +00:00
Jannis Leidel
7421f7269e
Fixed #11161 -- Added plural forms to all supported languages. Fixed other errors in the translation files that prevented them to pass the msgfmt check in preparation for the move to Transifex. Refs #14735 , too.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-02 00:48:56 +00:00
Jannis Leidel
81323cb119
Fixed #14730 -- Fixed unclosed anchor tag in Mongolian translation. Thanks for the report, ankhbayar.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:32:58 +00:00
Jannis Leidel
ab578bfe63
Fixed #14721 -- Made the THOUSAND_SEPERATOR a unicode string in a few locales. Thanks, Claude Paroz.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:32:32 +00:00
Russell Keith-Magee
78be884ea7
Fixed #3304 -- Added support for HTTPOnly cookies. Thanks to arvin for the suggestion, and rodolfo for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-26 13:30:50 +00:00
Russell Keith-Magee
99d247f4cb
Fixed #13795 -- Added a site-wide cache prefix and cache versioning. Thanks to bruth for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-19 15:39:35 +00:00
Jannis Leidel
33d8fcde8a
Fixed #14693 , #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings.
...
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.
* Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.
* Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.
* Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.
Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 15:36:26 +00:00
Adrian Holovaty
5844cdca38
Small grammar fix in 'user-uploaded files' comment from [14560]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 23:48:08 +00:00
Ramiro Morales
74f46c0ae2
Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-14 15:42:54 +00:00
Jannis Leidel
70edd4e103
Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 21:44:33 +00:00
Carl Meyer
4ba6348a00
Fixed #14598 -- Changed some 'domain.com' uses to 'example.com'
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02 16:19:17 +00:00
Jarek Zgoda
40a2a1c59d
Polish translation updated
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 09:26:53 +00:00
Jannis Leidel
cfc19f84de
Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 01:33:24 +00:00
Jannis Leidel
fa2159f85b
Fixed #14479 -- Added initial Punjabi (pa) translation. Thanks, A S Alam.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-18 11:23:07 +00:00
Jannis Leidel
58e3849ec3
Fixed #14429 -- Updated German translation. Thanks, jnns.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-16 20:39:56 +00:00
Jannis Leidel
87b748b3bb
Fixed #13863 -- Corrected decimal separator in Swedish format module. Thanks, Ulf Urdén.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 17:56:39 +00:00
Jannis Leidel
bca8aed419
Fixed links to the date formats choices in the global settings. Thanks, Russell.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 18:26:12 +00:00
Adrian Holovaty
edd767d261
Set default PROFANITIES_LIST setting to an empty tuple. This is technically backwards-compatible if you rely on a Web framework providing you with a woefully incomplete list of naughty words. Fixes #8794
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-07 15:13:00 +00:00
Russell Keith-Magee
24acca4139
Fixed #12012 -- Added support for logging. Thanks to Vinay Sajip for his draft patch, and to the many people who gave feedback during development of the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-04 15:12:39 +00:00
Jannis Leidel
45d348fdd9
Fixed #13596 -- Added Ukrainian pluralization rules. Thanks, shell_dweller.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 15:51:20 +00:00
Jannis Leidel
1df1378f9e
Fixed #13827 -- Cleaned up a few unnecessary function calls.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 21:36:22 +00:00
Jannis Leidel
7bb6abed12
Fixed #13702 -- Made sure to actually fall back to the l10n format strings provided in the settings, when disabled.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 19:40:44 +00:00
Malcolm Tredinnick
27265f70a1
When possible, sanity check the timezone setting to see if the Unix-like
...
box it's running on supports that setting. If checking isn't possible,
we skip it. Patch from seveas. Thanks.
Fixed #3415 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:36:51 +00:00