Kaynağa Gözat

AMBARI-4775. Confusing message/default value on Rolling Restart. (yusaku)

Yusaku Sako 11 yıl önce
ebeveyn
işleme
6fdaec4ee4

+ 1 - 2
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',

+ 2 - 6
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}