Skip to content

Commit

Permalink
Merge pull request #20104 from linbingquan/dev-editor-string1
Browse files Browse the repository at this point in the history
Editor: add slot to string.js
  • Loading branch information
mrdoob authored Aug 18, 2020
2 parents a2b30dd + 325cc31 commit d1046e4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion editor/js/Sidebar.Material.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function SidebarMaterial( editor ) {

var materialSlotRow = new UIRow();

materialSlotRow.add( new UIText( 'Slot' ).setWidth( '90px' ) );
materialSlotRow.add( new UIText( strings.getKey( 'sidebar/material/slot' ) ).setWidth( '90px' ) );

var materialSlotSelect = new UISelect().setWidth( '170px' ).setFontSize( '12px' ).onChange( update );
materialSlotSelect.setOptions( { 0: '' } ).setValue( 0 );
Expand Down
3 changes: 3 additions & 0 deletions editor/js/Strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ function Strings( config ) {
'sidebar/material/new': 'New',
'sidebar/material/copy': 'Copy',
'sidebar/material/paste': 'Paste',
'sidebar/material/slot': 'Slot',
'sidebar/material/type': 'Type',
'sidebar/material/uuid': 'UUID',
'sidebar/material/name': 'Name',
Expand Down Expand Up @@ -541,6 +542,7 @@ function Strings( config ) {
'sidebar/material/new': 'Nouveau',
'sidebar/material/copy': 'Copier',
'sidebar/material/paste': 'Coller',
'sidebar/material/slot': 'Slot',
'sidebar/material/type': 'Type',
'sidebar/material/uuid': 'UUID',
'sidebar/material/name': 'Nom',
Expand Down Expand Up @@ -846,6 +848,7 @@ function Strings( config ) {
'sidebar/material/new': '更新',
'sidebar/material/copy': '复制',
'sidebar/material/paste': '粘贴',
'sidebar/material/slot': '插槽',
'sidebar/material/type': '类型',
'sidebar/material/uuid': '识别码',
'sidebar/material/name': '名称',
Expand Down

0 comments on commit d1046e4

Please sign in to comment.