Merge "Graduate to oslo.i18n and cleanup incubator usage"

6 files changed, 7 insertions, 7 deletions

diff --git a/heatclient/osc/v1/event.py b/heatclient/osc/v1/event.py
index 44bcc37..9cdf28a 100644
--- a/heatclient/osc/v1/event.py
+++ b/heatclient/osc/v1/event.py
@@ -19,10 +19,10 @@ from cliff.formatters import base
 from osc_lib.command import command
 from osc_lib import utils
 
+from heatclient._i18n import _
 from heatclient.common import event_utils
 from heatclient.common import utils as heat_utils
 from heatclient import exc
-from heatclient.openstack.common._i18n import _
 
 
 class ShowEvent(command.ShowOne):
diff --git a/heatclient/osc/v1/software_config.py b/heatclient/osc/v1/software_config.py
index 7adccc8..af27be7 100644
--- a/heatclient/osc/v1/software_config.py
+++ b/heatclient/osc/v1/software_config.py
@@ -22,11 +22,11 @@ import six
 from six.moves.urllib import request
 import yaml
 
+from heatclient._i18n import _
 from heatclient.common import format_utils
 from heatclient.common import template_format
 from heatclient.common import utils as heat_utils
 from heatclient import exc as heat_exc
-from heatclient.openstack.common._i18n import _
 
 
 class DeleteConfig(command.Command):
diff --git a/heatclient/osc/v1/software_deployment.py b/heatclient/osc/v1/software_deployment.py
index 90c0ceb..37abcb4 100644
--- a/heatclient/osc/v1/software_deployment.py
+++ b/heatclient/osc/v1/software_deployment.py
@@ -20,11 +20,11 @@ from osc_lib import exceptions as exc
 from osc_lib import utils
 from oslo_serialization import jsonutils
 
+from heatclient._i18n import _
 from heatclient.common import deployment_utils
 from heatclient.common import format_utils
 from heatclient.common import utils as heat_utils
 from heatclient import exc as heat_exc
-from heatclient.openstack.common._i18n import _
 
 
 class CreateDeployment(format_utils.YamlFormat):
diff --git a/heatclient/osc/v1/stack.py b/heatclient/osc/v1/stack.py
index 5ecf843..2dcb579 100644
--- a/heatclient/osc/v1/stack.py
+++ b/heatclient/osc/v1/stack.py
@@ -24,6 +24,8 @@ from oslo_serialization import jsonutils
 import six
 from six.moves.urllib import request
 
+from heatclient._i18n import _
+from heatclient._i18n import _LI
 from heatclient.common import event_utils
 from heatclient.common import format_utils
 from heatclient.common import hook_utils
@@ -31,8 +33,6 @@ from heatclient.common import http
 from heatclient.common import template_utils
 from heatclient.common import utils as heat_utils
 from heatclient import exc as heat_exc
-from heatclient.openstack.common._i18n import _
-from heatclient.openstack.common._i18n import _LI
 
 
 class CreateStack(command.ShowOne):
diff --git a/heatclient/osc/v1/stack_failures.py b/heatclient/osc/v1/stack_failures.py
index 257f151..687f903 100644
--- a/heatclient/osc/v1/stack_failures.py
+++ b/heatclient/osc/v1/stack_failures.py
@@ -16,9 +16,9 @@ import collections
 
 from osc_lib.command import command
 
+from heatclient._i18n import _
 from heatclient.common import format_utils
 from heatclient import exc
-from heatclient.openstack.common._i18n import _
 
 
 class ListStackFailures(command.Command):
diff --git a/heatclient/osc/v1/template.py b/heatclient/osc/v1/template.py
index c4ed124..20fc7d5 100644
--- a/heatclient/osc/v1/template.py
+++ b/heatclient/osc/v1/template.py
@@ -18,12 +18,12 @@ from osc_lib.command import command
 from osc_lib import utils
 import six
 
+from heatclient._i18n import _
 from heatclient.common import format_utils
 from heatclient.common import http
 from heatclient.common import template_utils
 from heatclient.common import utils as heat_utils
 from heatclient import exc
-from heatclient.openstack.common._i18n import _
 
 
 class VersionList(command.Lister):