[django/django] acd0bb: Fixed #14894 -- Ensure that activating a translati...

[GitHub]

Branch: refs/heads/master
Home: https://github.com/django/django
Commit: acd0bb39df5c9ca486e49ec55ae34538242ce071
https://github.com/django/django/commit/acd0bb39df5c9ca486e49ec55ae34538242ce071
Author: Florian Apolloner <flo...@apolloner.eu>
Date: 2013-05-18 (Sat, 18 May 2013)

Changed paths:
M django/utils/translation/trans_real.py
M tests/i18n/tests.py

Log Message:
-----------
Fixed #14894 -- Ensure that activating a translation doesn't run into threading issues.

Thanks to maxbublis for the report and sergeykolosov for the patch.


Commit: dc8814bf7dc5139f3d11b8f9f44f54c7f77d2714
https://github.com/django/django/commit/dc8814bf7dc5139f3d11b8f9f44f54c7f77d2714
Author: Florian Apolloner <flo...@apolloner.eu>
Date: 2013-05-18 (Sat, 18 May 2013)

Changed paths:
M AUTHORS
M django/contrib/flatpages/views.py
M django/core/management/validation.py
R django/core/xheaders.py
M django/forms/fields.py
M django/middleware/cache.py
M django/middleware/csrf.py
M django/test/utils.py
M django/views/decorators/csrf.py
M docs/faq/admin.txt
M docs/internals/deprecation.txt
M docs/ref/models/fields.txt
M docs/ref/settings.txt
M docs/releases/1.6.txt
M docs/topics/cache.txt
M docs/topics/http/sessions.txt
M docs/topics/i18n/translation.txt
M tests/cache/tests.py
M tests/csrf_tests/tests.py
M tests/forms_tests/tests/test_extra.py
M tests/invalid_models/invalid_models/models.py
M tests/middleware/tests.py
A tests/model_validation/__init__.py
A tests/model_validation/models.py
A tests/model_validation/tests.py
R tests/special_headers/__init__.py
R tests/special_headers/fixtures/data.xml
R tests/special_headers/models.py
R tests/special_headers/templates/special_headers/article_detail.html
R tests/special_headers/tests.py
R tests/special_headers/urls.py
R tests/special_headers/views.py
M tests/transactions/tests.py
M tests/transactions_regress/tests.py

Log Message:
-----------
Merge branch 'master' of github.com:django/django


Compare: https://github.com/django/django/compare/bd97f7d0cb72...dc8814bf7dc5