From 8ee752c284241bd7ca87de31125716329a110eb5 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Thu, 4 Apr 2013 15:29:41 +0200 Subject: Use text.get in IPA.notify_success https://fedorahosted.org/freeipa/ticket/3235 --- install/ui/src/freeipa/association.js | 10 +++++----- install/ui/src/freeipa/certificate.js | 6 +++--- install/ui/src/freeipa/host.js | 4 ++-- install/ui/src/freeipa/ipa.js | 2 ++ install/ui/src/freeipa/search.js | 2 +- install/ui/src/freeipa/service.js | 2 +- install/ui/src/freeipa/sudo.js | 4 ++-- install/ui/src/freeipa/user.js | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js index 7fb49562a..4c4f3ef8f 100644 --- a/install/ui/src/freeipa/association.js +++ b/install/ui/src/freeipa/association.js @@ -586,7 +586,7 @@ IPA.association_table_widget = function (spec) { function() { that.refresh(); dialog.close(); - IPA.notify_success(IPA.messages.association.added); + IPA.notify_success('@i18n:association.added'); }, function() { that.refresh(); @@ -647,7 +647,7 @@ IPA.association_table_widget = function (spec) { selected_values, function() { that.refresh(); - IPA.notify_success(IPA.messages.association.removed); + IPA.notify_success('@i18n:association.removed'); }, function() { that.refresh(); @@ -1012,7 +1012,7 @@ IPA.association_facet = function (spec, no_init) { on_success: function() { that.refresh(); dialog.close(); - IPA.notify_success(IPA.messages.association.added); + IPA.notify_success('@i18n:association.added'); }, on_error: function() { that.refresh(); @@ -1063,7 +1063,7 @@ IPA.association_facet = function (spec, no_init) { method: that.remove_method, on_success: function() { that.refresh(); - IPA.notify_success(IPA.messages.association.removed); + IPA.notify_success('@i18n:association.removed'); }, on_error: function() { that.refresh(); @@ -1300,7 +1300,7 @@ IPA.attribute_facet = function(spec, no_init) { function(data) { that.load(data); that.show_content(); - IPA.notify_success(IPA.messages.association.removed); + IPA.notify_success('@i18n:association.removed'); }, function() { that.refresh(); diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js index d17ae625d..a4fe87811 100755 --- a/install/ui/src/freeipa/certificate.js +++ b/install/ui/src/freeipa/certificate.js @@ -642,7 +642,7 @@ IPA.cert.request_action = function(spec) { }, on_success: function(data, text_status, xhr) { facet.refresh(); - IPA.notify_success(IPA.messages.objects.cert.requested); + IPA.notify_success('@i18n:objects.cert.requested'); facet.certificate_updated.notify([], that.facet); } }).execute(); @@ -701,7 +701,7 @@ IPA.cert.revoke_action = function(spec) { }, on_success: function(data, text_status, xhr) { facet.refresh(); - IPA.notify_success(IPA.messages.objects.cert.revoked); + IPA.notify_success('@i18n:objects.cert.revoked'); facet.certificate_updated.notify([], that.facet); } }).execute(); @@ -755,7 +755,7 @@ IPA.cert.restore_action = function(spec) { args: [certificate.serial_number], on_success: function(data, text_status, xhr) { facet.refresh(); - IPA.notify_success(IPA.messages.objects.cert.restored); + IPA.notify_success('@i18n:objects.cert.restored'); facet.certificate_updated.notify([], that.facet); } }).execute(); diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js index 65557dc8c..f0630c945 100644 --- a/install/ui/src/freeipa/host.js +++ b/install/ui/src/freeipa/host.js @@ -644,7 +644,7 @@ IPA.host_unprovision_dialog = function(spec) { function(data, text_status, xhr) { that.facet.refresh(); that.close(); - IPA.notify_success(IPA.messages.objects.host.unprovisioned); + IPA.notify_success('@i18n:objects.host.unprovisioned'); }, function(xhr, text_status, error_thrown) { that.close(); @@ -880,7 +880,7 @@ IPA.host.set_otp_dialog = function(spec) { on_success: function(data) { that.facet.load(data); that.close(); - IPA.notify_success(IPA.messages.objects.host.password_set_success); + IPA.notify_success('@i18n:objects.host.password_set_success'); }, on_error: function() { that.close(); diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index f9f8a16c8..a47241813 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -2055,6 +2055,8 @@ IPA.notify_success = function(message, timeout) { if (!message) return; // don't show undefined, null and such + message = text.get(message); + function destroy_timeout() { if (IPA.notify_success.timeout) window.clearTimeout(IPA.notify_success.timeout); } diff --git a/install/ui/src/freeipa/search.js b/install/ui/src/freeipa/search.js index 46b589205..7fba2be9c 100644 --- a/install/ui/src/freeipa/search.js +++ b/install/ui/src/freeipa/search.js @@ -328,7 +328,7 @@ IPA.search_deleter_dialog = function(spec) { batch.on_success = function(data, text_status, xhr) { that.facet.refresh(); that.facet.on_update.notify([],that.facet); - IPA.notify_success(IPA.messages.search.deleted); + IPA.notify_success('@i18n:search.deleted'); }; batch.on_error = function() { diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js index d77622a13..aa3c4fc14 100644 --- a/install/ui/src/freeipa/service.js +++ b/install/ui/src/freeipa/service.js @@ -424,7 +424,7 @@ IPA.service.unprovision_dialog = function(spec) { on_success: function(data, text_status, xhr) { that.facet.refresh(); that.close(); - IPA.notify_success(IPA.messages.objects.service.unprovisioned); + IPA.notify_success('@i18n:objects.service.unprovisioned'); }, on_error: function(xhr, text_status, error_thrown) { that.close(); diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js index 0f536f2c6..b5a8487ec 100644 --- a/install/ui/src/freeipa/sudo.js +++ b/install/ui/src/freeipa/sudo.js @@ -819,7 +819,7 @@ IPA.sudo.options_section = function(spec) { on_success: function(data) { that.table.load(data.result.result); dialog.close(); - IPA.notify_success(IPA.messages.objects.sudorule.option_added); + IPA.notify_success('@i18n:objects.sudorule.option_added'); }, on_error: function(data) { that.reload(); @@ -880,7 +880,7 @@ IPA.sudo.options_section = function(spec) { that.reload(); } - IPA.notify_success(IPA.messages.objects.sudorule.option_removed); + IPA.notify_success('@i18n:objects.sudorule.option_removed'); }, on_error: function(data) { that.reload(); diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index d02d27cea..2fc27ba53 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -591,7 +591,7 @@ IPA.user_password_dialog = function(spec) { if (that.success_handler) { that.success_handler.call(this, data, text_status, xhr); } else { - IPA.notify_success(IPA.messages.password.password_change_complete); + IPA.notify_success('@i18n:password.password_change_complete'); that.close(); // refresh password expiration field -- cgit