Explorar o código

Editor: Localised more elements.

Mr.doob %!s(int64=6) %!d(string=hai) anos
pai
achega
a97c61de5a

+ 3 - 1
editor/js/Sidebar.Object.js

@@ -13,6 +13,7 @@ Sidebar.Object = function ( editor ) {
 
 
 	// Actions
 	// Actions
 
 
+	/*
 	var objectActions = new UI.Select().setPosition( 'absolute' ).setRight( '8px' ).setFontSize( '11px' );
 	var objectActions = new UI.Select().setPosition( 'absolute' ).setRight( '8px' ).setFontSize( '11px' );
 	objectActions.setOptions( {
 	objectActions.setOptions( {
 
 
@@ -50,7 +51,8 @@ Sidebar.Object = function ( editor ) {
 		this.setValue( 'Actions' );
 		this.setValue( 'Actions' );
 
 
 	} );
 	} );
-	// container.addStatic( objectActions );
+	container.addStatic( objectActions );
+	*/
 
 
 	// type
 	// type
 
 

+ 5 - 4
editor/js/Sidebar.Project.js

@@ -6,6 +6,7 @@ Sidebar.Project = function ( editor ) {
 
 
 	var config = editor.config;
 	var config = editor.config;
 	var signals = editor.signals;
 	var signals = editor.signals;
+	var strings = editor.strings;
 
 
 	var rendererTypes = {
 	var rendererTypes = {
 
 
@@ -29,7 +30,7 @@ Sidebar.Project = function ( editor ) {
 
 
 	} );
 	} );
 
 
-	titleRow.add( new UI.Text( 'Title' ).setWidth( '90px' ) );
+	titleRow.add( new UI.Text( strings.getKey( 'sidebar/project/title' ) ).setWidth( '90px' ) );
 	titleRow.add( title );
 	titleRow.add( title );
 
 
 	container.add( titleRow );
 	container.add( titleRow );
@@ -43,7 +44,7 @@ Sidebar.Project = function ( editor ) {
 
 
 	} );
 	} );
 
 
-	editableRow.add( new UI.Text( 'Editable' ).setWidth( '90px' ) );
+	editableRow.add( new UI.Text( strings.getKey( 'sidebar/project/editable' ) ).setWidth( '90px' ) );
 	editableRow.add( editable );
 	editableRow.add( editable );
 
 
 	container.add( editableRow );
 	container.add( editableRow );
@@ -57,7 +58,7 @@ Sidebar.Project = function ( editor ) {
 
 
 	} );
 	} );
 
 
-	vrRow.add( new UI.Text( 'VR' ).setWidth( '90px' ) );
+	vrRow.add( new UI.Text( strings.getKey( 'sidebar/project/vr' ) ).setWidth( '90px' ) );
 	vrRow.add( vr );
 	vrRow.add( vr );
 
 
 	container.add( vrRow );
 	container.add( vrRow );
@@ -85,7 +86,7 @@ Sidebar.Project = function ( editor ) {
 
 
 	} );
 	} );
 
 
-	rendererTypeRow.add( new UI.Text( 'Renderer' ).setWidth( '90px' ) );
+	rendererTypeRow.add( new UI.Text( strings.getKey( 'sidebar/project/renderer' ) ).setWidth( '90px' ) );
 	rendererTypeRow.add( rendererType );
 	rendererTypeRow.add( rendererType );
 
 
 	container.add( rendererTypeRow );
 	container.add( rendererTypeRow );

+ 9 - 9
editor/js/Sidebar.Properties.js

@@ -5,24 +5,24 @@
 Sidebar.Properties = function ( editor ) {
 Sidebar.Properties = function ( editor ) {
 
 
 	var signals = editor.signals;
 	var signals = editor.signals;
+	var strings = editor.strings;
 
 
 	var container = new UI.Span();
 	var container = new UI.Span();
 
 
-	var objectTab = new UI.Text( 'OBJECT' ).onClick( onClick );
-	var geometryTab = new UI.Text( 'GEOMETRY' ).onClick( onClick );
-	var materialTab = new UI.Text( 'MATERIAL' ).onClick( onClick );
+	var objectTab = new UI.Text( strings.getKey( 'sidebar/properties/object' ) ).setTextTransform( 'uppercase' );
+	objectTab.onClick( function () { select( 'OBJECT' ) } );
+
+	var geometryTab = new UI.Text( strings.getKey( 'sidebar/properties/geometry' ) ).setTextTransform( 'uppercase' );
+	geometryTab.onClick( function () { select( 'GEOMETRY' ) } );
+
+	var materialTab = new UI.Text( strings.getKey( 'sidebar/properties/material' ) ).setTextTransform( 'uppercase' );
+	materialTab.onClick( function () { select( 'MATERIAL' ) } );
 
 
 	var tabs = new UI.Div();
 	var tabs = new UI.Div();
 	tabs.setId( 'tabs' );
 	tabs.setId( 'tabs' );
 	tabs.add( objectTab, geometryTab, materialTab );
 	tabs.add( objectTab, geometryTab, materialTab );
 	container.add( tabs );
 	container.add( tabs );
 
 
-	function onClick( event ) {
-
-		select( event.target.textContent );
-
-	}
-
 	//
 	//
 
 
 	var object = new UI.Span().add(
 	var object = new UI.Span().add(

+ 3 - 2
editor/js/Sidebar.Scene.js

@@ -5,6 +5,7 @@
 Sidebar.Scene = function ( editor ) {
 Sidebar.Scene = function ( editor ) {
 
 
 	var signals = editor.signals;
 	var signals = editor.signals;
+	var strings = editor.strings;
 
 
 	var container = new UI.Panel();
 	var container = new UI.Panel();
 	container.setBorderTop( '0' );
 	container.setBorderTop( '0' );
@@ -119,7 +120,7 @@ Sidebar.Scene = function ( editor ) {
 
 
 	var backgroundColor = new UI.Color().setValue( '#aaaaaa' ).onChange( onBackgroundChanged );
 	var backgroundColor = new UI.Color().setValue( '#aaaaaa' ).onChange( onBackgroundChanged );
 
 
-	backgroundRow.add( new UI.Text( 'Background' ).setWidth( '90px' ) );
+	backgroundRow.add( new UI.Text( strings.getKey( 'sidebar/scene/background' ) ).setWidth( '90px' ) );
 	backgroundRow.add( backgroundColor );
 	backgroundRow.add( backgroundColor );
 
 
 	container.add( backgroundRow );
 	container.add( backgroundRow );
@@ -153,7 +154,7 @@ Sidebar.Scene = function ( editor ) {
 
 
 	} );
 	} );
 
 
-	fogTypeRow.add( new UI.Text( 'Fog' ).setWidth( '90px' ) );
+	fogTypeRow.add( new UI.Text( strings.getKey( 'sidebar/scene/fog' ) ).setWidth( '90px' ) );
 	fogTypeRow.add( fogType );
 	fogTypeRow.add( fogType );
 
 
 	container.add( fogTypeRow );
 	container.add( fogTypeRow );

+ 4 - 2
editor/js/Sidebar.Settings.Shortcuts.js

@@ -4,7 +4,9 @@
 
 
 Sidebar.Settings.Shortcuts = function ( editor ) {
 Sidebar.Settings.Shortcuts = function ( editor ) {
 
 
-	const IS_MAC = navigator.platform.toUpperCase().indexOf( 'MAC' ) >= 0;
+	var strings = editor.strings;
+
+	var IS_MAC = navigator.platform.toUpperCase().indexOf( 'MAC' ) >= 0;
 
 
 	function isValidKeyBinding( key ) {
 	function isValidKeyBinding( key ) {
 
 
@@ -76,7 +78,7 @@ Sidebar.Settings.Shortcuts = function ( editor ) {
 		}
 		}
 
 
 		shortcutInput.dom.maxLength = 1;
 		shortcutInput.dom.maxLength = 1;
-		shortcutRow.add( new UI.Text( name ).setTextTransform( 'capitalize' ).setWidth( '90px' ) );
+		shortcutRow.add( new UI.Text( strings.getKey( 'sidebar/settings/shortcuts/' + name ) ).setTextTransform( 'capitalize' ).setWidth( '90px' ) );
 		shortcutRow.add( shortcutInput );
 		shortcutRow.add( shortcutInput );
 
 
 		container.add( shortcutRow );
 		container.add( shortcutRow );

+ 2 - 1
editor/js/Sidebar.Settings.Viewport.js

@@ -5,11 +5,12 @@
 Sidebar.Settings.Viewport = function ( editor ) {
 Sidebar.Settings.Viewport = function ( editor ) {
 
 
 	var signals = editor.signals;
 	var signals = editor.signals;
+	var strings = editor.strings;
 
 
 	var container = new UI.Div();
 	var container = new UI.Div();
 	container.add( new UI.Break() );
 	container.add( new UI.Break() );
 
 
-	container.add( new UI.Text( 'Grid' ).setWidth( '90px' ) );
+	container.add( new UI.Text( strings.getKey( 'sidebar/settings/viewport/grid' ) ).setWidth( '90px' ) );
 
 
 	var show = new UI.THREE.Boolean( true ).onChange( update );
 	var show = new UI.THREE.Boolean( true ).onChange( update );
 	container.add( show );
 	container.add( show );

+ 3 - 2
editor/js/Sidebar.Settings.js

@@ -6,6 +6,7 @@ Sidebar.Settings = function ( editor ) {
 
 
 	var config = editor.config;
 	var config = editor.config;
 	var signals = editor.signals;
 	var signals = editor.signals;
+	var strings = editor.strings;
 
 
 	var container = new UI.Panel();
 	var container = new UI.Panel();
 	container.setBorderTop( '0' );
 	container.setBorderTop( '0' );
@@ -37,7 +38,7 @@ Sidebar.Settings = function ( editor ) {
 
 
 	} );
 	} );
 
 
-	languageRow.add( new UI.Text( 'Language' ).setWidth( '90px' ) );
+	languageRow.add( new UI.Text( strings.getKey( 'sidebar/settings/language' ) ).setWidth( '90px' ) );
 	languageRow.add( language );
 	languageRow.add( language );
 
 
 	container.add( languageRow );
 	container.add( languageRow );
@@ -68,7 +69,7 @@ Sidebar.Settings = function ( editor ) {
 
 
 	} );
 	} );
 
 
-	themeRow.add( new UI.Text( 'Theme' ).setWidth( '90px' ) );
+	themeRow.add( new UI.Text( strings.getKey( 'sidebar/settings/theme' ) ).setWidth( '90px' ) );
 	themeRow.add( theme );
 	themeRow.add( theme );
 
 
 	container.add( themeRow );
 	container.add( themeRow );

+ 10 - 9
editor/js/Sidebar.js

@@ -4,26 +4,27 @@
 
 
 var Sidebar = function ( editor ) {
 var Sidebar = function ( editor ) {
 
 
+	var strings = editor.strings;
+
 	var container = new UI.Panel();
 	var container = new UI.Panel();
 	container.setId( 'sidebar' );
 	container.setId( 'sidebar' );
 
 
 	//
 	//
 
 
-	var sceneTab = new UI.Text( 'SCENE' ).onClick( onClick );
-	var projectTab = new UI.Text( 'PROJECT' ).onClick( onClick );
-	var settingsTab = new UI.Text( 'SETTINGS' ).onClick( onClick );
+	var sceneTab = new UI.Text( strings.getKey( 'sidebar/scene' ) ).setTextTransform( 'uppercase' );
+	sceneTab.onClick( function () { select( 'SCENE' ) } );
+
+	var projectTab = new UI.Text( strings.getKey( 'sidebar/project' ) ).setTextTransform( 'uppercase' );
+	projectTab.onClick( function () { select( 'PROJECT' ) } );
+
+	var settingsTab = new UI.Text( strings.getKey( 'sidebar/settings' ) ).setTextTransform( 'uppercase' );
+	settingsTab.onClick( function () { select( 'SETTINGS' ) } );
 
 
 	var tabs = new UI.Div();
 	var tabs = new UI.Div();
 	tabs.setId( 'tabs' );
 	tabs.setId( 'tabs' );
 	tabs.add( sceneTab, projectTab, settingsTab );
 	tabs.add( sceneTab, projectTab, settingsTab );
 	container.add( tabs );
 	container.add( tabs );
 
 
-	function onClick( event ) {
-
-		select( event.target.textContent );
-
-	}
-
 	//
 	//
 
 
 	var scene = new UI.Span().add(
 	var scene = new UI.Span().add(

+ 76 - 2
editor/js/Strings.js

@@ -9,6 +9,7 @@ var Strings = function ( config ) {
 	var values = {
 	var values = {
 
 
 		en: {
 		en: {
+
 			'menubar/file': 'File',
 			'menubar/file': 'File',
 			'menubar/file/new': 'New',
 			'menubar/file/new': 'New',
 			'menubar/file/import': 'Import',
 			'menubar/file/import': 'Import',
@@ -56,10 +57,48 @@ var Strings = function ( config ) {
 
 
 			'menubar/help': 'Help',
 			'menubar/help': 'Help',
 			'menubar/help/source_code': 'Source Code',
 			'menubar/help/source_code': 'Source Code',
-			'menubar/help/about': 'About'
+			'menubar/help/about': 'About',
+
+			'sidebar/scene': 'Scene',
+			'sidebar/scene/background': 'Background',
+			'sidebar/scene/fog': 'Fog',
+
+			'sidebar/properties/object': 'Object',
+			'sidebar/properties/geometry': 'Geometry',
+			'sidebar/properties/material': 'Material',
+			'sidebar/properties/script': 'Script',
+
+			'sidebar/project': 'Project',
+			'sidebar/project/title': 'Title',
+			'sidebar/project/editable': 'Editable',
+			'sidebar/project/vr': 'VR',
+			'sidebar/project/renderer': 'Renderer',
+
+			'sidebar/settings': 'Settings',
+			'sidebar/settings/language': 'Language',
+			'sidebar/settings/theme': 'Theme',
+
+			'sidebar/settings/shortcuts/translate': 'Translate',
+			'sidebar/settings/shortcuts/rotate': 'Rotate',
+			'sidebar/settings/shortcuts/scale': 'Scale',
+			'sidebar/settings/shortcuts/undo': 'Undo',
+			'sidebar/settings/shortcuts/focus': 'Focus',
+
+			'sidebar/settings/viewport/grid': 'Grid',
+
+			'toolbar/translate': 'Translate',
+			'toolbar/rotate': 'Rotate',
+			'toolbar/scale': 'Scale',
+			'toolbar/local': 'Local',
+
+			'viewport/info/objects': 'Objects',
+			'viewport/info/vertices': 'Vertices',
+			'viewport/info/triangles': 'Triangles'
+
 		},
 		},
 
 
 		zh: {
 		zh: {
+
 			'menubar/file': '文件',
 			'menubar/file': '文件',
 			'menubar/file/new': '新建',
 			'menubar/file/new': '新建',
 			'menubar/file/import': '导入',
 			'menubar/file/import': '导入',
@@ -107,7 +146,42 @@ var Strings = function ( config ) {
 
 
 			'menubar/help': '帮助',
 			'menubar/help': '帮助',
 			'menubar/help/source_code': '源码',
 			'menubar/help/source_code': '源码',
-			'menubar/help/about': '关于'
+			'menubar/help/about': '关于',
+
+			'sidebar/scene': '场景',
+			'sidebar/scene/background': '背景',
+			'sidebar/scene/fog': '雾',
+
+			'sidebar/properties/object': '属性',
+			'sidebar/properties/geometry': '几何组件',
+			'sidebar/properties/material': '材质组件',
+			'sidebar/properties/script': '脚本',
+
+			'sidebar/project': '项目',
+			'sidebar/project/title': '标题',
+			'sidebar/project/editable': '编辑性',
+			'sidebar/project/vr': '虚拟现实',
+			'sidebar/project/renderer': '渲染器',
+
+			'sidebar/settings': '设置',
+			'sidebar/settings/language': '语言',
+			'sidebar/settings/theme': '主题',
+			'sidebar/settings/shortcuts/translate': '移动',
+			'sidebar/settings/shortcuts/rotate': '旋转',
+			'sidebar/settings/shortcuts/scale': '缩放',
+			'sidebar/settings/shortcuts/undo': '撤销',
+			'sidebar/settings/shortcuts/focus': '聚焦',
+			'sidebar/settings/viewport/grid': '网格',
+
+			'toolbar/translate': '移动',
+			'toolbar/rotate': '旋转',
+			'toolbar/scale': '缩放',
+			'toolbar/local': '本地',
+
+			'viewport/info/objects': '物体',
+			'viewport/info/vertices': '顶点',
+			'viewport/info/triangles': '三角形'
+
 		}
 		}
 
 
 	};
 	};

+ 5 - 4
editor/js/Toolbar.js

@@ -5,6 +5,7 @@
 var Toolbar = function ( editor ) {
 var Toolbar = function ( editor ) {
 
 
 	var signals = editor.signals;
 	var signals = editor.signals;
+	var strings = editor.strings;
 
 
 	var container = new UI.Panel();
 	var container = new UI.Panel();
 	container.setId( 'toolbar' );
 	container.setId( 'toolbar' );
@@ -15,7 +16,7 @@ var Toolbar = function ( editor ) {
 
 
 	// translate / rotate / scale
 	// translate / rotate / scale
 
 
-	var translate = new UI.Button( 'translate' );
+	var translate = new UI.Button( strings.getKey( 'toolbar/translate' ) );
 	translate.dom.className = 'Button selected';
 	translate.dom.className = 'Button selected';
 	translate.onClick( function () {
 	translate.onClick( function () {
 
 
@@ -24,7 +25,7 @@ var Toolbar = function ( editor ) {
 	} );
 	} );
 	buttons.add( translate );
 	buttons.add( translate );
 
 
-	var rotate = new UI.Button( 'rotate' );
+	var rotate = new UI.Button( strings.getKey( 'toolbar/rotate' ) );
 	rotate.onClick( function () {
 	rotate.onClick( function () {
 
 
 		signals.transformModeChanged.dispatch( 'rotate' );
 		signals.transformModeChanged.dispatch( 'rotate' );
@@ -32,7 +33,7 @@ var Toolbar = function ( editor ) {
 	} );
 	} );
 	buttons.add( rotate );
 	buttons.add( rotate );
 
 
-	var scale = new UI.Button( 'scale' );
+	var scale = new UI.Button( strings.getKey( 'toolbar/scale' ) );
 	scale.onClick( function () {
 	scale.onClick( function () {
 
 
 		signals.transformModeChanged.dispatch( 'scale' );
 		signals.transformModeChanged.dispatch( 'scale' );
@@ -40,7 +41,7 @@ var Toolbar = function ( editor ) {
 	} );
 	} );
 	buttons.add( scale );
 	buttons.add( scale );
 
 
-	var local = new UI.THREE.Boolean( false, 'local' );
+	var local = new UI.THREE.Boolean( false, strings.getKey( 'toolbar/local' ) );
 	local.onChange( function () {
 	local.onChange( function () {
 
 
 		signals.spaceChanged.dispatch( this.getValue() === true ? 'local' : 'world' );
 		signals.spaceChanged.dispatch( this.getValue() === true ? 'local' : 'world' );

+ 7 - 3
editor/js/Viewport.Info.js

@@ -5,6 +5,7 @@
 Viewport.Info = function ( editor ) {
 Viewport.Info = function ( editor ) {
 
 
 	var signals = editor.signals;
 	var signals = editor.signals;
+	var strings = editor.strings;
 
 
 	var container = new UI.Panel();
 	var container = new UI.Panel();
 	container.setId( 'info' );
 	container.setId( 'info' );
@@ -18,9 +19,12 @@ Viewport.Info = function ( editor ) {
 	var verticesText = new UI.Text( '0' ).setMarginLeft( '6px' );
 	var verticesText = new UI.Text( '0' ).setMarginLeft( '6px' );
 	var trianglesText = new UI.Text( '0' ).setMarginLeft( '6px' );
 	var trianglesText = new UI.Text( '0' ).setMarginLeft( '6px' );
 
 
-	container.add( new UI.Text( 'objects' ), objectsText, new UI.Break() );
-	container.add( new UI.Text( 'vertices' ), verticesText, new UI.Break() );
-	container.add( new UI.Text( 'triangles' ), trianglesText, new UI.Break() );
+	container.add( new UI.Text( strings.getKey( 'viewport/info/objects' ) ).setTextTransform( 'lowercase' ) );
+	container.add( objectsText, new UI.Break() );
+	container.add( new UI.Text( strings.getKey( 'viewport/info/vertices' ) ).setTextTransform( 'lowercase' ) );
+	container.add( verticesText, new UI.Break() );
+	container.add( new UI.Text( strings.getKey( 'viewport/info/triangles' ) ).setTextTransform( 'lowercase' ) );
+	container.add( trianglesText, new UI.Break() );
 
 
 	signals.objectAdded.add( update );
 	signals.objectAdded.add( update );
 	signals.objectRemoved.add( update );
 	signals.objectRemoved.add( update );