AMBARI-1375. Remove text from templates (main). (jaimin)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1444935 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -40,6 +40,8 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1375. Remove text from templates (main). (jaimin)
+
  AMBARI-1374. Add filter by alerts on the Hosts page. (jaimin)
 
  AMBARI-1373. Since there is the ability to log in to Ambari Web as 

ambari-web/app/messages.js

@@ -69,6 +69,7 @@ Em.I18n.translations = {
   'common.ipAddress':'IP Address',
   'common.cpu':'CPU',
   'common.ram':'RAM',
+  'common.disk':'Disk',
   'common.diskUsage':'Disk Usage',
   'common.loadAvg':'Load Avg',
   'common.components':'Components',
@@ -76,6 +77,14 @@ Em.I18n.translations = {
   'common.save':'Save',
   'common.servers':'Servers',
   'common.clients':'Clients',
+  'common.user': 'User',
+  'common.os':'OS',
+  'common.memory':'Memory',
+  'common.maximum':'Maximum',
+  'common.start':'Start',
+  'common.stop':'Stop',
+  'common.decommission':'Decommission',
+  'common.recommission':'Recommission',
 
   'popup.highlight':'click to highlight',
 
@@ -103,7 +112,8 @@ Em.I18n.translations = {
   'services.zookeeper.description':'ZooKeeper desc',
   'services.hbase.description':'Non-relational distributed database and centralized service for configuration management & synchronization',
   'services.hive.databaseComponent':'Database Server',
-  
+
+  'services.alerts.head':'You have {0} critical alert notification(s).',
   'services.alerts.OK.timePrefix': 'OK for ',
   'services.alerts.WARN.timePrefix': 'WARN for ',
   'services.alerts.CRIT.timePrefix': 'CRIT for ',
@@ -332,6 +342,8 @@ Em.I18n.translations = {
   'admin.users.createError.userNameExists': 'User with the same name is already exists',
   'admin.users.editError.requiredField': 'This is required',
 
+  'admin.confirmUninstall':'Confirm Uninstall',
+
   'question.sure':'Are you sure?',
   'yes':'Yes',
   'no':'No',
@@ -433,6 +445,11 @@ Em.I18n.translations = {
   'hosts.host.metrics.network':'Network Usage',
   'hosts.host.metrics.processes':'Processes',
 
+  'hosts.host.summary.header':'Summary',
+  'hosts.host.summary.hostname':'Hostname',
+  'hosts.host.summary.agentHeartbeat':'Agent <br/> Heartbeat',
+  'hosts.host.summary.hostMetrics':'Host Metrics',
+
   'hosts.host.details.deleteHost':'Delete Host',
 
   'host.host.componentFilter.master':'Master Components',
@@ -465,6 +482,8 @@ Em.I18n.translations = {
   'charts.horizon.chart.attributes.network':'Network',
   'charts.horizon.chart.attributes.io':'I/O',
 
+  'charts.heatmap.selectMetric':'Select Metric...',
+
   'charts.heatmap.category.host':'Host',
   'charts.heatmap.item.host.memory':'Memory Used',
   'charts.heatmap.item.host.disk':'Disk Space Used',
@@ -515,6 +534,7 @@ Em.I18n.translations = {
   'dashboard.services.hdfs.nodes.heap':'NameNode Heap',
   'dashboard.services.hdfs.nodes.heapUsed':'{0} / {1} ({2}% used)',
   'dashboard.services.hdfs.chart.label':'Capacity (Used/Total)',
+  'dashboard.services.hdfs.blockErrors':'{0} corrupt / {1} missing / {2} under replicated',
 
   'dashboard.services.mapreduce.summary':'{0} of {1} trackers live, {2} jobs running, {3} jobs waiting',
   'dashboard.services.mapreduce.taskTrackers':'TaskTrackers',
@@ -580,6 +600,15 @@ Em.I18n.translations = {
   'timeRange.presets.1month':'1mo',
   'timeRange.presets.1year':'1yr',
 
+  'apps.item.dag.job': 'Job',
+  'apps.item.dag.jobId': 'Job Id',
+  'apps.item.dag.status': 'Status',
+  'apps.item.dag.maps': 'Maps',
+  'apps.item.dag.reduces': 'Reduces',
+  'apps.item.dag.input': 'Input',
+  'apps.item.dag.output': 'Output',
+  'apps.item.dag.duration': 'Duration',
+
   'apps.avgTable.avg': 'Avg',
   'apps.avgTable.min': 'Min',
   'apps.avgTable.max': 'Max',

ambari-web/app/templates/main/admin/advanced/uninstall.hbs

@@ -16,4 +16,4 @@
 * limitations under the License.
 }}
 
-Confirm Uninstall
+{{t admin.confirmUninstall}}

ambari-web/app/templates/main/admin/user/edit.hbs

@@ -32,7 +32,7 @@
     <div class="controls">
       <button type="submit" class="btn" {{action gotoUsers}}>{{t form.cancel}}</button>
       <button type="submit"
-              class="btn btn-primary" {{action edit target="view"}}>Save</button>
+              class="btn btn-primary" {{action edit target="view"}}>{{t common.save}}</button>
     </div>
   </div>
 </form>

ambari-web/app/templates/main/apps/item/dag.hbs

@@ -20,14 +20,14 @@
     <table class="table table-bordered table-striped" id="innerTable">
       <thead>
       <tr>
-        <th>Job &#35;</th>
-        <th>Job Id</th>
-        <th>Status</th>
-        <th>Maps</th>
-        <th>Reduces</th>
-        <th>Input</th>
-        <th>Output</th>
-        <th>Duration</th>
+        <th>{{t apps.item.dag.job}} &#35;</th>
+        <th>{{t apps.item.dag.jobId}}</th>
+        <th>{{t apps.item.dag.status}}</th>
+        <th>{{t apps.item.dag.maps}}</th>
+        <th>{{t apps.item.dag.reduces}}</th>
+        <th>{{t apps.item.dag.input}}</th>
+        <th>{{t apps.item.dag.output}}</th>
+        <th>{{t apps.item.dag.duration}}</th>
       </tr>
       </thead>
       <tbody>

ambari-web/app/templates/main/apps/user_filter.hbs

@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 <button class="btn btn-info single-btn-group" {{action "clickFilterButton" target="view"}}>
-  User&nbsp;<span class="caret"></span>
+  {{t common.user}}&nbsp;<span class="caret"></span>
 </button>
 <ul class="dropdown-menu filter-components">
   {{#each user in view.users}}
@@ -25,7 +25,7 @@
     </li>
   {{/each}}
   <li>
-    <button class="btn" {{action "closeFilter" target="view"}}>Cancel</button>
-    <button class="btn btn-primary" {{action "applyFilter" target="view"}}>Apply</button>
+    <button class="btn" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button>
+    <button class="btn btn-primary" {{action "applyFilter" target="view"}}>{{t common.apply}}</button>
   </li>
 </ul>

ambari-web/app/templates/main/charts/heatmap.hbs

@@ -22,7 +22,7 @@
 	  <div class="row-fluid">
 	    <div class="span2 legend-column">
 		     <div class="btn-group">
-				  <button class="btn">Select Metric...</button>
+				  <button class="btn">{{t charts.heatmap.selectMetric}}</button>
 				  <button class="btn dropdown-toggle" data-toggle="dropdown">
 				    <span class="caret"></span>
 				  </button>
@@ -52,7 +52,7 @@
 					    </tr>
 					  {{/each}}
 					</table>
-	        Maximum:
+	        {{t common.maximum}}:
 	        <div>
 	          {{view Ember.TextField type="text" valueBinding="controller.selectedMetric.maximumValue" class="span6"}}
 	          {{controller.selectedMetric.units}}

ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs

@@ -17,20 +17,20 @@
 }}
 
 <b>{{view.details.publicHostName}}</b><br/>
-OS: {{view.details.osType}}<br/>
-IP: {{view.details.ip}}<br/>
+{{t common.os}}: {{view.details.osType}}<br/>
+{{t common.ipAddress}}: {{view.details.ip}}<br/>
 {{#if view.details.metricName}}
   {{view.details.metricName}}: {{view.details.metricValue}}<br/>
 {{/if}}
 {{#if view.details.diskUsage}}
-  Disk: {{view.details.diskUsage}}% <br/>
+  {{t common.disk}}: {{view.details.diskUsage}}% <br/>
 {{/if}}
 {{#if view.details.cpuUsage}}
-  CPU: {{view.details.cpuUsage}}%<br/>
+  {{t common.cpu}}: {{view.details.cpuUsage}}%<br/>
 {{/if}}
 {{#if view.details.memoryUsage}}
-  Memory: {{view.details.memoryUsage}}%<br/>
+  {{t common.memory}}: {{view.details.memoryUsage}}%<br/>
 {{/if}}
 {{#if view.details.hostComponents}}
-  Components: {{view.details.hostComponents}}<br/>
+  {{t common.components}}: {{view.details.hostComponents}}<br/>
 {{/if}}

ambari-web/app/templates/main/dashboard/alert_notification_popup.hbs

@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-<p>You have {{view.warnAlertsCount}} critical alert notification(s).</p>
+<p>{{view.warnAlertsMessage}}</p>
 {{#if view.warnAlertsCount}}
   <ul id='summary-alerts-list' class="alerts">
     {{#each view.warnAlerts}}

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

@@ -99,7 +99,7 @@
   {{#view App.QuickViewLinks contentBinding="view.service"}}
   <div class="btn-group">
     <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
-      Quick Links
+      {{t common.quickLinks}}
       <span class="caret"></span>
     </a>
     <ul class="dropdown-menu">

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

@@ -103,9 +103,7 @@
       <tr>
         <td>{{t services.service.summary.blockErrors}}</td>
         <td>
-          {{view.dfsCorruptBlocks}} corrupt /
-          {{view.dfsMissingBlocks}} missing /
-          {{view.dfsUnderReplicatedBlocks}} under replicated
+          {{view.blockErrorsMessage}}
         </td>
       </tr>
       <!-- Total Files And Directories -->
@@ -149,7 +147,7 @@
     {{#view App.QuickViewLinks contentBinding="view.service"}}
       <div class="btn-group">
         <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
-          Quick Links
+          {{t common.quickLinks}}
           <span class="caret"></span>
         </a>
         <ul class="dropdown-menu">

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

@@ -128,7 +128,7 @@
   {{#view App.QuickViewLinks contentBinding="view.service"}}
   <div class="btn-group">
     <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
-      Quick Links
+      {{t common.quickLinks}}
       <span class="caret"></span>
     </a>
     <ul class="dropdown-menu">

ambari-web/app/templates/main/host/summary.hbs

@@ -22,18 +22,18 @@
   <div class="host-configuration">
     <div class="box">
 		  <div class="box-header">
-		    <h4>Summary</h4>
+		    <h4>{{t hosts.host.summary.header}}</h4>
 		  </div>
 		  <div class="host-summary-content">
 		    <dl class="dl-horizontal">
-          <dt>Hostname:</dt><dd>&nbsp;{{view.content.publicHostName}}</dd>
-		      <dt>IP Address:</dt><dd>&nbsp;{{view.content.ip}}</dd>
-          <dt>OS:</dt><dd>&nbsp;{{view.content.osType}}&nbsp;({{view.content.osArch}})</dd>
-		      <dt>CPU:</dt><dd>&nbsp;{{view.content.cpu}}</dd>
-          <dt>Disk:</dt><dd>&nbsp;{{view.content.diskInfoBar}}</dd>
-          <dt>Memory:</dt><dd>&nbsp;{{view.content.memoryFormatted}}</dd>
-		      <dt>Load Avg:</dt><dd>&nbsp;{{view.content.loadAvg}}</dd>
-		      <dt>Agent <br/> Heartbeat:</dt><dd>{{view.timeSinceHeartBeat}}</dd>
+          <dt>{{t hosts.host.summary.hostname}}:</dt><dd>&nbsp;{{view.content.publicHostName}}</dd>
+		      <dt>{{t common.ipAddress}}:</dt><dd>&nbsp;{{view.content.ip}}</dd>
+          <dt>{{t common.os}}:</dt><dd>&nbsp;{{view.content.osType}}&nbsp;({{view.content.osArch}})</dd>
+		      <dt>{{t common.cpu}}:</dt><dd>&nbsp;{{view.content.cpu}}</dd>
+          <dt>{{t common.disk}}:</dt><dd>&nbsp;{{view.content.diskInfoBar}}</dd>
+          <dt>{{t common.memory}}:</dt><dd>&nbsp;{{view.content.memoryFormatted}}</dd>
+		      <dt>{{t common.loadAvg}}:</dt><dd>&nbsp;{{view.content.loadAvg}}</dd>
+		      <dt>{{t hosts.host.summary.agentHeartbeat}}:</dt><dd>{{view.timeSinceHeartBeat}}</dd>
 		    </dl>
 		  </div>
 	  </div>
@@ -57,30 +57,30 @@
               {{#if App.isAdmin}}
               <div class="btn-group">
                 <a {{ bindAttr class=":btn :dropdown-toggle view.disabledClass"}} data-toggle="dropdown">
-                  Action
+                  {{t common.action}}
                   <span class="caret pull-right"></span>
                 </a>
                 <ul class="dropdown-menu">
                   {{#if view.isDataNode}}
                   <li {{bindAttr class="view.isDataNodeDecommissionAvailable::hidden"}}>
                     <a href="javascript:void(null)" data-toggle="modal" {{action "decommission" view.content target="controller"}}>
-                      Decommission
+                      {{t common.decommission}}
                     </a>
                   </li>
                   <li {{bindAttr class="view.isDataNodeRecommissionAvailable::hidden"}}>
                     <a href="javascript:void(null)" data-toggle="modal" {{action "recommission" view.content target="controller"}}>
-                      Recommission
+                      {{t common.recommission}}
                     </a>
                   </li>
                   {{/if}}
                   <li {{bindAttr class="view.isStart::hidden"}}>
                     <a href="javascript:void(null)" data-toggle="modal" {{action "stopComponent" view.content target="controller"}}>
-                      Stop
+                      {{t common.stop}}
                     </a>
                   </li>
                   <li {{bindAttr class="view.isStart:hidden:"}}>
                     <a href="javascript:void(null)" data-toggle="modal" {{action "startComponent" view.content target="controller"}}>
-                      Start
+                      {{t common.start}}
                     </a>
                   </li>
                 </ul>
@@ -93,7 +93,7 @@
           {{#if view.clients.length}}
           <div class="clients row-fluid">
             <div class="span8 row">
-              <div class="span2">Clients&nbsp;/&nbsp;</div>
+              <div class="span2">{{t common.clients}}&nbsp;/&nbsp;</div>
               <div class="span8">
                 {{#each component in view.clients}}
                 {{#if component.isLast}}
@@ -115,7 +115,7 @@
  <div class="span6">
     <div class="box">
       <div class="box-header">
-        <h4>Host Metrics</h4>
+        <h4>{{t hosts.host.summary.hostMetrics}}</h4>
         <div class="btn-group">
           <a class="btn" rel="tooltip" title="Go to Ganglia" {{action "showGangliaCharts" target="view"}}><i class="icon-link"></i></a>
         </div>

ambari-web/app/views/main/dashboard.js

@@ -105,6 +105,10 @@ App.MainDashboardView = Em.View.extend({
           return this.get('warnAlerts').length;
         }.property('warnAlerts'),
 
+        warnAlertsMessage: function() {
+          return Em.I18n.t('services.alerts.head').format(this.get('warnAlertsCount'));
+        }.property('warnAlertsCount'),
+
         nagiosUrl: function () {
           return App.router.get('clusterController.nagiosUrl');
         }.property('App.router.clusterController.nagiosUrl'),

ambari-web/app/views/main/dashboard/service/hdfs.js

@@ -55,6 +55,10 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
     return this.formatUnavailable(this.get('service.dfsUnderReplicatedBlocks'));
   }.property('service.dfsUnderReplicatedBlocks'),
 
+  blockErrorsMessage: function() {
+    return Em.I18n.t('dashboard.services.hdfs.blockErrors').format(this.get('dfsCorruptBlocks'), this.get('dfsMissingBlocks'), this.get('dfsUnderReplicatedBlocks'));
+  }.property('dfsCorruptBlocks','dfsMissingBlocks','dfsUnderReplicatedBlocks'),
+
   nodeUptime: function () {
     var uptime = this.get('service').get('nameNodeStartTime');
     if (uptime && uptime > 0){