Simon Charette
4c5ed3e683
Refs #23919 -- Removed __nonzero__() methods (for Python 2).
...
Thanks Tim for the review.
2017-01-19 11:26:26 -05:00
Simon Charette
cecc079168
Refs #23919 -- Stopped inheriting from object to define new style classes.
2017-01-19 08:39:46 +01:00
Aymeric Augustin
3cc5f01d9b
Refs #23919 -- Stopped using django.utils.lru_cache().
2017-01-18 21:42:40 -05:00
Claude Paroz
2b281cc35e
Refs #23919 -- Removed most of remaining six usage
...
Thanks Tim Graham for the review.
2017-01-18 21:33:28 +01:00
Claude Paroz
7b2f2e74ad
Refs #23919 -- Removed six.<various>_types usage
...
Thanks Tim Graham and Simon Charette for the reviews.
2017-01-18 20:18:46 +01:00
Claude Paroz
c716fe8782
Refs #23919 -- Removed six.PY2/PY3 usage
...
Thanks Tim Graham for the review.
2017-01-18 16:21:28 +01:00
Claude Paroz
d7b9aaa366
Refs #23919 -- Removed encoding preambles and future imports
2017-01-18 09:55:19 +01:00
Ramin Farajpour Cami
967be82443
Fixed E305 flake8 warnings.
2016-11-14 12:30:46 -05:00
Carl Meyer
7107b6ff0f
Fixed #27454 -- Skipped gettext calls for apps without a locale dir.
2016-11-07 09:59:13 +01:00
Krzysztof Urbaniak
a01d887a3a
Fixed #27063 -- Prevented i18n_patterns() from using too much of the URL as the language.
2016-10-31 14:32:01 -04:00
Claude Paroz
fa2f55cfd5
Refs #26940 -- Re-allowed makemessages without settings
...
Thanks Tim Graham for the review.
2016-10-01 14:57:16 +02:00
Tim Graham
8119b679eb
Refs #27025 -- Fixed "invalid escape sequence" warnings in Python 3.6.
...
http://bugs.python.org/issue27364
2016-09-17 15:44:06 -04:00
Mattias Loverot
2315114090
Fixed #27067 -- Deprecated string_concat() in favor of format_lazy().
2016-08-25 16:12:40 -04:00
Claude Paroz
5fb22b4d4c
Fixed #27034 -- Made makemessages independent of USE_I18N
...
Thanks Tim Graham for the review.
2016-08-11 21:16:19 +02:00
Vytis Banaitis
57eb17b8c7
Fixed #26746 -- Fixed handling of zero priority in Accept-Language header parsing.
2016-06-13 07:58:25 -04:00
Vytis Banaitis
f1b38842af
Fixed #26744 -- Fixed a typo in regex for Accept-Language header parsing.
2016-06-11 21:32:56 -04:00
Thejaswi Puthraya
c8d2120b06
Fixed #26705 -- Fixed plural versions of languages not supported by Django.
2016-06-08 16:17:17 -04:00
Tim Graham
df8d8d4292
Fixed E128 flake8 warnings in django/.
2016-04-08 09:51:06 -04:00
Tim Graham
2cd2d18851
Fixed W503 flake8 warnings.
2016-04-04 17:14:26 -04:00
Claude Paroz
11c60b5298
Reused the DjangoTranslation class for the javascript_catalog view
...
Thanks Tim Graham and Cristiano Coelho for the reviews.
Refs #26328 , #26319 .
2016-03-08 21:39:59 +01:00
Alexey Kotlyarov
b59f963ad2
Fixed #26212 -- Made forms.FileField and translation.lazy_number() picklable.
2016-02-15 11:44:29 -05:00
userimack
60586dd737
Fixed #26125 -- Fixed E731 flake warnings.
2016-01-25 14:23:43 -05:00
Claude Paroz
104eddbdf6
Fixed #26093 -- Allowed escape sequences extraction by gettext on Python 3
...
Thanks Sylvain Fankhauser for the report and Tim Graham for the review.
2016-01-23 14:00:55 +01:00
Claude Paroz
632a9f21bc
Fixed #26046 -- Fixed a crash with translations and Django-unknown language code
...
Thanks Jens Lundstrom for the report and Tim Graham for the review.
2016-01-06 20:30:56 +01:00
Claude Paroz
cd3c042b04
Fixed #25915 -- Allowed language not in Django's default LANGUAGES
...
This fixes a regression introduced by a5f6cbce07
.
Thanks Gavin Wahl for the report and Tim Graham for the review.
2015-12-18 17:50:16 +01:00
Marti Raudsepp
d3e3703a15
Fixed #25720 -- Made gettext() return bytestring on Python 2 if input is bytestring.
...
This is consistent with the behavior of Django 1.7.x and earlier.
2015-11-11 08:56:10 -05:00
Claude Paroz
8b5acda821
Fixed #25571 -- Fixed boolean evaluation of ungettext_lazy
2015-10-22 15:17:45 +02:00
Alexandre Pocquet
e7b7f94678
Fixed #25297 -- Allowed makemessages to work with {% trans %} tags that use template filters.
2015-09-04 15:09:09 -04:00
Claude Paroz
9324935c3e
Fixed #25295 -- Restored 'no active translation' after language override
...
Thanks David Nelson Adamec for the report and Tim Graham for the review.
2015-08-25 10:32:10 +02:00
Doug Beck
b7508896fb
Fixed #24257 -- Corrected i18n handling of percent signs.
...
Refactored tests to use a sample project.
Updated extraction:
* Removed special handling of single percent signs.
* When extracting messages from template text, doubled all percent signs
so they are not interpreted by gettext as string format flags. All
strings extracted by gettext, if containing a percent sign, will now
be labeled "#, python-format".
Updated translation:
* Used "%%" for "%" in template text before calling gettext.
* Updated {% trans %} rendering to restore "%" from "%%".
2015-08-12 10:23:34 -04:00
Tim Graham
7da3923ba0
Sorted imports in __init__.py files.
2015-06-27 11:53:33 -04:00
Tomáš Ehrlich
002b3d87b5
Fixed #24230 -- Added translated language name for i18n template tag/filter.
2015-06-02 16:04:01 -04:00
Michal Čihař
76d26d8922
Fixed #24063 -- Allowed locale variants supported by gettext.
...
The locale code can contain a variant after @, so allowed that.
2015-04-24 20:31:16 -04:00
Claude Paroz
7a0d9b5cda
Fixed #24569 -- Made some translation functions accept None value
...
get_language() can return None when translations are deactivated.
Thanks Nicola Peduzzi for the reporti and Tim Graham for the review.
2015-04-04 10:54:16 +02:00
Claude Paroz
9e83f30cd3
Fixed #24515 -- Fixed DjangoTranslation plural handling
2015-03-21 10:27:30 +01:00
Preston Timmons
55f12f8709
Cleaned up the template debug implementation.
...
This patch does three major things:
* Merges the django.template.debug implementation into django.template.base.
* Simplifies the debug implementation.
The old implementation copied debug information to every token and node.
The django_template_source attribute was set in multiple places, some
quite hacky, like django.template.defaulttags.ForNode.
Debug information is now annotated in two high-level places:
* Template.compile_nodelist for errors during parsing
* Node.render_annotated for errors during rendering
These were chosen because they have access to the template and context
as well as to all exceptions that happen during either the parse or
render phase.
* Moves the contextual line traceback information creation from
django.views.debug into django.template.base.Template. The debug views now
only deal with the presentation of the debug information.
2015-03-20 08:58:07 -04:00
Claude Paroz
3cf1c02695
Fixed #24413 -- Prevented translation fallback for English
...
Thanks Tomasz Kontusz for the report, Baptiste Mispelon for
analysis and Tim Graham for the review.
2015-02-28 10:07:12 +01:00
Tim Graham
0ed7d15563
Sorted imports with isort; refs #23860 .
2015-02-06 08:16:28 -05:00
Tim Graham
f0a1df0b01
Removed deprecated Chinese language codes; refs #18149 .
2015-01-17 11:23:43 -05:00
Claude Paroz
543df07720
Fixed #24073 -- Returned None for get_language when translations are deactivated
...
This fixes a regression caused by f7c287fca9
. Thanks Markus Holtermann
for identifying the regression.
2015-01-08 17:43:07 +01:00
Aymeric Augustin
7eefdbf7ab
Cleaned up the django.template namespace.
...
Since this package is going to hold both the implementation of the Django
Template Language and the infrastructure for Multiple Template Engines,
it should be untied from the DTL as much as possible within our
backwards-compatibility policy.
Only public APIs (i.e. APIs mentioned in the documentation) were left.
2014-12-28 14:47:31 +01:00
Tim Graham
3325ec869c
Fixed #24045 -- Removed useless mark_safe() call in trans_null.py
2014-12-26 07:42:49 -05:00
Collin Anderson
5dddd79433
Fixed #20349 -- Moved setting_changed signal to django.core.signals.
...
This removes the need to load django.test when not testing.
2014-12-24 07:18:43 -05:00
Aymeric Augustin
9d3d1a0321
Simplified caching of supported languages.
2014-11-19 21:35:40 +01:00
Yuri Kriachko
11f307a5a8
Fixed #23196 -- Short-circuited empty string translation
...
Translating an empty string used to return the gettext catalog
metadata instead of the empty string.
Thanks Ned Batchelder for the suggestion, Tim Graham for the review
and Anton Berezin and Claude Paroz for contributions to the patch.
2014-09-21 17:08:17 +02:00
Tim Graham
1101467ce0
Limited lines to 119 characters in django/
...
refs #23395 .
2014-09-05 09:22:16 -04:00
Claude Paroz
5021421799
Fixed #22820 -- Treated int and long types alike in lazy_number
...
Thanks kwist for the report and the initial patch.
2014-08-30 18:51:12 +02:00
Thomas Chaumeny
efcbf3e095
Fixed #23381 -- Context manager restored state should be determined in __enter__
2014-08-28 19:18:34 -04:00
Thomas Chaumeny
2db1ed1033
Fixed #23323 -- Made django.utils.translation.override usable as a decorator.
2014-08-28 11:58:21 -04:00
Claude Paroz
5dcdbe95c7
Fixed #23005 -- Allowed specifying special fallback languages
...
This fixes the Chinese language issues described in #23005 but
also provides for other fallback exceptions by updating the
LANG_INFO structure.
Thanks caxekis at gmail.com for the report and Tim Graham for the
review.
2014-07-14 20:50:03 +02:00
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