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/21 00:08:54 UTC
svn commit: r1448461 - in /incubator/ambari/trunk/ambari-web/app:
controllers/ controllers/main/ controllers/main/charts/heatmap_metrics/
controllers/main/host/ controllers/main/service/ controllers/wizard/
views/common/
Author: yusaku
Date: Wed Feb 20 23:08:53 2013
New Revision: 1448461
URL: http://svn.apache.org/r1448461
Log:
AMBARI-1458. Committing missed files. (yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/main.js
incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_bytesread.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_byteswritten.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_gctime.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_memHeapUsed.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_diskspaceused.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_memoryused.js
incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_processrun.js
incubator/ambari/trunk/ambari-web/app/controllers/main/host.js
incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js
incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step10_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main.js Wed Feb 20 23:08:53 2013
@@ -28,7 +28,7 @@ App.MainController = Em.Controller.exten
name = name.length > 13 ? name.substr(0, 10) + "..." : name;
name = name.capitalize();
} else {
- name = 'Loading';
+ name = Em.I18n.t('common.loading');
}
$('title').text('Ambari - ' + name);
}.observes('App.router.clusterController.clusterName'),
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/apps_controller.js Wed Feb 20 23:08:53 2013
@@ -482,15 +482,15 @@ App.MainAppsController = Em.ArrayControl
columnsName: Ember.ArrayController.create({
content: [
- { name: 'App ID', index: 0 },
- { name: 'Name', index: 1 },
- { name: 'Type', index: 2 },
- { name: 'User', index: 3 },
- { name: 'Jobs', index: 4 },
- { name: 'Input', index: 5 },
- { name: 'Output', index: 6 },
- { name: 'Duration', index: 7 },
- { name: 'Run Date', index: 8 }
+ { name: Em.I18n.t('apps.table.column.appId'), index: 0 },
+ { name: Em.I18n.t('common.name'), index: 1 },
+ { name: Em.I18n.t('common.type'), index: 2 },
+ { name: Em.I18n.t('common.user'), index: 3 },
+ { name: Em.I18n.t('apps.avgTable.jobs'), index: 4 },
+ { name: Em.I18n.t('apps.avgTable.input'), index: 5 },
+ { name: Em.I18n.t('apps.avgTable.output'), index: 6 },
+ { name: Em.I18n.t('apps.avgTable.duration'), index: 7 },
+ { name: Em.I18n.t('apps.table.column.runDate'), index: 8 }
]
})
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric.js Wed Feb 20 23:08:53 2013
@@ -168,13 +168,13 @@ App.MainChartHeatmapMetric = Em.Object.e
defs.push(Em.Object.create({
from: NaN,
to: NaN,
- label: "Invalid data",
+ label: Em.I18n.t('charts.heatmap.label.invalidData'),
cssStyle: hatchStyle
}));
defs.push(Em.Object.create({
from: -1,
to: -1,
- label: "Not Applicable",
+ label: Em.I18n.t('charts.heatmap.label.notApplicable'),
cssStyle: "background-color:rgb(200, 200, 200)"
}));
return defs;
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_bytesread.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_bytesread.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_bytesread.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_bytesread.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapDFSBytesReadMetric = App.MainChartHeatmapDFSMetrics.extend({
- name: 'Bytes Read',
+ name: Em.I18n.t('charts.heatmap.metrics.bytesRead'),
maximumValue: 1024, // 1GB
defaultMetric: 'metrics.dfs.datanode.bytes_read',
units: 'MB',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_byteswritten.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_byteswritten.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_byteswritten.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_byteswritten.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapDFSBytesWrittenMetric = App.MainChartHeatmapDFSMetrics.extend({
- name: 'Bytes Written',
+ name: Em.I18n.t('charts.heatmap.metrics.bytesWritten'),
maximumValue: 1024, // 1GB
defaultMetric: 'metrics.dfs.datanode.bytes_written',
units: 'MB',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_gctime.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_gctime.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_gctime.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_gctime.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapDFSGCTimeMillisMetric = App.MainChartHeatmapDFSMetrics.extend({
- name: 'Garbage Collection Time',
+ name: Em.I18n.t('charts.heatmap.metrics.DFSGarbageCollection'),
maximumValue: 10000,
defaultMetric: 'metrics.jvm.gcTimeMillis',
units: ' ms',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_memHeapUsed.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_memHeapUsed.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_memHeapUsed.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_dfs_memHeapUsed.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapDFSMemHeapUsedMetric = App.MainChartHeatmapDFSMetrics.extend({
- name: 'JVM Heap Memory Used',
+ name: Em.I18n.t('charts.heatmap.metrics.DFSMemHeapUsed'),
maximumValue: 512,
defaultMetric: 'metrics.jvm.memHeapUsedM',
units: 'MB',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_diskspaceused.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_diskspaceused.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_diskspaceused.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_diskspaceused.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapDiskSpaceUsedMetric = App.MainChartHeatmapMetric.extend({
- name: 'Disk Space Used %',
+ name: Em.I18n.t('charts.heatmap.metrics.diskSpaceUsed'),
maximumValue: 100,
defaultMetric: 'metrics.disk',
units: '%',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_gctime.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapMapreduceGCTimeMillisMetric = App.MainChartHeatmapMapreduceMetrics.extend({
- name: 'Garbage Collection Time',
+ name: Em.I18n.t('charts.heatmap.metrics.MapReduceGCTime'),
maximumValue: 10000,
defaultMetric: 'metrics.jvm.gcTimeMillis',
units: ' ms',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_mapsRunning.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapMapreduceMapsRunningMetric = App.MainChartHeatmapMapreduceMetrics.extend({
- name: 'Maps Running',
+ name: Em.I18n.t('charts.heatmap.metrics.mapsRunning'),
maximumValue: 100,
defaultMetric: 'metrics.mapred.tasktracker.maps_running',
units: ' maps',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_memHeapUsed.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapMapreduceMemHeapUsedMetric = App.MainChartHeatmapMapreduceMetrics.extend({
- name: 'JVM Heap Memory Used',
+ name: Em.I18n.t('charts.heatmap.metrics.MRMemHeapUsed'),
maximumValue: 512,
defaultMetric: 'metrics.jvm.memHeapUsedM',
units: 'MB',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_mapreduce_reducesRunning.js Wed Feb 20 23:08:53 2013
@@ -21,7 +21,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapMapreduceReducesRunningMetric = App.MainChartHeatmapMapreduceMetrics.extend({
- name: 'Reduces Running',
+ name: Em.I18n.t('charts.heatmap.metrics.reducesRunning'),
maximumValue: 100,
defaultMetric: 'metrics.mapred.tasktracker.reduces_running',
units: ' reduces',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_memoryused.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_memoryused.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_memoryused.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_memoryused.js Wed Feb 20 23:08:53 2013
@@ -30,7 +30,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapMemoryUsedMetric = App.MainChartHeatmapMetric.extend({
- name: 'Memory Used %',
+ name: Em.I18n.t('charts.heatmap.metrics.memoryUsed'),
maximumValue: 100,
defaultMetric: 'metrics.memory',
units: '%',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_processrun.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_processrun.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_processrun.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_processrun.js Wed Feb 20 23:08:53 2013
@@ -30,7 +30,7 @@ var App = require('app');
*
*/
App.MainChartHeatmapProcessRunMetric = App.MainChartHeatmapMetric.extend({
- name: 'Total Running Processes',
+ name: Em.I18n.t('charts.heatmap.metrics.processRun'),
maximumValue: 1,
defaultMetric: 'metrics.process.proc_run',
units: 'Processes',
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/host.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/host.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/host.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/host.js Wed Feb 20 23:08:53 2013
@@ -94,8 +94,8 @@ App.MainHostController = Em.ArrayControl
App.ModalPopup.show({
header:Em.I18n.t('hosts.decommission.popup.header'),
body:Em.I18n.t('hosts.decommission.popup.body'),
- primary:'Yes',
- secondary:'No',
+ primary:Em.I18n.t('yes'),
+ secondary:Em.I18n.t('no'),
onPrimary:function () {
alert('do');
this.hide();
@@ -115,8 +115,8 @@ App.MainHostController = Em.ArrayControl
App.ModalPopup.show({
header:Em.I18n.t('hosts.delete.popup.header'),
body:Em.I18n.t('hosts.delete.popup.body'),
- primary:'Yes',
- secondary:'No',
+ primary:Em.I18n.t('yes'),
+ secondary:Em.I18n.t('no'),
onPrimary:function () {
self.removeHosts();
this.hide();
@@ -146,7 +146,7 @@ App.MainHostController = Em.ArrayControl
templateName: require('templates/main/host/alerts_popup')
}),
- primary: 'Close',
+ primary: Em.I18n.t('common.close'),
onPrimary: function() {
this.hide();
},
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/host/details.js Wed Feb 20 23:08:53 2013
@@ -93,8 +93,8 @@ App.MainHostDetailsController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('hosts.host.start.popup.header'),
body: Em.I18n.t('hosts.host.start.popup.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function() {
var component = event.context;
@@ -150,8 +150,8 @@ App.MainHostDetailsController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('hosts.host.start.popup.header'),
body: Em.I18n.t('hosts.host.start.popup.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function() {
var component = event.context;
@@ -210,8 +210,8 @@ App.MainHostDetailsController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('hosts.host.start.popup.header'),
body: Em.I18n.t('hosts.host.start.popup.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function(){
var component = event.context;
// Only HDFS service as of now
@@ -318,8 +318,8 @@ App.MainHostDetailsController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('hosts.host.start.popup.header'),
body: Em.I18n.t('hosts.host.start.popup.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function(){
var component = event.context;
// Only HDFS service as of now
@@ -375,7 +375,7 @@ App.MainHostDetailsController = Em.Contr
header: Em.I18n.t('hosts.cant.do.popup.header'),
html: true,
body: masterString + workingString,
- primary: "OK",
+ primary: Em.I18n.t('ok'),
secondary: null,
onPrimary: function() {
this.hide();
@@ -391,8 +391,8 @@ App.MainHostDetailsController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('hosts.delete.popup.header'),
body: Em.I18n.t('hosts.delete.popup.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function() {
self.removeHost();
this.hide();
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js Wed Feb 20 23:08:53 2013
@@ -71,8 +71,8 @@ App.MainServiceItemController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('services.service.confirmation.header'),
body: Em.I18n.t('services.service.confirmation.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function () {
self.sendCommandToServer('/services/' + self.get('content.serviceName').toUpperCase(), "PUT", {
ServiceInfo: {
@@ -130,8 +130,8 @@ App.MainServiceItemController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('services.service.confirmation.header'),
body: Em.I18n.t('services.service.confirmation.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function() {
self.sendCommandToServer('/services/' + self.get('content.serviceName').toUpperCase(), "PUT",{
ServiceInfo:{
@@ -183,8 +183,8 @@ App.MainServiceItemController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('services.service.confirmation.header'),
body: Em.I18n.t('services.service.confirmation.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function() {
self.content.set('runRebalancer', true);
App.router.get('backgroundOperationsController').showPopup();
@@ -205,8 +205,8 @@ App.MainServiceItemController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('services.service.confirmation.header'),
body: Em.I18n.t('services.service.confirmation.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function() {
self.content.set('runCompaction', true);
App.router.get('backgroundOperationsController').showPopup();
@@ -227,8 +227,8 @@ App.MainServiceItemController = Em.Contr
App.ModalPopup.show({
header: Em.I18n.t('services.service.confirmation.header'),
body: Em.I18n.t('services.service.confirmation.body'),
- primary: 'Yes',
- secondary: 'No',
+ primary: Em.I18n.t('yes'),
+ secondary: Em.I18n.t('no'),
onPrimary: function() {
var serviceName = self.get('content.serviceName').toUpperCase();
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/slave_component_groups_controller.js Wed Feb 20 23:08:53 2013
@@ -198,7 +198,7 @@ App.SlaveComponentGroupsController = Em.
var componentName = event.context;
var component = this.get('selectedSlaveComponent');
App.ModalPopup.show({
- header: componentName + ' Groups',
+ header: componentName + Em.I18n.t('installer.controls.slaveComponentGroups'),
bodyClass: Ember.View.extend({
controllerBinding: 'App.router.slaveComponentGroupsController',
header: Em.I18n.t('installer.slaveComponentHostsPopup.header').format(this.get('selectedComponentDisplayName')),
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step10_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step10_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step10_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step10_controller.js Wed Feb 20 23:08:53 2013
@@ -57,7 +57,7 @@ App.WizardStep10Controller = Em.Controll
}, this);
slaveHosts = hostObj.mapProperty('hostName').uniq();
var registeredHosts = App.Host.find().mapProperty('hostName').concat(masterHosts.concat(slaveHosts)).uniq();
- var registerHostsStatement = 'The cluster consists of ' + registeredHosts.length + ' hosts';
+ var registerHostsStatement = Em.I18n.t('installer.step10.hostsSummary').format(registeredHosts.length);
var registerHostsObj = Ember.Object.create({
id: 1,
color: 'text-info',
@@ -79,7 +79,7 @@ App.WizardStep10Controller = Em.Controll
var succeededHosts = hostsInfo.filterProperty('status', 'success');
var warnedHosts = hostsInfo.filterProperty('status', 'warning').concat(hostsInfo.filterProperty('status', 'failed'));
if (succeededHosts.length) {
- var successStatement = 'Installed and started services successfully on ' + succeededHosts.length + ' new ' + ((succeededHosts.length > 1) ? 'hosts' : 'host');
+ var successStatement = Em.I18n.t('installer.step10.servicesSummary').format(succeededHosts.length) + ((succeededHosts.length > 1) ? Em.I18n.t('installer.step8.hosts') : Em.I18n.t('installer.step8.host'));
this.get('clusterInfo').findProperty('id', 1).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-success',
@@ -88,7 +88,7 @@ App.WizardStep10Controller = Em.Controll
}
if (warnedHosts.length) {
- var warnStatement = warnedHosts.length + ' warnings';
+ var warnStatement = warnedHosts.length + Em.I18n.t('installer.step10.warnings');
this.get('clusterInfo').findProperty('id', 1).get('status').pushObject(Ember.Object.create({
id: 2,
color: 'text-warning',
@@ -100,14 +100,14 @@ App.WizardStep10Controller = Em.Controll
var clusterState;
console.log("Content.cluster.status is: " + this.get('content.cluster.status'));
if (this.get('content.cluster.status') === 'INSTALL FAILED') {
- clusterState = 'Installing ';
+ clusterState = Em.I18n.t('installer.step10.clusterState.installing');
} else if (this.get('content.cluster.status') === 'START FAILED') {
- clusterState = 'Starting ';
+ clusterState = Em.I18n.t('installer.step10.clusterState.starting');
}
console.log('host value is: ' + JSON.stringify(_host));
var failedTasks = _host.tasks.filterProperty('Tasks.status', 'FAILED');
failedTasks.forEach(function (_task) {
- var taskStatement = clusterState + App.format.role(_task.Tasks.role) + ' failed on ' + _host.name;
+ var taskStatement = clusterState + App.format.role(_task.Tasks.role) + Em.I18n.t('installer.step10.taskStatus.failed') + _host.name;
this.get('clusterInfo').findProperty('id', 1).get('status').findProperty('id', 2).get('statements').pushObject(Ember.Object.create({
status: 'failed',
color: 'text-info',
@@ -117,7 +117,7 @@ App.WizardStep10Controller = Em.Controll
var abortedTasks = _host.tasks.filterProperty('Tasks.status', 'ABORTED');
abortedTasks.forEach(function (_task) {
- var abortStatement = clusterState + App.format.role(_task.Tasks.role) + ' aborted on ' + _host.name;
+ var abortStatement = clusterState + App.format.role(_task.Tasks.role) + Em.I18n.t('installer.step10.taskStatus.aborted') + _host.name;
this.get('clusterInfo').findProperty('id', 1).get('status').findProperty('id', 2).get('statements').pushObject(Ember.Object.create({
status: 'aborted',
color: 'text-info',
@@ -127,7 +127,7 @@ App.WizardStep10Controller = Em.Controll
var timedOutTasks = _host.tasks.filterProperty('Tasks.status', 'TIMEDOUT');
timedOutTasks.forEach(function (_task) {
- var timedOutStatement = clusterState + App.format.role(_task.Tasks.role) + ' timed out on ' + _host.name;
+ var timedOutStatement = clusterState + App.format.role(_task.Tasks.role) + Em.I18n.t('installer.step10.taskStatus.timedOut') + _host.name;
this.get('clusterInfo').findProperty('id', 1).get('status').findProperty('id', 2).get('statements').pushObject(Ember.Object.create({
status: 'timedout',
color: 'text-info',
@@ -144,7 +144,7 @@ App.WizardStep10Controller = Em.Controll
if (this.get('content.cluster.status') === 'INSTALL FAILED') {
this.get('clusterInfo').pushObject(Ember.Object.create({
id: 2,
- displayStatement: 'Installing master services failed',
+ displayStatement: Em.I18n.t('installer.step10.installStatus.failed'),
color: 'text-error',
status: []
}));
@@ -152,7 +152,7 @@ App.WizardStep10Controller = Em.Controll
} else {
this.get('clusterInfo').pushObject(Ember.Object.create({
id: 2,
- displayStatement: 'Master services installed',
+ displayStatement: Em.I18n.t('installer.step10.installStatus.installed'),
color: 'text-success',
status: []
}));
@@ -197,7 +197,7 @@ App.WizardStep10Controller = Em.Controll
loadNn: function (component) {
if (component.get('hostName')) {
- var statement = 'NameNode installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.nameNode') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -210,7 +210,7 @@ App.WizardStep10Controller = Em.Controll
loadSnn: function (component) {
if (component.get('hostName')) {
- var statement = 'SecondaryNameNode installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.secondaryNameNode') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -223,7 +223,7 @@ App.WizardStep10Controller = Em.Controll
loadJt: function (component) {
if (component.get('hostName')) {
- var statement = 'JobTracker installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.jobTracker') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -239,11 +239,11 @@ App.WizardStep10Controller = Em.Controll
if (hostLength) {
var hostVal;
if (hostLength === 1) {
- hostVal = 'host';
+ hostVal = Em.I18n.t('installer.step8.host');
} else {
- hostVal = 'hosts';
+ hostVal = Em.I18n.t('installer.step8.hosts');
}
- var statement = 'ZooKeeper installed on ' + component.get('hostName').length + ' ' + hostVal;
+ var statement = Em.I18n.t('installer.step10.master.zooKeeper') + component.get('hostName').length + ' ' + hostVal;
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -256,7 +256,7 @@ App.WizardStep10Controller = Em.Controll
loadHb: function (component) {
if (component.get('hostName')) {
- var statement = 'HBase Master installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.hbase') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -269,7 +269,7 @@ App.WizardStep10Controller = Em.Controll
loadHiveServer: function (component) {
if (component.get('hostName')) {
- var statement = 'Hive Metastore installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.hiveMetastore') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -282,7 +282,7 @@ App.WizardStep10Controller = Em.Controll
loadOozieServer: function (component) {
if (component.get('hostName')) {
- var statement = 'Oozie Server installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.oozie') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -295,7 +295,7 @@ App.WizardStep10Controller = Em.Controll
loadGanglia: function (component) {
if (component.get('hostName')) {
- var statement = 'Ganglia Server installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.ganglia') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -308,7 +308,7 @@ App.WizardStep10Controller = Em.Controll
loadNagios: function (component) {
if (component.get('hostName')) {
- var statement = 'Nagios Server installed on ' + component.get('hostName');
+ var statement = Em.I18n.t('installer.step10.master.nagios') + component.get('hostName');
this.get('clusterInfo').findProperty('id', 2).get('status').pushObject(Ember.Object.create({
id: 1,
color: 'text-info',
@@ -321,17 +321,17 @@ App.WizardStep10Controller = Em.Controll
loadStartedServices: function (component) {
if (this.get('content.cluster.status') === 'STARTED') {
- var statement = 'All services started';
+ var statement = Em.I18n.t('installer.step10.startStatus.started');
this.get('clusterInfo').pushObject(Ember.Object.create({
id: 3,
color: 'text-success',
- displayStatement: 'All services started',
+ displayStatement: Em.I18n.t('installer.step10.startStatus.started'),
status: []
}));
this.get('clusterInfo').pushObject(Ember.Object.create({
id: 4,
color: 'text-success',
- displayStatement: 'All tests passed',
+ displayStatement: Em.I18n.t('installer.step10.startStatus.passed'),
status: []
}));
return true;
@@ -339,7 +339,7 @@ App.WizardStep10Controller = Em.Controll
this.get('clusterInfo').pushObject(Ember.Object.create({
id: 3,
color: 'text-error',
- displayStatement: 'Starting services failed',
+ displayStatement: Em.I18n.t('installer.step10.startStatus.failed'),
status: []
}));
return false;
@@ -354,9 +354,9 @@ App.WizardStep10Controller = Em.Controll
var seconds = Math.floor((this.get('content.cluster.installTime') - minutes) * secondsPerMinute);
var statement;
if (minutes !== 0) {
- statement = 'Install and start completed in ' + minutes + ' minutes and ' + seconds + ' seconds';
+ statement = Em.I18n.t('installer.step10.installTime.minutes').format(minutes, seconds);
} else {
- statement = 'Install and start completed in ' + seconds + ' seconds';
+ statement = Em.I18n.t('installer.step10.installTime.seconds').format(seconds);
}
this.get('clusterInfo').pushObject(Ember.Object.create({
id: 5,
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js Wed Feb 20 23:08:53 2013
@@ -179,13 +179,13 @@ App.WizardStep2Controller = Em.Controlle
if (this.get('inputtedAgainHostNames').length) {
var self = this;
App.ModalPopup.show({
- header: 'Warning',
+ header: Em.I18n.t('common.warning'),
onPrimary: function () {
self.proceedNext();
this.hide();
},
bodyClass: Ember.View.extend({
- template: Ember.Handlebars.compile('<p>These hosts are already installed on the cluster and will be ignored:</p><p>' + self.get('inputtedAgainHostNames').join(', ') + '</p><p>Do you want to continue?</p>')
+ template: Ember.Handlebars.compile('<p>{{t installer.step2.evaluateStep.installedHosts}}</p><p>' + self.get('inputtedAgainHostNames').join(', ') + '</p><p>{{t installer.step2.evaluateStep.continueConfirm}}</p>')
})
});
} else {
@@ -250,7 +250,7 @@ App.WizardStep2Controller = Em.Controlle
var requestId = App.router.get(this.get('content.controllerName')).launchBootstrap(bootStrapData);
if (requestId == '0') {
var controller = App.router.get(App.clusterStatus.wizardControllerName);
- controller.registerErrPopup('Information', 'Host Registration is currently in progress. Please try again later.');
+ controller.registerErrPopup(Em.I18n.t('common.information'), Em.I18n.t('installer.step2.evaluateStep.hostRegInProgress'));
} else if (requestId) {
this.set('content.installOptions.bootRequestId', requestId);
this.saveHosts();
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js Wed Feb 20 23:08:53 2013
@@ -65,13 +65,13 @@ App.WizardStep3Controller = Em.Controlle
});
var categories = [
- self.categoryObject.create({value: 'All', hostsCount: function () {
+ self.categoryObject.create({value: Em.I18n.t('common.all'), hostsCount: function () {
return this.get('controller.hosts.length');
}.property('controller.hosts.length') }),
- self.categoryObject.create({value: 'Installing', hostsBootStatus: 'RUNNING'}),
- self.categoryObject.create({value: 'Registering', hostsBootStatus: 'REGISTERING'}),
- self.categoryObject.create({value: 'Success', hostsBootStatus: 'REGISTERED' }),
- self.categoryObject.create({value: 'Fail', hostsBootStatus: 'FAILED', last: true })
+ self.categoryObject.create({value: Em.I18n.t('installer.step3.hosts.status.installing'), hostsBootStatus: 'RUNNING'}),
+ self.categoryObject.create({value: Em.I18n.t('installer.step3.hosts.status.registering'), hostsBootStatus: 'REGISTERING'}),
+ self.categoryObject.create({value: Em.I18n.t('common.success'), hostsBootStatus: 'REGISTERED' }),
+ self.categoryObject.create({value: Em.I18n.t('common.fail'), hostsBootStatus: 'FAILED', last: true })
];
this.set('category', categories.get('firstObject'));
@@ -326,7 +326,7 @@ App.WizardStep3Controller = Em.Controlle
if(hosts[i].get('bootStatus') !== 'REGISTERED'){
if (!isValidHost) {
hosts[i].set('bootStatus', 'FAILED');
- hosts[i].set('bootLog', 'Registration with the server failed.');
+ hosts[i].set('bootLog', Em.I18n.t('installer.step3.hosts.bootLog.failed'));
}
}
}
@@ -410,7 +410,7 @@ App.WizardStep3Controller = Em.Controlle
switch (_host.get('bootStatus')) {
case 'DONE':
_host.set('bootStatus', 'REGISTERING');
- _host.set('bootLog', (_host.get('bootLog') != null ? _host.get('bootLog') : '') + '\nRegistering with the server...');
+ _host.set('bootLog', (_host.get('bootLog') != null ? _host.get('bootLog') : '') + Em.I18n.t('installer.step3.hosts.bootLog.registering'));
// update registration timestamp so that the timeout is computed from the last host that finished bootstrapping
self.set('registrationStartedAt', new Date().getTime());
stopPolling = false;
@@ -419,7 +419,7 @@ App.WizardStep3Controller = Em.Controlle
if (jsonData.items.someProperty('Hosts.host_name', _host.name)) {
console.log(_host.name + ' has been registered');
_host.set('bootStatus', 'REGISTERED');
- _host.set('bootLog', (_host.get('bootLog') != null ? _host.get('bootLog') : '') + '\nRegistration with the server succeeded.');
+ _host.set('bootLog', (_host.get('bootLog') != null ? _host.get('bootLog') : '') + Em.I18n.t('installer.step3.hosts.bootLog.registering'));
} else {
console.log(_host.name + ' is registering...');
stopPolling = false;
@@ -447,7 +447,7 @@ App.WizardStep3Controller = Em.Controlle
console.log('registration timed out');
hosts.filterProperty('bootStatus', 'REGISTERING').forEach(function (_host) {
_host.set('bootStatus', 'FAILED');
- _host.set('bootLog', (_host.get('bootLog') != null ? _host.get('bootLog') : '') + '\nRegistration with the server failed.');
+ _host.set('bootLog', (_host.get('bootLog') != null ? _host.get('bootLog') : '') + Em.I18n.t('installer.step3.hosts.bootLog.failed'));
});
self.getHostInfo();
}
@@ -553,9 +553,9 @@ App.WizardStep3Controller = Em.Controlle
var button = $(this.get('element')).find('.textTrigger');
button.click(function () {
if (self.get('isTextArea')) {
- $(this).text('click to highlight');
+ $(this).text(Em.I18n.t('installer.step3.hostLogPopup.highlight'));
} else {
- $(this).text('press CTRL+C');
+ $(this).text(Em.I18n.t('installer.step3.hostLogPopup.copy'));
}
self.set('isTextArea', !self.get('isTextArea'));
});
@@ -701,7 +701,7 @@ App.WizardStep3Controller = Em.Controlle
var parsedPath = {
name: path.name,
isWarn: (path.type == 'not_exist') ? false : true,
- message: (path.type == 'not_exist') ? 'OK' : 'WARN: already exists on host'
+ message: (path.type == 'not_exist') ? Em.I18n.t('ok') : Em.I18n.t('installer.step3.hostWarningsPopup.existOnHost')
}
warningsByHost.directoriesFiles.push(parsedPath);
// parsing total warnings
@@ -709,7 +709,7 @@ App.WizardStep3Controller = Em.Controlle
totalWarnings.directoriesFiles.push({
name:parsedPath.name,
isWarn: parsedPath.isWarn,
- message: (parsedPath.isWarn) ? 'WARN: already exists on 1 host': 'OK',
+ message: (parsedPath.isWarn) ? Em.I18n.t('installer.step3.hostWarningsPopup.existOnOneHost') : Em.I18n.t('ok'),
warnCount: (parsedPath.isWarn) ? 1 : 0
})
} else if(parsedPath.isWarn){
@@ -717,7 +717,7 @@ App.WizardStep3Controller = Em.Controlle
if(item.name == parsedPath.name){
totalWarnings.directoriesFiles[index].isWarn = true;
totalWarnings.directoriesFiles[index].warnCount++;
- totalWarnings.directoriesFiles[index].message = 'WARN: already exists on '+ totalWarnings.directoriesFiles[index].warnCount +' hosts';
+ totalWarnings.directoriesFiles[index].message = Em.I18n.t('installer.step3.hostWarningsPopup.existOnManyHost').format(totalWarnings.directoriesFiles[index].warnCount);
}
});
}
@@ -728,7 +728,7 @@ App.WizardStep3Controller = Em.Controlle
var parsedPackage = {
name: _package.name,
isWarn: _package.installed,
- message: (_package.installed) ? 'WARN: already installed on host' : 'OK'
+ message: (_package.installed) ? Em.I18n.t('installer.step3.hostWarningsPopup.installedOnHost') : Em.I18n.t('ok')
}
warningsByHost.packages.push(parsedPackage);
// parsing total warnings
@@ -736,7 +736,7 @@ App.WizardStep3Controller = Em.Controlle
totalWarnings.packages.push({
name:parsedPackage.name,
isWarn: parsedPackage.isWarn,
- message: (parsedPackage.isWarn) ? 'WARN: already exists on 1 host': 'OK',
+ message: (parsedPackage.isWarn) ? Em.I18n.t('installer.step3.hostWarningsPopup.installedOnOneHost') : Em.I18n.t('ok'),
warnCount: (parsedPackage.isWarn) ? 1 : 0
})
} else if(parsedPackage.isWarn){
@@ -744,7 +744,7 @@ App.WizardStep3Controller = Em.Controlle
if(item.name == parsedPackage.name){
totalWarnings.packages[index].isWarn = true;
totalWarnings.packages[index].warnCount++;
- totalWarnings.packages[index].message = 'WARN: already exists on '+ totalWarnings.packages[index].warnCount +' hosts';
+ totalWarnings.packages[index].message = Em.I18n.t('installer.step3.hostWarningsPopup.installedOnManyHost').format(totalWarnings.packages[index].warnCount);
}
});
}
@@ -758,7 +758,7 @@ App.WizardStep3Controller = Em.Controlle
pid: process.pid,
command: process.command,
shortCommand: (process.command.substr(0, 15)+'...'),
- message: (process.hadoop) ? 'WARN: running on host' : 'OK'
+ message: (process.hadoop) ? Em.I18n.t('installer.step3.hostWarningsPopup.runningOnHost') : Em.I18n.t('ok')
}
warningsByHost.processes.push(parsedProcess);
// parsing total warnings
@@ -769,7 +769,7 @@ App.WizardStep3Controller = Em.Controlle
command: process.command,
shortCommand: (process.command.substr(0, 15)+'...'),
isWarn: parsedProcess.isWarn,
- message: (parsedProcess.isWarn) ? 'WARN: running on 1 host': 'OK',
+ message: (parsedProcess.isWarn) ? Em.I18n.t('installer.step3.hostWarningsPopup.runningOnOneHost') : Em.I18n.t('ok'),
warnCount: (parsedProcess.isWarn) ? 1 : 0
})
} else if(parsedProcess.isWarn){
@@ -777,7 +777,7 @@ App.WizardStep3Controller = Em.Controlle
if(item.pid == parsedProcess.pid){
totalWarnings.processes[index].isWarn = true;
totalWarnings.processes[index].warnCount++;
- totalWarnings.processes[index].message = 'WARN: running on '+ totalWarnings.processes[index].warnCount +' hosts';
+ totalWarnings.processes[index].message = Em.I18n.t('installer.step3.hostWarningsPopup.runningOnManyHost').format(totalWarnings.processes[index].warnCount);
}
});
}
@@ -801,8 +801,8 @@ App.WizardStep3Controller = Em.Controlle
App.ModalPopup.show({
header: Em.I18n.t('installer.step3.warnings.popup.header'),
- secondary: 'Rerun Checks',
- primary: 'Close',
+ secondary: Em.I18n.t('installer.step3.hostWarningsPopup.rerunChecks'),
+ primary: Em.I18n.t('common.close'),
onPrimary: function () {
self.set('checksUpdateStatus', null);
this.hide();
@@ -878,23 +878,23 @@ App.WizardStep3Controller = Em.Controlle
var content = this.get('content');
var newContent = '';
if(content.hostName == 'All Hosts'){
- newContent += '<h4>Warnings across all hosts</h4>';
+ newContent += '<h4>'+Em.I18n.t('installer.step3.warningsWindow.allHosts')+'</h4>';
} else {
- newContent += '<h4>Warnings on ' + content.hostName + '</h4>';
+ newContent += '<h4>' + Em.I18n.t('installer.step3.warningsWindow.warningsOn') + content.hostName + '</h4>';
}
- newContent += '<div>DIRECTORIES AND FILES</div><div>';
+ newContent += '<div>' + Em.I18n.t('installer.step3.warningsWindow.directoriesAndFiles') + '</div><div>';
content.directoriesFiles.filterProperty('isWarn', true).forEach(function(path){
newContent += path.name + ' '
});
if(content.directoriesFiles.filterProperty('isWarn', true).length == 0){
- newContent += 'No warnings';
+ newContent += Em.I18n.t('installer.step3.warningsWindow.noWarnings');
}
newContent += '</div><br/><div>PACKAGES</div><div>';
content.packages.filterProperty('isWarn', true).forEach(function(_package){
newContent += _package.name + ' '
});
if(content.packages.filterProperty('isWarn', true).length == 0){
- newContent += 'No warnings';
+ newContent += Em.I18n.t('installer.step3.warningsWindow.noWarnings');
}
newContent += '</div><br/><div>PROCESSES</div><div>';
content.processes.filterProperty('isWarn', true).forEach(function(process, index){
@@ -902,7 +902,7 @@ App.WizardStep3Controller = Em.Controlle
newContent += (index != (content.processes.filterProperty('isWarn', true).length-1)) ? ',' : '';
})
if(content.processes.filterProperty('isWarn', true).length == 0){
- newContent += 'No warnings';
+ newContent += Em.I18n.t('installer.step3.warningsWindow.noWarnings');
}
return newContent;
}.property('content'),
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js Wed Feb 20 23:08:53 2013
@@ -79,7 +79,7 @@ App.WizardStep5Controller = Em.Controlle
cpu:_host.cpu,
memory:_host.memory,
disk_info:_host.disk_info,
- host_info:"%@ (%@, %@ cores)".fmt(_host.name, (_host.memory * 1024).bytesToSize(1, 'parseFloat'), _host.cpu)
+ host_info: Em.I18n.t('installer.step5.hostInfo').fmt(_host.name, (_host.memory * 1024).bytesToSize(1, 'parseFloat'), _host.cpu)
// Uncomment to test sorting with random cpu, memory, host_info
// cpu:function () {
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js Wed Feb 20 23:08:53 2013
@@ -268,19 +268,19 @@ App.WizardStep7Controller = Em.Controlle
var displayMsg = null;
if (displayNames && displayNames.length) {
if (displayNames.length === 1) {
- displayMsg = siteProperty + ' as ' + displayNames[0];
+ displayMsg = siteProperty + ' '+Em.I18n.t('as')+' ' + displayNames[0];
} else {
var name = null;
displayNames.forEach(function (_name, index) {
if (index === 0) {
name = _name;
} else if (index === displayNames.length - 1) {
- name = name + ' and ' + _name;
+ name = name + ' '+Em.I18n.t('and')+' ' + _name;
} else {
name = name + ', ' + _name;
}
}, this);
- displayMsg = siteProperty + ' as ' + name;
+ displayMsg = siteProperty + ' '+Em.I18n.t('as')+' ' + name;
}
} else {
displayMsg = siteProperty;
@@ -309,14 +309,14 @@ App.WizardStep7Controller = Em.Controlle
showCustomConfigErrMsg: function (customConfig) {
App.ModalPopup.show({
- header: 'Custom configuration error: ',
- primary: 'OK',
+ header: Em.I18n.t('installer.step7.ConfigErrMsg.header'),
+ primary: Em.I18n.t('ok'),
secondary: null,
onPrimary: function () {
this.hide();
},
bodyClass: Ember.View.extend({
- message: 'Error in custom configuration. Some properties entered in the box are already exposed on this page',
+ message: Em.I18n.t('installer.step7.ConfigErrMsg.message'),
siteProperties: customConfig,
getDisplayMessage: function () {
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js Wed Feb 20 23:08:53 2013
@@ -502,7 +502,7 @@ App.WizardStep8Controller = Em.Controlle
groupLabel = 'groups';
}
*/
- dnComponent.set('component_value', totalDnHosts + ' hosts');
+ dnComponent.set('component_value', totalDnHosts + Em.I18n.t('installer.step8.hosts'));
},
@@ -541,7 +541,7 @@ App.WizardStep8Controller = Em.Controlle
groupLabel = 'groups';
}
*/
- ttComponent.set('component_value', totalTtHosts + ' hosts');
+ ttComponent.set('component_value', totalTtHosts + Em.I18n.t('installer.step8.hosts'));
},
/**
@@ -619,7 +619,7 @@ App.WizardStep8Controller = Em.Controlle
} else {
groupLabel = 'groups';
} */
- rsComponent.set('component_value', totalRsHosts + ' hosts');
+ rsComponent.set('component_value', totalRsHosts + Em.I18n.t('installer.step8.hosts'));
},
/**
@@ -642,9 +642,9 @@ App.WizardStep8Controller = Em.Controlle
var zkHostNames = this.get('content.masterComponentHosts').filterProperty('display_name', 'ZooKeeper').length;
var hostSuffix;
if (zkHostNames === 1) {
- hostSuffix = 'host';
+ hostSuffix = Em.I18n.t('installer.step8.host');
} else {
- hostSuffix = 'hosts';
+ hostSuffix = Em.I18n.t('installer.step8.hosts');
}
serverComponent.set('component_value', zkHostNames + ' ' + hostSuffix);
},
@@ -1540,7 +1540,7 @@ App.WizardStep8Controller = Em.Controlle
params.error = function (xhr, status, error) {
var responseText = JSON.parse(xhr.responseText);
var controller = App.router.get(App.clusterStatus.wizardControllerName);
- controller.registerErrPopup("Error", responseText.message);
+ controller.registerErrPopup(Em.I18n.t('common.error'), responseText.message);
self.set('hasErrorOccurred', true);
// an error will break the ajax call chain and allow submission again
self.set('isSubmitDisabled', false);
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js Wed Feb 20 23:08:53 2013
@@ -183,80 +183,80 @@ App.WizardStep9Controller = Em.Controlle
case 'INSTALL':
switch (task.status) {
case 'PENDING':
- return 'Preparing to install ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.install.pending') + role;
case 'QUEUED' :
- return 'Waiting to install ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.install.queued') + role;
case 'IN_PROGRESS':
- return 'Installing ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.install.inProgress') + role;
case 'COMPLETED' :
- return 'Successfully installed ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.install.completed') + role;
case 'FAILED':
- return 'Failed to install ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.install.failed') + role;
}
case 'UNINSTALL':
switch (task.status) {
case 'PENDING':
- return 'Preparing to uninstall ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.uninstall.pending') + role;
case 'QUEUED' :
- return 'Waiting to uninstall ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.uninstall.queued') + role;
case 'IN_PROGRESS':
- return 'Uninstalling ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.uninstall.inProgress') + role;
case 'COMPLETED' :
- return 'Successfully uninstalled ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.uninstall.completed') + role;
case 'FAILED':
- return 'Failed to uninstall ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.uninstall.failed') + role;
}
case 'START' :
switch (task.status) {
case 'PENDING':
- return 'Preparing to start ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.start.pending') + role;
case 'QUEUED' :
- return 'Waiting to start ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.start.queued') + role;
case 'IN_PROGRESS':
- return 'Starting ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.start.inProgress') + role;
case 'COMPLETED' :
- return role + ' started successfully';
+ return role + Em.I18n.t('installer.step9.serviceStatus.start.completed');
case 'FAILED':
- return role + ' failed to start';
+ return role + Em.I18n.t('installer.step9.serviceStatus.start.failed');
}
case 'STOP' :
switch (task.status) {
case 'PENDING':
- return 'Preparing to stop ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.stop.pending') + role;
case 'QUEUED' :
- return 'Waiting to stop ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.stop.queued') + role;
case 'IN_PROGRESS':
- return 'Stopping ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.stop.inProgress') + role;
case 'COMPLETED' :
- return role + ' stopped successfully';
+ return role + Em.I18n.t('installer.step9.serviceStatus.stop.completed');
case 'FAILED':
- return role + ' failed to stop';
+ return role + Em.I18n.t('installer.step9.serviceStatus.stop.failed');
}
case 'EXECUTE' :
switch (task.status) {
case 'PENDING':
- return 'Preparing to execute ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.execute.pending') + role;
case 'QUEUED' :
- return 'Waiting to execute ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.execute.queued') + role;
case 'IN_PROGRESS':
- return 'Executing ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.execute.inProgress') + role;
case 'COMPLETED' :
- return role + ' executed successfully';
+ return role + Em.I18n.t('installer.step9.serviceStatus.execute.completed');
case 'FAILED':
- return role + ' failed to execute';
+ return role + Em.I18n.t('installer.step9.serviceStatus.execute.failed');
}
case 'ABORT' :
switch (task.status) {
case 'PENDING':
- return 'Preparing to abort ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.abort.pending') + role;
case 'QUEUED' :
- return 'Waiting to abort ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.abort.queued') + role;
case 'IN_PROGRESS':
- return 'Aborting ' + role;
+ return Em.I18n.t('installer.step9.serviceStatus.abort.inProgress') + role;
case 'COMPLETED' :
- return role + ' aborted successfully';
+ return role + Em.I18n.t('installer.step9.serviceStatus.abort.completed');
case 'FAILED':
- return role + ' failed to abort';
+ return role + Em.I18n.t('installer.step9.serviceStatus.abort.failed');
}
}
},
Modified: incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js?rev=1448461&r1=1448460&r2=1448461&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js Wed Feb 20 23:08:53 2013
@@ -50,8 +50,8 @@ App.ModalPopup = Ember.View.extend({
body: ' ',
encodeBody: true,
// define bodyClass which extends Ember.View to use an arbitrary Handlebars template as the body
- primary: 'OK',
- secondary: 'Cancel',
+ primary: Em.I18n.t('ok'),
+ secondary: Em.I18n.t('common.cancel'),
autoHeight: true,
onPrimary: function() {