get_language() isn't reliable here, so we'll clear everything. This works on my local box
This commit is contained in:
Родитель
d9ed8e0278
Коммит
9e5aef461d
|
@ -75,12 +75,10 @@ def activate(locale):
|
||||||
|
|
||||||
jingo.env.install_gettext_translations(t)
|
jingo.env.install_gettext_translations(t)
|
||||||
|
|
||||||
def deactivate():
|
def deactivate_all():
|
||||||
""" Override django's utils.translation.deactivate(). Django continues
|
""" Override django's utils.translation.deactivate_all(). Django continues
|
||||||
to cache a catalog even if you call their deactivate().
|
to cache a catalog even if you call their deactivate_all().
|
||||||
"""
|
"""
|
||||||
locale = django_trans.get_language()
|
django_trans.deactivate_all()
|
||||||
django_trans.deactivate()
|
django_trans._translations = {}
|
||||||
if locale in django_trans._translations:
|
|
||||||
del django_trans._translations[locale]
|
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ def setup():
|
||||||
def teardown():
|
def teardown():
|
||||||
if os.path.isdir(LOCALEDIR):
|
if os.path.isdir(LOCALEDIR):
|
||||||
shutil.rmtree(LOCALEDIR)
|
shutil.rmtree(LOCALEDIR)
|
||||||
l10n.deactivate()
|
l10n.deactivate_all()
|
||||||
|
|
||||||
|
|
||||||
@with_setup(setup, teardown)
|
@with_setup(setup, teardown)
|
||||||
|
@ -67,13 +67,13 @@ def test_ungettext():
|
||||||
|
|
||||||
|
|
||||||
def test_activate():
|
def test_activate():
|
||||||
l10n.deactivate()
|
l10n.deactivate_all()
|
||||||
l10n.activate('fr')
|
l10n.activate('fr')
|
||||||
# This string is from the AMO .po file
|
# This string is from the AMO .po file
|
||||||
a_text = "My Account"
|
a_text = "My Account"
|
||||||
p_text = "Mon compte"
|
p_text = "Mon compte"
|
||||||
eq_(p_text, _(a_text))
|
eq_(p_text, _(a_text))
|
||||||
l10n.deactivate()
|
l10n.deactivate_all()
|
||||||
|
|
||||||
|
|
||||||
MO_DATA = '''\
|
MO_DATA = '''\
|
||||||
|
|
Загрузка…
Ссылка в новой задаче