Updated Branches: refs/heads/trunk e84f5368c -> 241f059cb
AMBARI-4384. Storm: label fixes. (Denys Buzhor via akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/241f059c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/241f059c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/241f059c Branch: refs/heads/trunk Commit: 241f059cbe91806108473da3ccb07bb5a3685de7 Parents: e84f536 Author: Aleksandr Kovalenko <[email protected]> Authored: Wed Jan 22 19:50:54 2014 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Wed Jan 22 19:50:54 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/data/HDP2/site_properties.js | 2 +- ambari-web/app/data/review_configs.js | 4 ++-- ambari-web/app/data/service_configs.js | 2 +- ambari-web/app/messages.js | 7 +++---- ambari-web/app/templates/main/dashboard/service/storm.hbs | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/241f059c/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index ddf0219..90f2983 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/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", http://git-wip-us.apache.org/repos/asf/ambari/blob/241f059c/ambari-web/app/data/review_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/review_configs.js b/ambari-web/app/data/review_configs.js index 60bec8c..c358114 100644 --- a/ambari-web/app/data/review_configs.js +++ b/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: '' }) ) -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/241f059c/ambari-web/app/data/service_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js index fdd6dca..b8947c6 100644 --- a/ambari-web/app/data/service_configs.js +++ b/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'}), http://git-wip-us.apache.org/repos/asf/ambari/blob/241f059c/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index a2bc6fc..2f2ea10 100644 --- a/ambari-web/app/messages.js +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/241f059c/ambari-web/app/templates/main/dashboard/service/storm.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/service/storm.hbs b/ambari-web/app/templates/main/dashboard/service/storm.hbs index 7411f87..49cc1c9 100644 --- a/ambari-web/app/templates/main/dashboard/service/storm.hbs +++ b/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>
