From 1a3a47e71c6979acc19d367ba33757510c28ea42 Mon Sep 17 00:00:00 2001 From: John Dennis Date: Wed, 24 Aug 2011 17:38:06 -0400 Subject: ticket 1706 - internationalize cli help framework In cli.py is a framework for printing out help information. The command documentation being displayed is internationalized, however the text generated by the help framework itself is not internationalized. The strings output by the help subsystem need to be internationalized. --- ipalib/cli.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ipalib/cli.py b/ipalib/cli.py index 99416c90a..0a7d1a4cf 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -748,7 +748,7 @@ class help(frontend.Local): self.print_commands(name) elif name in self.Command: cmd = self.Command[name] - print 'Purpose: %s' % unicode(cmd.doc).strip() + print unicode(_('Purpose: %s')) % unicode(_(cmd.doc)).strip() self.Backend.cli.build_parser(cmd).print_help() elif mod_name in sys.modules: self.print_commands(name) @@ -765,19 +765,19 @@ class help(frontend.Local): def print_topics(self): topics = sorted(self._topics.keys()) - print 'Usage: ipa [global-options] COMMAND ...' + print unicode(_('Usage: ipa [global-options] COMMAND ...')) print '' - print 'Built-in commands:' + print unicode(_('Built-in commands:')) for c in self._builtins: - print 'Help subtopics:' + print unicode(_('Help subtopics:')) print ' %s %s' % (to_cli(c.name).ljust(self._mtl), c.summary) print '' - print 'Help topics:' + print unicode(_('Help topics:')) for t in topics: topic = self._topics[t] print ' %s %s' % (to_cli(t).ljust(self._mtl), topic[0]) print '' - print 'Try `ipa --help` for a list of global options.' + print unicode(_('Try `ipa --help` for a list of global options.')) def print_commands(self, topic): if topic in self._topics and type(self._topics[topic][2]) is dict: @@ -808,7 +808,7 @@ class help(frontend.Local): print doc if len(commands) > 1: print '' - print 'Topic commands:' + print unicode(_('Topic commands:')) for c in commands: print ' %s %s' % (to_cli(c.name).ljust(mcl), c.summary) print "\n" -- cgit