0901283923
This pulls in the alias mapping from Babel[0] that previously made
some two character locale names available. It simply appends each
alias that is found by gettext.find to the list of available languages.
This change in behavior was initially reported as a result of a
breaking Glance unit test. After looking a bit closer at the test
in question, it appears they mock out gettext.find to assume the
existence of that locale. Whether it would actually exist in a real
world deployment I have no idea. However, I don't think it hurts
anything to include these aliases in the list checked by
get_available_languages so this should be fine.
Note that I did no mapping of the aliases in our override of
gettext.find. There was no aliasing going on there for these two
letter locales before either, so if they were found before they
will be found now. The same is true if they were not found before,
so this maintains the previous behavior.
Change-Id: Ie57ed2ca0228634ed9a3def99bf606ce1832a195
0: e7e4265d9a/babel/core.py (L80)
Closes-Bug: 1877386
129 lines
5.0 KiB
Python
129 lines
5.0 KiB
Python
# Copyright 2012 Red Hat, Inc.
|
|
# Copyright 2013 IBM Corp.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import gettext
|
|
import logging
|
|
from unittest import mock
|
|
|
|
from oslotest import base as test_base
|
|
import six
|
|
|
|
from oslo_i18n import _factory
|
|
from oslo_i18n import _gettextutils
|
|
from oslo_i18n import _lazy
|
|
from oslo_i18n import _message
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class GettextTest(test_base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(GettextTest, self).setUp()
|
|
# remember so we can reset to it later in case it changes
|
|
self._USE_LAZY = _lazy.USE_LAZY
|
|
self.t = _factory.TranslatorFactory('oslo_i18n.test')
|
|
|
|
def tearDown(self):
|
|
# reset to value before test
|
|
_lazy.USE_LAZY = self._USE_LAZY
|
|
super(GettextTest, self).tearDown()
|
|
|
|
def test_gettext_does_not_blow_up(self):
|
|
LOG.info(self.t.primary('test'))
|
|
|
|
def test__gettextutils_install(self):
|
|
_gettextutils.install('blaa')
|
|
_lazy.enable_lazy(False)
|
|
self.assertTrue(isinstance(self.t.primary('A String'),
|
|
six.text_type))
|
|
|
|
_gettextutils.install('blaa')
|
|
_lazy.enable_lazy(True)
|
|
self.assertTrue(isinstance(self.t.primary('A Message'),
|
|
_message.Message))
|
|
|
|
def test_gettext_install_looks_up_localedir(self):
|
|
with mock.patch('os.environ.get') as environ_get:
|
|
with mock.patch('gettext.install'):
|
|
environ_get.return_value = '/foo/bar'
|
|
_gettextutils.install('blaa')
|
|
environ_get.assert_has_calls([mock.call('BLAA_LOCALEDIR')])
|
|
|
|
def test_gettext_install_updates_builtins(self):
|
|
with mock.patch('os.environ.get') as environ_get:
|
|
with mock.patch('gettext.install'):
|
|
environ_get.return_value = '/foo/bar'
|
|
if '_' in six.moves.builtins.__dict__:
|
|
del six.moves.builtins.__dict__['_']
|
|
_gettextutils.install('blaa')
|
|
self.assertIn('_', six.moves.builtins.__dict__)
|
|
|
|
def test_get_available_languages(self):
|
|
# Only the languages available for a specific translation domain
|
|
def _mock_gettext_find(domain, localedir=None, languages=None, all=0):
|
|
languages = languages or []
|
|
if domain == 'domain_1':
|
|
if any(x in ['en_GB', 'es_ES', 'fil_PH', 'it']
|
|
for x in languages):
|
|
return 'translation-file'
|
|
elif domain == 'domain_2':
|
|
if any(x in ['fr_FR', 'zh_HK'] for x in languages):
|
|
return 'translation-file'
|
|
return None
|
|
mock_patcher = mock.patch.object(gettext, 'find', _mock_gettext_find)
|
|
mock_patcher.start()
|
|
self.addCleanup(mock_patcher.stop)
|
|
|
|
# Ensure that no domains are cached
|
|
_gettextutils._AVAILABLE_LANGUAGES = {}
|
|
|
|
# en_US should always be available no matter the domain
|
|
# and it should also always be the first element since order matters
|
|
domain_1_languages = _gettextutils.get_available_languages('domain_1')
|
|
domain_2_languages = _gettextutils.get_available_languages('domain_2')
|
|
|
|
# The domain languages should be included after en_US with
|
|
# with their respective aliases when it applies
|
|
self.assertEqual('en_US', domain_1_languages[0])
|
|
self.assertEqual('en_US', domain_2_languages[0])
|
|
|
|
self.assertEqual(5, len(domain_1_languages), domain_1_languages)
|
|
self.assertEqual(
|
|
{'en_US', 'fil_PH', 'en_GB', 'es_ES', 'it'},
|
|
set(domain_1_languages),
|
|
)
|
|
self.assertEqual(3, len(domain_2_languages), domain_2_languages)
|
|
self.assertEqual({'en_US', 'fr_FR', 'zh_HK'},
|
|
set(domain_2_languages))
|
|
|
|
self.assertEqual(2, len(_gettextutils._AVAILABLE_LANGUAGES))
|
|
# Now test an unknown domain, only en_US should be included
|
|
unknown_domain_languages = _gettextutils.get_available_languages('huh')
|
|
self.assertEqual(1, len(unknown_domain_languages))
|
|
self.assertIn('en_US', unknown_domain_languages)
|
|
|
|
def test_cached_find(self):
|
|
domain = 'my-unique-domain'
|
|
key = (domain, None, None, 0)
|
|
self.assertNotIn(key, _gettextutils._FIND_CACHE)
|
|
gettext.find(domain)
|
|
self.assertIn(key, _gettextutils._FIND_CACHE)
|
|
_gettextutils._FIND_CACHE[key] = "spoof result"
|
|
self.assertEqual("spoof result", gettext.find(domain))
|
|
_gettextutils._FIND_CACHE.pop(key)
|