summaryrefslogtreecommitdiffstats
path: root/install/ui
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2012-12-13 11:42:06 -0500
committerMartin Kosek <mkosek@redhat.com>2013-02-21 16:26:09 +0100
commit42300eb55b1d122f9e946f37e2adc218af913a3d (patch)
treec612ac88548c0a46350da2bb7d4aa537fce335e1 /install/ui
parent24bca144a8049cea8683afd699d2e0e158b5f164 (diff)
downloadfreeipa-42300eb55b1d122f9e946f37e2adc218af913a3d.tar.gz
freeipa-42300eb55b1d122f9e946f37e2adc218af913a3d.tar.xz
freeipa-42300eb55b1d122f9e946f37e2adc218af913a3d.zip
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.
Diffstat (limited to 'install/ui')
-rw-r--r--install/ui/src/freeipa/ipa.js2
-rw-r--r--install/ui/test/data/ipa_init.json2
2 files changed, 2 insertions, 2 deletions
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."