diff options
| author | liyi <liyi8611@gmail.com> | 2017-03-21 13:01:13 +0800 |
|---|---|---|
| committer | liyi <liyi8611@gmail.com> | 2017-03-23 11:39:51 +0800 |
| commit | fb5e3908917199810c54ffbdc433e9cd327133b1 (patch) | |
| tree | 939adb1ba722f69d6d43f862eb0305ff9609723c /heatclient/v1 | |
| parent | a795a9a30485a8b3f4e612a66eddfe2843efb306 (diff) | |
| download | python-heatclient-fb5e3908917199810c54ffbdc433e9cd327133b1.tar.gz | |
Remove log translations
Log messages are no longer being translated. This removes all use of
the _LE, _LI, and _LW translation markers to simplify logging and to
avoid confusion with new contributions.
See:
http://lists.openstack.org/pipermail/openstack-i18n/2016-November/002574.html
http://lists.openstack.org/pipermail/openstack-dev/2017-March/113365.html
Change-Id: I601eee9f1fca65d5fb53e6b75482b74283908a29
Diffstat (limited to 'heatclient/v1')
| -rw-r--r-- | heatclient/v1/shell.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index a38c32a..70ffc9f 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -23,8 +23,6 @@ from six.moves.urllib import request import yaml from heatclient._i18n import _ -from heatclient._i18n import _LI -from heatclient._i18n import _LW from heatclient.common import deployment_utils from heatclient.common import event_utils from heatclient.common import hook_utils @@ -38,8 +36,8 @@ logger = logging.getLogger(__name__) def show_deprecated(deprecated, recommended): - logger.warning(_LW('"%(old)s" is deprecated, ' - 'please use "%(new)s" instead'), + logger.warning('"%(old)s" is deprecated, ' + 'please use "%(new)s" instead', {'old': deprecated, 'new': recommended} ) @@ -105,8 +103,8 @@ def do_stack_create(hc, args): env_paths=args.environment_file, env_list_tracker=env_files_list) if args.create_timeout: - logger.warning(_LW('%(arg1)s is deprecated, ' - 'please use %(arg2)s instead'), + logger.warning('%(arg1)s is deprecated, ' + 'please use %(arg2)s instead', { 'arg1': '-c/--create-timeout', 'arg2': '-t/--timeout'}) @@ -192,8 +190,8 @@ def do_stack_adopt(hc, args): raise exc.CommandError('Invalid adopt-file, no data!') if args.create_timeout: - logger.warning(_LW('%(arg1)s is deprecated, ' - 'please use %(arg2)s instead'), + logger.warning('%(arg1)s is deprecated, ' + 'please use %(arg2)s instead', { 'arg1': '-c/--create-timeout', 'arg2': '-t/--timeout'}) @@ -308,16 +306,16 @@ def do_stack_delete(hc, args): _("Are you sure you want to delete this stack(s) [y/N]? ")) prompt_response = sys.stdin.readline().lower() if not prompt_response.startswith('y'): - logger.info(_LI( - 'User did not confirm stack delete so taking no action.')) + logger.info( + 'User did not confirm stack delete so taking no action.') return except KeyboardInterrupt: # ctrl-c - logger.info(_LI( - 'User did not confirm stack delete (ctrl-c) so taking no action.')) + logger.info( + 'User did not confirm stack delete (ctrl-c) so taking no action.') return except EOFError: # ctrl-d - logger.info(_LI( - 'User did not confirm stack delete (ctrl-d) so taking no action.')) + logger.info( + 'User did not confirm stack delete (ctrl-d) so taking no action.') return for sid in args.id: |