mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 19:46:22 +00:00
Code Issues 30 Releases Wiki Activity
9,894 Commits 28 Branches 426 Tags 677 MiB
174d8db57c
Commit Graph

21 Commits

Author SHA1 Message Date
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
Timo Graham
ec38c88dfb Fixed #12193 - Add details to the i18n documentation for translation of model classes (relations and methods). Thanks Maxime Petazzoni and Ramiro for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-29 15:39:12 +00:00
Timo Graham
aa1b537b11 Fixed #13961 - note that reverse URL lookups can't be done within a blocktrans tag. Thanks garrison for the report and richardb and zerok for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-29 14:19:38 +00:00
Chris Beaven
3ae9117c46 Fixes #7817 and #9456. 
- The include tag now has a 'with' option to include to provide extra context
  vairables to the included template.

- The include tag now has an 'only' option to exclude the current context
  when rendering the included template.

- The with tag now accepts multiple variable assignments.

- The with, include and blocktrans tags now use a new keyword argument format
  for variable assignments (e.g. `{% with foo=1 bar=2 %}`).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-18 02:50:26 +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
Ramiro Morales
4858a8d9f3 Removed reference to potential exception during template rendering-time from the ungettext() documentation. Exceptions at that point should be considered and reported as a bug. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-01 15:06:25 +00:00
Alex Gaynor
c0248f6f07 Corrected some syntax issues in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 16:08:28 +00:00
Jannis Leidel
17b329ae08 Fixed #10004 and #12320 -- Enabled the makemessages management command to collect comments for translators that start with the "Translators" keyword. Thanks for the report and patches, martinb and Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:37:33 +00:00
Gabriel Hurley
b951ffbc6b Fixed #14669 -- corrected an ungrammatical sentence in the internationalization docs. Thanks to steveire for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-12 02:48:26 +00:00
Jannis Leidel
05db03c206 Fixed typo in i18n docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-04 10:48:45 +00:00
Jannis Leidel
83aeb3c768 Fixed #9988 -- Added support for translation contexts. Thanks, Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-04 10:48:27 +00:00
Russell Keith-Magee
08beb148c8 Fixed #14421 -- Clarified the english in the i18n documentation. Thanks to Ned Batchelder for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-08 15:36:15 +00:00
Jacob Kaplan-Moss
728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents. 
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 19:27:44 +00:00
Russell Keith-Magee
458e3a3ff9 Fixed #13658 -- Added missing command in JavaScript example. Thanks to erikr for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 02:44:38 +00:00
Jannis Leidel
c796fc7e36 Fixed #13317 - Clarified documentation about how the blocktrans and trans template tags work with regard to variables. Thanks for the initial patch, Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 13:55:15 +00:00
Russell Keith-Magee
7b98fe98f4 Fixed #12278 -- Corrected an example usage of string_concat. Thanks to loumz for the report, and timo for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 06:42:42 +00:00
Russell Keith-Magee
3341f39f41 Fixed #13417 -- Clarified the use of the djangojs domain for translation. Thanks to stephaner for the report and initial patch, and Ramiro Morales for his additional markup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:25:34 +00:00
Gary Wilson Jr
5256a805ff Fixed #13189 -- Fixed typo in code example, thanks to gabrielhurley for patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 00:14:10 +00:00
Jannis Leidel
3c06e2101b Fixed #13014 - Added section about how to use the language code with fragement caching. Thanks for the initial patch, fgutierrez. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-15 12:16:37 +00:00
Russell Keith-Magee
abd0e96285 Fixed #13013 -- Added missing {% csrf_token %} in example form. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-08 03:18:58 +00:00
Jannis Leidel
f93f056c32 Fixed #10260 - Refactored internationalization documentation. Thanks, Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:12:53 +00:00