mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 27 Releases Wiki Activity
18,282 Commits 28 Branches 426 Tags 668 MiB
19d8f2ebf4
Commit Graph

156 Commits

Author SHA1 Message Date
Aymeric Augustin
67e6e0fcf3 Fixed #17087 -- Re-organized the i18n docs to reduce confusion between USE_I18N/USE_L10N and the concepts of internationalization/localisation. Re 
moved some duplicate content.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-22 17:17:57 +00:00
Julien Phalip
26698bc851 Fixed #14806 -- Added support for contextual translations to the trans and blocktrans template tags. Thanks to jtiai for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-19 04:59:47 +00:00
Luke Plant
d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:12:01 +00:00
Ramiro Morales
d544110c52 Removed a couple of notes associated with deprecated utilities from the localization document to unclutter it a bit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 11:00:08 +00:00
Julien Phalip
c2b9f6496e Added some sphinx cross-reference links to the built-in template tags and filters in multiple areas of the documentation. Also fixed a few minor inconsistencies and did a little PEP8 cleanup while I was at it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-03 08:06:01 +00:00
Carl Meyer
00678334aa Fixed #16863 -- Corrected ReST markup to avoid errors building docs. 
Although directives such as "note" and "warning" will accept content
immediately following the directive, this is technically where arguments to the
directive should go (see http://sphinx.pocoo.org/rest.html#directives). Putting
the content there means that any lines beginning with an inline text role
(e.g. ":setting:`DEBUG`") will be mis-interpreted as an option block for the
directive. To avoid this error, there should always be a blank line between the
directive start and the directive content.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 18:06:42 +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
Jannis Leidel
16bb9c594c Fixed #16516 -- Relaxed the blocktrans rendering a little by falling back to the default language if resolving one of the arguments fails, raising a KeyError. Thanks, Claude Paroz and Aymeric Augustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:24:41 +00:00
Jannis Leidel
3256862f5f Fixed #16717 -- Added ability to store result of trans template tag in context variable. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-30 12:09:45 +00:00
Simon Meers
8d6c2dad9d Fixed #16440 -- minor ungettext documentation issue, thanks Bradley Ayers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-10 21:32:39 +00:00
Jannis Leidel
286a1cad88 Fixed #16332 -- Added language template tag that switches the activate language for the enclosed template section, e.g. to allow translation of URLs as added in r16405. Many thanks to Florian Apolloner and Orne Brocaar. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-04 09:52:06 +00:00
Jannis Leidel
63f9b67129 Added '.txt' to list of file extensions that the makemessages management command automatically scans. Refs #12202. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-19 11:24:25 +00:00
Jannis Leidel
44b03484ec Fixed #15908 -- Mention blocktrans in the pluralize filter documentation section. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-16 16:34:20 +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
Jannis Leidel
62bb4b8c37 Added a few cross references to the i18n docs and documented pgettext and colleagues. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-15 10:48:13 +00:00
Jannis Leidel
d77514e428 Fixed #16075 -- Corrected localize template tag docs. Thanks, Horst Gutmann. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 15:44:00 +00:00
Jannis Leidel
49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-29 17:41:04 +00:00
Chris Beaven
17a6bb0f70 Fixes #16072 -- incorrect documentation for multiple expressions inside a blocktrans tag 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16268 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-23 01:52:49 +00:00
Ramiro Morales
5f605678f0 Removed last vestiges of references to technical messages from documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-14 12:28:36 +00:00
Simon Meers
df6e031408 Fixed #16005 -- Error in blocktrans docs -- thanks bezidejni 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-13 00:48:30 +00:00
Simon Meers
f3f1983f30 Moved versionadded below heading for "Localized names of languages". 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-24 10:02:58 +00:00
Gabriel Hurley
f58dd619b8 Fixed #15347 -- Corrected a typo in the l10n docs. Thanks to RaceCondition for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-18 22:42:37 +00:00
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
Timo Graham
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
Jannis Leidel
b224b05304 Fixed #14910 -- Clarified the order of precedence of loading translation catalogues. Thanks, vanschelven. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 14:57:57 +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
Alex Gaynor
c6e64aaa66 Fixed #14636 -- corrected bad formatting in the docs, which was resulting in an invalid link. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-07 15:21:47 +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
ccc49029b8 Fixed #14181 -- Added a template tag and filters to allow localization to be disabled in a template. Thanks to Benjamin Wohlwend for the work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-29 16:48:58 +00:00
Ramiro Morales
b12c739143 Fixed #6073 -- Made compilemessages 18n management command reject PO files with BOM. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 16:38:28 +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
Russell Keith-Magee
663d17897e Fixed #13497 -- Corrected various typos and markup problems in docs. Thanks to Ramiro Morales for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:23:43 +00:00
Russell Keith-Magee
b626d60240 Fixed #13499 -- Corrected typo in l10n docs. Thanks to selwin for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-09 04:23:00 +00:00
Russell Keith-Magee
4e0aa65d16 Refs #13339 -- Disable %b/%B-based locale datetime input formats, and document that they are problematic. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13039 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-28 11:27:38 +00:00
Jannis Leidel
ca4c6f65ea Fixed #13032 - Added localize parameter to form fields to be able to selectively enable localization. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 16:43:27 +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
Jannis Leidel
44390aeb5d Fixed #13045 - Add USE_L10N to the project skeleton settings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-15 12:16:21 +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
5787925cdb Fixed #12967 - Added missing versionadded/-changed doc markers for r11964. Thanks, Karen and Ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 17:05:52 +00:00
Jannis Leidel
0d4726f518 Fixed #11714 - Document a few of the i18n function that can be used outside views and templates. Thanks, Jarek Zgoda and Ramiro Morales. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-21 23:44:05 +00:00
Jannis Leidel
fef575a7f9 Fixed #6380 - Follow symlinks when examining source code and templates for translation strings. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:14:27 +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