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/20 23:23:57 UTC
svn commit: r1448442 - in /incubator/ambari/trunk: ./ ambari-web/app/
ambari-web/app/templates/main/ ambari-web/app/views/
ambari-web/app/views/common/ ambari-web/app/views/main/
ambari-web/app/views/main/admin/advanced/ ambari-web/app/views/main/admin...
Author: yusaku
Date: Wed Feb 20 22:23:56 2013
New Revision: 1448442
URL: http://svn.apache.org/r1448442
Log:
AMBARI-1458. Externalize strings from views to messages.js. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/router.js
incubator/ambari/trunk/ambari-web/app/templates/main/host.hbs
incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js
incubator/ambari/trunk/ambari-web/app/views/loading.js
incubator/ambari/trunk/ambari-web/app/views/main/admin/advanced/password.js
incubator/ambari/trunk/ambari-web/app/views/main/admin/user/create.js
incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js
incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/hdfs.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/mapreduce.js
incubator/ambari/trunk/ambari-web/app/views/main/host.js
incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/cpu.js
incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js
incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/load.js
incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js
incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/network.js
incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/processes.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/io.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js
incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js
incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js
incubator/ambari/trunk/ambari-web/app/views/wizard/step6_view.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 20 22:23:56 2013
@@ -43,6 +43,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMABRI-1458. Externalize strings from views to messages.js. (yusaku)
+
AMBARI-1437. Update stack version. (yusaku)
AMBARI-1429. Update API docs. (jspeidel)
Modified: incubator/ambari/trunk/ambari-web/app/router.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/router.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/router.js (original)
+++ incubator/ambari/trunk/ambari-web/app/router.js Wed Feb 20 22:23:56 2013
@@ -192,7 +192,7 @@ App.Router = Em.Router.extend({
router.transitionTo(router.getSection());
postLogin(true);
} else {
- controller.set('errorMessage', "Your administrator has not set up a Hadoop cluster yet.");
+ controller.set('errorMessage', Em.I18n.t('router.hadoopClusterNotSetUp'));
}
},
error: function (req) {
@@ -337,7 +337,7 @@ App.Router = Em.Router.extend({
},
connectOutlets: function (router, context) {
- $('title').text('Ambari');
+ $('title').text(Em.I18n.t('app.name'));
console.log('/login:connectOutlet');
console.log('currentStep is: ' + router.getInstallerCurrentStep());
console.log('authenticated is: ' + router.getAuthenticated());
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/host.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/host.hbs?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/host.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/host.hbs Wed Feb 20 22:23:56 2013
@@ -20,7 +20,7 @@
<div class="box-header row">
<div class="pull-left">
- <span>{{t hosts.table.Search}} </span>{{view Ember.TextField valueBinding="view.globalSearchValue"}}
+ <span>{{t common.search}} </span>{{view Ember.TextField valueBinding="view.globalSearchValue"}}
</div>
{{#if App.isAdmin}}
<div class="button-section pull-right">
Modified: incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/common/filter_view.js Wed Feb 20 22:23:56 2013
@@ -109,7 +109,7 @@ var wrapperView = Ember.View.extend({
*/
var textFieldView = Ember.TextField.extend({
type:'text',
- placeholder: 'Any',
+ placeholder: Em.I18n.t('any'),
valueBinding: "parentView.value"
});
@@ -242,7 +242,7 @@ module.exports = {
config.filterView = selectFieldView.extend({
classNames : [ config.fieldType ]
});
- config.emptyValue = 'Any';
+ config.emptyValue = Em.I18n.t('any');
return wrapperView.extend(config);
},
Modified: incubator/ambari/trunk/ambari-web/app/views/loading.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/loading.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/loading.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/loading.js Wed Feb 20 22:23:56 2013
@@ -20,5 +20,5 @@ var App = require('app');
App.LoadingView = Em.View.extend({
tagName: 'h2',
- template: Ember.Handlebars.compile('Loading...')
+ template: Ember.Handlebars.compile('{{t app.loadingPlaceholder}}')
});
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/views/main/admin/advanced/password.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/admin/advanced/password.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/admin/advanced/password.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/admin/advanced/password.js Wed Feb 20 22:23:56 2013
@@ -20,8 +20,8 @@ var App = require('app');
App.MainAdminAdvancedPasswordView = App.Form.extend({
fieldsOptions:[
- { name:"password", displayName:"Password", displayType:"password", disableRequiredOnExistent:true },
- { name:"passwordRetype", displayName:"Retype Password", displayType:"passwordRetype", disableRequiredOnExistent:true }
+ { name:"password", displayName:Em.I18n.t('form.password'), displayType:"password", disableRequiredOnExistent:true },
+ { name:"passwordRetype", displayName:Em.I18n.t('form.passwordRetype'), displayType:"passwordRetype", disableRequiredOnExistent:true }
],
fields: []
});
\ No newline at end of file
Modified: incubator/ambari/trunk/ambari-web/app/views/main/admin/user/create.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/admin/user/create.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/admin/user/create.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/admin/user/create.js Wed Feb 20 22:23:56 2013
@@ -43,7 +43,7 @@ App.MainAdminUserCreateView = Em.View.ex
App.ModalPopup.show({
header: Em.I18n.t('admin.users.addButton'),
body: Em.I18n.t('admin.users.createError'),
- primary: 'Ok',
+ primary: Em.I18n.t('ok'),
secondary: null,
onPrimary: function() {
this.hide();
@@ -54,7 +54,7 @@ App.MainAdminUserCreateView = Em.View.ex
App.ModalPopup.show({
header: Em.I18n.t('admin.users.addButton'),
body: Em.I18n.t('admin.users.createSuccess'),
- primary: 'Ok',
+ primary: Em.I18n.t('ok'),
secondary: null,
onPrimary: function() {
this.hide();
Modified: incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/admin/user/edit.js Wed Feb 20 22:23:56 2013
@@ -47,7 +47,7 @@ App.MainAdminUserEditView = Em.View.exte
App.ModalPopup.show({
header: Em.I18n.t('admin.users.editButton'),
body: message,
- primary: 'Ok',
+ primary: Em.I18n.t('ok'),
secondary: null,
onPrimary: function() {
this.hide();
Modified: incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/apps_view.js Wed Feb 20 22:23:56 2013
@@ -143,7 +143,7 @@ App.MainAppsView = Em.View.extend({
appSearchThrough: Em.TextField.extend({
classNames: ['input-medium'],
type: 'text',
- placeholder: 'Search'
+ placeholder: Em.I18n.t('common.search')
}),
/**
* Filter-field for App ID.
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js Wed Feb 20 22:23:56 2013
@@ -43,7 +43,7 @@ App.ChartClusterMetricsCPU = App.ChartLi
var seriesData = jsonData.metrics.cpu[name];
if (seriesData) {
var s = this.transformData(seriesData, displayName);
- if ('Idle' == s.name) {
+ if (Em.I18n.t('dashboard.clusterMetrics.cpu.displayNames.idle') == s.name) {
cpu_idle = s;
}
else {
@@ -57,7 +57,7 @@ App.ChartClusterMetricsCPU = App.ChartLi
},
colorForSeries: function (series) {
- if ("Idle" == series.name){
+ if (Em.I18n.t('dashboard.clusterMetrics.cpu.displayNames.idle') == series.name){
return '#CFECEC';
}
return null;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/hdfs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/hdfs.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/hdfs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/hdfs.js Wed Feb 20 22:23:56 2013
@@ -94,7 +94,7 @@ App.MainDashboardServiceHdfsView = App.M
var used = total - remaining;
var percent = total > 0 ? ((used * 100) / total).toFixed(1) : 0;
if (percent == "NaN" || percent < 0) {
- percent = "n/a ";
+ percent = Em.I18n.t('services.service.summary.notAvailable') + " ";
}
return text.format(liveCount, totalCount, percent);
}.property('service.liveDataNodes', 'service.dataNodes', 'service.capacityUsed', 'service.capacityTotal'),
@@ -106,7 +106,7 @@ App.MainDashboardServiceHdfsView = App.M
var used = total - remaining;
var percent = total > 0 ? ((used * 100) / total).toFixed(1) : 0;
if (percent == "NaN" || percent < 0) {
- percent = "n/a ";
+ percent = Em.I18n.t('services.service.summary.notAvailable') + " ";
}
if (used < 0) {
used = 0;
@@ -119,7 +119,7 @@ App.MainDashboardServiceHdfsView = App.M
dataNodeComponent: function () {
return App.HostComponent.find().findProperty('componentName', 'DATANODE');
- }.property('+'),
+ }.property(),
isSafeMode: function () {
var safeMode = this.get('service.safeModeStatus');
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/mapreduce.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/mapreduce.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/mapreduce.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/service/mapreduce.js Wed Feb 20 22:23:56 2013
@@ -111,7 +111,7 @@ App.MainDashboardServiceMapreduceView =
if(liveNodeCount != 0){
var avg = (mapSlots + reduceSlots) / liveNodeCount;
}else{
- avg = "n/a ";
+ avg = Em.I18n.t('services.service.summary.notAvailable') + " ";
}
return this.t('dashboard.services.mapreduce.slotCapacitySummary').format(mapSlots, reduceSlots, avg);
}.property('service.mapSlots', 'service.reduceSlots', 'service.aliveTrackers'),
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host.js Wed Feb 20 22:23:56 2013
@@ -80,7 +80,7 @@ App.MainHostView = Em.View.extend({
});
shortLabels = shortLabels.substr(0, shortLabels.length - 2);
if (labels.length > 2) {
- shortLabels += ' and ' + (labels.length - 2) + ' more';
+ shortLabels += ' ' + Em.I18n.t('and') + ' ' + (labels.length - 2) + ' ' + Em.I18n.t('more');
}
return shortLabels;
}.property('labels'),
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/cpu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/cpu.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/cpu.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/cpu.js Wed Feb 20 22:23:56 2013
@@ -43,29 +43,29 @@ App.ChartHostMetricsCPU = App.ChartLinea
var seriesData = jsonData.metrics.cpu[name];
switch (name) {
case "cpu_wio":
- displayName = "CPU I/O Idle";
+ displayName = Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_wio');
break;
case "cpu_idle":
- displayName = "CPU Idle";
+ displayName = Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_idle');
break;
case "cpu_nice":
- displayName = "CPU Nice";
+ displayName = Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_nice');
break;
case "cpu_aidle":
- displayName = "CPU Boot Idle";
+ displayName = Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_aidle');
break;
case "cpu_system":
- displayName = "CPU System";
+ displayName = Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_system');
break;
case "cpu_user":
- displayName = "CPU User";
+ displayName = Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_user');
break;
default:
break;
}
if (seriesData) {
var s = this.transformData(seriesData, displayName);
- if ('CPU Idle' == s.name) {
+ if (Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_idle') == s.name) {
cpu_idle = s;
}
else {
@@ -79,7 +79,7 @@ App.ChartHostMetricsCPU = App.ChartLinea
},
colorForSeries: function (series) {
- if ("CPU Idle" == series.name) {
+ if (Em.I18n.t('hosts.host.metrics.cpu.displayNames.cpu_idle') == series.name) {
return '#CFECEC';
}
return null;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/disk.js Wed Feb 20 22:23:56 2013
@@ -46,10 +46,10 @@ App.ChartHostMetricsDisk = App.ChartLine
var seriesData = jsonData.metrics.disk[name];
switch (name) {
case "disk_total":
- displayName = "Total";
+ displayName = Em.I18n.t('hosts.host.metrics.disk.displayNames.disk_total');
break;
case "disk_free":
- displayName = "Available";
+ displayName = Em.I18n.t('hosts.host.metrics.disk.displayNames.disk_free');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/load.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/load.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/load.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/load.js Wed Feb 20 22:23:56 2013
@@ -41,13 +41,13 @@ App.ChartHostMetricsLoad = App.ChartLine
var seriesData = jsonData.metrics.load[name];
switch (name) {
case "load_fifteen":
- displayName = "15 Minute Load";
+ displayName = Em.I18n.t('hosts.host.metrics.load.displayNames.load_fifteen');
break;
case "load_one":
- displayName = "1 Minute Load";
+ displayName = Em.I18n.t('hosts.host.metrics.load.displayNames.load_one');
break;
case "load_five":
- displayName = "5 Minute Load";
+ displayName = Em.I18n.t('hosts.host.metrics.load.displayNames.load_five');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/memory.js Wed Feb 20 22:23:56 2013
@@ -43,19 +43,19 @@ App.ChartHostMetricsMemory = App.ChartLi
var seriesData = jsonData.metrics.memory[name];
switch (name) {
case "mem_shared":
- displayName = "Shared";
+ displayName = Em.I18n.t('hosts.host.metrics.memory.displayNames.mem_shared');
break;
case "swap_free":
- displayName = "Swap";
+ displayName = Em.I18n.t('hosts.host.metrics.memory.displayNames.swap_free');
break;
case "mem_buffers":
- displayName = "Buffers";
+ displayName = Em.I18n.t('hosts.host.metrics.memory.displayNames.mem_buffers');
break;
case "mem_free":
- displayName = "Free";
+ displayName = Em.I18n.t('hosts.host.metrics.memory.displayNames.mem_free');
break;
case "mem_cached":
- displayName = "Cached";
+ displayName = Em.I18n.t('hosts.host.metrics.memory.displayNames.mem_cached');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/network.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/network.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/network.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/network.js Wed Feb 20 22:23:56 2013
@@ -42,16 +42,16 @@ App.ChartHostMetricsNetwork = App.ChartL
var seriesData = jsonData.metrics.network[name];
switch (name) {
case "pkts_out":
- displayName = "Packets Out";
+ displayName = Em.I18n.t('hosts.host.metrics.network.displayNames.pkts_out');
break;
case "bytes_in":
- displayName = "Bytes In";
+ displayName = Em.I18n.t('hosts.host.metrics.network.displayNames.bytes_in');
break;
case "bytes_out":
- displayName = "Bytes Out";
+ displayName = Em.I18n.t('hosts.host.metrics.network.displayNames.bytes_out');
break;
case "pkts_in":
- displayName = "Packets In";
+ displayName = Em.I18n.t('hosts.host.metrics.network.displayNames.pkts_in');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/processes.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/processes.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/processes.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/metrics/processes.js Wed Feb 20 22:23:56 2013
@@ -41,10 +41,10 @@ App.ChartHostMetricsProcesses = App.Char
var seriesData = jsonData.metrics.process[name];
switch (name) {
case "proc_total":
- displayName = "Total Processes";
+ displayName = Em.I18n.t('hosts.host.metrics.processes.displayNames.proc_total');
break;
case "proc_run":
- displayName = "Processes Run";
+ displayName = Em.I18n.t('hosts.host.metrics.processes.displayNames.proc_run');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js Wed Feb 20 22:23:56 2013
@@ -40,7 +40,7 @@ App.ChartServiceMetricsHBASE_ClusterRequ
var seriesData = jsonData.metrics.hbase.master[name];
switch (name) {
case "cluster_requests":
- displayName = "Request Count";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.clusterRequests.displayNames.requestCount');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js Wed Feb 20 22:23:56 2013
@@ -42,7 +42,7 @@ App.ChartServiceMetricsHBASE_HlogSplitSi
var seriesData = jsonData.metrics.hbase.master[name];
switch (name) {
case "splitSize_avg_time":
- displayName = "Split Size";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.hlogSplitSize.displayNames.splitSize');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js Wed Feb 20 22:23:56 2013
@@ -42,7 +42,7 @@ App.ChartServiceMetricsHBASE_HlogSplitTi
var seriesData = jsonData.metrics.hbase.master[name];
switch (name) {
case "splitTime_avg_time":
- displayName = "Split Time";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.hlogSplitTime.displayNames.splitTime');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js Wed Feb 20 22:23:56 2013
@@ -41,10 +41,10 @@ App.ChartServiceMetricsHBASE_RegionServe
var seriesData = jsonData.metrics.hbase.regionserver[name];
switch (name) {
case "compactionQueueSize":
- displayName = "Compaction Queue Size";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.regionServerQueueSize.displayNames.compactionQueueSize');
break;
case "flushQueueSize":
- displayName = "Flush Queue Size";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.regionServerQueueSize.displayNames.flushQueueSize');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js Wed Feb 20 22:23:56 2013
@@ -41,7 +41,7 @@ App.ChartServiceMetricsHBASE_RegionServe
var seriesData = jsonData.metrics.hbase.regionserver[name];
switch (name) {
case "regions":
- displayName = "Regions";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.regionServerRegions.displayNames.regions');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js Wed Feb 20 22:23:56 2013
@@ -41,10 +41,10 @@ App.ChartServiceMetricsHBASE_RegionServe
var seriesData = jsonData.metrics.hbase.regionserver[name];
switch (name) {
case "writeRequestsCount":
- displayName = "Write Requests";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.regionServerRequests.displayNames.writeRequests');
break;
case "readRequestsCount":
- displayName = "Read Requests";
+ displayName = Em.I18n.t('services.service.info.metrics.hbase.regionServerRequests.displayNames.readRequests');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js Wed Feb 20 22:23:56 2013
@@ -41,10 +41,10 @@ App.ChartServiceMetricsHDFS_BlockStatus
var seriesData = jsonData.metrics.dfs.FSNamesystem[name];
switch (name) {
case "PendingReplicationBlocks":
- displayName = "Pending Replication Blocks";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.blockStatus.displayNames.pendingReplicationBlocks');
break;
case "UnderReplicatedBlocks":
- displayName = "Under Replicated Blocks";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.blockStatus.displayNames.underReplicatedBlocks');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js Wed Feb 20 22:23:56 2013
@@ -41,13 +41,13 @@ App.ChartServiceMetricsHDFS_FileOperatio
var seriesData = jsonData.metrics.dfs.namenode[name];
switch (name) {
case "FileInfoOps":
- displayName = "File Information Operations";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.fileOperations.displayNames.fileInformationOperations');
break;
case "DeleteFileOps":
- displayName = "Delete File Operations";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.fileOperations.displayNames.deleteFileOperations');
break;
case "CreateFileOps":
- displayName = "Create File Operations";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.fileOperations.displayNames.createFileOperations');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js Wed Feb 20 22:23:56 2013
@@ -42,7 +42,7 @@ App.ChartServiceMetricsHDFS_GC = App.Cha
var seriesData = jsonData.metrics.jvm[name];
switch (name) {
case "gcTimeMillis":
- displayName = "Time";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.gc.displayNames.gcTimeMillis');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/io.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/io.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/io.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/io.js Wed Feb 20 22:23:56 2013
@@ -42,10 +42,10 @@ App.ChartServiceMetricsHDFS_IO = App.Cha
var seriesData = jsonData.metrics.dfs.datanode[name];
switch (name) {
case "bytes_written":
- displayName = "Bytes Written";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.io.displayNames.bytesWritten');
break;
case "bytes_read":
- displayName = "Bytes Read";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.io.displayNames.bytesRead');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js Wed Feb 20 22:23:56 2013
@@ -43,16 +43,16 @@ App.ChartServiceMetricsHDFS_JVMHeap = Ap
var seriesData = jsonData.metrics.jvm[name];
switch (name) {
case "memHeapCommittedM":
- displayName = "Heap Memory Committed";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmHeap.displayNames.memHeapCommittedM');
break;
case "memNonHeapUsedM":
- displayName = "Non Heap Memory Used";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmHeap.displayNames.memNonHeapUsedM');
break;
case "memHeapUsedM":
- displayName = "Heap Memory Used";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmHeap.displayNames.memHeapUsedM');
break;
case "memNonHeapCommittedM":
- displayName = "Non Heap Memory Committed";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmHeap.displayNames.memNonHeapCommittedM');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js Wed Feb 20 22:23:56 2013
@@ -41,16 +41,16 @@ App.ChartServiceMetricsHDFS_JVMThreads =
var seriesData = jsonData.metrics.jvm[name];
switch (name) {
case "threadsBlocked":
- displayName = "Threads Blocked";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmThreads.displayNames.threadsBlocked');
break;
case "threadsWaiting":
- displayName = "Threads Waiting";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmThreads.displayNames.threadsWaiting');
break;
case "threadsTimedWaiting":
- displayName = "Threads Timed Waiting";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmThreads.displayNames.threadsTimedWaiting');
break;
case "threadsRunnable":
- displayName = "Threads Runnable";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.jvmThreads.displayNames.threadsRunnable');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js Wed Feb 20 22:23:56 2013
@@ -41,7 +41,7 @@ App.ChartServiceMetricsHDFS_RPC = App.Ch
var seriesData = jsonData.metrics.rpc[name];
switch (name) {
case "RpcQueueTime_avg_time":
- displayName = "Queue Average Wait Time";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.rpc.displayNames.rpcQueueTimeAvgTime');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js Wed Feb 20 22:23:56 2013
@@ -43,13 +43,13 @@ App.ChartServiceMetricsHDFS_SpaceUtiliza
var seriesData = jsonData.metrics.dfs.FSNamesystem[name];
switch (name) {
case "CapacityRemainingGB":
- displayName = "Capacity Remaining";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityRemainingGB');
break;
case "CapacityUsedGB":
- displayName = "Capacity Used";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityUsedGB');
break;
case "CapacityTotalGB":
- displayName = "Capacity Total";
+ displayName = Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization.displayNames.capacityTotalGB');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js Wed Feb 20 22:23:56 2013
@@ -41,7 +41,7 @@ App.ChartServiceMetricsMapReduce_GC = Ap
var seriesData = jsonData.metrics.jvm[name];
switch (name) {
case "gcTimeMillis":
- displayName = "Time";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.gc.displayNames.gcTimeMillis');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js Wed Feb 20 22:23:56 2013
@@ -41,19 +41,19 @@ App.ChartServiceMetricsMapReduce_JobsSta
var seriesData = jsonData.metrics.mapred.jobtracker[name];
switch (name) {
case "jobs_running":
- displayName = "Running";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsRunning');
break;
case "jobs_failed":
- displayName = "Failed";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsFailed');
break;
case "jobs_completed":
- displayName = "Succeeded";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsCompleted');
break;
case "jobs_preparing":
- displayName = "Preparing";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsPreparing');
break;
case "jobs_submitted":
- displayName = "Submitted";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus.displayNames.jobsSubmitted');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js Wed Feb 20 22:23:56 2013
@@ -43,16 +43,16 @@ App.ChartServiceMetricsMapReduce_JVMHeap
var seriesData = jsonData.metrics.jvm[name];
switch (name) {
case "memHeapCommittedM":
- displayName = "Heap Memory Committed";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapCommittedM');
break;
case "memNonHeapUsedM":
- displayName = "Non Heap Memory Used";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapUsedM');
break;
case "memHeapUsedM":
- displayName = "Heap Memory Used";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memHeapUsedM');
break;
case "memNonHeapCommittedM":
- displayName = "Non Heap Memory Committed";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap.displayNames.memNonHeapCommittedM');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js Wed Feb 20 22:23:56 2013
@@ -41,16 +41,16 @@ App.ChartServiceMetricsMapReduce_JVMThre
var seriesData = jsonData.metrics.jvm[name];
switch (name) {
case "threadsBlocked":
- displayName = "Threads Blocked";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsBlocked');
break;
case "threadsWaiting":
- displayName = "Threads Waiting";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsWaiting');
break;
case "threadsTimedWaiting":
- displayName = "Threads Timed Waiting";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsTimedWaiting');
break;
case "threadsRunnable":
- displayName = "Threads Runnable";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads.displayNames.threadsRunnable');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js Wed Feb 20 22:23:56 2013
@@ -41,10 +41,10 @@ App.ChartServiceMetricsMapReduce_MapSlot
var seriesData = jsonData.metrics.mapred.jobtracker[name];
switch (name) {
case "reserved_map_slots":
- displayName = "Map Slots Reserved";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.mapSlots.displayNames.reservedMapSlots');
break;
case "occupied_map_slots":
- displayName = "Map Slots Occupied";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.mapSlots.displayNames.occupiedMapSlots');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js Wed Feb 20 22:23:56 2013
@@ -41,10 +41,10 @@ App.ChartServiceMetricsMapReduce_ReduceS
var seriesData = jsonData.metrics.mapred.jobtracker[name];
switch (name) {
case "reserved_reduce_slots":
- displayName = "Reduce Slots Reserved";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.reduceSlots.displayNames.reservedReduceSlots');
break;
case "occupied_reduce_slots":
- displayName = "Reduce Slots Occupied";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.reduceSlots.displayNames.occupiedReduceSlots');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js Wed Feb 20 22:23:56 2013
@@ -41,7 +41,7 @@ App.ChartServiceMetricsMapReduce_RPC = A
var seriesData = jsonData.metrics.rpc[name];
switch (name) {
case "RpcQueueTime_avg_time":
- displayName = "Queue Average Wait Time";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.rpc.displayNames.RpcQueueTimeAvgTime');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js Wed Feb 20 22:23:56 2013
@@ -41,16 +41,16 @@ App.ChartServiceMetricsMapReduce_TasksRu
var seriesData = jsonData.metrics.mapred.jobtracker[name];
switch (name) {
case "running_maps":
- displayName = "Running Map Tasks";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningMaps');
break;
case "running_reduces":
- displayName = "Running Reduce Tasks";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.runningReduces');
break;
case "waiting_maps":
- displayName = "Waiting Map Tasks";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingMaps');
break;
case "waiting_reduces":
- displayName = "Waiting Reduce Tasks";
+ displayName = Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting.displayNames.waitingReduces');
break;
default:
break;
Modified: incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js Wed Feb 20 22:23:56 2013
@@ -97,11 +97,12 @@ App.ServiceConfigPasswordField = Ember.T
type: 'password',
valueBinding: 'serviceConfig.value',
classNames: [ 'span3' ],
- placeholder: 'Type password',
+ placeholder: Em.I18n.t('form.item.placeholders.typePassword'),
- template: Ember.Handlebars.compile('{{view view.retypePasswordView placeholder="Retype password"}}'),
+ template: Ember.Handlebars.compile('{{view view.retypePasswordView}}'),
retypePasswordView: Ember.TextField.extend({
+ placeholder: Em.I18n.t('form.passwordRetype'),
type: 'password',
classNames: [ 'span3', 'retyped-password' ],
valueBinding: 'parentView.serviceConfig.retypedPassword'
Modified: incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js Wed Feb 20 22:23:56 2013
@@ -87,7 +87,7 @@ App.WizardStep2View = Em.View.extend({
manualInstallPopup: function(){
if(!this.get('controller.content.installOptions.useSsh')){
App.ModalPopup.show({
- header: "Warning",
+ header: Em.I18n.t('common.warning'),
body: Em.I18n.t('installer.step2.manualInstall.info'),
encodeBody: false,
onPrimary: function () {
Modified: incubator/ambari/trunk/ambari-web/app/views/wizard/step6_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/step6_view.js?rev=1448442&r1=1448441&r2=1448442&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/step6_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/step6_view.js Wed Feb 20 22:23:56 2013
@@ -44,7 +44,7 @@ App.WizardStep6View = Em.View.extend({
label = label + ',';
}
} else {
- label = label + ' and ' + _client.display_name + '.';
+ label = label + ' ' + Em.I18n.t('and') + ' ' + _client.display_name + '.';
}
}, this);
this.set('label', label);