diff options
| author | Ethan Lynn <xjunlin@cn.ibm.com> | 2014-07-22 11:06:53 +0800 |
|---|---|---|
| committer | Ethan Lynn <xjunlin@cn.ibm.com> | 2014-09-02 10:53:14 +0800 |
| commit | d5c449ab32a1a3a3f47c5ebdcbee97d61e681165 (patch) | |
| tree | b8912819ec697f5afde4380502071cac4df03d42 /bin | |
| parent | 12b3bd4360503c824c82f02b81c352f8d21fcc10 (diff) | |
| download | heat-d5c449ab32a1a3a3f47c5ebdcbee97d61e681165.tar.gz | |
Import oslo.i18n and port heat bins to use oslo.i18n
Import oslo.i18n and port heat bins to use oslo.i18n
blueprint oslo-i18n
Change-Id: If30df87d7d2b8047225f0c413d338ace975062b1
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/heat-api | 6 | ||||
| -rwxr-xr-x | bin/heat-api-cfn | 7 | ||||
| -rwxr-xr-x | bin/heat-api-cloudwatch | 7 | ||||
| -rwxr-xr-x | bin/heat-engine | 5 | ||||
| -rwxr-xr-x | bin/heat-manage | 3 |
5 files changed, 11 insertions, 17 deletions
diff --git a/bin/heat-api b/bin/heat-api index af89fd1af..a05a64bdb 100755 --- a/bin/heat-api +++ b/bin/heat-api @@ -31,16 +31,16 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')): sys.path.insert(0, possible_topdir) from oslo.config import cfg +from oslo import i18n from heat.common import config +from heat.common.i18n import _ from heat.common import messaging from heat.common import wsgi -from heat.openstack.common import gettextutils from heat.openstack.common import log as logging from heat.openstack.common import systemd -gettextutils.enable_lazy() -gettextutils.install('heat', lazy=True) +i18n.enable_lazy() LOG = logging.getLogger('heat.api') diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn index 2249a89ba..079a8b939 100755 --- a/bin/heat-api-cfn +++ b/bin/heat-api-cfn @@ -33,17 +33,16 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')): sys.path.insert(0, possible_topdir) from oslo.config import cfg +from oslo import i18n from heat.common import config +from heat.common.i18n import _ from heat.common import messaging from heat.common import wsgi -from heat.openstack.common import gettextutils - from heat.openstack.common import log as logging from heat.openstack.common import systemd -gettextutils.enable_lazy() -gettextutils.install('heat', lazy=True) +i18n.enable_lazy() LOG = logging.getLogger('heat.api.cfn') diff --git a/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch index 550a3684c..ad966c61c 100755 --- a/bin/heat-api-cloudwatch +++ b/bin/heat-api-cloudwatch @@ -33,17 +33,16 @@ if os.path.exists(os.path.join(possible_topdir, 'heat', '__init__.py')): sys.path.insert(0, possible_topdir) from oslo.config import cfg +from oslo import i18n from heat.common import config +from heat.common.i18n import _ from heat.common import messaging from heat.common import wsgi -from heat.openstack.common import gettextutils - from heat.openstack.common import log as logging from heat.openstack.common import systemd -gettextutils.enable_lazy() -gettextutils.install('heat', lazy=True) +i18n.enable_lazy() LOG = logging.getLogger('heat.api.cloudwatch') diff --git a/bin/heat-engine b/bin/heat-engine index a0c3183b2..2c4354c41 100755 --- a/bin/heat-engine +++ b/bin/heat-engine @@ -33,16 +33,15 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'heat', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) from oslo.config import cfg +from oslo import i18n from heat.common import messaging -from heat.openstack.common import gettextutils from heat.openstack.common import log as logging from heat.openstack.common import service from heat.rpc import api as rpc_api -gettextutils.enable_lazy() -gettextutils.install('heat', lazy=True) +i18n.enable_lazy() LOG = logging.getLogger('heat.engine') diff --git a/bin/heat-manage b/bin/heat-manage index 4045eea6d..e47bdbb72 100755 --- a/bin/heat-manage +++ b/bin/heat-manage @@ -25,8 +25,5 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'heat', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) from heat.cmd import manage -from heat.openstack.common import gettextutils - -gettextutils.install('heat') manage.main() |