summaryrefslogtreecommitdiff
path: root/django/utils/translation
AgeCommit message (Collapse)Author
2011-12-11Made makemessages leave `'%%'` sequences untouched when extracting ↵Ramiro Morales
translatable literals from blocktrans template tags. This makes it consistent with behavior introduced when fixing #11240 in processing of literal passed to the trans tag to avoid double escaping (i.e. `'%%%%'` sequences in resulting PO files.) Also, cleaned up tests changes from r17190 (removed commented out code and implemented compatibility with Python 2.5.) git-svn-id: http://code.djangoproject.com/svn/django/trunk@17192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-11Fixed #11240 -- Made makemessages i18n command escape % symbols in literals ↵Ramiro Morales
passed to the trans tag. This avoids problems with unintended automatic detection, marking and validation of Python string formatting specifiers performed by xgettext(1)/msgfmt(1) that stem from the fact that under the hood makemessages converts templates to Python code before passing them to xgettext. This also makes it consistent with its behavior on literals passed to the blocktrans tag. Thanks Jannis and claude for reviewing and feedback. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-19Fixed #14806 -- Added support for contextual translations to the `trans` and ↵Julien Phalip
`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-09-08Fixed #16516 -- Relaxed the blocktrans rendering a little by falling back to ↵Jannis Leidel
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-07-13Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for ↵Jannis Leidel
the work on the patch and Alex for reviewing. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-26Fixed #16322 -- Fixed Accept-Language parsing to allow spaces around ↵Jannis Leidel
semicolons. Thanks, Max Arnold. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-15Fixed #11585 -- Added ability to translate and prefix URL patterns with a ↵Jannis Leidel
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-09Fixed #16155 -- Removed Python 2.4 compatibility constructs from code and ↵Ramiro Morales
mentions from docs. Thanks Aymeric Augustin for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-10Added missing callables to django.utils.translation.__all__ (`override` and ↵Jannis Leidel
`ugettext_noop`). Many thanks to Ramiro for the hint. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-06Added django.utils.translation.override context manager to easily activate ↵Jannis Leidel
and deactivate a language for a code block. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-18Fixed #15848 -- Fixed regression introduced in [15882] in makemessages ↵Ramiro Morales
management command when processing multi-line comments that contain non-ASCCI characters in templates. Thanks for the report Denis Drescher. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02Removed deprecated 'no' translationRussell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02Advanced deprecations in django.utils.translation.Russell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28Removed a Python 2.4 try/except no longer necessary in ↵Adrian Holovaty
django.utils.translation.trans_real git-svn-id: http://code.djangoproject.com/svn/django/trunk@15934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-19Fixed #15632 -- Ignore unrelated content in template multi-line comment ↵Ramiro Morales
blocks when looking for tokens that identify comments for translators. Thanks andrew AT ie-grad DOT ru for the report and Claude Paroz for spotting the problem and helping to fix it. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14Normalize the locale paths when considering merging a project language ↵Jannis Leidel
catalogue. Refs #14924. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12Don't merge in translations twice from deprecated project level tree when it ↵Ramiro Morales
is also listed in LOCALE_PATHS. Thanks Claude Paroz. Refs #14924. Also, removed some old unused variables as reported by pyflakes. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12Fixed #15286 -- Don't show deprecation warning if project locale dir is ↵Jannis Leidel
included in LOCALE_PATHS. Thanks to Claude and Ramiro. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12Fixed #14461 -- Look also in LOCALE_PATHS when checking if a language is ↵Jannis Leidel
supported. Thanks to Diego Búrigo for the initial patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-07Fixed #5494, #10765, #14924 -- Modified the order in which translations are ↵Ramiro Morales
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-01-17Refactor all uses of thread locals to be more consistant and sane.Alex Gaynor
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12Fixed #4030 -- Added ability to translate language names. Thanks to Antti ↵Jannis Leidel
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-04Fixed #12201 -- Added a lineno attibute to template Token so e.g. we can ↵Ramiro Morales
report line numbers in errors during i18n literals extraction. Thanks madewulf for the report and Claude Paroz for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17Fixed #10004 and #12320 -- Enabled the makemessages management command to ↵Jannis Leidel
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-04Fixed #11966 -- Made it possible to use a percent sign in a translation ↵Jannis Leidel
message id. Thanks for the patch, Claude Paroz. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04Fixed #9988 -- Added support for translation contexts. Thanks, Claude Paroz.Jannis Leidel
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14450 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to ↵Russell Keith-Magee
DeprecationWarnings, and removed 1.1 deprecated code. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27Fixed #14306 -- Cleaned up django.utils.translation module a bit to be ↵Jannis Leidel
quicker. Thanks for the report and initial patch, Anssi Kääriäinen. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06Fixed #12746 -- Updated sorting calls to use 'key' instead of 'cmp'. This ↵Russell Keith-Magee
will be slightly faster in certain circumstances, but more importantly, is a required step for migration to Python 3. Thanks to Martin van Loewis for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-08Fixed #3469 -- added django.utils documentation for stable bitsBrian Rosner
Thanks to Rupe and Ramiro Morales for their initial work on this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-29Fixed #11068 - Introduced new language code "nb" for Norwegian Bokmål as a ↵Jannis Leidel
replacement of the current "no". git-svn-id: http://code.djangoproject.com/svn/django/trunk@13047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29Fixed #13234 -- Rejiggered the imports in the translation utils . Thanks to ↵Russell Keith-Magee
roklenardic and Spark23 for their reports, and to Alex for his suggestion on a potential fix. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27Fixed #12769, #12924 -- Corrected the pickling of curried and lazy objects, ↵Russell Keith-Magee
which was preventing queries with translated or related fields from being pickled. And lo, Alex Gaynor didst slayeth the dragon. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16Fixed #11384 - Make sure translations in the project directory really ↵Jannis Leidel
override translations in apps as specified in the docs. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16Removed Python 2.3 compat code in translation framework.Jannis Leidel
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16Fixed #7720 - Fallback to the base language if the sub language given in the ↵Jannis Leidel
language cookie doesn't exist. Thanks, djoume and Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12442 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01Fixed #12230 - Updated utils.translation.to_locale to support the special ↵Jannis Leidel
sr_Latn locale. Thanks to Janos Guljas. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22Fixed #7980 - Improved i18n framework to support locale aware formatting ↵Jannis Leidel
(dates and numbers) and form processing. Thanks to Marc Garcia for working on this during his Google Summer of Code 2009! Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-18Fixed #8193: all dynamic imports in Django are now done correctly. I know ↵Jacob Kaplan-Moss
this because Brett Cannon borrowed the time machine and brought Python 2.7's '`importlib` back for inclusion in Django. Thanks for the patch-from-the-future, Brett! git-svn-id: http://code.djangoproject.com/svn/django/trunk@10088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-28Fixed #8654: added `ugettext_lazy` to `django.utils.translation.__all__`.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27Fixed #8584 -- Fixed a case where the wrong locale might be made active in theMalcolm Tredinnick
locale detection loop. Thanks, Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26Removed stray code from [8601].Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26Fixed #8566 -- Allow safe-strings in the "attrs" parameter to form widgets.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26Fixed #4389: be more robust in `get_language_bidi()`. Thanks, arien.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25Fixed #7831: be case-insensitive when in `get_language_from_request`.Jacob Kaplan-Moss
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21Changed/fixed the way Django handles SCRIPT_NAME and PATH_INFO (orMalcolm Tredinnick
equivalents). Basically, URL resolving will only use the PATH_INFO and the SCRIPT_NAME will be prepended by reverse() automatically. Allows for more portable development and installation. Also exposes SCRIPT_NAME in the HttpRequest instance. There are a number of cases where things don't work completely transparently, so mod_python and fastcgi users should read the relevant docs. Fixed #285, #1516, #3414. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19Revert [7991] - [7993]. I was committing from the wrong branch. Sorry 'boutMalcolm Tredinnick
that, folks. :-( git-svn-id: http://code.djangoproject.com/svn/django/trunk@7995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19Starting to do the reverse() threading stuff.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-07Fixed #7163 -- Fixed a translation-sharing problem so that you can have en-gbMalcolm Tredinnick
and en-us at the app-level, even though Django only has an "en" translation (for example). Analysis and patch from ognjen.maric@gmail.com. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-08Removed unused import, corrected a typo, and made some styling fixes.Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
generated by cgit v1.3 (git 2.53.0) at 2026-09-18 18:52:15 +0000