diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index 178bd03f6..46b033a00 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -276,6 +276,9 @@ var IPA = function () { * @param {Function} params.on_error */ that.init_metadata = function(params) { + var loading = text.get('@i18n:login.loading_md'); + + topic.publish('set-activity', loading); var objects = rpc.command({ name: 'ipa_init_objects', diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index 1d98cc408..6ad8aadaf 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -6990,6 +6990,7 @@ exp.activity_widget = IPA.activity_widget = function(spec) { that.activate_event = spec.activate_event || 'rpc-start'; that.deactivate_event = spec.deactivate_event || 'rpc-end'; + that.set_activity_event = 'set-activity'; that.create = function(container) { that.widget_create(container); @@ -7024,6 +7025,10 @@ exp.activity_widget = IPA.activity_widget = function(spec) { if (that.connection_counter === 0) that.hide(); if (that.connection_counter < 0) that.connection_counter = 0; }); + + topic.subscribe(that.set_activity_event, function(new_text) { + that.text = new_text; + }); }; that.toggle_timer = function(start) { diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 514206a0c..6d11e7338 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -186,6 +186,7 @@ "form_auth": " To login with username and password, enter them in the corresponding fields, then click Login.", "header": "Logged In As", "krb_auth_msg": " To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and configured the browser correctly, then click Login.", + "loading_md": "Loading data", "login": "Login", "logout": "Logout", "logout_error": "Logout error", diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py index 6107a142e..0a8139ec0 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -335,6 +335,7 @@ class i18n_messages(Command): "form_auth": _(" To login with username and password, enter them in the corresponding fields, then click Login."), "header": _("Logged In As"), "krb_auth_msg": _(" To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and configured the browser correctly, then click Login."), + "loading_md": _("Loading data"), "login": _("Login"), "logout": _("Logout"), "logout_error": _("Logout error"),