Skip to content

Commit 76e8ce5

Browse files
AbdullahAlfarajAbdullahAlfaraj
committed
Updated missed element to use Locale for UI labels
1 parent f514120 commit 76e8ce5

File tree

7 files changed

+66
-40
lines changed

7 files changed

+66
-40
lines changed

‎i18n/zh_CN/ps-plugin.json

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
"use lora in your prompt": "在提示中使用 lora",
1313
"Generate": "生成",
1414
"Generate Txt2Img": "生成 Txt2Img",
15+
"Generate Img2Img": "生成 Img2Img",
16+
"Generate Inpaint": "生成 Inpaint",
17+
"Generate Outpaint": "生成 Outpaint",
18+
"outpaint": "outpaint",
1519
"Progress...": "进度...",
1620
"Toggle the visibility of the Preview Image on the canvas": "切换画布上预览图像的可见性",
1721
"Move and reSize the highlighted layer to fit into the Selection Area": "移动和调整突出显示的图层以适合选择区域",
@@ -67,6 +71,7 @@
6771
"Random": "随机",
6872
"Last": "最后",
6973
"Show Samplers": "显示采样器",
74+
"Sampling Steps:": "Sampling Steps:",
7075
"Select A Script": "选择脚本",
7176
"Activate": "激活",
7277
"Viewer": "查看器",

‎typescripts/after_detailer/after_detailer.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { ErrorBoundary } from '../util/errorBoundary'
2121
import { ScriptMode } from '../util/ts/enum'
2222

2323
import './style/after_detailer.css'
24+
import Locale from '../locale/locale'
2425

2526
declare let g_sd_url: string
2627

@@ -133,8 +134,7 @@ export class AfterDetailerComponent extends React.Component<{
133134
Automatic1111 webui
134135
</sp-label>
135136
<button
136-
className="btnSquare refreshButton"
137-
id="btnResetSettings"
137+
className="btnSquare refreshButton btnResetSettings"
138138
title="Refresh the ADetailer Extension"
139139
onClick={this.handleRefresh}
140140
></button>
@@ -150,7 +150,7 @@ export class AfterDetailerComponent extends React.Component<{
150150
store.updateProperty('is_enabled', event.target.checked)
151151
}}
152152
>
153-
{'Activate'}
153+
{Locale('Activate')}
154154
</sp-checkbox>
155155
<SpMenu
156156
title="model"

‎typescripts/sd_tab/sd_tab.tsx

+29-20
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,10 @@ class SDTab extends React.Component<{}> {
403403
padding: '3px',
404404
}}
405405
>
406-
<Collapsible defaultIsOpen={true} label={'Prompts'}>
406+
<Collapsible
407+
defaultIsOpen={true}
408+
label={Locale('Prompts')}
409+
>
407410
<MultiTextArea />
408411
</Collapsible>
409412
</div>
@@ -425,7 +428,7 @@ class SDTab extends React.Component<{}> {
425428
: void 0
426429
}
427430
>
428-
{config.name}
431+
{Locale(config.name)}
429432
</sp-radio>
430433
)
431434
})}
@@ -527,7 +530,7 @@ class SDTab extends React.Component<{}> {
527530
alignItems: 'flex-start',
528531
}}
529532
>
530-
<sp-label>Batch Size:</sp-label>
533+
<sp-label>{Locale('Batch Size:')}</sp-label>
531534
<SpTextfield
532535
style={{ width: '100%' }}
533536
title="the number of images to generate at once.The larger the number more VRAM stable diffusion will use."
@@ -553,7 +556,7 @@ class SDTab extends React.Component<{}> {
553556
alignItems: 'flex-start',
554557
}}
555558
>
556-
<sp-label>Batch Count:</sp-label>
559+
<sp-label>{Locale('Batch Count:')}</sp-label>
557560
<SpTextfield
558561
style={{ width: '100%' }}
559562
title="the number of images to generate in queue. The larger the number the longer will take."
@@ -577,7 +580,7 @@ class SDTab extends React.Component<{}> {
577580
}}
578581
>
579582
<sp-label id="sdLabelSampleStep">
580-
Sampling Steps
583+
{Locale('Sampling Steps:')}
581584
</sp-label>
582585
<SpTextfield
583586
style={{ width: '100%' }}
@@ -597,7 +600,7 @@ class SDTab extends React.Component<{}> {
597600
<div id="selectionMode">
598601
<div>
599602
<sp-label id="rbSelectionModeLabel" slot="label">
600-
Selection Mode:
603+
{Locale('Selection Mode:')}
601604
</sp-label>
602605
</div>
603606

@@ -637,7 +640,7 @@ class SDTab extends React.Component<{}> {
637640
}
638641
}}
639642
>
640-
{selection_mode.name}
643+
{Locale(selection_mode.name)}
641644
</sp-radio>
642645
)
643646
}
@@ -767,7 +770,7 @@ class SDTab extends React.Component<{}> {
767770
}}
768771
>
769772
<sp-label slot="label" class="title">
770-
Width:
773+
{Locale('Width:')}
771774
</sp-label>
772775
<sp-label
773776
class="labelNumber"
@@ -808,7 +811,7 @@ class SDTab extends React.Component<{}> {
808811
}}
809812
>
810813
<sp-label slot="label" class="title">
811-
Height:
814+
{Locale('Height:')}
812815
</sp-label>
813816
<sp-label
814817
class="labelNumber"
@@ -851,7 +854,7 @@ class SDTab extends React.Component<{}> {
851854
}}
852855
>
853856
<sp-label slot="label" class="title">
854-
CFG Scale:
857+
{Locale('CFG Scale:')}
855858
</sp-label>
856859
</SpSlider>
857860

@@ -876,7 +879,7 @@ class SDTab extends React.Component<{}> {
876879
}}
877880
>
878881
<sp-label slot="label" class="title">
879-
Denoising Strength:
882+
{Locale('Denoising Strength:')}
880883
</sp-label>
881884
<sp-label slot="label" id="lDenoisingStrength">
882885
{store.data.denoising_strength.toFixed(2)}
@@ -995,7 +998,9 @@ class SDTab extends React.Component<{}> {
995998
}
996999
}}
9971000
>
998-
<sp-label slot="label">Mask Expansion:</sp-label>
1001+
<sp-label slot="label">
1002+
{Locale('Mask Expansion:')}
1003+
</sp-label>
9991004
</SpSlider>
10001005

10011006
<div style={{ display: 'flex' }}>
@@ -1080,7 +1085,7 @@ class SDTab extends React.Component<{}> {
10801085
mask_content.value
10811086
}}
10821087
>
1083-
{mask_content.name}
1088+
{Locale(`${mask_content.name}`)}
10841089
</sp-radio>
10851090
)
10861091
})}
@@ -1116,7 +1121,7 @@ class SDTab extends React.Component<{}> {
11161121
evt.target.checked
11171122
}}
11181123
>
1119-
Restore Faces
1124+
{Locale('Restore Faces')}
11201125
</SpCheckBox>
11211126
<SpCheckBox
11221127
class="checkbox"
@@ -1129,7 +1134,7 @@ class SDTab extends React.Component<{}> {
11291134
store.data.enable_hr = evt.target.checked
11301135
}}
11311136
>
1132-
Hi Res Fix
1137+
{Locale('Hi Res Fix')}
11331138
</SpCheckBox>
11341139
<SpCheckBox
11351140
class="checkbox"
@@ -1139,7 +1144,7 @@ class SDTab extends React.Component<{}> {
11391144
store.data.tiling = evt.target.checked
11401145
}}
11411146
>
1142-
tiling
1147+
{Locale('Tiling')}
11431148
</SpCheckBox>
11441149
</div>
11451150
<div
@@ -1361,7 +1366,9 @@ class SDTab extends React.Component<{}> {
13611366

13621367
<div>
13631368
<div style={{ display: 'flex' }}>
1364-
<sp-label id="sdLabelSeed">Seed:</sp-label>
1369+
<sp-label id="sdLabelSeed">
1370+
{Locale('Seed:')}
1371+
</sp-label>
13651372
<sp-textfield
13661373
id="tiSeed"
13671374
placeholder="Seed"
@@ -1381,7 +1388,7 @@ class SDTab extends React.Component<{}> {
13811388
store.data.seed = '-1'
13821389
}}
13831390
>
1384-
Random
1391+
{Locale('Random')}
13851392
</button>
13861393
<button
13871394
className="btnSquare"
@@ -1391,7 +1398,7 @@ class SDTab extends React.Component<{}> {
13911398
session_store.data.last_seed
13921399
}}
13931400
>
1394-
Last
1401+
{Locale('Last')}
13951402
</button>
13961403
</div>
13971404
<button
@@ -1415,7 +1422,9 @@ class SDTab extends React.Component<{}> {
14151422
: 'none',
14161423
}}
14171424
>
1418-
<sp-label slot="label">Select Sampler:</sp-label>
1425+
<sp-label slot="label">
1426+
{Locale('Select Sampler:')}
1427+
</sp-label>
14191428
{(helper_store.data.sampler_list || []).map(
14201429
(sampler: any, index: number) => {
14211430
return (

‎typescripts/settings/settings.tsx

+10-11
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ export class Settings extends React.Component<{}> {
255255
></SpMenu>
256256

257257
<div style={{ width: '100%' }}>
258-
<sp-label>select language</sp-label>
258+
<sp-label>{Locale('select language:')}</sp-label>
259259
</div>
260260
<SpMenu
261261
title="select language"
@@ -280,10 +280,7 @@ export class Settings extends React.Component<{}> {
280280
onChange={onShouldLogToFileChange}
281281
checked={store.data.should_log_to_file}
282282
>
283-
{
284-
//@ts-ignore
285-
Locale('Log Errors To File')
286-
}
283+
{Locale('Log Errors To File')}
287284
</SpCheckBox>
288285
</div>
289286

@@ -348,7 +345,7 @@ export class Settings extends React.Component<{}> {
348345
}}
349346
style={{ display: 'inline-flex' }}
350347
>
351-
Image Cfg Scale Slider
348+
{Locale('Image Cfg Scale Slider')}
352349
</sp-checkbox>
353350
</div>
354351
<div>
@@ -359,12 +356,14 @@ export class Settings extends React.Component<{}> {
359356
store.data.use_sharp_mask = evt.target.checked
360357
}}
361358
>
362-
use sharp mask
359+
{Locale('use sharp mask')}
363360
</sp-checkbox>
364361
</div>
365362
<div>
366363
<sp-radio-group selected={store.data.extension_type}>
367-
<sp-label slot="label">Select Extension:</sp-label>
364+
<sp-label slot="label">
365+
{Locale('Select Extension:')}
366+
</sp-label>
368367
{[
369368
ExtensionTypeEnum.ProxyServer,
370369
ExtensionTypeEnum.Auto1111Extension,
@@ -387,7 +386,7 @@ export class Settings extends React.Component<{}> {
387386
evt.target.value
388387
}}
389388
>
390-
{config[extension_type].label}
389+
{Locale(config[extension_type].label)}
391390
</sp-radio>
392391
)
393392
})}
@@ -410,7 +409,7 @@ export class Settings extends React.Component<{}> {
410409
)
411410
}}
412411
>
413-
Turn Off Server Status Alert
412+
{Locale('Turn Off Server Status Alert')}
414413
</sp-checkbox>
415414
</div>
416415
<div>
@@ -452,7 +451,7 @@ export class Settings extends React.Component<{}> {
452451
: false
453452
}}
454453
>
455-
Smart Object
454+
{Locale('Smart Object')}
456455
</sp-checkbox>
457456
</div>
458457
</div>

‎typescripts/tool_bar/tool_bar.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ class ToolBar extends React.Component<{}> {
137137
}}
138138
></button>
139139
<button
140-
className="btnSquare resetButton"
141-
id="btnResetSettings"
140+
className="btnSquare resetButton btnResetSettings"
142141
title="reset the ui settings to their default values"
143142
style={{ marginRight: '3px' }}
144143
onClick={(evt: any) => {

‎typescripts/ultimate_sd_upscaler/scripts.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { SpMenu } from '../util/elements'
88
import * as ultimate_sd_upscale_script from './ultimate_sd_upscaler'
99
import { ScriptMode } from './ultimate_sd_upscaler'
1010
import { ErrorBoundary } from '../util/errorBoundary'
11+
import Locale from '../locale/locale'
1112
export function toJsFunc(store: any) {
1213
return toJS(store)
1314
}
@@ -139,7 +140,7 @@ class ScriptComponent extends React.Component<{}> {
139140
script_store.setIsActive(event.target.checked)
140141
}}
141142
>
142-
{'Activate'}
143+
{Locale('Activate')}
143144
</sp-checkbox>
144145
<>
145146
{script_store.selected_script_name === 'None' && <></>}

‎typescripts/util/elements.tsx

+16-3
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,7 @@ export const ScriptInstallComponent = observer(
496496
Automatic1111 webui
497497
</sp-label>
498498
<button
499-
className="btnSquare refreshButton"
500-
id="btnResetSettings"
499+
className="btnSquare refreshButton btnResetSettings"
501500
title="Refresh the ADetailer Extension"
502501
onClick={onRefreshHandler}
503502
></button>
@@ -626,7 +625,21 @@ export class SearchableMenu extends React.Component<{
626625
() => {
627626
console.log('onBlur:', evt.target.value)
628627

629-
this.setState({ openMenu: false })
628+
const state_values: Record<string, any> = {}
629+
if (
630+
!this.props.allItems.includes(
631+
this.state.searchQuery
632+
)
633+
) {
634+
state_values.searchQuery = ''
635+
636+
if (this.props.onSelectItemFailure) {
637+
state_values.searchQuery =
638+
this.props.onSelectItemFailure()
639+
}
640+
}
641+
state_values.openMenu = false
642+
this.setState(state_values)
630643

631644
console.log(
632645
'this.state.searchQuery: ',

0 commit comments

Comments
 (0)