AMBARI-4384. Storm: label fixes. (Denys Buzhor via akovalenko)

ambari-web/app/data/HDP2/site_properties.js

@@ -947,7 +947,7 @@ module.exports =
     {
       "id": "site property",
       "name": "nimbus.host",
-      "displayName": "nimbus.host",
+      "displayName": "Nimbus Host",
       "description": "",
       "defaultValue": "",
       "displayType": "masterHost",

ambari-web/app/data/review_configs.js

@@ -298,7 +298,7 @@ module.exports = [
             isMaster: true
           }),
           Ember.Object.create({
-            display_name: 'SuperVisor',
+            display_name: 'Supervisor',
             component_name: 'SUPERVISOR',
             component_value: '',
             isMaster: false
@@ -319,4 +319,4 @@ if (App.supports.appTimelineServer) {
       component_value: ''
     })
   )
-}
+}

ambari-web/app/data/service_configs.js

@@ -238,7 +238,7 @@ module.exports = [
     filename: 'storm-site',
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'Nimbus', displayName : 'Nimbus'}),
-      App.ServiceConfigCategory.create({ name: 'Supervisor', displayName : 'SuperVisor'}),
+      App.ServiceConfigCategory.create({ name: 'Supervisor', displayName : 'Supervisor'}),
       App.ServiceConfigCategory.create({ name: 'StormUIServer', displayName : 'Storm UI Server'}),
       App.ServiceConfigCategory.create({ name: 'DRPCServer', displayName : 'DRPC Server'}),
       App.ServiceConfigCategory.create({ name: 'LogviewerServer', displayName : 'Logviewer Server'}),

ambari-web/app/messages.js

@@ -945,8 +945,7 @@ Em.I18n.translations = {
   'services.service.summary.TrackersLive':'Trackers Live',
   'services.service.summary.RegionServersLIVE':'RegionServers Live',
   'services.service.summary.GangliaMonitorsLIVE':'Ganglia Monitors Live',
-  'services.service.summary.SuperVisorsLIVE':'SuperVisors Live',
-  'services.service.summary.SuperVisorLIVE':'SuperVisor Lives',
+  'services.service.summary.SupervisorsLIVE':'Supervisors Live',
   'services.service.summary.nameNode':'NameNode Web UI',
   'services.service.summary.nameNodeUptime':'NameNode Uptime',
   'services.service.summary.nameNodeHeap':'NameNode Heap',
@@ -1647,8 +1646,8 @@ Em.I18n.translations = {
 
   'dashboard.services.oozie.clients':'Oozie Clients',
   'dashboard.services.oozie.client':'Oozie Client',
-  'dashboard.services.storm.supervisor': 'SuperVisor',
-  'dashboard.services.storm.supervisors': 'SuperVisors',
+  'dashboard.services.storm.supervisor': 'Supervisor',
+  'dashboard.services.storm.supervisors': 'Supervisors',
 
   'dashboard.services.configs.popup.stopService.header':'Stop service',
   'dashboard.services.configs.popup.stopService.body' : 'Service needs to be stopped for reconfiguration',

ambari-web/app/templates/main/dashboard/service/storm.hbs

@@ -20,7 +20,7 @@
 <tr>
   <td>
     <a href="#" {{action filterHosts view.superVisorComponents.[0]}}>
-      {{pluralize view.superVisorComponents.length singular="t:dashboard.services.storm.supervisor" plural="t:dashboard.services.storm.supervisors"}}
+      {{t dashboard.services.storm.supervisors}}
     </a>
   </td>
   <td>
@@ -28,6 +28,6 @@
       {{#view view.superVisorsLiveTextView}}
         {{view.liveComponents}}/{{view.totalComponents}}
       {{/view}}
-    </span> {{pluralize view.superVisorComponents.length singular="t:services.service.summary.SuperVisorLIVE" plural="t:services.service.summary.SuperVisorsLIVE"}}
+    </span> {{t services.service.summary.SupervisorsLIVE}}
   </td>
 </tr>