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/02 03:27:28 UTC
svn commit: r1441688 - in /incubator/ambari/trunk: ./ ambari-web/app/
ambari-web/app/views/main/
ambari-web/app/views/main/dashboard/cluster_metrics/
ambari-web/app/views/main/host/ ambari-web/app/views/main/host/metrics/
ambari-web/app/views/main/serv...
Author: yusaku
Date: Sat Feb 2 02:27:27 2013
New Revision: 1441688
URL: http://svn.apache.org/viewvc?rev=1441688&view=rev
Log:
AMBARI-1336. Externalize text to messages.js. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/messages.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/load.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/network.js
incubator/ambari/trunk/ambari-web/app/views/main/host/details.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/menu.js
incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.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/main/service/info/summary.js
incubator/ambari/trunk/ambari-web/app/views/wizard/controls_view.js
incubator/ambari/trunk/ambari-web/app/views/wizard/step6_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=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Feb 2 02:27:27 2013
@@ -38,6 +38,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1336. Externalize text to messages.js. (yusaku)
+
AMBARI-1334. Show hosts that have failed install tasks as "red" to allow the user
to easily identify source of failure. (yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Sat Feb 2 02:27:27 2013
@@ -58,6 +58,15 @@ Em.I18n.translations = {
'installer.header':'Cluster Install Wizard',
'installer.navigation.warning.header':'Navigation Warning',
+
+ 'installer.controls.serviceConfigPopover.title':'{0}<br><small>{1}</small>',
+ 'installer.controls.serviceConfigMultipleHosts.other':'1 other',
+ 'installer.controls.serviceConfigMultipleHosts.others':'{0} others',
+ 'installer.controls.serviceConfigMasterHosts.header':'{0} Hosts',
+ 'installer.controls.addSlaveComponentGroupButton.title':'Add a {0} Group',
+ 'installer.controls.addSlaveComponentGroupButton.content':'If you need different settings on certain {0}s, you can add a {1} group.<br>All {2}s within the same group will have the same set of settings. You can create multiple groups.',
+ 'installer.controls.slaveComponentChangeGroupName.error':'group with this name already exist',
+
'installer.step1.header':'Welcome',
'installer.step1.body.header':'Welcome to Apache Ambari!',
'installer.step1.body':'Ambari makes it easy to install, manage, and monitor Hadoop clusters.<br>' +
@@ -147,6 +156,7 @@ Em.I18n.translations = {
'installer.step6.body':'Assign slave and client components to hosts you want to run them on.<br/>Hosts that are assigned master components are shown with <i class=icon-asterisks>✵</i>. <br/>"Client" will install ',
'installer.step6.error.mustSelectOne':'You must assign at least one host to each.',
'installer.step6.error.mustSelectOneForHost':'You must assign at least one slave/client component to each.',
+ 'installer.step6.wizardStep6Host.title':'master components hosted on {0}',
'installer.step7.header':'Customize Services',
'installer.step7.body':'We have come up with recommended configurations for the services you selected. Customize them as you see fit.',
@@ -165,6 +175,13 @@ Em.I18n.translations = {
'installer.step9.host.status.failed':'Failures encountered',
'installer.step9.host.status.nothingToInstall':'Waiting (Nothing to install)',
'installer.step9.hostLog.popup.header':'Tasks. executed on ',
+ 'installer.step9.hostLog.popup.categories.all':'All',
+ 'installer.step9.hostLog.popup.categories.pending':'Queued / Pending',
+ 'installer.step9.hostLog.popup.categories.in_progress':'In Progress',
+ 'installer.step9.hostLog.popup.categories.failed':'Failed',
+ 'installer.step9.hostLog.popup.categories.completed':'Success',
+ 'installer.step9.hostLog.popup.categories.aborted':'Cancelled',
+ 'installer.step9.hostLog.popup.categories.timedout':'Timed Out',
'installer.step10.header':'Summary',
'installer.step10.body':'Here is the summary of the install process.',
@@ -243,6 +260,7 @@ Em.I18n.translations = {
'question.sure':'Are you sure?',
'yes':'Yes',
'no':'No',
+ 'and':'and',
'services.service.start':'Start',
'services.service.stop':'Stop',
@@ -292,8 +310,49 @@ Em.I18n.translations = {
'services.service.summary.notRunning':'Not Running',
'services.service.summary.notAvailable':'n/a',
+ 'services.service.info.metrics.hbase.clusterRequests':'Cluster Requests',
+ 'services.service.info.metrics.hbase.hlogSplitSize':'HLog Split Size',
+ 'services.service.info.metrics.hbase.hlogSplitTime':'HLog Split Time',
+ 'services.service.info.metrics.hbase.regionServerQueueSize':'RegionServer Queue Size',
+ 'services.service.info.metrics.hbase.regionServerRegions':'RegionServer Regions',
+ 'services.service.info.metrics.hbase.regionServerRequests':'RegionServer Requests',
+
+ 'services.service.info.metrics.hdfs.blockStatus':'Block Status',
+ 'services.service.info.metrics.hdfs.fileOperations':'File Operations',
+ 'services.service.info.metrics.hdfs.gc':'Garbage Collection',
+ 'services.service.info.metrics.hdfs.io':'HDFS I/O',
+ 'services.service.info.metrics.hdfs.jvmHeap':'JVM Memory Status',
+ 'services.service.info.metrics.hdfs.jvmThreads':'JVM Thread Status',
+ 'services.service.info.metrics.hdfs.rpc':'RPC',
+ 'services.service.info.metrics.hdfs.spaceUtilization':'Total Space Utilization',
+
+ 'services.service.info.metrics.mapreduce.gc':'Garbage Collection',
+ 'services.service.info.metrics.mapreduce.jobsStatus':'Jobs Status',
+ 'services.service.info.metrics.mapreduce.jvmHeap':'JVM Memory Status',
+ 'services.service.info.metrics.mapreduce.jvmThreads':'JVM Thread Status',
+ 'services.service.info.metrics.mapreduce.mapSlots':'Map Slots Utilization',
+ 'services.service.info.metrics.mapreduce.reduceSlots':'Reduce Slots Utilization',
+ 'services.service.info.metrics.mapreduce.rpc':'RPC',
+ 'services.service.info.metrics.mapreduce.tasksRunningWaiting':'Tasks (Running/Waiting)',
+
+ 'services.service.info.menu.summary':'Summary',
+ 'services.service.info.menu.configs':'Configs',
+ '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.add.header':'Add Service Wizard',
+
+ 'hosts.host.metrics.cpu':'CPU Usage',
+ 'hosts.host.metrics.disk':'Disk Usage',
+ 'hosts.host.metrics.load':'Load',
+ 'hosts.host.metrics.memory':'Memory Usage',
+ 'hosts.host.metrics.network':'Network Usage',
+ 'hosts.host.metrics.processes':'Processes',
+
+ 'hosts.host.details.deleteHost':'Delete Host',
+
'hosts.host.start.popup.header':'Confirmation',
'hosts.host.stop.popup.header':'Confirmation',
'hosts.host.start.popup.body':'Are you sure?',
@@ -339,6 +398,12 @@ Em.I18n.translations = {
'metric.more.network':'Network',
'metric.more.process':'Process',
+ 'dashboard.clusterMetrics.cpu':'CPU Usage',
+ 'dashboard.clusterMetrics.load':'Cluster Load',
+ 'dashboard.clusterMetrics.memory':'Memory Usage',
+ 'dashboard.clusterMetrics.network':'Network Usage',
+
+
'dashboard.services':'Services',
'dashboard.services.hosts':'Hosts',
'dashboard.services.uptime':'{0}',
@@ -446,6 +511,13 @@ Em.I18n.translations = {
'apps.isRunning.popup.title':'Is running',
'apps.isRunning.popup.content':'Job is running now',
- 'nagios.alerts.unavailable':'Alerts Unavailable'
+ 'nagios.alerts.unavailable':'Alerts Unavailable',
+
+ 'menu.item.dashboard':'Dashboard',
+ 'menu.item.heatmaps':'Heatmaps',
+ 'menu.item.services':'Services',
+ 'menu.item.hosts':'Hosts',
+ 'menu.item.jobs':'Jobs',
+ 'menu.item.admin':'Admin'
};
\ No newline at end of file
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -36,7 +36,7 @@ App.ChartClusterMetricsCPU = App.ChartLi
);
}.property('clusterName').volatile(),
- title: "CPU Usage",
+ title: Em.I18n.t('dashboard.clusterMetrics.cpu'),
yAxisFormatter: App.ChartLinearTimeView.PercentageFormatter,
transformToSeries: function (jsonData) {
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/load.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/load.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/load.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/load.js Sat Feb 2 02:27:27 2013
@@ -38,7 +38,7 @@ App.ChartClusterMetricsLoad = App.ChartL
}.property('clusterName').volatile(),
renderer: 'line',
- title: "Cluster Load",
+ title: Em.I18n.t('dashboard.clusterMetrics.load'),
transformToSeries: function(jsonData){
var seriesArray = [];
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js Sat Feb 2 02:27:27 2013
@@ -36,7 +36,7 @@ App.ChartClusterMetricsMemory = App.Char
);
}.property('clusterName').volatile(),
- title: "Memory Usage",
+ title: Em.I18n.t('dashboard.clusterMetrics.memory'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
transformToSeries: function (jsonData) {
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/network.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/network.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/network.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/cluster_metrics/network.js Sat Feb 2 02:27:27 2013
@@ -37,7 +37,7 @@ App.ChartClusterMetricsNetwork = App.Cha
);
}.property('clusterName').volatile(),
- title: "Network Usage",
+ title: Em.I18n.t('dashboard.clusterMetrics.network'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host/details.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host/details.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host/details.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host/details.js Sat Feb 2 02:27:27 2013
@@ -27,7 +27,7 @@ App.MainHostDetailsView = Em.View.extend
}.property('App.router.mainHostDetailsController.content'),
maintenance: function(){
- var options = [{action: 'deleteHost', 'label': 'Delete Host'}];
+ var options = [{action: 'deleteHost', 'label': this.t('hosts.host.details.deleteHost')}];
return options;
}.property('controller.content')
});
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartHostMetricsCPU = App.ChartLinearTimeView.extend({
id: "host-metrics-cpu",
- title: "CPU Usage",
+ title: Em.I18n.t('hosts.host.metrics.cpu'),
yAxisFormatter: App.ChartLinearTimeView.PercentageFormatter,
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartHostMetricsDisk = App.ChartLinearTimeView.extend({
id: "host-metrics-disk",
- title: "Disk Usage",
+ title: Em.I18n.t('hosts.host.metrics.disk'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartHostMetricsLoad = App.ChartLinearTimeView.extend({
id: "host-metrics-load",
- title: "Load",
+ title: Em.I18n.t('hosts.host.metrics.load'),
renderer: 'line',
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartHostMetricsMemory = App.ChartLinearTimeView.extend({
id: "host-metrics-memory",
- title: "Memory Usage",
+ title: Em.I18n.t('hosts.host.metrics.memory'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartHostMetricsNetwork = App.ChartLinearTimeView.extend({
id: "host-metrics-network",
- title: "Network Usage",
+ title: Em.I18n.t('hosts.host.metrics.network'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartHostMetricsProcesses = App.ChartLinearTimeView.extend({
id: "host-metrics-processes",
- title: "Processes",
+ title: Em.I18n.t('hosts.host.metrics.processes'),
renderer: 'line',
url: function () {
return App.formatUrl(
Modified: incubator/ambari/trunk/ambari-web/app/views/main/menu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/menu.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/menu.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/menu.js Sat Feb 2 02:27:27 2013
@@ -27,14 +27,14 @@ App.MainMenuView = Em.CollectionView.ext
classNames:['nav'],
content:function(){
var result = [
- { label:'Dashboard', routing:'dashboard', active:'active'},
- { label:'Heatmaps', routing:'charts'},
- { label:'Services', routing:'services'},
- { label:'Hosts', routing:'hosts'},
- { label:'Jobs', routing:'apps'}
+ { label:Em.I18n.t('menu.item.dashboard'), routing:'dashboard', active:'active'},
+ { label:Em.I18n.t('menu.item.heatmaps'), routing:'charts'},
+ { label:Em.I18n.t('menu.item.services'), routing:'services'},
+ { label:Em.I18n.t('menu.item.hosts'), routing:'hosts'},
+ { label:Em.I18n.t('menu.item.jobs'), routing:'apps'}
];
- if(App.db.getUser().admin) result.push({ label:'Admin', routing:'admin'});
+ if(App.db.getUser().admin) result.push({ label:Em.I18n.t('menu.item.admin'), routing:'admin'});
return result;
}.property(),
/**
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/menu.js Sat Feb 2 02:27:27 2013
@@ -23,10 +23,10 @@ App.MainServiceInfoMenuView = Em.Collect
classNames: ["nav", "nav-tabs"],
content:function(){
var menuItems = [
- { label:'Summary', routing:'summary', active:"active"}
+ { label: Em.I18n.t('services.service.info.menu.summary'), routing:'summary', active:"active"}
//{ label:'Audit', routing:'audit'}
];
- if(this.get('configTab')) menuItems.push({ label:'Configs', routing:'configs'});
+ if(this.get('configTab')) menuItems.push({ label: Em.I18n.t('services.service.info.menu.configs'), routing:'configs'});
return menuItems;
}.property(),
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHBASE_ClusterRequests = App.ChartLinearTimeView.extend({
id: "service-metrics-hbase-cluster-requests",
- title: "Cluster Requests",
+ title: Em.I18n.t('services.service.info.metrics.hbase.clusterRequests'),
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHBASE_HlogSplitSize = App.ChartLinearTimeView.extend({
id: "service-metrics-hbase-hlog-split-size",
- title: "HLog Split Size",
+ title: Em.I18n.t('services.service.info.metrics.hbase.hlogSplitSize'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHBASE_HlogSplitTime = App.ChartLinearTimeView.extend({
id: "service-metrics-hbase-hlog-split-time",
- title: "HLog Split Time",
+ title: Em.I18n.t('services.service.info.metrics.hbase.hlogSplitTime'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHBASE_RegionServerQueueSize = App.ChartLinearTimeView.extend({
id: "service-metrics-hbase-regionserver-queuesize",
- title: "RegionServer Queue Size",
+ title: Em.I18n.t('services.service.info.metrics.hbase.regionServerQueueSize'),
renderer: 'line',
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHBASE_RegionServerRegions = App.ChartLinearTimeView.extend({
id: "service-metrics-hbase-regionserver-regions",
- title: "RegionServer Regions",
+ title: Em.I18n.t('services.service.info.metrics.hbase.regionServerRegions'),
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHBASE_RegionServerReadWriteRequests = App.ChartLinearTimeView.extend({
id: "service-metrics-hbase-regionserver-rw-requests",
- title: "RegionServer Requests",
+ title: Em.I18n.t('services.service.info.metrics.hbase.regionServerRequests'),
renderer: 'line',
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_BlockStatus = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-block-status",
- title: "Block Status",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.blockStatus'),
renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_FileOperations = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-file-operations",
- title: "File Operations",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.fileOperations'),
renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_GC = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-gc",
- title: "Garbage Collection",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.gc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_IO = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-io",
- title: "HDFS I/O",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.io'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_JVMHeap = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-jvm-heap",
- title: "JVM Memory Status",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.jvmHeap'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_JVMThreads = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-jvm-threads",
- title: "JVM Thread Status",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.jvmThreads'),
renderer: 'line',
url: function () {
var hdfsService = App.HDFSService.find().objectAt(0);
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_RPC = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-rpc",
- title: "RPC",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.rpc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsHDFS_SpaceUtilization = App.ChartLinearTimeView.extend({
id: "service-metrics-hdfs-space-utilization",
- title: "Total Space Utilization",
+ title: Em.I18n.t('services.service.info.metrics.hdfs.spaceUtilization'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_GC = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-gc",
- title: "Garbage Collection",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.gc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_JobsStatus = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jobs-status",
- title: "Jobs Status",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.jobsStatus'),
renderer: 'line',
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_JVMHeap = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jvm-heap",
- title: "JVM Memory Status",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmHeap'),
yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
renderer: 'line',
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_JVMThreads = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-jvm-threads",
- title: "JVM Thread Status",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.jvmThreads'),
renderer: 'line',
url: function () {
var mrService = App.MapReduceService.find().objectAt(0);
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_MapSlots = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-map-slots",
- title: "Map Slots Utilization",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.mapSlots'),
renderer: 'line',
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_ReduceSlots = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-reduce-slots",
- title: "Reduce Slots Utilization",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.reduceSlots'),
renderer: 'line',
url: function () {
return App.formatUrl(
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_RPC = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-rpc",
- title: "RPC",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.rpc'),
yAxisFormatter: App.ChartLinearTimeView.TimeElapsedFormatter,
url: function () {
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -28,7 +28,7 @@ var App = require('app');
*/
App.ChartServiceMetricsMapReduce_TasksRunningWaiting = App.ChartLinearTimeView.extend({
id: "service-metrics-mapreduce-tasks-running-waiting",
- title: "Tasks (Running/Waiting)",
+ title: Em.I18n.t('services.service.info.metrics.mapreduce.tasksRunningWaiting'),
renderer: 'line',
url: function () {
return App.formatUrl(
Modified: incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js?rev=1441688&r1=1441687&r2=1441688&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js Sat Feb 2 02:27:27 2013
@@ -91,7 +91,7 @@ App.MainServiceInfoSummaryView = Em.View
if (servers.length > 2) {
result[1].isAnd = true;
result.push({
- 'host': servers.length - 2 + ' more',
+ 'host': Em.I18n.t('services.service.info.summary.serversHostCount').format(servers.length - 2),
'isComma': false,
'isAnd': false
});
@@ -106,7 +106,7 @@ App.MainServiceInfoSummaryView = Em.View
if (service.get("id") == "GANGLIA") {
var monitors = service.get('hostComponents').filterProperty('isMaster', false);
if (monitors.length) {
- result = monitors.length - 1 ? monitors.length + ' hosts running monitor' : '1 host running monitor';
+ result = monitors.length - 1 ? Em.I18n.t('services.service.info.summary.hostsRunningMonitor').format(monitors.length) : Em.I18n.t('services.service.info.summary.hostRunningMonitor');
}
}
return result;
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -34,7 +34,7 @@ App.ServiceConfigPopoverSupport = Ember.
didInsertElement: function () {
if (this.get('isPopoverEnabled') !== 'false') {
this.$().popover({
- title: this.get('serviceConfig.displayName') + '<br><small>' + this.get('serviceConfig.name') + '</small>',
+ title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(this.get('serviceConfig.displayName'), this.get('serviceConfig.name')),
content: this.get('serviceConfig.description'),
placement: 'right',
trigger: 'hover'
@@ -279,9 +279,9 @@ App.ServiceConfigMultipleHostsDisplay =
otherLength: function () {
var len = this.get('value').length;
if (len > 2) {
- return (len - 1) + ' others';
+ return Em.I18n.t('installer.controls.serviceConfigMultipleHosts.others').format(len - 1);
} else {
- return '1 other';
+ return Em.I18n.t('installer.controls.serviceConfigMultipleHosts.other');
}
}.property('value')
@@ -307,7 +307,7 @@ App.ServiceConfigMasterHostsView = Ember
showHosts: function () {
var serviceConfig = this.get('serviceConfig');
App.ModalPopup.show({
- header: serviceConfig.category + ' Hosts',
+ header: Em.I18n.t('installer.controls.serviceConfigMasterHosts.header').format(serviceConfig.category),
bodyClass: Ember.View.extend({
serviceConfig: serviceConfig,
templateName: require('templates/wizard/master_hosts_popup')
@@ -360,9 +360,8 @@ App.AddSlaveComponentGroupButton = Ember
didInsertElement: function () {
this.$().popover({
- title: 'Add a ' + this.get('slaveComponentName') + ' Group',
- content: 'If you need different settings on certain ' + this.get('slaveComponentName') + 's, you can add a ' + this.get('slaveComponentName') + ' group.<br>' +
- 'All ' + this.get('slaveComponentName') + 's within the same group will have the same set of settings. You can create multiple groups.',
+ title: Em.I18n.t('installer.controls.addSlaveComponentGroupButton.title').format(this.get('slaveComponentName')),
+ content: Em.I18n.t('installer.controls.addSlaveComponentGroupButton.content').format(this.get('slaveComponentName'), this.get('slaveComponentName'), this.get('slaveComponentName')),
placement: 'right',
trigger: 'hover'
});
@@ -453,7 +452,7 @@ App.SlaveComponentChangeGroupNameView =
this.set('error', false);
}.observes('controller.activeGroup'),
errorMessage: function () {
- return this.get('error') ? 'group with this name already exist' : '';
+ return this.get('error') ? Em.I18n.t('installer.controls.slaveComponentChangeGroupName.error') : '';
}.property('error'),
/**
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -64,7 +64,7 @@ App.WizardStep6HostView = Em.View.extend
});
components = components.join(" /\n");
this.$().popover({
- title: 'master components hosted on ' + this.get('host.hostName'),
+ title: Em.I18n.t('installer.step6.wizardStep6Host.title').format(this.get('host.hostName')),
content: components,
placement: 'right',
trigger: 'hover'
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=1441688&r1=1441687&r2=1441688&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 Sat Feb 2 02:27:27 2013
@@ -218,13 +218,13 @@ App.HostStatusView = Em.View.extend({
}.observes('category', 'tasks'),
categories: [
- Ember.Object.create({value: 'all', label: 'All' }),
- Ember.Object.create({value: 'pending', label: 'Queued / Pending'}),
- Ember.Object.create({value: 'in_progress', label: 'In Progress'}),
- Ember.Object.create({value: 'failed', label: 'Failed' }),
- Ember.Object.create({value: 'completed', label: 'Success' }),
- Ember.Object.create({value: 'aborted', label: 'Cancelled' }),
- Ember.Object.create({value: 'timedout', label: 'Timed Out' })
+ Ember.Object.create({value: 'all', label: Em.I18n.t('installer.step9.hostLog.popup.categories.all') }),
+ Ember.Object.create({value: 'pending', label: Em.I18n.t('installer.step9.hostLog.popup.categories.pending')}),
+ Ember.Object.create({value: 'in_progress', label: Em.I18n.t('installer.step9.hostLog.popup.categories.in_progress')}),
+ Ember.Object.create({value: 'failed', label: Em.I18n.t('installer.step9.hostLog.popup.categories.failed') }),
+ Ember.Object.create({value: 'completed', label: Em.I18n.t('installer.step9.hostLog.popup.categories.completed') }),
+ Ember.Object.create({value: 'aborted', label: Em.I18n.t('installer.step9.hostLog.popup.categories.aborted') }),
+ Ember.Object.create({value: 'timedout', label: Em.I18n.t('installer.step9.hostLog.popup.categories.timedout') })
],
category: null,