Claude Paroz
9618d68b34
Fixed #8033 -- Explained app registry error during translation setup
...
Thanks Tim Graham and Aymeric Augustin for the review.
2014-06-23 09:31:45 +02:00
Andrew Godwin
d359647715
Fixed #21498 : Don't use a fallback language if you're en-us.
2014-06-16 20:40:13 -07:00
Claude Paroz
daaeb84158
Fixed #22773 -- Forced templatize() to return unicode
2014-06-06 08:42:52 +02:00
Claude Paroz
2779c299c8
Removed code deprecated from Django 1.2
2014-05-25 21:25:23 +02:00
Claude Paroz
dbb48d2bb9
Applied unicode_literals to makemessages command
...
This also fixes #22686 as some sort of side-effect.
2014-05-24 11:51:57 +02:00
Tim Graham
4492ea5475
Fixed #22586 -- Added LANGUAGE_SESSION_KEY to __all__.
...
Thanks david.fischer.ch at gmail.com for the report.
2014-05-06 19:47:22 -04:00
Claude Paroz
142c27218a
Fixed #22565 -- Prevented pgettext_lazy crash with bytestring input
...
Thanks ygbo for the report.
2014-05-02 19:33:22 +02:00
Tim Graham
45c2d1f5d9
flake8 fixes.
2014-04-30 18:33:46 -04:00
Doug Beck
a5f6cbce07
Refactored DjangoTranslation class
...
Also fixes #18192 and #21055 .
2014-04-30 18:36:25 +02:00
Tomasz Wysocki
cb9704fc4f
Refactor. Stop using memory for list copies.
2014-04-02 17:32:51 +02:00
Aymeric Augustin
f356b6ecc3
Increased memoization cache size for language codes.
...
There may be more than 100 (default maxsize) commonly seen xx-yy values
on some sites. The additional memory consumption isn't significant.
Also added a comment explaining why this cache must have a maxsize.
2014-03-29 19:47:15 +01:00
Tim Graham
6d1ae5e27c
Removed reading of old 'django_language' session variable per deprecation timeline.
...
refs #5789 .
2014-03-21 09:53:16 -04:00
Matthew Somerville
61296fb1ba
Fixed #22283 -- Updated documentation referring to non-existent tuples.
2014-03-18 10:57:47 +01:00
Claude Paroz
210d0489c5
Fixed #21188 -- Introduced subclasses for to-be-removed-in-django-XX warnings
...
Thanks Anssi Kääriäinen for the idea and Simon Charette for the
review.
2014-03-08 09:57:40 +01:00
Bouke Haarsma
2bab9d6d9e
Fixed #21389 -- Accept most valid language codes
...
By removing the 'supported' keyword from the detection methods and only relying
on a cached settings.LANGUAGES, the speed of said methods has been improved;
around 4x raw performance. This allows us to stop checking Python's incomplete
list of locales, and rely on a less restrictive regular expression for
accepting certain locales.
HTTP Accept-Language is defined as being case-insensitive, based on this fact
extra performance improvements have been made; it wouldn't make sense to
check for case differences.
2014-02-26 16:58:04 +01:00
Alex Gaynor
2798e63fa1
Extra new line to make flake8 happy
2014-02-22 11:50:19 -06:00
Erik Romijn
8cd32f0965
Fixed #22120 -- Documented persistent activation of languages and cleaned up language session key use
2014-02-22 18:29:06 +01:00
Aymeric Augustin
1716b7ce5a
Renamed AppCache to Apps.
...
Also renamed app_cache to apps and "app cache" to "app registry".
Deprecated AppCache.app_cache_ready() in favor of Apps.ready().
2013-12-24 12:25:17 +01:00
Aymeric Augustin
2fef9e5375
Moved apps back in the toplevel django namespace.
...
Reverted 4a56a93cc4
.
2013-12-22 11:39:55 +01:00
Aymeric Augustin
65cd74be8e
Stopped iterating on INSTALLED_APPS.
...
Used the app cache's get_app_configs() method instead.
2013-12-22 11:39:18 +01:00
Bouke Haarsma
91c38ce4b2
Fixed 21406 -- Made blocktrans 'trimmed' option preserve line numbers.
...
Thanks Bouke Haarsma for report, fix and initial patch.
2013-12-04 08:36:20 -03:00
Baptiste Mispelon
8f5a688d00
Fixed #21458 -- Made check_for_language more resistant to malformed input.
...
Thanks to Sergey Sorokin for the report and to Bouke Haarsma for the review.
2013-11-20 17:51:53 +01:00
Bouke Haarsma
9b7455e918
Fixed #21351 -- Replaced memoize with Python's lru_cache.
...
Replaced the custom, untested memoize with a similar decorator from Python's
3.2 stdlib. Although some minor performance degradation (see ticket), it is
expected that in the long run lru_cache will outperform memoize once it is
implemented in C.
Thanks to EvilDMP for the report and Baptiste Mispelon for the idea of
replacing memoize with lru_cache.
2013-11-11 08:53:09 +01:00
Bouke Haarsma
7a7c789d5a
Fixed #5849 -- Strip whitespace from blocktrans
...
Add the trimmed option to the blocktrans tag to trim any newlines and
whitespace from its content.
This allows the developer to indent the blocktrans tag without adding
new lines and whitespace to the msgid in the PO file.
Thanks to mpessas for the initial patch and Dmitri Fedortchenko for the
report.
2013-11-08 00:52:17 +02:00
Alex Gaynor
e5b7045422
flake8 fixes
2013-11-06 20:00:48 -08:00
Baptiste Mispelon
8265323c91
Distinguish between browser-deprecated locales and internally
...
deprecated ones.
Thanks to bouke for pointing this out.
2013-11-06 12:27:35 +01:00
Baptiste Mispelon
79716dcca8
Fix python2 breakage caused by e5e044da87
.
2013-11-05 19:51:54 +01:00
Bouke Haarsma
e5e044da87
Fixed #18419 -- Full backwards compatibility for old language codes
...
Improved documentation about zh-* deprecation and upgrade path.
Thanks to Baptiste Mispelon for the code reviews.
2013-11-05 19:26:58 +01:00
Baptiste Mispelon
bdca494464
Fixed python3 breakage introduced by c0a2388a1c
.
2013-11-04 23:57:43 +01:00
Bouke Haarsma
c0a2388a1c
Fixed #18149 -- Changed language codes for Chinese
...
Language codes for Chinese are zh_Hans (Simplified) and zh_Hant (Traditional).
Added support for browsers that still send the deprecated language codes.
Thanks to Olli Wang for the report.
2013-11-04 23:03:28 +01:00
Aymeric Augustin
cb2c3ce154
Merge pull request #1821 from Bouke/tickets/14170
...
#14170 -- Reset i18n cache when settings changed
2013-11-04 13:50:21 -08:00
Alex Gaynor
c347f78cc1
Fixed all E226 violations
2013-11-03 10:08:55 -08:00
Bouke Haarsma
d0669843d0
Fixed #14170 -- Reset i18n cache when settings change
2013-11-03 09:36:09 +01:00
Ray Ashman Jr
e2ae8b048e
Correct flake8 E302 violations
2013-11-02 19:53:29 -04:00
Boryslav Larin
e737c009b8
Fixed flake8 E241
2013-11-02 21:45:40 +02:00
Alex Gaynor
b35ff0d920
Fixed all the E203 violations
2013-10-26 18:27:42 -07:00
Alex Gaynor
f2d8027c9a
Fixed up some more flake8 violations (this particular violation still has many occurrences in the tests/ dir so it can't be removed from setup.cfg yet)
2013-10-26 10:50:40 -07:00
Bouke Haarsma
0d0f4f020a
Fixed #5789 -- Changed LocaleMiddleware session variable to '_language'.
...
The old 'django_language' variable will still be read from in order
to migrate users. The backwards-compatability shim will be removed in
Django 1.8.
Thanks to jdunck for the report and stugots for the initial patch.
2013-10-22 09:24:42 -04:00
Alasdair Nicol
eb214452c3
Fixed #21270 -- Fixed E701 pep8 warnings
2013-10-17 12:12:40 +01:00
Tim Graham
1dae4ac177
Whitespace cleanup.
...
* Removed trailing whitespace.
* Added newline to EOF if missing.
* Removed blank lines at EOF.
* Removed some stray tabs.
2013-10-10 16:49:20 -04:00
Josh Mize
a52cc1c088
Fixed #21078 -- Handled additional bad Accept-Language header
2013-09-09 15:19:09 -04:00
Tim Graham
5649c0af9d
Fixed "indentation is not a multiple of four" pep8 issues.
2013-09-03 14:22:21 -04:00
Simon Charette
11cd7388f7
Fixed #20989 -- Removed useless explicit list comprehensions.
2013-08-30 10:57:51 -04:00
Curtis Maloney
07876cf02b
Deprecated SortedDict (replaced with collections.OrderedDict)
...
Thanks Loic Bistuer for the review.
2013-08-04 07:09:39 -04:00
Claude Paroz
fdd7a355bf
Deprecated django.utils.importlib
...
This was a shim for pre-Python 2.7 support.
2013-07-29 17:10:22 +02:00
Claude Paroz
c0439b6210
Removed obsolete attribute of DjangoTranslation
2013-05-25 14:01:52 +02:00
Łukasz Langa
26e3e7ecb5
Fixed #11915 : generic Accept-Language matches country-specific variants
2013-05-19 12:50:09 +02:00
Florian Apolloner
acd0bb39df
Fixed #14894 -- Ensure that activating a translation doesn't run into threading issues.
...
Thanks to maxbublis for the report and sergeykolosov for the patch.
2013-05-18 17:36:31 +02:00
Łukasz Langa
92ebb29c53
Fixes #19919 : get_language_from_request() disregards "en-us" and "en" languages
...
when matching Accept-Language
2013-05-18 14:37:04 +02:00
Aymeric Augustin
9c487b5974
Replaced an antiquated pattern.
...
Thanks Lennart Regebro for pointing it out.
2013-05-17 18:08:58 +02:00
Łukasz Langa
8c8f94fe9d
Fixes #19763 - LocaleMiddleware should check for supported languages in settings.LANGUAGE_CODE
2013-02-24 14:43:45 +01:00
Łukasz Langa
539900f117
Fixes #17866 : Vary: Accept-Language header when language prefix used
2013-02-23 19:41:33 +01:00
Konrad Hałas
48dc0cbf2a
Changed %r to %s in get_language_info error message.
2013-02-23 18:54:54 +01:00
Konrad Hałas
6bd6a56896
Fixed #19811 - Added language code fallback in get_language_info.
2013-02-23 17:02:07 +01:00
Aymeric Augustin
ace9d4efc3
Made ungettext_lazy usable for messages that do not contain the count.
...
Fixed #19160 (again). Thanks Alexey Boriskin.
2013-02-02 10:58:31 +01:00
Aymeric Augustin
3f1a0c0040
Fixed #19160 -- Made lazy plural translations usable.
...
Many thanks to Alexey Boriskin, Claude Paroz and Julien Phalip.
2013-01-30 20:28:16 +01:00
Ramiro Morales
47ddd6a408
Fixed #19552 -- Enhanced makemessages handling of ``{# #}``-style template comments.
...
They are simply ignored now. This allows for a more correct behavior when
they are placed before translatable constructs on the same line.
Previously, the latter were wrongly ignored because the former were
preserved when converting template code to the internal Python-syntax
form later fed to xgettext but Python has no ``/* ... */``-style
comments.
Also, special comments directed to translators are now only taken in
account when they are located at the end of a line. e.g.::
{# Translators: ignored #}{% trans "Literal A" %}{# Translators: valid, associated with "Literal B" below #}
{% trans "Literal B" %}
Behavior of ``{% comment %}...{% endcomment %}``tags remains unchanged.
Thanks juneih at redpill-linpro dot com for the report and Claude for
his work on the issue.
2013-01-29 19:13:23 -03:00
Claude Paroz
c91667338a
Fixed #19357 -- Allow non-ASCII chars in filesystem paths
...
Thanks kujiu for the report and Aymeric Augustin for the review.
2012-12-08 11:13:52 +01:00
Claude Paroz
550ddc66b4
Fixed #19272 -- Fixed gettext_lazy returned type on Python 2
...
Thanks tyrion for the report.
2012-11-14 10:50:15 +01:00
Jan Bednařík
e6b34193c5
Fixed #19142 -- Language codes can include numbers (RFC 3066).
2012-10-21 01:25:35 +02:00
Claude Paroz
afbf913b90
Build context strings out of [u|n]gettext
...
The context strings in [n]pgettext functions should not be marked
themselves for translation.
2012-10-15 10:00:22 +02:00
Julien Phalip
b8244c654c
Fixed #18881 -- Made the context option in {% trans %} and {% blocktrans %} accept literals wrapped in single quotes. Thanks to lanyjie for the report.
2012-09-27 20:34:45 -07:00
Claude Paroz
ae88e73fa6
Replaced some smart_xxx by force_xxx equivalent
...
smart_str/smart_text should only be used when a potential lazy
string should be preserved in the result of the function call.
2012-08-30 15:46:16 +02:00
Aymeric Augustin
85e7a5e140
[py3] Stopped attempting to translate bytes.
...
That goes actively against the goal of cleaning string handling.
2012-08-18 11:36:09 +02:00
Aymeric Augustin
9e8df02d68
[py3] Ported django.utils.translation.
2012-08-07 12:00:24 +02:00
Aymeric Augustin
c5ef65bcf3
[py3] Ported django.utils.encoding.
...
* Renamed smart_unicode to smart_text (but kept the old name under
Python 2 for backwards compatibility).
* Renamed smart_str to smart_bytes.
* Re-introduced smart_str as an alias for smart_text under Python 3
and smart_bytes under Python 2 (which is backwards compatible).
Thus smart_str always returns a str objects.
* Used the new smart_str in a few places where both Python 2 and 3
want a str.
2012-08-07 12:00:22 +02:00
Aymeric Augustin
ca07fda2ef
[py3] Switched to Python 3-compatible imports.
...
xrange/range will be dealt with in a separate commit due to the huge
number of changes.
2012-07-22 09:29:56 +02:00
Aymeric Augustin
bdca5ea345
[py3] Replaced unicode/str by six.text_type/bytes.
2012-07-22 09:29:54 +02:00
Claude Paroz
4a103086d5
Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.
...
Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
2012-06-07 18:08:47 +02:00
Claude Paroz
d7dfab59ea
Replaced cStringIO.StringIO by io.BytesIO.
...
Also replaced StringIO.StringIO by BytesIO in some other appropriate
places. StringIO is not available in Python 3.
2012-05-05 21:41:44 +02:00
Ramiro Morales
b41ebcf1b9
Fixed #18040 -- Removed so-called project-level locale trees from the list of paths the translation loading process takes in account.
...
Deprecated in Django 1.3. Removed completely for Django 1.5.
Thanks Claude for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 22:24:24 +00:00
Jannis Leidel
2f520139be
Fixed #17873 -- Removed stale code from translation utilities that should have been removed a while ago. Thanks, Aymeric Augustin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 18:51:48 +00:00
Jannis Leidel
7dd0ceba2e
Fixed #17720 -- Stopped the LocaleMiddleware from overeagerly using the request path for language activation if it's actually not wanted. Thanks to Anssi Kääriäinen for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-18 13:37:30 +00:00
Jannis Leidel
ef4d84d11a
Fixed #17555 -- Added support for a missing trailing slash when redirecting based on the browser language. Thanks, neaf.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-04 18:43:20 +00:00
Ramiro Morales
f2e99ecfda
Made makemessages leave `'%%'` sequences untouched when extracting 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-11 00:48:26 +00:00
Ramiro Morales
ff7556c4ec
Fixed #11240 -- Made makemessages i18n command escape % symbols in literals 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-12-11 00:07:06 +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
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
24f4764a48
Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for 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-07-13 09:35:51 +00:00
Jannis Leidel
352b7ffaf0
Fixed #16322 -- Fixed Accept-Language parsing to allow spaces around semicolons. Thanks, Max Arnold.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-26 16:51:54 +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
Ramiro Morales
dff31de20a
Fixed #16155 -- Removed Python 2.4 compatibility constructs from code and 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-06-09 20:01:28 +00:00
Jannis Leidel
5e39ada245
Added missing callables to django.utils.translation.__all__ (`override` and `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-10 18:49:04 +00:00
Jannis Leidel
71ec87fed8
Added django.utils.translation.override context manager to easily activate 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-05-06 13:29:32 +00:00
Ramiro Morales
0defa7dc9d
Fixed #15848 -- Fixed regression introduced in [15882] in makemessages 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-18 20:00:10 +00:00
Russell Keith-Magee
d60ae0b721
Removed deprecated 'no' translation
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:43:43 +00:00
Russell Keith-Magee
86ba75b090
Advanced deprecations in django.utils.translation.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-02 08:41:51 +00:00
Adrian Holovaty
b4f0c1a775
Removed a Python 2.4 try/except no longer necessary in django.utils.translation.trans_real
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:31:31 +00:00
Ramiro Morales
775a6e694f
Fixed #15632 -- Ignore unrelated content in template multi-line comment 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-03-19 12:56:38 +00:00
Jannis Leidel
6b1191b1a2
Normalize the locale paths when considering merging a project language catalogue. Refs #14924 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 01:42:12 +00:00
Ramiro Morales
ee06020240
Don't merge in translations twice from deprecated project level tree when it 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-12 22:38:23 +00:00
Jannis Leidel
179fefcf7c
Fixed #15286 -- Don't show deprecation warning if project locale dir is 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-12 19:12:36 +00:00
Jannis Leidel
e1e3f24371
Fixed #14461 -- Look also in LOCALE_PATHS when checking if a language is 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-12 19:12:28 +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
Alex Gaynor
fcbf881d82
Refactor all uses of thread locals to be more consistant and sane.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-17 09:52:47 +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
23f69af454
Fixed #12201 -- Added a lineno attibute to template Token so e.g. we can 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-12-04 17:42:54 +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
Jannis Leidel
127506aeac
Fixed #11966 -- Made it possible to use a percent sign in a translation 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-04 14:06:24 +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
1070c57b83
Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 12:20:07 +00:00
Jannis Leidel
bf8c93f2cf
Fixed #14306 -- Cleaned up django.utils.translation module a bit to be 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-09-27 15:25:38 +00:00
Russell Keith-Magee
c4b6edf3b8
Fixed #12746 -- Updated sorting calls to use 'key' instead of 'cmp'. This 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-08-06 16:31:44 +00:00
Brian Rosner
47639b6410
Fixed #3469 -- added django.utils documentation for stable bits
...
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-05-08 21:38:27 +00:00
Jannis Leidel
77c13844ae
Fixed #11068 - Introduced new language code "nb" for Norwegian Bokmål as a replacement of the current "no".
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-29 14:36:09 +00:00
Russell Keith-Magee
7d25682108
Fixed #13234 -- Rejiggered the imports in the translation utils . Thanks to 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-29 08:14:57 +00:00
Russell Keith-Magee
ad5afd6ed2
Fixed #12769 , #12924 -- Corrected the pickling of curried and lazy objects, 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-03-27 15:54:31 +00:00
Jannis Leidel
12d40a9fd6
Fixed #11384 - Make sure translations in the project directory really 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-16 12:17:17 +00:00
Jannis Leidel
16942e178f
Removed Python 2.3 compat code in translation framework.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:16:01 +00:00
Jannis Leidel
71da5f62da
Fixed #7720 - Fallback to the base language if the sub language given in the 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-02-16 12:13:48 +00:00
Jannis Leidel
855e805b4c
Fixed #12230 - Updated utils.translation.to_locale to support the special sr_Latn locale. Thanks to Janos Guljas.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-01 21:38:34 +00:00
Jannis Leidel
9233d04265
Fixed #7980 - Improved i18n framework to support locale aware formatting (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-12-22 17:58:49 +00:00
Jacob Kaplan-Moss
c485e236bd
Fixed #8193 : all dynamic imports in Django are now done correctly. I know 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
2009-03-18 16:55:59 +00:00
Jacob Kaplan-Moss
503fda43fa
Fixed #8654 : added `ugettext_lazy` to `django.utils.translation.__all__`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-28 20:20:40 +00:00
Malcolm Tredinnick
3b993b2995
Fixed #8584 -- Fixed a case where the wrong locale might be made active in the
...
locale detection loop. Thanks, Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-27 05:10:20 +00:00
Malcolm Tredinnick
05133baaaa
Removed stray code from [8601].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 21:33:18 +00:00
Malcolm Tredinnick
1fc8f84f58
Fixed #8566 -- Allow safe-strings in the "attrs" parameter to form widgets.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 21:32:17 +00:00
Jacob Kaplan-Moss
a0329d0ae3
Fixed #4389 : be more robust in `get_language_bidi()`. Thanks, arien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-26 20:08:02 +00:00
Jacob Kaplan-Moss
6a5cc9e7f6
Fixed #7831 : be case-insensitive when in `get_language_from_request`.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-25 22:53:44 +00:00
Malcolm Tredinnick
bfcecbffd3
Changed/fixed the way Django handles SCRIPT_NAME and PATH_INFO (or
...
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-21 07:57:10 +00:00
Malcolm Tredinnick
189c704ae6
Revert [7991] - [7993]. I was committing from the wrong branch. Sorry 'bout
...
that, folks. :-(
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:37:55 +00:00
Malcolm Tredinnick
ff68e85b8e
Starting to do the reverse() threading stuff.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 19:32:18 +00:00
Malcolm Tredinnick
72544950e1
Fixed #7163 -- Fixed a translation-sharing problem so that you can have en-gb
...
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-07-07 01:57:05 +00:00
Gary Wilson Jr
dcdd9b3c63
Removed unused import, corrected a typo, and made some styling fixes.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-08 03:55:47 +00:00
Malcolm Tredinnick
efed04b634
Fixed #5603 -- Allow customization of the language cookie name. Thanks, moe.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-29 18:38:44 +00:00
Malcolm Tredinnick
0a3c8f03e0
Fixed #6409 -- Unbreak compound locale name parsing (e.g. zh-cn).
...
This was inadvertently broken back in [6608]. Slightly backwards-incompatible:
people specifying "es_AR" in their LANGUAGES list will need to change that to
"es-ar". Thanks, simonb and Ramiro Morales for making the effort to fix this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-06 01:04:30 +00:00
Gary Wilson Jr
1607acee40
Fixed #5978 -- Gave `LOCALE_PATHS` a default setting of an empty tuple and removed some code that was checking for its existance in settings before accessing it.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-19 05:59:58 +00:00
Malcolm Tredinnick
64c0bf8677
Translating safe strings should return a safe result.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-17 12:11:54 +00:00
Jacob Kaplan-Moss
842a771e05
i18n security fix. Details will be posted shortly to the Django mailing lists and the official weblog.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-26 19:52:42 +00:00
Malcolm Tredinnick
7ca708140a
Fixed #2920 -- Removed _() from builtins.
...
This is backwards incompatible, but easy to work around.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-21 17:14:25 +00:00
Malcolm Tredinnick
2a63414ccd
Fixed #5674 -- Fixed a typo in a docstring from [6446]. Thanks, ski.whitespace@gmail.com.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-03 22:12:22 +00:00
Malcolm Tredinnick
fa546d797e
Fixed #4796 . Fixed a problem when using i18n support for the first time -- in
...
particular when string_concat() was the first call made. Thanks, Andy Durdin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-10-03 01:57:02 +00:00
Adrian Holovaty
604504896c
Fixed #3088 -- Filter parameters are now translated in blocktrans. Thanks, permon
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-09-15 05:14:16 +00:00
Malcolm Tredinnick
953badbea5
Merged Unicode branch into trunk (r4952:5608). This should be fully
...
backwards compatible for all practical purposes.
Fixed #2391 , #2489 , #2996 , #3322 , #3344 , #3370 , #3406 , #3432 , #3454 , #3492 , #3582 , #3690 , #3878 , #3891 , #3937 , #4039 , #4141 , #4227 , #4286 , #4291 , #4300 , #4452 , #4702
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-07-04 12:11:04 +00:00
Malcolm Tredinnick
439cb4047f
Fixed #4040 -- Changed uses of has_key() to "in". Slight performance
...
improvement and forward-compatible with future Python releases. Patch from Gary
Wilson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-26 13:30:48 +00:00
Malcolm Tredinnick
e57d1bddda
Small fix to [4931].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-05 03:25:30 +00:00
Malcolm Tredinnick
8424ea39f8
Fixed #3918 -- Handle technical message IDs correctly when settings.USE_I18N is
...
False.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-05 03:22:49 +00:00
Malcolm Tredinnick
9107ab6e1d
Fixed #3900 -- Included missing function in utils/translation/__init__.py.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-03 03:08:56 +00:00
Malcolm Tredinnick
286e676231
Delayed the reading of settings.USE_I18N until the first use of the i18n
...
functions. This solves a few import problems we are seeing. Fixed #3687 . Refs #2920 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-02 10:58:43 +00:00
Malcolm Tredinnick
6c4757729b
Revert [4485] in order to fix accidental mod_python breakage. Refs #2920 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-11 23:50:35 +00:00
Russell Keith-Magee
0e924c70b1
Refs #2920 -- Replaced implicit uses of _() with explicit imports or calls to gettext(). At some point post 0.96, we need to remove the calls that put _ into the builtins.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4485 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-11 06:20:52 +00:00
Adrian Holovaty
e433e07a8d
Fixed #2408 -- Added get_language_from_request() to trans_null.py. Thanks, ubernostrum
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3458 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-27 16:38:32 +00:00
Adrian Holovaty
dba1f95e12
Added check_for_language and to_locale to utils.translation.trans_null
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3344 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-14 02:55:42 +00:00
Adrian Holovaty
78adbd9434
Added get_language_bidi to django.utils.translation.trans_nuill. Refs #2203
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3329 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-11 14:08:42 +00:00
Adrian Holovaty
5ce4a56a7c
Fixed bug in utils.translation.trans_null -- get_date_formats and get_partial_date_formats weren't returning tuples properly
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-10 04:08:45 +00:00
Adrian Holovaty
18eb7ecb13
Fixed #2310 -- Changed trans_null.py to use settings.LANGUAGE_CODE instead of hard-coded 'en'
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-08 13:58:33 +00:00
Adrian Holovaty
ec4a143a40
Made django/utils/translation.py into a package django/utils/translation, which is loaded lazily depending on the value of settings.USE_I18N.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-07-04 03:58:45 +00:00