Skip to content

Commit 1bf9fa4

Browse files
authored
fix language detection when registry does not have a PreferredUILanguages entry
* fix: the cmd flashes back when the System Registry does not have a PreferredUILanguages project When the System Registry does not have a PreferredUILanguages project, the execution of cmd will flash back and be 100% re-emerged. In a newly installed Windows 10 system, there will be no PreferredUILanguages project in the registry if the user has not viewed or edited the system UI settings. * fix: look for language settings in two registry locations Co-authored-by: XiaoXi <[email protected]>
1 parent 202aabf commit 1bf9fa4

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

InteractiveHtmlBom/Run.bat

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,29 @@ set FilePath=%~dp0
66
set option=--show-dialog
77

88
::detect current language of user.
9-
FOR /F "tokens=3" %%a IN ('reg query "HKCU\Control Panel\Desktop" /v PreferredUILanguages ^| find "PreferredUILanguages"') DO set language=%%a
9+
reg query "HKCU\Control Panel\Desktop" /v PreferredUILanguages>nul 2>nul&&goto _dosearch1_||goto _dosearch2_
10+
11+
:_dosearch1_
12+
FOR /F "tokens=3" %%a IN (
13+
'reg query "HKCU\Control Panel\Desktop" /v PreferredUILanguages ^| find "PreferredUILanguages"'
14+
) DO (
15+
set language=%%a
16+
)
1017
set language=%language:~,2%
18+
goto _setlanguage_
19+
20+
:_dosearch2_
21+
FOR /F "tokens=3" %%a IN (
22+
'reg query "HKLM\SYSTEM\ControlSet001\Control\Nls\Language" /v InstallLanguage ^| find "InstallLanguage"'
23+
) DO (
24+
set language=%%a
25+
)
26+
if %language%==0804 (
27+
set language=zh
28+
)
29+
goto _setlanguage_
30+
31+
:_setlanguage_
1132
if %language%==zh (
1233
call %FilePath%\i18n\language_zh.bat
1334
) else (
@@ -28,7 +49,7 @@ echo ---------------------------------------------------------------------------
2849

2950
set pyFilePath=%FilePath%generate_interactive_bom.py
3051

31-
:convert
52+
:_convert_
3253
if not defined pathofEDASourceFile (
3354
set /p pathofEDASourceFile=%i18n_draghere%
3455
)
@@ -49,4 +70,4 @@ echo ---------------------------------------------------------------------------
4970

5071
CHOICE /C YN /N /M "%i18n_again% [ Y/N ]"
5172
if errorlevel 2 exit
52-
if errorlevel 1 goto convert
73+
if errorlevel 1 goto _convert_

InteractiveHtmlBom/i18n/language_en.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
::start up echo
22
set i18n_gitAddr= https://github.com/openscopeproject/InteractiveHtmlBom
33
set i18n_batScar= Bat file by Scarrrr0725
4-
set i18n_thx4using= Thankyou For Using Generate Interactive Bom
4+
set i18n_thx4using= Thank You For Using Generate Interactive Bom
55

66
::convert
77
set i18n_draghere=Please Drag the EasyEDA PCB source file here :

InteractiveHtmlBom/i18n/language_zh.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ set i18n_batScar= Bat 文件: Scarrr
99
set i18n_thx4using= 感谢使用 Generate Interactive Bom
1010

1111
::convert
12-
set i18n_draghere=请将您的EDA PCB源文件拖移至此 :
12+
set i18n_draghere=请将您的 EDA PCB 源文件拖移至此:
1313
set i18n_converting=导出中 . . . . . ."
1414

1515
::converted
16-
set i18n_again=请问是否转换其他文件
17-
set i18n_converted= 您的EDA源文件已成功导出 Bom
16+
set i18n_again=请问是否转换其他文件
17+
set i18n_converted= 您的 EDA 源文件已成功导出 Bom

0 commit comments

Comments
 (0)