AMBARI-1353. "Missing translation" shown in Job Browser. (jaimin)

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

CHANGES.txt

@@ -255,6 +255,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1353. "Missing translation" shown in Job Browser. (jaimin)
+
  AMBARI-1351. Provide consistent ordering of hosts in heatmap. (jaimin)
 
  AMBARI_1344. mapred.tasktracker.reduce.tasks.maximum in mapred-site.xml is not

ambari-web/app/messages.js

@@ -232,11 +232,12 @@ Em.I18n.translations = {
   'installer.step6.wizardStep6Host.title':'master components hosted on {0}',
 
   'installer.step7.header':'Customize Services',
-  'installer.step7.body':'We have come up with recommended configurations for the services you selected.  Customize them as you see fit.',
-  'installer.step7.attentionNeeded':'<strong>Attention:</strong> Some configurations need your attention before you can proceed.',
+  'installer.step7.body':'We have come up with recommended configurations for the services you selected. Customize them as you see fit.',
+  'installer.step7.attentionNeeded':'<b>Attention:</b> Some configurations need your attention before you can proceed.',
 
   'installer.step8.header':'Review',
   'installer.step8.body':'Please review the configuration before installation',
+  'installer.step8.deployPopup.message':'Preparing to Deploy: {0} of {1} tasks completed.',
 
   'installer.step9.header':'Install, Start and Test',
   'installer.step9.body':'Please wait while the selected services are installed and started.',

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

@@ -52,7 +52,7 @@
 
   <div class="filter_info">
 
-    <div class="span4" id="filter_buttons">{{t apps.filters.show}}:
+    <div class="span4" id="filter_buttons">{{t common.show}}:
       <a class="all selected" {{action "clickViewType" target="view"}} data-view-type="all">{{t apps.filters.all}}
         ({{controller.paginationObject.iTotalRecords}})</a> &#124;
       <a class="filtered" {{action "clickViewType" target="view"}} data-view-type="filtered">{{t apps.filters.filtered}}
@@ -102,7 +102,7 @@
 
   <div class="page-bar">
       <div class="items-on-page">
-          <label>{{t apps.filters.show}}: {{view view.runPerPageSelectView viewName="runPerPageSelectView" selectionBinding="controller.filterObject.iDisplayLength"}}</label>
+          <label>{{t common.show}}: {{view view.runPerPageSelectView viewName="runPerPageSelectView" selectionBinding="controller.filterObject.iDisplayLength"}}</label>
       </div>
       <div class="info">{{view.paginationInfo}}</div>
       <div class="paging_two_button">

ambari-web/app/templates/main/background_operations_popup.hbs

@@ -21,7 +21,7 @@
 <div>
   <a {{action showOperationLog target="view"}} href="#">
     <i {{bindAttr class="view.iconClass"}}></i>
-    {{#if view.isOpen}}Hide{{else}}Show{{/if}} info about {{operation.command}} {{operation.role}}
+    {{#if view.isOpen}}{{t common.hide}}{{else}}{{t common.show}}{{/if}} info about {{operation.command}} {{operation.role}}
     on {{operation.host_name}}
   </a>
   {{#if view.hasProgressBar}}
@@ -30,7 +30,7 @@
   </div>
   {{/if}}
   <div class="content-area">
-    <div class="textTrigger">click to highlight</div>
+    <div class="textTrigger">{{t popup.highlight}}</div>
     {{#if view.isOpen}}
     {{#if view.isTextArea}}
     <div>

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

@@ -36,7 +36,7 @@
   <div class="span6">
 		<div class="box">
 			<div class="box-header">
-				<h4>Cluster Metrics</h4>
+				<h4>{{t dashboard.clusterMetrics}}</h4>
 				<div class="btn-group">
         </div>
 				<div class="btn-group">

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

@@ -22,7 +22,7 @@
     <div class="button-section">
       <button class="btn btn-inverse add-host-button" {{action addHost}}>
         <i class="icon-plus icon-white"></i>
-        Add New Hosts
+        {{t hosts.host.add}}
       </button>
     </div>
   </div>
@@ -31,13 +31,13 @@
     <thead>
     <tr>
       <th class="first">&nbsp;</th>
-      <th>Name</th>
-      <th>IP Address</th>
-      <th>CPU</th>
-      <th>RAM</th>
-      <th>Disk Usage</th>
-      <th>Load Avg</th>
-      <th>Components</th>
+      <th>{{t common.name}}</th>
+      <th>{{t common.ipAddress}}</th>
+      <th>{{t common.cpu}}</th>
+      <th>{{t common.ram}}</th>
+      <th>{{t common.diskUsage}}</th>
+      <th>{{t common.loadAvg}}</th>
+      <th>{{t common.components}}</th>
       <th></th>
       <th></th>
     </tr>

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

@@ -17,14 +17,14 @@
 }}
 
     <button class="btn btn-info single-btn-group" {{action "clickFilterButton" target="view"}}>
-        Components <span class="caret"></span>
+        {{t common.components}} <span class="caret"></span>
     </button>
     <ul class="dropdown-menu filter-components">
         <li>
             <ul>
                 <li>
                     <label class="checkbox">
-                        {{view Ember.Checkbox checkedBinding="view.masterComponentsChecked"}} Master Components:
+                        {{view Ember.Checkbox checkedBinding="view.masterComponentsChecked"}} {{t host.host.componentFilter.master}}:
                     </label>
                     <ul>
                         {{#each component in masterComponents}}
@@ -38,7 +38,7 @@
                 </li>
                 <li>
                     <label class="checkbox">
-                        {{view Ember.Checkbox checkedBinding="view.slaveComponentsChecked"}} Slave Components:
+                        {{view Ember.Checkbox checkedBinding="view.slaveComponentsChecked"}} {{t host.host.componentFilter.slave}}:
                     </label>
                     <ul>
                         {{#each component in slaveComponents}}
@@ -52,7 +52,7 @@
                 </li>
                 <li>
                     <label class="checkbox">
-                        {{view Ember.Checkbox checkedBinding="view.clientComponentsChecked"}} Client Components:
+                        {{view Ember.Checkbox checkedBinding="view.clientComponentsChecked"}} {{t host.host.componentFilter.client}}:
                     </label>
                     <ul>
                         {{#each component in clientComponents}}
@@ -67,7 +67,7 @@
             </ul>
         </li>
         <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/host/details.hbs

@@ -23,7 +23,7 @@
   {{else}}
     <span class="label label-important alerts-count">No alerts</span>
   {{/if}}
-  <div><a href="javascript:void(null)" data-toggle="modal" {{action backToHostsList}}><i class="icon-arrow-left"></i>&nbsp;Back to Hosts</a></div>
+  <div><a href="javascript:void(null)" data-toggle="modal" {{action backToHostsList}}><i class="icon-arrow-left"></i>&nbsp;{{t hosts.host.back}}</a></div>
 <!--   {{#if App.isAdmin}} -->
 <!--   <div class="host-maintenance"> -->
 <!--     <div class="host-maintenance-btn btn-group display-inline-block"> -->

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

@@ -24,7 +24,7 @@
     <div class="add-service-button">
       <a class="btn" {{action addService href="true"}}>
         <i class="icon-plus"></i>
-        Add Service
+        {{t services.service.add}}
       </a>
     </div>
     {{/if}}

ambari-web/app/templates/main/service/info/configs.hbs

@@ -58,7 +58,7 @@
     <p class="pull-right">
         <!--<input class="btn btn-primary" type="button" value="Save" {{!bindAttr disabled="isSubmitDisabled"}} />-->
         <a class="btn btn-primary" {{bindAttr disabled="isSubmitDisabled"}}
-          {{action restartServicePopup target="controller"}}>Save</a>
+          {{action restartServicePopup target="controller"}}>{{t common.save}}</a>
     </p>
     {{/if}}
   {{else}}

ambari-web/app/templates/main/service/info/summary.hbs

@@ -22,7 +22,7 @@
 {{#view App.QuickViewLinks contentBinding="view.service"}}
 <ul class="nav nav-pills move">
   <li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Quick Links<b class="caret"></b></a>
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{t common.quickLinks}}<b class="caret"></b></a>
     <ul class="dropdown-menu">
      {{#each view.quickLinks}}
       <a {{bindAttr href="url"}} {{bindAttr target="view.linkTarget"}}>{{label}}</a>
@@ -35,7 +35,7 @@
 
 <div class="box">
   <div class="box-header">
-    <h4>{{controller.content.label}} Summary</h4>
+    <h4>{{controller.content.label}} {{t services.service.info.menu.summary}}</h4>
   </div>
   <div class="service-content">
     <table id="summary-info" class="table no-borders table-condensed">
@@ -60,7 +60,7 @@
       {{/each}}
       {{#if view.serviceStatus.nagios}}
         <tr>
-          <td class="summary-label">Nagios Web UI</td>
+          <td class="summary-label">{{t services.service.info.summary.nagiosWebUI}}</td>
           <td><a target=_blank href="http://{{unbound view.nagiosServer}}/nagios">{{view.nagiosServer}}/nagios</a></td>
         </tr>
       {{/if}}
@@ -128,11 +128,11 @@
 			{{else}}
 		    {{#if controller.isNagiosInstalled}}
 			    <div class="alert alert-info">
-			      No alerts
+			      {{t services.service.info.summary.nagios.noAlerts}}
 			    </div>
 			  {{else}}
 			    <div class="alert">
-			      Nagios service required for viewing alerts
+			      {{t services.service.info.summary.nagios.alerts}}
 			    </div>
 			  {{/if}}
 			{{/if}}
@@ -146,7 +146,7 @@
   <div class="span12">
     <div class="box">
       <div class="box-header">
-        <h4>{{controller.content.label}} Metrics</h4>
+        <h4>{{controller.content.label}} {{t common.metrics}}</h4>
         <div class="btn-group">
           <a class="btn" target="_blank" rel="tooltip" title="Go to Ganglia" {{bindAttr href="view.gangliaUrl"}}><i class="icon-link"></i></a>
         </div>

ambari-web/app/templates/main/service/info/summary/ganglia.hbs

@@ -24,10 +24,10 @@
   {{/if}}
 {{/each}}
 <tr>
-  <td class="summary-label">Ganglia Monitors</td>
+  <td class="summary-label">{{t dashboard.services.ganglia.monitors}}</td>
   <td><a {{action filterHosts view.monitorsObj}} href="javascript:void(null)">{{view.monitors}}</a></td>
 </tr>
 <tr>
-  <td class="summary-label">Ganglia Web UI</td>
+  <td class="summary-label">{{t dashboard.services.ganglia.webUi}}</td>
   <td><a target=_blank href="http://{{unbound view.gangliaServer}}/ganglia">{{view.gangliaServer}}/ganglia</a></td>
 </tr>

ambari-web/app/templates/main/service/info/summary/oozie.hbs

@@ -19,18 +19,18 @@
 {{#each component in controller.content.hostComponents}}
   {{#if component.isMaster}}
     <tr>
-        <td class="summary-label">Server</td>
+        <td class="summary-label">{{t common.servers}}</td>
         <td><a {{action selectHost component.host}} href="javascript:void(null)">{{component.host.publicHostName}}</a></td>
     </tr>
   {{/if}}
 {{/each}}
 <tr>
-  <td class="summary-label">Clients</td>
+  <td class="summary-label">{{t common.clients}}</td>
   <td>
     <a {{action filterHosts view.clientObj}} href="javascript:void(null)">{{view.clients.length}} Oozie Client{{#if view.hasManyClients}}s{{/if}}</a>
   </td>
 </tr>
 <tr>
-  <td class="summary-label">Oozie Web UI</td>
+  <td class="summary-label">{{t dashboard.services.oozie.webUi}}</td>
   <td><a target=_blank href="http://{{unbound view.oozieServer}}:11000/oozie">{{view.oozieServer}}/oozie</a></td>
 </tr>

ambari-web/app/templates/main/service/info/summary/zookeeper.hbs

@@ -17,14 +17,14 @@
 }}
 
 <tr>
-  <td class="summary-label">Servers</td>
+  <td class="summary-label">{{t common.servers}}</td>
   <td>
       <a {{action filterHosts view.serversHost}} href="javascript:void(null)">{{view.servers.length}} ZooKeeper Server{{#if view.hasManyServers}}s{{/if}}</a>
   </td>
 </tr>
 
 <tr>
-  <td class="summary-label">Clients</td>
+  <td class="summary-label">{{t common.clients}}</td>
   <td>
       <a {{action filterHosts view.clientObj}} href="javascript:void(null)">{{view.clients.length}} ZooKeeper Client{{#if view.hasManyClients}}s{{/if}}</a>
   </td>

ambari-web/app/templates/main/service/item.hbs

@@ -38,12 +38,12 @@
   <a href="javascript:void(null)" {{bindAttr class=":btn controller.content.isStartDisabled:disabled:btn-success" }}
      data-toggle="modal" {{action "startService" target="controller"}}>
     <i class="icon-play"></i>
-    Start
+    {{t services.service.start}}
   </a>
   <a href="javascript:void(null)" {{bindAttr class=":btn controller.content.isStopDisabled:disabled:btn-danger" }}
      data-toggle="modal" {{action "stopService" target="controller"}}>
     <i class="icon-stop icon-white"></i>
-    Stop
+    {{t services.service.stop}}
   </a>
 </div>
 {{/if}}

ambari-web/app/templates/wizard/step10.hbs

@@ -44,5 +44,5 @@
 </div>
 <div class="btn-area">
   <a class="btn pull-left" {{bindAttr disabled="isSubmitDisabled"}} {{action back}}>&larr; {{t common.back}}</a>
-  <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action complete}}>{{t common.cmoplete}} &rarr;</a>
+  <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action complete}}>{{t common.complete}} &rarr;</a>
 </div>

ambari-web/app/views/wizard/step8_view.js

@@ -68,9 +68,9 @@ App.WizardStep8View = Em.View.extend({
       bodyClass: Ember.View.extend({
         templateName: require('templates/wizard/step8_log_popup'),
 
-        messsage: function() {
-          return 'Preparing to Deploy: <strong>'+this.get('ajaxQueueComplete')+'</strong> of <strong>'+this.get('ajaxQueueLength')+'</strong> tasks completed.';
-        }.property(),
+        message: function() {
+          return Em.I18n.t('installer.step8.deployPopup.message').format(this.get('ajaxQueueComplete'), this.get('ajaxQueueLength'));
+        }.property('ajaxQueueComplete', 'ajaxQueueLength'),
 
         controllerBinding: 'App.router.wizardStep8Controller',