Commit Graph

998 Commits

Author SHA1 Message Date
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
Russell Keith-Magee f4dd38757c Fixed #13681 -- Added a commented out admindocs entry to the default INSTALLED_APPS for a new project. Thanks to elkan for the report, and andrews for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 12:38:05 +00:00
Russell Keith-Magee 4835d86203 Fixed #13699 -- Updated Catalan translation. Thanks to txels.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 12:33:31 +00:00
Russell Keith-Magee b61e7754ca Fixed #13905 -- Updated Basque translation. Thanks to Aitzol Naberan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 12:32:22 +00:00
Russell Keith-Magee 7b62523b95 Fixed #14079 -- Updated Norwegian Nynorsk translation. Thanks to Håvard Grimelid.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 12:19:44 +00:00
Russell Keith-Magee 6732c98101 Fixed #14084 -- Updated French translation. Thanks to stephaner.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 12:19:19 +00:00
Ramiro Morales a004ac6eef Fixed typos in es_AR translation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-11 12:02:40 +00:00
Russell Keith-Magee 973fb63e4f Fixed #14076 -- Updated Danish translation. Thanks to finngruwier.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 14:17:14 +00:00
Russell Keith-Magee 9a63264b09 Fixed #14070 -- Updated Serbian translations. Thanks to janos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-07 02:18:03 +00:00
Ramiro Morales b71f990a9c Tweaked r13520 translation update (one forgtten fuzzy string).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 19:15:58 +00:00
Ramiro Morales 998daa897f Updated es_AR translation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 19:01:18 +00:00
Jannis Leidel 7c03f1c97a Updated German translation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:55:44 +00:00
Russell Keith-Magee 4e1c9ec24b Fixed #14069 -- Updated Czech translation. Thanks to Tuttle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13513 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:54:43 +00:00
Russell Keith-Magee 75ac6c26da Fixed #14064 -- Corrected spelling of Argentinian. There are arguments that it can be spelled both ways (and arguments that the right phrase is Argentine), but we're going with the OED on this one.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 02:10:45 +00:00
Russell Keith-Magee aa4061dbc0 Fixed #13651 -- Added Malayalam (ml) translation. Thanks to rajeesh.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 02:10:21 +00:00
Jarek Zgoda 9ebf411f26 Fixed #13577 - wrong thousands separator in Polish formats file. Thanks sero for report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-07 14:47:10 +00:00
Jannis Leidel 5acd9cd8ba Fixed #13577 -- Updated Polish formats file. Thanks, ludwik.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21 14:09:25 +00:00
Ramiro Morales b496518623 Fixed a couple of es_AR translation errors.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-17 13:57:15 +00:00
Jannis Leidel a17d897751 Fixed #13545 -- Updated Norwegian nynorsk (nn) translation. Thanks, Håvard Grimelid.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-16 20:48:45 +00:00
Jannis Leidel fa14e3127d Fixed #13544 -- Updated Norwegian bokmal translation. Thanks, Jon Lønne.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-15 00:19:01 +00:00
Jannis Leidel 01f09c945e Fixed #13536 - Updated French translation. Thanks, David Larlet.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 09:13:32 +00:00
Jannis Leidel 670baf2e48 Updated the English language files to match the strings in the 1.2 release.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-13 13:42:24 +00:00
Jannis Leidel b3fff855ab Updated German translation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-13 13:42:01 +00:00
Russell Keith-Magee 70a8f07006 Fixed #13502 -- Updated Arabic translation. Thanks to okhayat.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 13:29:57 +00:00
Russell Keith-Magee b8ed827952 Fixed #13517 -- Added Latvian L10N description. Thanks to fest.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 11:07:50 +00:00
Ramiro Morales b6f0fa586b Updated es_AR translation. Complete as of r13237.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-11 21:46:39 +00:00
Russell Keith-Magee bfa0bae9a9 Fixed #13523 -- Updated Russian translation. Thanks to Alexey Boriskin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-11 14:43:24 +00:00
Russell Keith-Magee 6543539777 Fixed #13522 -- Updated Indonesian translation. Thanks to gchandrasa.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-11 13:07:09 +00:00
Russell Keith-Magee 8d9bef9a46 Fixed #13520 -- Updated Finnish translation. Thanks to Aku Kotkavuo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-11 06:10:58 +00:00
Jannis Leidel bbbf1002cf Fixed #13515 -- Updated Irish translation of Javascript catalog. Thanks, Michael Thornhill.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 22:00:39 +00:00
Jannis Leidel adde9f4bd2 Fixed #13517 -- Updated Latvian translation. Thanks, Reinis Veips.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 22:00:17 +00:00
Aljosa Mohorovic 6c2f14e9fd updated croatian translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 17:12:36 +00:00
Nicola Larosa d12130a72c Compiled .mo file for the Italian translation
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 12:53:51 +00:00
Nicola Larosa 5b588dbab6 Italian translation updated
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 12:53:02 +00:00