You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/02/06 01:55:51 UTC
svn commit: r1442820 - in /incubator/ambari/trunk: ./ ambari-web/app/
ambari-web/app/controllers/wizard/ ambari-web/app/templates/
ambari-web/app/templates/common/ ambari-web/app/templates/common/grid/
ambari-web/app/templates/wizard/ ambari-web/app/vi...
Author: yusaku
Date: Wed Feb 6 00:55:50 2013
New Revision: 1442820
URL: http://svn.apache.org/viewvc?rev=1442820&view=rev
Log:
AMBARI-1348. Externalize strings to messages.js. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
incubator/ambari/trunk/ambari-web/app/messages.js
incubator/ambari/trunk/ambari-web/app/templates/application.hbs
incubator/ambari/trunk/ambari-web/app/templates/common/grid/header.hbs
incubator/ambari/trunk/ambari-web/app/templates/common/grid/pager.hbs
incubator/ambari/trunk/ambari-web/app/templates/common/metric.hbs
incubator/ambari/trunk/ambari-web/app/templates/common/time_range.hbs
incubator/ambari/trunk/ambari-web/app/templates/main.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/master_hosts.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_hosts.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step1.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step10.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_log_popup.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step4.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step6.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step7.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step8.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step8_log_popup.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step9.hbs
incubator/ambari/trunk/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js
incubator/ambari/trunk/ambari-web/app/views/wizard/step9_view.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 6 00:55:50 2013
@@ -40,6 +40,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1348. Externalize strings to messages.js. (yusaku)
+
AMBARI-1342. Hive client is not installed on Nagios server host.
(jaimin)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js Wed Feb 6 00:55:50 2013
@@ -201,6 +201,7 @@ App.SlaveComponentGroupsController = Em.
header: componentName + ' Groups',
bodyClass: Ember.View.extend({
controllerBinding: 'App.router.slaveComponentGroupsController',
+ header: Em.I18n.t('installer.slaveComponentHostsPopup.header').format(this.get('selectedComponentDisplayName')),
templateName: require('templates/wizard/slave_component_hosts_popup')
}),
onPrimary: function (event) {
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Wed Feb 6 00:55:50 2013
@@ -23,6 +23,62 @@ Em.I18n.translations = {
'app.reloadPopup.text': 'Trying to connect to server...',
'app.reloadPopup.header': 'Reload Page',
+ 'app.loadingPlaceholder': 'Loading...',
+ 'app.sighout':'Sign out',
+
+ 'apply':'apply',
+ 'and':'and',
+ 'none':'none',
+ 'all':'all',
+ 'minimum':'minimum',
+ 'from':'From',
+ 'to':'To',
+
+ 'common.learnMore':'Learn more',
+ 'common.back':'Back',
+ 'common.prev':'Prev',
+ 'common.next':'Next',
+ 'common.host':'Host',
+ 'common.group':'Group',
+ 'common.progress':'Progress',
+ 'common.status':'Status',
+ 'common.action':'Action',
+ 'common.remove':'Remove',
+ 'common.retry':'Retry',
+ 'common.show':'Show',
+ 'common.hide':'Hide',
+ 'common.cancel':'Cancel',
+ 'common.apply':'Apply',
+ 'common.service': 'Service',
+ 'common.version':'Version',
+ 'common.description':'Description',
+ 'common.client':'Client',
+ 'common.regionServer':'RegionServer',
+ 'common.taskTracker':'TaskTracker',
+ 'common.dataNode':'DataNode',
+ 'common.print':'Print',
+ 'common.deploy':'Deploy',
+ 'common.message':'Message',
+ 'common.tasks':'Tasks',
+ 'common.open':'Open',
+ 'common.copy':'Copy',
+ 'common.complete':'Complete',
+ 'common.metrics':'Metrics',
+ 'common.timeRange':'Time Range',
+ 'common.name':'Name',
+ 'common.ipAddress':'IP Address',
+ 'common.cpu':'CPU',
+ 'common.ram':'RAM',
+ 'common.diskUsage':'Disk Usage',
+ 'common.loadAvg':'Load Avg',
+ 'common.components':'Components',
+ 'common.quickLinks':'Quick Links',
+ 'common.save':'Save',
+ 'common.servers':'Servers',
+ 'common.clients':'Clients',
+
+ 'popup.highlight':'click to highlight',
+
'login.header':'Sign in',
'login.username':'Username',
'login.password':'Password',
@@ -61,6 +117,12 @@ Em.I18n.translations = {
'installer.header':'Cluster Install Wizard',
'installer.navigation.warning.header':'Navigation Warning',
+ 'installer.mockData':'mockData',
+ 'installer.pollData':'pollData',
+ 'installer.noHostsAssigned':'No host assigned',
+ 'installer.slaveComponentHosts.selectHosts':'select hosts for this group',
+ 'installer.slaveComponentHostsPopup.header':'Select which hosts should belong to which {0} group',
+
'installer.controls.serviceConfigPopover.title':'{0}<br><small>{1}</small>',
'installer.controls.serviceConfigMultipleHosts.other':'1 other',
'installer.controls.serviceConfigMultipleHosts.others':'{0} others',
@@ -122,6 +184,8 @@ Em.I18n.translations = {
'installer.step2.manualInstall.tooltip.content':'Manually registering the Ambari Agent on each host eliminates the need for SSH and should be performed prior to continuing cluster installation.',
'installer.step2.manualInstall.popup.header':'Before You Proceed',
'installer.step2.manualInstall.popup.body':'You must install Ambari Agents on each host you want to manage before you proceed.',
+ 'installer.step2.orUse':'Or use',
+ 'installer.step2.registerAndConfirm':'Register and Confirm',
'installer.step3.header':'Confirm Hosts',
'installer.step3.body':'Registering your hosts.<br>' +
@@ -133,6 +197,11 @@ Em.I18n.translations = {
'installer.step3.hosts.retry.popup.body':'Are you sure you want to retry discovery of the selected host(s)?',
'installer.step3.hostInformation.popup.header':'Error in retrieving host Information',
'installer.step3.hostInformation.popup.body' : 'All bootstrapped hosts registered but unable to retrieve cpu and memory related information',
+ 'installer.step3.hostWarningsPopup.details':'Show Details',
+ 'installer.step3.hostWarningsPopup.directoriesAndFiles':'DIRECTORIES & FILES',
+ 'installer.step3.hostWarningsPopup.packages':'PACKAGES',
+ 'installer.step3.hostWarningsPopup.processes':'PROCESSES',
+ 'installer.step3.hostWarningsPopup.noProcesses':'No processes to display',
'installer.step3.hosts.noHosts':'No hosts to display',
'installer.step3.warnings.popup.header':'Host Checks',
'installer.step3.warnings.description':'Some warnings were encountered while performing checks against the above hosts.',
@@ -141,6 +210,8 @@ Em.I18n.translations = {
'installer.step3.warnings.noWarnings':'All host checks were successful.',
'installer.step3.warnings.updateChecks.success':'Host Checks successfully updated',
'installer.step3.warnings.updateChecks.failed':'Host Checks update failed',
+ 'installer.step3.removeSelected':'Remove Selected',
+ 'installer.step3.retryFailed':'Retry Failed',
'installer.step4.header':'Choose Services',
'installer.step4.body':'Choose which services you want to install on your cluster.',
@@ -184,6 +255,8 @@ Em.I18n.translations = {
'installer.step9.hostLog.popup.categories.completed':'Success',
'installer.step9.hostLog.popup.categories.aborted':'Cancelled',
'installer.step9.hostLog.popup.categories.timedout':'Timed Out',
+ 'installer.step9.hostLog.popup.noTasksToShow':'No tasks to show',
+ 'installer.step9.overallProgress':'{0} % overall',
'installer.step10.header':'Summary',
'installer.step10.body':'Here is the summary of the install process.',
@@ -261,7 +334,6 @@ Em.I18n.translations = {
'question.sure':'Are you sure?',
'yes':'Yes',
'no':'No',
- 'and':'and',
'services.service.start':'Start',
'services.service.stop':'Stop',
@@ -341,10 +413,17 @@ Em.I18n.translations = {
'services.service.info.summary.hostsRunningMonitor':'{0} hosts running monitor',
'services.service.info.summary.hostRunningMonitor':'1 host running monitor',
'services.service.info.summary.serversHostCount':'{0} more',
+ 'services.service.info.summary.nagiosWebUI':'Nagios Web UI',
+ 'services.service.info.summary.nagios.noAlerts':'No alerts',
+ 'services.service.info.summary.nagios.alerts':'Nagios service required for viewing alerts',
'services.add.header':'Add Service Wizard',
+ 'services.service.add':'Add Service',
+ 'hosts.host.add':'Add New Hosts',
+ 'hosts.host.back':'Back to Hosts',
+
'hosts.host.metrics.cpu':'CPU Usage',
'hosts.host.metrics.disk':'Disk Usage',
'hosts.host.metrics.load':'Load',
@@ -354,6 +433,10 @@ Em.I18n.translations = {
'hosts.host.details.deleteHost':'Delete Host',
+ 'host.host.componentFilter.master':'Master Components',
+ 'host.host.componentFilter.slave':'Slave Components',
+ 'host.host.componentFilter.client':'Client Components',
+
'hosts.host.start.popup.header':'Confirmation',
'hosts.host.stop.popup.header':'Confirmation',
'hosts.host.start.popup.body':'Are you sure?',
@@ -377,7 +460,7 @@ Em.I18n.translations = {
'charts.horizon.chart.attributes.memory':'Memory',
'charts.horizon.chart.attributes.network':'Network',
'charts.horizon.chart.attributes.io':'I/O',
-
+
'charts.heatmap.category.host':'Host',
'charts.heatmap.item.host.memory':'Memory Used',
'charts.heatmap.item.host.disk':'Disk Space Used',
@@ -386,6 +469,7 @@ Em.I18n.translations = {
'charts.heatmap.category.mapreduce': 'MapReduce',
'charts.heatmap.unknown': 'Unknown',
+ 'metric.notFound':'no items found',
'metric.default':'combined',
'metric.cpu':'cpu',
'metric.memory':'disk used',
@@ -399,6 +483,8 @@ Em.I18n.translations = {
'metric.more.network':'Network',
'metric.more.process':'Process',
+ 'dashboard.clusterMetrics':'Cluster Metrics',
+
'dashboard.clusterMetrics.cpu':'CPU Usage',
'dashboard.clusterMetrics.load':'Cluster Load',
'dashboard.clusterMetrics.memory':'Memory Usage',
@@ -472,6 +558,9 @@ Em.I18n.translations = {
'dashboard.services.oozie.clients': '{0} Oozie Clients',
'dashboard.services.oozie.webUi': 'Oozie Web UI',
+ 'dashboard.services.ganglia.webUi': 'Ganglia Web UI',
+ 'dashboard.services.ganglia.monitors': 'Ganglia Monitors',
+
'dashboard.services.zookeeper.prefix': '{0} of',
'dashboard.services.zookeeper.title': '{0} ZooKeepers',
'dashboard.services.zookeeper.postfix': 'running',
@@ -499,7 +588,6 @@ Em.I18n.translations = {
'apps.filters.all': 'All',
'apps.filters.filtered': 'Filtered',
'apps.filters.clearFilters': 'Clear filters',
- 'apps.filters.show': 'Show',
'apps.filters.paginationInfo': '{0} - {1} of {2}',
'apps.filters.customRunDate':'Run Date custom filter',
'apps.filters.nothingToShow': 'No jobs to display',
Modified: incubator/ambari/trunk/ambari-web/app/templates/application.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/application.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/application.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/application.hbs Wed Feb 6 00:55:50 2013
@@ -40,7 +40,7 @@
<ul class="nav">
<!-- <li class="right"><a class="help" {{!translateAttr href="topnav.help.href"}} target="_blank">Help</a></li> -->
{{#if App.router.loggedIn}}
- <li class="right"><a class="help" href="" {{action logoff}}>Sign out</a></li>
+ <li class="right"><a class="help" href="" {{action logoff}}>{{t app.sighout}}</a></li>
{{/if}}
<li class="right">{{loginName}}</li>
</ul>
Modified: incubator/ambari/trunk/ambari-web/app/templates/common/grid/header.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/common/grid/header.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/common/grid/header.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/common/grid/header.hbs Wed Feb 6 00:55:50 2013
@@ -19,5 +19,5 @@
{{view.label}}<i {{action toggleFilter target="view"}} class="icon-filter"></i>
{{#if view.showFilter}}
{{view view.filter}}
- <a {{action applyFilter target="view"}}>apply</a>
+ <a {{action applyFilter target="view"}}>{{t apply}}</a>
{{/if}}
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/templates/common/grid/pager.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/common/grid/pager.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/common/grid/pager.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/common/grid/pager.hbs Wed Feb 6 00:55:50 2013
@@ -17,9 +17,9 @@
}}
<ul>
- <li {{bindAttr class="view.prevPageDisabled"}}><a {{action activatePrevPage target="view"}} href="#">Prev</a></li>
+ <li {{bindAttr class="view.prevPageDisabled"}}><a {{action activatePrevPage target="view"}} href="#">{{t common.prev}}</a></li>
{{#each page in view.pages}}
<li {{bindAttr class="page.activeClass"}} ><a {{action activatePage page target="view" }} href="#">{{page.number}}</a></li>
{{/each}}
- <li {{bindAttr class="view.nextPageDisabled"}}><a {{action activateNextPage target="view"}} href="#">Next</a></li>
+ <li {{bindAttr class="view.nextPageDisabled"}}><a {{action activateNextPage target="view"}} href="#">{{t common.next}}</a></li>
</ul>
Modified: incubator/ambari/trunk/ambari-web/app/templates/common/metric.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/common/metric.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/common/metric.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/common/metric.hbs Wed Feb 6 00:55:50 2013
@@ -17,7 +17,7 @@
}}
<div class="span title">
- Metrics <i class="icon-question-sign"></i>
+ {{t common.metrics}} <i class="icon-question-sign"></i>
</div>
<ul class="display-inline-block nav nav-pills">
{{#each metric in view.metrics}}
@@ -49,7 +49,7 @@
{{/each}}
</ul>
{{else}}
- no items found
+ {{t metric.notFound}}
{{/if}}
</div>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/common/time_range.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/common/time_range.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/common/time_range.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/common/time_range.hbs Wed Feb 6 00:55:50 2013
@@ -17,14 +17,14 @@
}}
<div class="span title">
- Time Range <i class="icon-question-sign"></i>
+ {{t common.timeRange}} <i class="icon-question-sign"></i>
</div>
<ul class="display-inline-block nav nav-pills">
{{#each preset in view.presets}}
{{view view.presetView presetBinding="preset" widgetBinding="view"}}
{{/each}}
- From {{view view.dateFromView}}
- To {{view view.dateToView}}
+ {{t from}} {{view view.dateFromView}}
+ {{t to}} {{view view.dateToView}}
</ul>
<div id="slider">
<sapn class="period-marker">{{view.rangeLabel}}</sapn>
Modified: incubator/ambari/trunk/ambari-web/app/templates/main.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main.hbs Wed Feb 6 00:55:50 2013
@@ -26,5 +26,5 @@
</div>
{{outlet}}
{{else}}
-<h2>loading...</h2>
+<h2>{{t app.loadingPlaceholder}}</h2>
{{/if}}
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/master_hosts.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/master_hosts.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/master_hosts.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/master_hosts.hbs Wed Feb 6 00:55:50 2013
@@ -17,11 +17,11 @@
}}
{{#if view.hasNoHosts}}
- No host assigned
+ {{t installer.noHostsAssigned}}
{{/if}}
{{#if view.hasOneHost}}
{{value}}
{{/if}}
{{#if view.hasMultipleHosts}}
- <a href="#" {{action showHosts target="view"}}>{{value.firstObject}} and {{view.otherLength}}</a>
+ <a href="#" {{action showHosts target="view"}}>{{value.firstObject}} {{t and}} {{view.otherLength}}</a>
{{/if}}
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts.hbs Wed Feb 6 00:55:50 2013
@@ -17,14 +17,14 @@
}}
{{#if view.hasNoHosts}}
-none -
+{{t none}} -
<a href="#" {{action showEditSlaveComponentGroups view.serviceConfig.category target="controller"}}>
- select hosts for this group
+ {{t installer.slaveComponentHosts.selectHosts}}
</a>
{{else}}
<a href="#" {{action showEditSlaveComponentGroups view.serviceConfig.category target="controller"}}>
{{#if view.hasMultipleHosts}}
- {{view.hosts.firstObject.hostName}} and {{view.otherLength}}
+ {{view.hosts.firstObject.hostName}} {{t and}} {{view.otherLength}}
{{else}}
{{view.hosts.firstObject.hostName}}
{{/if}}
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs Wed Feb 6 00:55:50 2013
@@ -16,12 +16,12 @@
* limitations under the License.
}}
-<div id="slave-hosts-popup" class="alert alert-info">Select which hosts should belong to which {{selectedComponentDisplayName}} group.</div>
+<div id="slave-hosts-popup" class="alert alert-info">{{header}}</div>
<table class="table table-striped">
<thead>
<tr>
- <th>Host</th>
- <th>Group</th>
+ <th>{{t common.host}}</th>
+ <th>{{t common.group}}</th>
</tr>
</thead>
<tbody>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_hosts.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_hosts.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_hosts.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/slave_hosts.hbs Wed Feb 6 00:55:50 2013
@@ -17,10 +17,10 @@
}}
{{#if view.hasNoHosts}}
- No host assigned
+ {{t installer.noHostsAssigned}}
{{else}}
{{#if view.hasMultipleHosts}}
- {{view.value.[0]}} and {{view.otherLength}}
+ {{view.value.[0]}} {{and}} {{view.otherLength}}
{{else}}
{{view.value.[0]}}
{{/if}}
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step1.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step1.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step1.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step1.hbs Wed Feb 6 00:55:50 2013
@@ -25,7 +25,7 @@
<a href="javascript:void(null)"
rel="popover"
{{translateAttr title="installer.step1.clusterName.tooltip.title"
- data-content="installer.step1.clusterName.tooltip.content"}}>Learn more</a>
+ data-content="installer.step1.clusterName.tooltip.content"}}>{{t common.learnMore}}</a>
</label>
<div class="controls">
@@ -35,7 +35,7 @@
</div>
<div class="btn-area">
- <a class="btn btn-success pull-right" {{bindAttr disabled="invalidClusterName"}} {{action "submit" target="controller"}}>Next →</a>
+ <a class="btn btn-success pull-right" {{bindAttr disabled="invalidClusterName"}} {{action "submit" target="controller"}}>{{t common.next}} →</a>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step10.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step10.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step10.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step10.hbs Wed Feb 6 00:55:50 2013
@@ -43,6 +43,6 @@
{{/each}}
</div>
<div class="btn-area">
- <a class="btn pull-left" {{bindAttr disabled="isSubmitDisabled"}} {{action back}}>← Back</a>
- <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action complete}}>Complete →</a>
+ <a class="btn pull-left" {{bindAttr disabled="isSubmitDisabled"}} {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action complete}}>{{t common.cmoplete}} →</a>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs Wed Feb 6 00:55:50 2013
@@ -25,7 +25,7 @@
<h5>{{t installer.step2.targetHosts}}</h5>
<div {{bindAttr class="hostsError:error :control-group :target-hosts-input"}}>
- <p>{{t installer.step2.targetHosts.info}}. Or use
+ <p>{{t installer.step2.targetHosts.info}}. {{t installer.step2.orUse}}
<a href="javascript:void(null)"
rel="popover"
{{translateAttr title="installer.step2.hostPattern.tooltip.title" data-content="installer.step2.hostPattern.tooltip.content"}}>
@@ -110,10 +110,10 @@
</div>
<div class="btn-area">
{{#unless view.parentView.controller.hideBackButton}}
- <a class="btn pull-left" {{action back}}>← Back</a>
+ <a class="btn pull-left" {{action back}}>← {{t common.back}}</a>
{{/unless}}
<a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action evaluateStep target="controller"}}>
- Register and Confirm →</a>
+ {{t installer.step2.registerAndConfirm}} →</a>
</div>
</div>
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs Wed Feb 6 00:55:50 2013
@@ -26,29 +26,29 @@
<a class="btn btn-primary" {{bindAttr disabled="noHostsSelected"}}
href="#" {{action removeSelectedHosts target="controller" }}><i
class="icon-trash icon-white"></i>
- Remove Selected
+ {{t installer.step3.removeSelected}}
</a>
{{#unless isRetryDisabled}}
<a class="btn btn-primary decommission"
href="#" {{action retrySelectedHosts target="controller"}}><i
class="icon-repeat icon-white"></i>
- Retry Failed
+ {{t installer.step3.retryFailed}}
</a>
{{/unless}}
{{#if App.testMode}}
<a class="btn btn-info"
href="#" {{action mockBtn target="controller"}}>
- mockData
+ {{t installer.mockData}}
</a>
<a class="btn btn-info"
href="#" {{action pollBtn target="controller"}}>
- pollData
+ {{t installer.pollData}}
</a>
{{/if}}
<div id="host-filter" class="pull-right">
<ul class="clearfix">
- <li class="first">Show:</li>
+ <li class="first">{{t common.show}}:</li>
{{#each category in controller.categories}}
<li {{bindAttr class="category.itemClass"}}>
<a {{action selectCategory category target="controller"}} href="#">
@@ -69,12 +69,12 @@
<thead>
<tr>
<th class="span1">{{view Ember.Checkbox checkedBinding="allChecked"}}</th>
- <th class="span3">Host</th>
+ <th class="span3">{{t common.host}}</th>
<!-- retrieved from local storage initially -->
- <th class="span3">Progress</th>
- <th class="span2">Status</th>
+ <th class="span3">{{t common.progress}}</th>
+ <th class="span2">{{t common.status}}</th>
<!-- given by the parsing function that parses data from bootstrap call, dynamically assign the color -->
- <th class="span3">Action</th>
+ <th class="span3">{{t common.action}}</th>
<!-- trash icon -->
<!-- retry icon -->
</tr>
@@ -102,9 +102,9 @@
</td>
<td>
{{#if view.isRemovable}}<a class="btn btn-mini" {{action remove target="view"}}><i class="icon-trash"></i>
- Remove</a>{{/if}}
+ {{t common.remove}}</a>{{/if}}
{{#if view.isRetryable}}<a class="btn btn-mini" {{action retry target="view"}}><i class="icon-repeat"></i>
- Retry</a>{{/if}}
+ {{t common.retry}}</a>{{/if}}
</td>
{{/view}}
{{/each}}
@@ -138,7 +138,7 @@
{{/if}}
{{/if}}
<div class="btn-area">
- <a class="btn pull-left" {{bindAttr disabled="isInstallInProgress"}} {{action back}}>← Back</a>
- <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}>Next →</a>
+ <a class="btn pull-left" {{bindAttr disabled="isInstallInProgress"}} {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.next}} →</a>
</div>
</div>
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_log_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_log_popup.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_log_popup.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_log_popup.hbs Wed Feb 6 00:55:50 2013
@@ -19,7 +19,7 @@
<div id="host-log">
<div class="content-area">
- <div class="textTrigger">click to highlight</div>
+ <div class="textTrigger">{{t popup.highlight}}</div>
{{#if view.isTextArea}}
<div>
{{view view.textArea contentBinding="view.host.bootLog"}}
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs Wed Feb 6 00:55:50 2013
@@ -26,7 +26,7 @@
}}
</div>
<div class="span3 offset3">
- <a href="javascript.void(0)" title="Show Details" {{action openWarningsInDialog target="view"}} class="task-detail-open-dialog"><i class="icon-external-link"></i> Show Details</a>
+ <a href="javascript.void(0)" title="Show Details" {{action openWarningsInDialog target="view"}} class="task-detail-open-dialog"><i class="icon-external-link"></i> {{t installer.step3.hostWarningsPopup.details}}</a>
</div>
</div>
<div class="content-area">
@@ -34,7 +34,7 @@
<table class="table">
<thead>
<tr>
- <th class="category-title" colspan="2">DIRECTORIES & FILES</th>
+ <th class="category-title" colspan="2">{{t installer.step3.hostWarningsPopup.directoriesAndFiles}}</th>
</tr>
</thead>
<tbody>
@@ -58,7 +58,7 @@
<table class="table">
<thead>
<tr>
- <th class="category-title" colspan="2">PACKAGES</th>
+ <th class="category-title" colspan="2">{{t installer.step3.hostWarningsPopup.packages}}</th>
</tr>
</thead>
<tbody>
@@ -82,7 +82,7 @@
<table class="table">
<thead>
<tr>
- <th class="category-title" colspan="2">PROCESSES</th>
+ <th class="category-title" colspan="2">{{t installer.step3.hostWarningsPopup.processes}}</th>
</tr>
</thead>
<tbody>
@@ -103,7 +103,7 @@
</tr>
{{/each}}
{{else}}
- <tr><td colspan="2">No processes to display</td></tr>
+ <tr><td colspan="2">{{t installer.step3.hostWarningsPopup.noProcesses}}</td></tr>
{{/if}}
</tbody>
</table>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step4.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step4.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step4.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step4.hbs Wed Feb 6 00:55:50 2013
@@ -25,16 +25,16 @@
<table class="table table-striped">
<thead>
<tr>
- <th class="span3">Service
+ <th class="span3">{{t common.service}}
<span style="margin-left:10px">
- <a href="#" {{action selectAll target="controller"}} {{bindAttr class="isAll:selected:deselected"}}>all</a>
+ <a href="#" {{action selectAll target="controller"}} {{bindAttr class="isAll:selected:deselected"}}>{{t all}}</a>
|
<a
- href="#" {{action selectMinimum target="controller"}} {{bindAttr class="isMinimum:selected:deselected"}}>minimum</a>
+ href="#" {{action selectMinimum target="controller"}} {{bindAttr class="isMinimum:selected:deselected"}}>{{t minimum}}</a>
</span>
</th>
- <th>Version</th>
- <th>Description</th>
+ <th>{{t common.version}}</th>
+ <th>{{t common.description}}</th>
</tr>
</thead>
<tbody>
@@ -54,9 +54,9 @@
<div class="btn-area">
{{#unless view.parentView.controller.hideBackButton}}
- <a class="btn pull-left" {{action back}}>← Back
+ <a class="btn pull-left" {{action back}}>← {{t common.back}}
</a>
{{/unless}}
- <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}> Next →</a>
+ <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}> {{t common.next}} →</a>
</div>
</div>
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs Wed Feb 6 00:55:50 2013
@@ -79,6 +79,6 @@
<div style="clear: both;"></div>
</div>
<div class="btn-area">
- <a class="btn pull-left" {{action back href="true"}}>← Back</a>
- <a class="btn btn-success pull-right" {{action next}}>Next →</a>
+ <a class="btn pull-left" {{action back href="true"}}>← {{t common.back}}</a>
+ <a class="btn btn-success pull-right" {{action next}}>{{t common.next}} →</a>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step6.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step6.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step6.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step6.hbs Wed Feb 6 00:55:50 2013
@@ -28,36 +28,36 @@
<table class="table table-striped">
<thead>
<tr>
- <th>Host</th>
+ <th>{{t common.host}}</th>
<th>
<a href="#" {{bindAttr class="isAllDataNodes:selected:deselected"}}
- {{action selectAllDataNodes target="controller"}}>all</a> |
+ {{action selectAllDataNodes target="controller"}}>{{t all}}</a> |
<a href="#" {{bindAttr class="isNoDataNodes:selected:deselected"}}
- {{action deselectAllDataNodes target="controller"}}>none</a>
+ {{action deselectAllDataNodes target="controller"}}>{{t none}}</a>
</th>
{{#if controller.isMrSelected}}
<th>
<a href="#" {{bindAttr class="isAllTaskTrackers:selected:deselected"}}
- {{action selectAllTaskTrackers target="controller"}}>all</a> |
+ {{action selectAllTaskTrackers target="controller"}}>{{t all}}</a> |
<a href="#" {{bindAttr class="isNoTaskTrackers:selected:deselected"}}
- {{action deselectAllTaskTrackers target="controller"}}>none</a>
+ {{action deselectAllTaskTrackers target="controller"}}>{{t none}}</a>
</th>
{{/if}}
{{#if controller.isHbSelected}}
<th>
<a href="#" {{bindAttr class="isAllRegionServers:selected:deselected"}}
- {{action selectAllRegionServers target="controller"}}>all</a> |
+ {{action selectAllRegionServers target="controller"}}>{{t all}}</a> |
<a href="#" {{bindAttr class="isNoRegionServers:selected:deselected"}}
- {{action deselectAllRegionServers target="controller"}}>none</a>
+ {{action deselectAllRegionServers target="controller"}}>{{t none}}</a>
</th>
{{/if}}
<th>
- <a href="#" {{bindAttr class="isAllClients:selected:deselected"}} {{action selectAllClients target="controller"}}>all</a>
+ <a href="#" {{bindAttr class="isAllClients:selected:deselected"}} {{action selectAllClients target="controller"}}>{{t all}}</a>
|
- <a href="#" {{bindAttr class="isNoClients:selected:deselected"}} {{action deselectAllClients target="controller"}}>none</a>
+ <a href="#" {{bindAttr class="isNoClients:selected:deselected"}} {{action deselectAllClients target="controller"}}>{{t none}}</a>
</th>
</tr>
</thead>
@@ -71,21 +71,21 @@
<i class=icon-asterisks>✵</i>
{{/if}}
{{/view}}
- <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isDataNodeInstalled" checkedBinding="isDataNode"}}DataNode</label></td>
+ <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isDataNodeInstalled" checkedBinding="isDataNode"}}{{t common.dataNode}}</label></td>
{{#if controller.isMrSelected}}
- <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isTaskTrackerInstalled" checkedBinding="isTaskTracker"}}TaskTracker</label></td>
+ <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isTaskTrackerInstalled" checkedBinding="isTaskTracker"}}{{t common.taskTracker}}</label></td>
{{/if}}
{{#if controller.isHbSelected}}
- <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isRegionServerInstalled" checkedBinding="isRegionServer"}}RegionServer</label></td>
+ <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isRegionServerInstalled" checkedBinding="isRegionServer"}}{{t common.regionServer}}</label></td>
{{/if}}
- <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isClientInstalled" checkedBinding="isClient"}}Client</label></td>
+ <td><label class="checkbox">{{view Ember.Checkbox disabledBinding="isClientInstalled" checkedBinding="isClient"}}{{t common.client}}</label></td>
</tr>
{{/each}}
</tbody>
</table>
</div>
<div class="btn-area">
- <a class="btn" {{action back}}>← Back</a>
- <a class="btn btn-success pull-right" {{action next}}>Next →</a>
+ <a class="btn" {{action back}}>← {{t common.back}}</a>
+ <a class="btn btn-success pull-right" {{action next}}>{{t common.next}} →</a>
</div>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step7.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step7.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step7.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step7.hbs Wed Feb 6 00:55:50 2013
@@ -78,10 +78,10 @@
{{/if}}
<div class="btn-area">
- <a class="btn" {{action back}}>← Back</a>
+ <a class="btn" {{action back}}>← {{t common.back}}</a>
<a
class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}}
- {{action submit target="controller"}}>Next →</a>
+ {{action submit target="controller"}}>{{t common.next}} →</a>
</div>
</div>
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step8.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step8.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step8.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step8.hbs Wed Feb 6 00:55:50 2013
@@ -24,7 +24,7 @@
<div id="step8-content" class="well pre-scrollable">
<div id="printReview">
- <a class="btn btn-info pull-right" {{action printReview target="view"}}>Print</a> <br/>
+ <a class="btn btn-info pull-right" {{action printReview target="view"}}>{{t common.print}}</a> <br/>
</div>
<div id="step8-info">
{{#each item in controller.clusterInfo}}
@@ -34,7 +34,7 @@
{{/each}}
<div>
- <p><b>Services</b></p>
+ <p><b>{{t menu.item.services}}</b></p>
{{#each controller.services}}
<div>
<ul><em><b>{{display_name}}</b></em>
@@ -52,7 +52,7 @@
</div>
</div>
<div class="btn-area">
- <a class="btn pull-left" {{action back href="true"}}>← Back</a>
+ <a class="btn pull-left" {{action back href="true"}}>← {{t common.back}}</a>
<a class="btn btn-success pull-right"
- id="spinner" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action submit target="controller"}}>Deploy →</a>
+ id="spinner" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.deploy}} →</a>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step8_log_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step8_log_popup.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step8_log_popup.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step8_log_popup.hbs Wed Feb 6 00:55:50 2013
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
-<p>Preparing to Deploy: <strong>{{view.ajaxQueueComplete}}</strong> of <strong>{{view.ajaxQueueLength}}</strong> tasks completed.</p>
+<p>{{view.message}}</p>
<div class="progress">
<div class="bar" {{bindAttr style="view.barWidth"}}>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step9.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step9.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step9.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step9.hbs Wed Feb 6 00:55:50 2013
@@ -28,11 +28,10 @@
<div class="span10">
<div {{bindAttr class="isStepCompleted::progress-striped isStepCompleted::active view.barColor :progress"}}>
<div class="bar" {{bindAttr style="view.barWidth"}}>
- <!--<strong style="color: #00008b;">Overall Progress</strong>-->
</div>
</div>
</div>
- <div class="span2">{{progress}}% overall</div>
+ <div class="span2">{{view.progressMessage}}</div>
</div>
</div>
@@ -42,16 +41,16 @@
{{#if controller.showRetry}}
<a class="btn btn-primary"
href="#" {{action retry}}><i class="icon-repeat icon-white"></i>
- Retry
+ {{t common.retry}}
</a>
{{/if}}
{{#if App.testMode}}
<a class="btn btn-info" href="#" {{action mockBtn target="controller"}}>
- mockData
+ {{t installer.mockData}}
</a>
<a class="btn btn-primary"
href="#" {{action pollBtn target="controller"}}><i class="icon-repeat icon-white"></i>
- pollData
+ {{t installer.pollData}}
</a>
{{/if}}
</div>
@@ -62,11 +61,11 @@
<thead>
<tr>
<th class="host">
- Host
+ {{t common.host}}
</th>
- <th class="status">Status</th>
+ <th class="status">{{t common.status}}</th>
<!-- given by the parsing function that parses data from bootstrap call -->
- <th class="message">Message</th>
+ <th class="message">{{t common.message}}</th>
<!-- retrieved from local storage initially -->
</tr>
</thead>
@@ -110,7 +109,7 @@
<p {{bindAttr class="view.resultMsgColor :alert"}}>{{view.resultMsg}}</p>
{{/if}}
<div class="btn-area">
- <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}>Next →</a>
+ <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.next}} →</a>
</div>
</div>
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs Wed Feb 6 00:55:50 2013
@@ -17,9 +17,9 @@
}}
<div {{bindAttr class="view.isLogWrapHidden::hidden :task-list-main-warp"}}>
<div class="task-top-wrap">
- Tasks
+ {{t common.tasks}}
<div class="select-wrap">
- Show:
+ {{t common.show}}:
{{view Ember.Select
contentBinding="view.categories"
optionValuePath="content.value"
@@ -41,22 +41,22 @@
</div>
{{/each}}
{{#if view.isEmptyList}}
- <div class="log-list-wrap">No tasks to show</div>
+ <div class="log-list-wrap">{{t installer.step9.hostLog.popup.noTasksToShow}}</div>
{{/if}}
</div>
</div>
<div {{bindAttr class="view.isLogWrapHidden:hidden :task-detail-info"}}>
<div class="task-top-wrap">
- <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i class="icon-arrow-left"></i> Tasks</a>
+ <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i class="icon-arrow-left"></i> {{t common.tasks}}</a>
<div>
<!--<img src="data:image/png;base64,R0lGODlhFAAUAIAAAP///wAAACH5BAEAAAAALAAAAAAUABQAAAIRhI+py+0Po5y02ouz3rz7rxUAOw==" class="task-detail-status-ico" />-->
<i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}} class="task-detail-status-ico"></i>
<span class="task-detail-log-rolename" >{{{view.openedTask.role}} {{view.openedTask.command}}</span>
</div>
<div class="task-detail-ico-wrap">
- <div title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i class="icon-copy"></i> Copy</div>
- <div title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i class="icon-external-link"></i> Open</div>
+ <div title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i class="icon-copy"></i> {{t common.copy}}</div>
+ <div title="Open in New Window" {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i class="icon-external-link"></i> {{t common.open}}</div>
</div>
</div>
<div class="task-detail-log-info">
Modified: incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/step8_view.js Wed Feb 6 00:55:50 2013
@@ -68,6 +68,10 @@ 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(),
+
controllerBinding: 'App.router.wizardStep8Controller',
ajaxQueueLength: function() {
Modified: incubator/ambari/trunk/ambari-web/app/views/wizard/step9_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/step9_view.js?rev=1442820&r1=1442819&r2=1442820&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/step9_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/step9_view.js Wed Feb 6 00:55:50 2013
@@ -38,6 +38,10 @@ App.WizardStep9View = Em.View.extend({
return barWidth;
}.property('controller.progress'),
+ progressMessage: function() {
+ return Em.I18n.t('installer.step9.overallProgress').format(this.get('controller.progress'));
+ }.property('controller.progress'),
+
onStatus:function () {
if (this.get('controller.status') === 'info') {
this.set('resultMsg', '');