Repository: ambari Updated Branches: refs/heads/trunk b612522f9 -> 82c0cfb2f
AMBARI-5075. Receiving incorrect confirmation prompt when trying to add components. (xiwang via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/82c0cfb2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82c0cfb2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82c0cfb2 Branch: refs/heads/trunk Commit: 82c0cfb2fb6e3ff82be4528e2f2b9fbe9e2d688b Parents: b612522 Author: Yusaku Sako <[email protected]> Authored: Thu Mar 13 17:37:40 2014 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Mar 13 17:37:40 2014 -0700 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/details.js | 2 +- ambari-web/app/messages.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/82c0cfb2/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index 6b6aece..870a9f6 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -626,7 +626,7 @@ App.MainHostDetailsController = Em.Controller.extend({ var displayName = component.get('displayName'); App.ModalPopup.show({ - primary: Em.I18n.t('hosts.host.addComponent.popup.confirm'), + primary: Em.I18n.t('hosts.host.installComponent.popup.confirm'), header: Em.I18n.t('popup.confirmation.commonHeader'), installComponentMessage: function(){ return Em.I18n.t('hosts.host.installComponent.msg').format(displayName); http://git-wip-us.apache.org/repos/asf/ambari/blob/82c0cfb2/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 01f6424..ca2b6f0 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1485,6 +1485,7 @@ Em.I18n.translations = { 'hosts.host.deleteComponent.popup.msg2':'<b>Important:</b> After this <i>{0}</i> is deleted, go to <i>Services -> Nagios</i> to restart the Nagios service. This is required for the alerts and notifications to work properly.', 'hosts.host.deleteComponent.popup.warning':'<b>WARNING!</b> Delete the last <i>{0}</i> component in the cluster?</br>Deleting the last component in the cluster could result in permanent loss of service data.', 'hosts.host.deleteComponent.popup.confirm':'Confirm Delete', + 'hosts.host.installComponent.popup.confirm':'Confirm Install', 'hosts.host.installComponent.msg':'Are you sure you want to install {0}?', 'hosts.host.addComponent.msg':'Are you sure you want to add {0}?', 'hosts.host.addComponent.addZooKeeper':'Adding ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li></ul>',
