Skip to content

Editor: i18n #15179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 31, 2018
Merged

Editor: i18n #15179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4936e19
Editor: i18n
linbingquan Oct 27, 2018
7d58dfd
Editor: i18n
linbingquan Oct 29, 2018
86bd6f5
rename
linbingquan Oct 31, 2018
885c3f7
i18n
linbingquan Oct 31, 2018
8dcc2f7
cleanup
linbingquan Oct 31, 2018
21cc8fc
fixed position of options with i18n
linbingquan Oct 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions editor/css/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ select {
color: #888;
margin: 0;
padding: 8px;
line-height: 16px;
}

#menubar .menu .options {
Expand Down
1 change: 1 addition & 0 deletions editor/css/light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ select {
color: #888;
margin: 0;
padding: 8px;
line-height: 16px;
}

#menubar .menu .options {
Expand Down
14 changes: 8 additions & 6 deletions editor/js/Sidebar.Geometry.BoxGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.BoxGeometry = function ( editor, object ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -16,7 +18,7 @@ Sidebar.Geometry.BoxGeometry = function ( editor, object ) {
var widthRow = new UI.Row();
var width = new UI.Number( parameters.width ).onChange( update );

widthRow.add( new UI.Text( 'Width' ).setWidth( '90px' ) );
widthRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/box_geometry/width' ) ).setWidth( '90px' ) );
widthRow.add( width );

container.add( widthRow );
Expand All @@ -26,7 +28,7 @@ Sidebar.Geometry.BoxGeometry = function ( editor, object ) {
var heightRow = new UI.Row();
var height = new UI.Number( parameters.height ).onChange( update );

heightRow.add( new UI.Text( 'Height' ).setWidth( '90px' ) );
heightRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/box_geometry/height' ) ).setWidth( '90px' ) );
heightRow.add( height );

container.add( heightRow );
Expand All @@ -36,7 +38,7 @@ Sidebar.Geometry.BoxGeometry = function ( editor, object ) {
var depthRow = new UI.Row();
var depth = new UI.Number( parameters.depth ).onChange( update );

depthRow.add( new UI.Text( 'Depth' ).setWidth( '90px' ) );
depthRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/box_geometry/depth' ) ).setWidth( '90px' ) );
depthRow.add( depth );

container.add( depthRow );
Expand All @@ -46,7 +48,7 @@ Sidebar.Geometry.BoxGeometry = function ( editor, object ) {
var widthSegmentsRow = new UI.Row();
var widthSegments = new UI.Integer( parameters.widthSegments ).setRange( 1, Infinity ).onChange( update );

widthSegmentsRow.add( new UI.Text( 'Width Seg' ).setWidth( '90px' ) );
widthSegmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/box_geometry/widthseg' ) ).setWidth( '90px' ) );
widthSegmentsRow.add( widthSegments );

container.add( widthSegmentsRow );
Expand All @@ -56,7 +58,7 @@ Sidebar.Geometry.BoxGeometry = function ( editor, object ) {
var heightSegmentsRow = new UI.Row();
var heightSegments = new UI.Integer( parameters.heightSegments ).setRange( 1, Infinity ).onChange( update );

heightSegmentsRow.add( new UI.Text( 'Height Seg' ).setWidth( '90px' ) );
heightSegmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/box_geometry/heightseg' ) ).setWidth( '90px' ) );
heightSegmentsRow.add( heightSegments );

container.add( heightSegmentsRow );
Expand All @@ -66,7 +68,7 @@ Sidebar.Geometry.BoxGeometry = function ( editor, object ) {
var depthSegmentsRow = new UI.Row();
var depthSegments = new UI.Integer( parameters.depthSegments ).setRange( 1, Infinity ).onChange( update );

depthSegmentsRow.add( new UI.Text( 'Depth Seg' ).setWidth( '90px' ) );
depthSegmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/box_geometry/depthseg' ) ).setWidth( '90px' ) );
depthSegmentsRow.add( depthSegments );

container.add( depthSegmentsRow );
Expand Down
6 changes: 4 additions & 2 deletions editor/js/Sidebar.Geometry.BufferGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.BufferGeometry = function ( editor ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -20,7 +22,7 @@ Sidebar.Geometry.BufferGeometry = function ( editor ) {
container.clear();
container.setDisplay( 'block' );

var text = new UI.Text( 'Attributes' ).setWidth( '90px' );
var text = new UI.Text( strings.getKey( 'sidebar/geometry/buffer_geometry/attributes' ) ).setWidth( '90px' );
container.add( text );

var container2 = new UI.Span().setDisplay( 'inline-block' ).setWidth( '160px' );
Expand All @@ -30,7 +32,7 @@ Sidebar.Geometry.BufferGeometry = function ( editor ) {

if ( index !== null ) {

container2.add( new UI.Text( 'index' ).setWidth( '80px' ) );
container2.add( new UI.Text( strings.getKey( 'sidebar/geometry/buffer_geometry/index' ) ).setWidth( '80px' ) );
container2.add( new UI.Text( ( index.count ).format() ).setFontSize( '12px' ) );
container2.add( new UI.Break() );

Expand Down
10 changes: 6 additions & 4 deletions editor/js/Sidebar.Geometry.CircleGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.CircleGeometry = function ( editor, object ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -16,7 +18,7 @@ Sidebar.Geometry.CircleGeometry = function ( editor, object ) {
var radiusRow = new UI.Row();
var radius = new UI.Number( parameters.radius ).onChange( update );

radiusRow.add( new UI.Text( 'Radius' ).setWidth( '90px' ) );
radiusRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/circle_geometry/radius' ) ).setWidth( '90px' ) );
radiusRow.add( radius );

container.add( radiusRow );
Expand All @@ -26,7 +28,7 @@ Sidebar.Geometry.CircleGeometry = function ( editor, object ) {
var segmentsRow = new UI.Row();
var segments = new UI.Integer( parameters.segments ).setRange( 3, Infinity ).onChange( update );

segmentsRow.add( new UI.Text( 'Segments' ).setWidth( '90px' ) );
segmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/circle_geometry/segments' ) ).setWidth( '90px' ) );
segmentsRow.add( segments );

container.add( segmentsRow );
Expand All @@ -36,7 +38,7 @@ Sidebar.Geometry.CircleGeometry = function ( editor, object ) {
var thetaStartRow = new UI.Row();
var thetaStart = new UI.Number( parameters.thetaStart * THREE.Math.RAD2DEG ).setStep( 10 ).onChange( update );

thetaStartRow.add( new UI.Text( 'Theta start' ).setWidth( '90px' ) );
thetaStartRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/circle_geometry/thetastart' ) ).setWidth( '90px' ) );
thetaStartRow.add( thetaStart );

container.add( thetaStartRow );
Expand All @@ -46,7 +48,7 @@ Sidebar.Geometry.CircleGeometry = function ( editor, object ) {
var thetaLengthRow = new UI.Row();
var thetaLength = new UI.Number( parameters.thetaLength * THREE.Math.RAD2DEG ).setStep( 10 ).onChange( update );

thetaLengthRow.add( new UI.Text( 'Theta length' ).setWidth( '90px' ) );
thetaLengthRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/circle_geometry/thetalength' ) ).setWidth( '90px' ) );
thetaLengthRow.add( thetaLength );

container.add( thetaLengthRow );
Expand Down
14 changes: 8 additions & 6 deletions editor/js/Sidebar.Geometry.CylinderGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.CylinderGeometry = function ( editor, object ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -16,7 +18,7 @@ Sidebar.Geometry.CylinderGeometry = function ( editor, object ) {
var radiusTopRow = new UI.Row();
var radiusTop = new UI.Number( parameters.radiusTop ).onChange( update );

radiusTopRow.add( new UI.Text( 'Radius top' ).setWidth( '90px' ) );
radiusTopRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/cylinder_geometry/radiustop' ) ).setWidth( '90px' ) );
radiusTopRow.add( radiusTop );

container.add( radiusTopRow );
Expand All @@ -26,7 +28,7 @@ Sidebar.Geometry.CylinderGeometry = function ( editor, object ) {
var radiusBottomRow = new UI.Row();
var radiusBottom = new UI.Number( parameters.radiusBottom ).onChange( update );

radiusBottomRow.add( new UI.Text( 'Radius bottom' ).setWidth( '90px' ) );
radiusBottomRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/cylinder_geometry/radiusbottom' ) ).setWidth( '90px' ) );
radiusBottomRow.add( radiusBottom );

container.add( radiusBottomRow );
Expand All @@ -36,7 +38,7 @@ Sidebar.Geometry.CylinderGeometry = function ( editor, object ) {
var heightRow = new UI.Row();
var height = new UI.Number( parameters.height ).onChange( update );

heightRow.add( new UI.Text( 'Height' ).setWidth( '90px' ) );
heightRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/cylinder_geometry/height' ) ).setWidth( '90px' ) );
heightRow.add( height );

container.add( heightRow );
Expand All @@ -46,7 +48,7 @@ Sidebar.Geometry.CylinderGeometry = function ( editor, object ) {
var radialSegmentsRow = new UI.Row();
var radialSegments = new UI.Integer( parameters.radialSegments ).setRange( 1, Infinity ).onChange( update );

radialSegmentsRow.add( new UI.Text( 'Radial segments' ).setWidth( '90px' ) );
radialSegmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/cylinder_geometry/radialsegments' ) ).setWidth( '90px' ) );
radialSegmentsRow.add( radialSegments );

container.add( radialSegmentsRow );
Expand All @@ -56,7 +58,7 @@ Sidebar.Geometry.CylinderGeometry = function ( editor, object ) {
var heightSegmentsRow = new UI.Row();
var heightSegments = new UI.Integer( parameters.heightSegments ).setRange( 1, Infinity ).onChange( update );

heightSegmentsRow.add( new UI.Text( 'Height segments' ).setWidth( '90px' ) );
heightSegmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/cylinder_geometry/heightsegments' ) ).setWidth( '90px' ) );
heightSegmentsRow.add( heightSegments );

container.add( heightSegmentsRow );
Expand All @@ -66,7 +68,7 @@ Sidebar.Geometry.CylinderGeometry = function ( editor, object ) {
var openEndedRow = new UI.Row();
var openEnded = new UI.Checkbox( parameters.openEnded ).onChange( update );

openEndedRow.add( new UI.Text( 'Open ended' ).setWidth( '90px' ) );
openEndedRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/cylinder_geometry/openended' ) ).setWidth( '90px' ) );
openEndedRow.add( openEnded );

container.add( openEndedRow );
Expand Down
6 changes: 4 additions & 2 deletions editor/js/Sidebar.Geometry.Geometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.Geometry = function ( editor ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -13,7 +15,7 @@ Sidebar.Geometry.Geometry = function ( editor ) {
var verticesRow = new UI.Row();
var vertices = new UI.Text();

verticesRow.add( new UI.Text( 'Vertices' ).setWidth( '90px' ) );
verticesRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/geometry/vertices' ) ).setWidth( '90px' ) );
verticesRow.add( vertices );

container.add( verticesRow );
Expand All @@ -23,7 +25,7 @@ Sidebar.Geometry.Geometry = function ( editor ) {
var facesRow = new UI.Row();
var faces = new UI.Text();

facesRow.add( new UI.Text( 'Faces' ).setWidth( '90px' ) );
facesRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/geometry/faces' ) ).setWidth( '90px' ) );
facesRow.add( faces );

container.add( facesRow );
Expand Down
6 changes: 4 additions & 2 deletions editor/js/Sidebar.Geometry.IcosahedronGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.IcosahedronGeometry = function ( editor, object ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -16,7 +18,7 @@ Sidebar.Geometry.IcosahedronGeometry = function ( editor, object ) {
var radiusRow = new UI.Row();
var radius = new UI.Number( parameters.radius ).onChange( update );

radiusRow.add( new UI.Text( 'Radius' ).setWidth( '90px' ) );
radiusRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/icosahedron_geometry/radius' ) ).setWidth( '90px' ) );
radiusRow.add( radius );

container.add( radiusRow );
Expand All @@ -26,7 +28,7 @@ Sidebar.Geometry.IcosahedronGeometry = function ( editor, object ) {
var detailRow = new UI.Row();
var detail = new UI.Integer( parameters.detail ).setRange( 0, Infinity ).onChange( update );

detailRow.add( new UI.Text( 'Detail' ).setWidth( '90px' ) );
detailRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/icosahedron_geometry/detail' ) ).setWidth( '90px' ) );
detailRow.add( detail );

container.add( detailRow );
Expand Down
10 changes: 6 additions & 4 deletions editor/js/Sidebar.Geometry.LatheGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.LatheGeometry = function( editor, object ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -16,7 +18,7 @@ Sidebar.Geometry.LatheGeometry = function( editor, object ) {
var segmentsRow = new UI.Row();
var segments = new UI.Integer( parameters.segments ).onChange( update );

segmentsRow.add( new UI.Text( 'Segments' ).setWidth( '90px' ) );
segmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/lathe_geometry/segments' ) ).setWidth( '90px' ) );
segmentsRow.add( segments );

container.add( segmentsRow );
Expand All @@ -26,7 +28,7 @@ Sidebar.Geometry.LatheGeometry = function( editor, object ) {
var phiStartRow = new UI.Row();
var phiStart = new UI.Number( parameters.phiStart * 180 / Math.PI ).onChange( update );

phiStartRow.add( new UI.Text( 'Phi start (°)' ).setWidth( '90px' ) );
phiStartRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/lathe_geometry/phistart' ) ).setWidth( '90px' ) );
phiStartRow.add( phiStart );

container.add( phiStartRow );
Expand All @@ -36,7 +38,7 @@ Sidebar.Geometry.LatheGeometry = function( editor, object ) {
var phiLengthRow = new UI.Row();
var phiLength = new UI.Number( parameters.phiLength * 180 / Math.PI ).onChange( update );

phiLengthRow.add( new UI.Text( 'Phi length (°)' ).setWidth( '90px' ) );
phiLengthRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/lathe_geometry/philength' ) ).setWidth( '90px' ) );
phiLengthRow.add( phiLength );

container.add( phiLengthRow );
Expand All @@ -47,7 +49,7 @@ Sidebar.Geometry.LatheGeometry = function( editor, object ) {
var pointsUI = [];

var pointsRow = new UI.Row();
pointsRow.add( new UI.Text( 'Points' ).setWidth( '90px' ) );
pointsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/lathe_geometry/points' ) ).setWidth( '90px' ) );

var points = new UI.Span().setDisplay( 'inline-block' );
pointsRow.add( points );
Expand Down
10 changes: 6 additions & 4 deletions editor/js/Sidebar.Geometry.PlaneGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

Sidebar.Geometry.PlaneGeometry = function ( editor, object ) {

var strings = editor.strings;

var signals = editor.signals;

var container = new UI.Row();
Expand All @@ -16,7 +18,7 @@ Sidebar.Geometry.PlaneGeometry = function ( editor, object ) {
var widthRow = new UI.Row();
var width = new UI.Number( parameters.width ).onChange( update );

widthRow.add( new UI.Text( 'Width' ).setWidth( '90px' ) );
widthRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/plane_geometry/width' ) ).setWidth( '90px' ) );
widthRow.add( width );

container.add( widthRow );
Expand All @@ -26,7 +28,7 @@ Sidebar.Geometry.PlaneGeometry = function ( editor, object ) {
var heightRow = new UI.Row();
var height = new UI.Number( parameters.height ).onChange( update );

heightRow.add( new UI.Text( 'Height' ).setWidth( '90px' ) );
heightRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/plane_geometry/height' ) ).setWidth( '90px' ) );
heightRow.add( height );

container.add( heightRow );
Expand All @@ -36,7 +38,7 @@ Sidebar.Geometry.PlaneGeometry = function ( editor, object ) {
var widthSegmentsRow = new UI.Row();
var widthSegments = new UI.Integer( parameters.widthSegments ).setRange( 1, Infinity ).onChange( update );

widthSegmentsRow.add( new UI.Text( 'Width segments' ).setWidth( '90px' ) );
widthSegmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/plane_geometry/widthsegments' ) ).setWidth( '90px' ) );
widthSegmentsRow.add( widthSegments );

container.add( widthSegmentsRow );
Expand All @@ -46,7 +48,7 @@ Sidebar.Geometry.PlaneGeometry = function ( editor, object ) {
var heightSegmentsRow = new UI.Row();
var heightSegments = new UI.Integer( parameters.heightSegments ).setRange( 1, Infinity ).onChange( update );

heightSegmentsRow.add( new UI.Text( 'Height segments' ).setWidth( '90px' ) );
heightSegmentsRow.add( new UI.Text( strings.getKey( 'sidebar/geometry/plane_geometry/heightsegments' ) ).setWidth( '90px' ) );
heightSegmentsRow.add( heightSegments );

container.add( heightSegmentsRow );
Expand Down
Loading