You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/02/21 03:34:35 UTC
git commit: AMBARI-4775. Confusing message/default value on Rolling
Restart. (yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 01359ffe6 -> 6fdaec4ee
AMBARI-4775. Confusing message/default value on Rolling Restart. (yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6fdaec4e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fdaec4e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fdaec4e
Branch: refs/heads/trunk
Commit: 6fdaec4ee438b5f7422eb494d122863180b79c79
Parents: 01359ff
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Feb 20 18:18:23 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Feb 20 18:18:39 2014 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 3 +--
ambari-web/app/views/common/rolling_restart_view.js | 8 ++------
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdaec4e/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index df1b022..2dfbeb3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1824,8 +1824,7 @@ Em.I18n.translations = {
'rollingrestart.dialog.title': 'Restart {0}s',
'rollingrestart.dialog.primary': 'Trigger Restart',
'rollingrestart.notsupported.hostComponent': 'Rolling restart not supported for {0} components',
- 'rollingrestart.dialog.msg.restart': 'This will restart {0} {1} at a time.',
- 'rollingrestart.dialog.msg.restart.plural': 'This will restart {0} {1}s at a time.',
+ 'rollingrestart.dialog.msg.restart': 'This will restart a specified number of {0}s at a time.',
'rollingrestart.dialog.msg.noRestartHosts': 'There are no {0}s to do rolling restarts',
'rollingrestart.dialog.msg.maintainance': 'Note: {0} {1} in Maintenance Mode will not be restarted',
'rollingrestart.dialog.msg.maintainance.plural': 'Note: {0} {1}s in Maintenance Mode will not be restarted',
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdaec4e/ambari-web/app/views/common/rolling_restart_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/rolling_restart_view.js b/ambari-web/app/views/common/rolling_restart_view.js
index 045fac7..fc01345 100644
--- a/ambari-web/app/views/common/rolling_restart_view.js
+++ b/ambari-web/app/views/common/rolling_restart_view.js
@@ -150,12 +150,8 @@ App.RollingRestartView = Em.View.extend({
* @type {String}
*/
restartMessage : function() {
- var rhc = this.get('restartHostComponents.length');
- if (rhc > 1) {
- return Em.I18n.t('rollingrestart.dialog.msg.restart.plural').format(rhc, this.get('hostComponentDisplayName'))
- }
- return Em.I18n.t('rollingrestart.dialog.msg.restart').format(rhc, this.get('hostComponentDisplayName'))
- }.property('restartHostComponents', 'hostComponentDisplayName'),
+ return Em.I18n.t('rollingrestart.dialog.msg.restart').format(this.get('hostComponentDisplayName'))
+ }.property('hostComponentDisplayName'),
/**
* @type {String}