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.

5 files changed, 7 insertions, 7 deletions

diff --git a/API.txt b/API.txt
index c0800e959..a43fce596 100644
--- a/API.txt
+++ b/API.txt
@@ -1944,7 +1944,7 @@ output: Output('value', <type 'unicode'>, None)
 command: i18n_messages
 args: 0,1,1
 option: Str('version?', exclude='webui')
-output: Output('messages', <type 'dict'>, None)
+output: Output('texts', <type 'dict'>, None)
 command: idrange_add
 args: 1,12,3
 arg: Str('cn', attribute=True, cli_name='name', multivalue=False, primary_key=True, required=True)
diff --git a/VERSION b/VERSION
index ed8cbfd76..26696e1f5 100644
--- a/VERSION
+++ b/VERSION
@@ -89,4 +89,4 @@ IPA_DATA_VERSION=20100614120000
 #                                                      #
 ########################################################
 IPA_API_VERSION_MAJOR=2
-IPA_API_VERSION_MINOR=52
+IPA_API_VERSION_MINOR=53
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index 1619cad55..0d5c0bbdc 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -110,7 +110,7 @@ var IPA = function() {
         batch.add_command(IPA.command({
             method: 'i18n_messages',
             on_success: function(data, text_status, xhr) {
-                that.messages = data.messages;
+                that.messages = data.texts;
             }
         }));
 
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 44484a9aa..c16bc992e 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -6,7 +6,7 @@
         "results": [
             {
                 "error": null,
-                "messages": {
+                "texts": {
                     "ajax": {
                         "401": {
                             "message": "Your session has expired. Please re-login."
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index e9fc9de40..42bece601 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)