f6e38f3800
Fixed #5494 , #10765 , #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime.
...
This is slightly backward-incompatible (could result in changed final translations for literals appearing multiple times in different .po files but with different translations).
Translations are now read in the following order (from lower to higher priority):
For the 'django' gettext domain:
* Django translations
* INSTALLED_APPS apps translations (with the ones listed first having higher priority)
* settings/project path translations (deprecated, see below)
* LOCALE_PATHS translations (with the ones listed first having higher priority)
For the 'djangojs' gettext domain:
* Python modules whose names are passed to the javascript_catalog view
* LOCALE_PATHS translations (with the ones listed first having higher priority, previously they weren't included)
Also, automatic loading of translations from the 'locale' subdir of the settings/project path is now deprecated.
Thanks to vanschelven, vbmendes and an anonymous user for reporting issues, to vanschelven, Claude Paroz and an anonymous contributor for their initial work on fixes and to Jannis Leidel and Claude for review and discussion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15441 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07 18:48:40 +00:00
f77d81de3d
Fixed #15208 - Document ModelAdmin.formfield_for_choice_field; thanks julien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 20:57:09 +00:00
3cdd6d898e
Fixed #15204 - Update form examples for rendering of the help_text; thanks prestontimmons.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-02 20:23:13 +00:00
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
0bf5fbfa76
Some tweaks to the staticfiles docs to clarify things for new users. Thanks Jannis and brutasse for review and discussion.
...
* Rearranged 'in a nutshell' usage docs to clarify app-dirs vs STATICFILES_DIRS, initially focus on the simplest path to working local dev, and remove the need for repetitive 'you don't need this in local dev' notes.
* Added docs on using staticfiles serve view for non-staticfiles (e.g. user-uploaded files).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-31 22:06:53 +00:00
456534dda9
Fixed #15191 - typo in form validation docs; thanks berto for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 19:09:44 +00:00
aaa76ca1b3
Fixed #14978 -- Added versionchanged directive to --adminmedia docs clarifying why it's not working with staticfiles (deprecation of AdminMediaHandler).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:30 +00:00
8fe42053bc
Reworded parts of the staticfiles documentation after receiving various user feedback. Thanks, all!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:25 +00:00
e3d322ede8
Fixed #15177 -- Added note to generic views reference page indicating that the views have been deprecated (mirroring the topic guide). Thanks to rasca for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15367 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 13:33:53 +00:00
34288ec2f2
Fixed example use of deprecated function in GeoDjango tutorial.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 08:10:20 +00:00
fe0a15b6c9
Fixed #14993 - Improved docs for ModelAdmin.filter_horizontal adding that it's for ManyToManyFields; thanks jammon for the suggestion.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-29 02:01:43 +00:00
f81d4ba5b3
Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 15:42:24 +00:00
3f528e10d5
Fixed #15012 -- Added post-rendering callbacks to TemplateResponse so that decorators (in particular, the cache decorator) can defer processing until after rendering has occurred. Thanks to Joshua Ginsberg for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 14:24:35 +00:00
4849ebb017
Fixed #15147 - Typo in "Managing static files"; thanks ori for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15284 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-22 23:29:11 +00:00
578ad9b472
Fixed #15141 - remove some deprecated storage engines from the MySQL notes; thanks mariuz for the suggestion.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-22 16:16:42 +00:00
a757b5b8ca
Fixed #15133 - Some markup issues in the docs; thanks Aryeh Leib Taurog for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-22 12:43:50 +00:00
93a4d46184
Fixed #14672 - Added admin handling for on_delete=PROTECT. Thanks to jtiai for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-20 00:33:32 +00:00
4d654c92ce
Fixed #15030 - ModelAdmin media docs don't mention STATIC_URL. Thanks jezdez for the suggestion, Silva for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 13:56:12 +00:00
645eb2b26b
Stopped staticfiles app from requiring a models module when looking for static files. Also removed a bit of code smell in the prefix handling by saving it in the source file storage.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 23:38:00 +00:00
8b4e39bc2e
Fixed #15088 - Missing dash in documentation. Thanks Aryeh Leib Taurog for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15217 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 18:45:49 +00:00
d7fa33af78
Fixed #14928 -- Ensure that a fully qualified domain name can be used for runserver. Thanks to Karmel Allison for the report, Łukasz Rekucki for the patch, and claudep for the tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 06:31:38 +00:00
2d352444b0
Fixed #14176 -- Added forwards compatibility to the legacy syndication feed view. This allows class-based feeds to be deployed using the old-style feed view, as long as the feed requires no arguments (i.e., get_object returns None). Thanks to psychcf for the report, cwhaines for the investigation, and Andrew Godwin for the assist.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 14:51:34 +00:00
7b8c38250c
Fixed #15057 - documented change in [14992]
...
Thanks to Tai Lee for the patch.
Refs #15025 , #7153
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 13:47:21 +00:00
1b90cdcf23
Fixed #15045 - Typo auto_add_now -> auto_now_add; thanks dr_gone for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-11 00:29:38 +00:00
30c8a5574a
Fixed #15003 - assorted edits to admin docs; thanks adamv.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 21:15:00 +00:00
a3894945b6
Fixed #15010 -- Added current_app parameter to close gap between TemplateResponse and render method. Thanks, acdha.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 22:41:43 +00:00
07ef43082d
Fixed #15002 - Fix title casing to conform to style guidelines. thanks adamv.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:29:17 +00:00
a00e8d4e42
Fixed #14878 -- Clarified the way verbose_name_plural is used in generic list views as a context variable. Thanks to diegueus9 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 13:15:58 +00:00
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
70c8cd4100
Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-31 23:02:07 +00:00
7902a89ced
Fixed #12469 - Add a few clarifications to the ModelAdmin.get_urls() docs. Thanks benc for the suggestions.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 21:50:40 +00:00
9b18b46c0f
Fixed #14842 - Indent the model Meta options. Thanks adamv.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:30:24 +00:00
032aac72c4
Fixed #13452 - Document that regroup can be used with any template lookup. Thanks shacker for the suggestion and draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:20:53 +00:00
4243d49700
Fixed #14987 - Alpha sort date filter arguments. Thanks Peter for the report; adamv for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 20:05:51 +00:00
12266059cd
Fixed #14712 - Add an example for the post_syncdb signal. Thanks Frank Wiles for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 15:47:46 +00:00
ad4969e5e8
Fixed #14959 - Add a link to localflavor in the model field docs. Thanks PaulM for the suggestion, elbarto for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 13:47:28 +00:00
a43c2f50c2
Fixed #7726 -- Added validation of max_digits and decimal_places options to DecimalField model field. Thanks theevilgeek for the report and elbarto for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 01:18:11 +00:00
1517659693
Fixed a Sphinx formatting problem in the signals reference docs.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 00:09:09 +00:00
7f3210efa8
Fixed #14403 -- Provided some extra resources on the difference between FloatField and DecimalField in the model field reference. Thanks to typeshige for the report and trebor74hr and dmedvinsky for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-29 00:03:02 +00:00
cd977b9221
Fixed #14905 -- Corrected some misleading linking and language in the FileField docs. Thanks to Keryn Knight for the report and draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 23:24:34 +00:00
645323155b
Fixed #14912 -- Expanded documentation for the urlize template filter. Thanks to adamv for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 22:53:28 +00:00
40d1a478fd
Fixed #11496 - note that DecimalField max/min_value should be type(decimal.Decimal); thanks adamv.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:54:47 +00:00
5c6a9f35a9
Refs #12398 - TypedMultipleChoiceField is new in Django 1.3
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15082 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:29:34 +00:00
b0ecab516f
Fixed #14708 - Document available keys for form field error messages; thanks adamv.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 21:10:19 +00:00
4919aaee11
Fixed #14320 - Add a note about lack of timezone support in MySQL. Thanks RauntyDave for the suggestion, adamv for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 13:35:48 +00:00
75e841d534
Fixed #13837 - Add geodjango packages for Ubuntu 10.04; thanks muanis and zerok for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-28 00:12:49 +00:00
ddfe700563
Fixed #12642 - Add docs for has_[add|change|delete]_permission ModelAdmin methods. Thanks to MadeR for the report and for the wiki contributors from which I took language for this patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:41:19 +00:00
ee5fb7d18c
Fixed #6181 - Document `django.views.decorators.http` - thanks adamv for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15064 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 13:27:26 +00:00
2ea93f9327
Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 00:37:14 +00:00
8a9be74776
Fixed #14927 - typo in model option docs. thanks tiliv.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-25 20:30:15 +00:00
Ramiro Morales
Timo Graham
Carl Meyer
Jannis Leidel
Russell Keith-Magee
Justin Bronn
Luke Plant
Gabriel Hurley