1
0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
django/django
Ramiro Morales 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
..
bin Fixed #14419 -- Enhanced the help text of the makemessages management command. Thanks lsaffre for the report and suggestions and gruszczy for the patch. 2011-01-25 01:39:39 +00:00
conf Fixed #15227 -- Updated Slovenian localization. Thanks to Gasper Zejn. 2011-02-06 06:07:06 +00:00
contrib Fixed #13674 -- Ensure that labels on added inlines fields have the right 'for' attribute. Thanks to Jonas for the report, and Julien Phalip for the patch. 2011-02-06 06:20:27 +00:00
core Fixed #15181 -- Ensure that special characters are escaped when querying for the URL of an uploaded file. Thanks to e.generalov for the report and patch. 2011-02-04 14:43:10 +00:00
db Fixed #15230 -- added some more attributes to the dummy database backend. 2011-02-06 18:46:40 +00:00
dispatch
forms Fixed #15226 - Made SelectDateWidget render the label tag associated with the correct dropdown sub-widget when USE_L10N is active and non-English locale is in use. 2011-02-05 18:16:27 +00:00
http Fixed #15046 -- Added "CHROMEFRAME" as a user agent alias for various MSIE fixes. Thanks to chrj for the report and patch. 2011-01-27 03:13:39 +00:00
middleware Fixed #13283 -- Corrected CACHE_MIDDLEWARE_ANONYMOUS_ONLY's bad habit of setting Vary: Cookie on all responses and destroying cache efficiency. Thanks to natrius for the fix. 2011-02-01 00:20:31 +00:00
shortcuts Fixed #15010 -- Added current_app parameter to close gap between TemplateResponse and render method. Thanks, acdha. 2011-01-05 22:41:43 +00:00
template Fixed #14046 -- Made {% include %} behave the same, regardless of whether the template included is named by variable or constant string. Thanks to defcube for the report, and George Karpenkov for the draft patch. 2011-02-04 17:10:21 +00:00
templatetags
test Fixed #15029 -- Moved to database backends the ability to decide if two DATABASES items are different when creating temporary databases for tests. 2011-02-02 14:02:14 +00:00
utils Fixed #5494, #10765, #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime. 2011-02-07 18:48:40 +00:00
views Fixed #5494, #10765, #14924 -- Modified the order in which translations are read when composing the final translation to offer at runtime. 2011-02-07 18:48:40 +00:00
__init__.py