Skip to content

Commit a97c61d

Browse files
committed
Editor: Localised more elements.
1 parent 1103be3 commit a97c61d

11 files changed

+127
-39
lines changed

editor/js/Sidebar.Object.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Sidebar.Object = function ( editor ) {
1313

1414
// Actions
1515

16+
/*
1617
var objectActions = new UI.Select().setPosition( 'absolute' ).setRight( '8px' ).setFontSize( '11px' );
1718
objectActions.setOptions( {
1819
@@ -50,7 +51,8 @@ Sidebar.Object = function ( editor ) {
5051
this.setValue( 'Actions' );
5152
5253
} );
53-
// container.addStatic( objectActions );
54+
container.addStatic( objectActions );
55+
*/
5456

5557
// type
5658

editor/js/Sidebar.Project.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Sidebar.Project = function ( editor ) {
66

77
var config = editor.config;
88
var signals = editor.signals;
9+
var strings = editor.strings;
910

1011
var rendererTypes = {
1112

@@ -29,7 +30,7 @@ Sidebar.Project = function ( editor ) {
2930

3031
} );
3132

32-
titleRow.add( new UI.Text( 'Title' ).setWidth( '90px' ) );
33+
titleRow.add( new UI.Text( strings.getKey( 'sidebar/project/title' ) ).setWidth( '90px' ) );
3334
titleRow.add( title );
3435

3536
container.add( titleRow );
@@ -43,7 +44,7 @@ Sidebar.Project = function ( editor ) {
4344

4445
} );
4546

46-
editableRow.add( new UI.Text( 'Editable' ).setWidth( '90px' ) );
47+
editableRow.add( new UI.Text( strings.getKey( 'sidebar/project/editable' ) ).setWidth( '90px' ) );
4748
editableRow.add( editable );
4849

4950
container.add( editableRow );
@@ -57,7 +58,7 @@ Sidebar.Project = function ( editor ) {
5758

5859
} );
5960

60-
vrRow.add( new UI.Text( 'VR' ).setWidth( '90px' ) );
61+
vrRow.add( new UI.Text( strings.getKey( 'sidebar/project/vr' ) ).setWidth( '90px' ) );
6162
vrRow.add( vr );
6263

6364
container.add( vrRow );
@@ -85,7 +86,7 @@ Sidebar.Project = function ( editor ) {
8586

8687
} );
8788

88-
rendererTypeRow.add( new UI.Text( 'Renderer' ).setWidth( '90px' ) );
89+
rendererTypeRow.add( new UI.Text( strings.getKey( 'sidebar/project/renderer' ) ).setWidth( '90px' ) );
8990
rendererTypeRow.add( rendererType );
9091

9192
container.add( rendererTypeRow );

editor/js/Sidebar.Properties.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
Sidebar.Properties = function ( editor ) {
66

77
var signals = editor.signals;
8+
var strings = editor.strings;
89

910
var container = new UI.Span();
1011

11-
var objectTab = new UI.Text( 'OBJECT' ).onClick( onClick );
12-
var geometryTab = new UI.Text( 'GEOMETRY' ).onClick( onClick );
13-
var materialTab = new UI.Text( 'MATERIAL' ).onClick( onClick );
12+
var objectTab = new UI.Text( strings.getKey( 'sidebar/properties/object' ) ).setTextTransform( 'uppercase' );
13+
objectTab.onClick( function () { select( 'OBJECT' ) } );
14+
15+
var geometryTab = new UI.Text( strings.getKey( 'sidebar/properties/geometry' ) ).setTextTransform( 'uppercase' );
16+
geometryTab.onClick( function () { select( 'GEOMETRY' ) } );
17+
18+
var materialTab = new UI.Text( strings.getKey( 'sidebar/properties/material' ) ).setTextTransform( 'uppercase' );
19+
materialTab.onClick( function () { select( 'MATERIAL' ) } );
1420

1521
var tabs = new UI.Div();
1622
tabs.setId( 'tabs' );
1723
tabs.add( objectTab, geometryTab, materialTab );
1824
container.add( tabs );
1925

20-
function onClick( event ) {
21-
22-
select( event.target.textContent );
23-
24-
}
25-
2626
//
2727

2828
var object = new UI.Span().add(

editor/js/Sidebar.Scene.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
Sidebar.Scene = function ( editor ) {
66

77
var signals = editor.signals;
8+
var strings = editor.strings;
89

910
var container = new UI.Panel();
1011
container.setBorderTop( '0' );
@@ -119,7 +120,7 @@ Sidebar.Scene = function ( editor ) {
119120

120121
var backgroundColor = new UI.Color().setValue( '#aaaaaa' ).onChange( onBackgroundChanged );
121122

122-
backgroundRow.add( new UI.Text( 'Background' ).setWidth( '90px' ) );
123+
backgroundRow.add( new UI.Text( strings.getKey( 'sidebar/scene/background' ) ).setWidth( '90px' ) );
123124
backgroundRow.add( backgroundColor );
124125

125126
container.add( backgroundRow );
@@ -153,7 +154,7 @@ Sidebar.Scene = function ( editor ) {
153154

154155
} );
155156

156-
fogTypeRow.add( new UI.Text( 'Fog' ).setWidth( '90px' ) );
157+
fogTypeRow.add( new UI.Text( strings.getKey( 'sidebar/scene/fog' ) ).setWidth( '90px' ) );
157158
fogTypeRow.add( fogType );
158159

159160
container.add( fogTypeRow );

editor/js/Sidebar.Settings.Shortcuts.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
Sidebar.Settings.Shortcuts = function ( editor ) {
66

7-
const IS_MAC = navigator.platform.toUpperCase().indexOf( 'MAC' ) >= 0;
7+
var strings = editor.strings;
8+
9+
var IS_MAC = navigator.platform.toUpperCase().indexOf( 'MAC' ) >= 0;
810

911
function isValidKeyBinding( key ) {
1012

@@ -76,7 +78,7 @@ Sidebar.Settings.Shortcuts = function ( editor ) {
7678
}
7779

7880
shortcutInput.dom.maxLength = 1;
79-
shortcutRow.add( new UI.Text( name ).setTextTransform( 'capitalize' ).setWidth( '90px' ) );
81+
shortcutRow.add( new UI.Text( strings.getKey( 'sidebar/settings/shortcuts/' + name ) ).setTextTransform( 'capitalize' ).setWidth( '90px' ) );
8082
shortcutRow.add( shortcutInput );
8183

8284
container.add( shortcutRow );

editor/js/Sidebar.Settings.Viewport.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
Sidebar.Settings.Viewport = function ( editor ) {
66

77
var signals = editor.signals;
8+
var strings = editor.strings;
89

910
var container = new UI.Div();
1011
container.add( new UI.Break() );
1112

12-
container.add( new UI.Text( 'Grid' ).setWidth( '90px' ) );
13+
container.add( new UI.Text( strings.getKey( 'sidebar/settings/viewport/grid' ) ).setWidth( '90px' ) );
1314

1415
var show = new UI.THREE.Boolean( true ).onChange( update );
1516
container.add( show );

editor/js/Sidebar.Settings.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Sidebar.Settings = function ( editor ) {
66

77
var config = editor.config;
88
var signals = editor.signals;
9+
var strings = editor.strings;
910

1011
var container = new UI.Panel();
1112
container.setBorderTop( '0' );
@@ -37,7 +38,7 @@ Sidebar.Settings = function ( editor ) {
3738

3839
} );
3940

40-
languageRow.add( new UI.Text( 'Language' ).setWidth( '90px' ) );
41+
languageRow.add( new UI.Text( strings.getKey( 'sidebar/settings/language' ) ).setWidth( '90px' ) );
4142
languageRow.add( language );
4243

4344
container.add( languageRow );
@@ -68,7 +69,7 @@ Sidebar.Settings = function ( editor ) {
6869

6970
} );
7071

71-
themeRow.add( new UI.Text( 'Theme' ).setWidth( '90px' ) );
72+
themeRow.add( new UI.Text( strings.getKey( 'sidebar/settings/theme' ) ).setWidth( '90px' ) );
7273
themeRow.add( theme );
7374

7475
container.add( themeRow );

editor/js/Sidebar.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,27 @@
44

55
var Sidebar = function ( editor ) {
66

7+
var strings = editor.strings;
8+
79
var container = new UI.Panel();
810
container.setId( 'sidebar' );
911

1012
//
1113

12-
var sceneTab = new UI.Text( 'SCENE' ).onClick( onClick );
13-
var projectTab = new UI.Text( 'PROJECT' ).onClick( onClick );
14-
var settingsTab = new UI.Text( 'SETTINGS' ).onClick( onClick );
14+
var sceneTab = new UI.Text( strings.getKey( 'sidebar/scene' ) ).setTextTransform( 'uppercase' );
15+
sceneTab.onClick( function () { select( 'SCENE' ) } );
16+
17+
var projectTab = new UI.Text( strings.getKey( 'sidebar/project' ) ).setTextTransform( 'uppercase' );
18+
projectTab.onClick( function () { select( 'PROJECT' ) } );
19+
20+
var settingsTab = new UI.Text( strings.getKey( 'sidebar/settings' ) ).setTextTransform( 'uppercase' );
21+
settingsTab.onClick( function () { select( 'SETTINGS' ) } );
1522

1623
var tabs = new UI.Div();
1724
tabs.setId( 'tabs' );
1825
tabs.add( sceneTab, projectTab, settingsTab );
1926
container.add( tabs );
2027

21-
function onClick( event ) {
22-
23-
select( event.target.textContent );
24-
25-
}
26-
2728
//
2829

2930
var scene = new UI.Span().add(

editor/js/Strings.js

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ var Strings = function ( config ) {
99
var values = {
1010

1111
en: {
12+
1213
'menubar/file': 'File',
1314
'menubar/file/new': 'New',
1415
'menubar/file/import': 'Import',
@@ -56,10 +57,48 @@ var Strings = function ( config ) {
5657

5758
'menubar/help': 'Help',
5859
'menubar/help/source_code': 'Source Code',
59-
'menubar/help/about': 'About'
60+
'menubar/help/about': 'About',
61+
62+
'sidebar/scene': 'Scene',
63+
'sidebar/scene/background': 'Background',
64+
'sidebar/scene/fog': 'Fog',
65+
66+
'sidebar/properties/object': 'Object',
67+
'sidebar/properties/geometry': 'Geometry',
68+
'sidebar/properties/material': 'Material',
69+
'sidebar/properties/script': 'Script',
70+
71+
'sidebar/project': 'Project',
72+
'sidebar/project/title': 'Title',
73+
'sidebar/project/editable': 'Editable',
74+
'sidebar/project/vr': 'VR',
75+
'sidebar/project/renderer': 'Renderer',
76+
77+
'sidebar/settings': 'Settings',
78+
'sidebar/settings/language': 'Language',
79+
'sidebar/settings/theme': 'Theme',
80+
81+
'sidebar/settings/shortcuts/translate': 'Translate',
82+
'sidebar/settings/shortcuts/rotate': 'Rotate',
83+
'sidebar/settings/shortcuts/scale': 'Scale',
84+
'sidebar/settings/shortcuts/undo': 'Undo',
85+
'sidebar/settings/shortcuts/focus': 'Focus',
86+
87+
'sidebar/settings/viewport/grid': 'Grid',
88+
89+
'toolbar/translate': 'Translate',
90+
'toolbar/rotate': 'Rotate',
91+
'toolbar/scale': 'Scale',
92+
'toolbar/local': 'Local',
93+
94+
'viewport/info/objects': 'Objects',
95+
'viewport/info/vertices': 'Vertices',
96+
'viewport/info/triangles': 'Triangles'
97+
6098
},
6199

62100
zh: {
101+
63102
'menubar/file': '文件',
64103
'menubar/file/new': '新建',
65104
'menubar/file/import': '导入',
@@ -107,7 +146,42 @@ var Strings = function ( config ) {
107146

108147
'menubar/help': '帮助',
109148
'menubar/help/source_code': '源码',
110-
'menubar/help/about': '关于'
149+
'menubar/help/about': '关于',
150+
151+
'sidebar/scene': '场景',
152+
'sidebar/scene/background': '背景',
153+
'sidebar/scene/fog': '雾',
154+
155+
'sidebar/properties/object': '属性',
156+
'sidebar/properties/geometry': '几何组件',
157+
'sidebar/properties/material': '材质组件',
158+
'sidebar/properties/script': '脚本',
159+
160+
'sidebar/project': '项目',
161+
'sidebar/project/title': '标题',
162+
'sidebar/project/editable': '编辑性',
163+
'sidebar/project/vr': '虚拟现实',
164+
'sidebar/project/renderer': '渲染器',
165+
166+
'sidebar/settings': '设置',
167+
'sidebar/settings/language': '语言',
168+
'sidebar/settings/theme': '主题',
169+
'sidebar/settings/shortcuts/translate': '移动',
170+
'sidebar/settings/shortcuts/rotate': '旋转',
171+
'sidebar/settings/shortcuts/scale': '缩放',
172+
'sidebar/settings/shortcuts/undo': '撤销',
173+
'sidebar/settings/shortcuts/focus': '聚焦',
174+
'sidebar/settings/viewport/grid': '网格',
175+
176+
'toolbar/translate': '移动',
177+
'toolbar/rotate': '旋转',
178+
'toolbar/scale': '缩放',
179+
'toolbar/local': '本地',
180+
181+
'viewport/info/objects': '物体',
182+
'viewport/info/vertices': '顶点',
183+
'viewport/info/triangles': '三角形'
184+
111185
}
112186

113187
};

editor/js/Toolbar.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
var Toolbar = function ( editor ) {
66

77
var signals = editor.signals;
8+
var strings = editor.strings;
89

910
var container = new UI.Panel();
1011
container.setId( 'toolbar' );
@@ -15,7 +16,7 @@ var Toolbar = function ( editor ) {
1516

1617
// translate / rotate / scale
1718

18-
var translate = new UI.Button( 'translate' );
19+
var translate = new UI.Button( strings.getKey( 'toolbar/translate' ) );
1920
translate.dom.className = 'Button selected';
2021
translate.onClick( function () {
2122

@@ -24,23 +25,23 @@ var Toolbar = function ( editor ) {
2425
} );
2526
buttons.add( translate );
2627

27-
var rotate = new UI.Button( 'rotate' );
28+
var rotate = new UI.Button( strings.getKey( 'toolbar/rotate' ) );
2829
rotate.onClick( function () {
2930

3031
signals.transformModeChanged.dispatch( 'rotate' );
3132

3233
} );
3334
buttons.add( rotate );
3435

35-
var scale = new UI.Button( 'scale' );
36+
var scale = new UI.Button( strings.getKey( 'toolbar/scale' ) );
3637
scale.onClick( function () {
3738

3839
signals.transformModeChanged.dispatch( 'scale' );
3940

4041
} );
4142
buttons.add( scale );
4243

43-
var local = new UI.THREE.Boolean( false, 'local' );
44+
var local = new UI.THREE.Boolean( false, strings.getKey( 'toolbar/local' ) );
4445
local.onChange( function () {
4546

4647
signals.spaceChanged.dispatch( this.getValue() === true ? 'local' : 'world' );

0 commit comments

Comments
 (0)