[enh] Rely on format string method for ask_string encoding in hook

This commit is contained in:
Jérôme Lebleu 2014-07-20 18:14:56 +02:00
parent cfb952f108
commit a0da8060f6

View file

@ -129,7 +129,7 @@ def hook_exec(file, args=None):
args -- Arguments to pass to the script
"""
from yunohost.app import _value_for_locale, _encode_string
from yunohost.app import _value_for_locale
if isinstance(args, list):
arg_list = args
@ -152,11 +152,9 @@ def hook_exec(file, args=None):
# Append extra strings
if 'choices' in arg:
ask_string += ' ({:s})'.format(
_encode_string('|'.join(arg['choices'])))
ask_string += ' ({:s})'.format('|'.join(arg['choices']))
if 'default' in arg:
ask_string += ' (default: {:s})'.format(
_encode_string(arg['default']))
ask_string += ' (default: {:s})'.format(arg['default'])
input_string = msignals.prompt(ask_string)