From 42300eb55b1d122f9e946f37e2adc218af913a3d Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Thu, 13 Dec 2012 11:42:06 -0500 Subject: Rename the "messages" Output of the i18n_messages command to "texts" This is to prevent a fatal name clash wih the new common "messages" Output. Since i18n_messages is an internal plugin, the change does not affect our public API. --- ipalib/plugins/internal.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipalib/plugins/internal.py') diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index e9fc9de4..42bece60 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -25,7 +25,7 @@ Plugins not accessible directly through the CLI, commands used internally import json -from ipalib import api, errors +from ipalib import api from ipalib import Command from ipalib import Str from ipalib.output import Output @@ -680,10 +680,10 @@ class i18n_messages(Command): }, } has_output = ( - Output('messages', dict, doc=_('Dict of I18N messages')), + Output('texts', dict, doc=_('Dict of I18N messages')), ) def execute(self, **options): - return dict([("messages",json_serialize(self.messages))]) + return dict(texts=json_serialize(self.messages)) def output_for_cli(self, textui, result, *args, **options): print json.dumps(result, default=json_serialize) -- cgit