diff --git a/.vscode/launch.json b/.vscode/launch.json index a78761b..faaab82 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -359,15 +359,16 @@ "args": [] }, { - "name": "create_numbers.py with BGMG.dxf", + "name": "translate.py ST500592_10_5-13_ILS.dxf.py with BGMG.dxf", "type": "debugpy", "request": "launch", "program": "${file}", "console": "integratedTerminal", "args": [ - "--filename", "BGMG.dxf", - "--errorfile", "BGMG_errors.json", - "--info", "BGMG_symbols.json" + "--filename", "ST500592_10_5-13_ILS.dxf", + "--extract", "-t", "json,text", + "--outname", "ST500592_10_5-13_ILS_texts.json", + "--translate", "CS" ] },{ "name": "create_numbers.py with Nummerierung1.dxf", diff --git a/bin/dropItem_create.bat b/bin/dropItem_create.bat index b9ecce0..29bb2cf 100644 --- a/bin/dropItem_create.bat +++ b/bin/dropItem_create.bat @@ -13,7 +13,7 @@ set TARGET2=%PROJECT_BIN%\ioconverter.bat set ICON2=%PROJECT_DOC%\img\Icons\Icon_portal.ico set SHORTCUT3=%INSTALL_DIR%\tr_dxf2txt.lnk -set TARGET3=%PROJECT_BIN%\tr2txt_cs.bat +set TARGET_TRTXT=%PROJECT_BIN%\tr2txt.bat set ICON3=%PROJECT_DOC%\img\Icons\dxf2txt.ico set SHORTCUT_CS=%INSTALL_DIR%\tr_dxf2CS.lnk @@ -37,9 +37,9 @@ set TARGET_ES=%PROJECT_BIN%\tr2dxf_es.bat set ICON_ES=%PROJECT_DOC%\img\Icons\dxfES.ico REM ersetze die Zeile mit setenv.bat durch die mit dem neuen Pfad -powershell -Command "(Get-Content getexdraw.bat) -replace '^.*setenv.bat$', 'call %PROJECT_BIN%\setenv.bat' | Set-Content getexdraw.bat" +powershell -Command "(Get-Content getexdraw.bat) -replace '^.*setenv.bat$', 'call %PROJECT_BIN%\setenv.bat' | Set-Content getexdraw.bat" powershell -Command "(Get-Content ioconverter.bat) -replace '^.*setenv.bat$', 'call %PROJECT_BIN%\setenv.bat' | Set-Content ioconverter.bat" -powershell -Command "(Get-Content tr2txt_cs.bat) -replace '^.*setenv.bat$', 'call %PROJECT_BIN%\setenv.bat' | Set-Content tr2txt_cs.bat" +powershell -Command "(Get-Content tr2txt.bat) -replace '^.*setenv.bat$', 'call %PROJECT_BIN%\setenv.bat' | Set-Content tr2txt.bat" powershell -Command "(Get-Content tr2dxf_cs.bat) -replace '^.*setenv.bat$', 'call %PROJECT_BIN%\setenv.bat' | Set-Content tr2dxf_cs.bat" powershell -Command "(Get-Content tr2dxf_en.bat) -replace '^.*setenv.bat$', 'call %PROJECT_BIN%\setenv.bat' | Set-Content tr2dxf_en.bat" @@ -53,7 +53,7 @@ REM Icon2 anlegen für Ioconverter powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT2%');$s.TargetPath='%TARGET2%';$s.IconLocation='%ICON2%';$s.Save()" REM Icon für Txt Extraktion anlegen -powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT3%');$s.TargetPath='%TARGET3%';$s.IconLocation='%ICON3%';$s.Save()" +powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT3%');$s.TargetPath='%TARGET_TRTXT%';$s.IconLocation='%ICON3%';$s.Save()" REM Icon für Übersetzungen anlegen powershell -Command "$s=(New-Object -COM WScript.Shell).CreateShortcut('%SHORTCUT_CS%');$s.TargetPath='%TARGET_CS%';$s.IconLocation='%ICON_CS%';$s.Save()" diff --git a/bin/getexdraw.bat b/bin/getexdraw.bat index e08a9ef..0c435a4 100644 --- a/bin/getexdraw.bat +++ b/bin/getexdraw.bat @@ -6,7 +6,7 @@ for %%i in ("%~1") do ( set "EXT=%%~xi" set "DIR=%%~dpi" ) -call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat +call C:\kabellaengen\bin\setenv.bat REM echo Dateiname ohne Erweiterung: %FILENAME% REM echo Erweiterung: %EXT% diff --git a/bin/tr2dxf_cs.bat b/bin/tr2dxf_cs.bat index 28a1f14..1b9816c 100644 --- a/bin/tr2dxf_cs.bat +++ b/bin/tr2dxf_cs.bat @@ -1,46 +1,5 @@ @echo off +REM Wrapper für Tschechisch-Übersetzungen +REM Ruft tr2dxf.bat mit CS als Sprachparameter auf -if [%1]==[] goto usage -for %%i in ("%~1") do ( - set "FILENAME=%%~ni" - set "EXT=%%~xi" - set "DIR=%%~dpi" -) -call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat - -REM echo Dateiname ohne Erweiterung: %FILENAME% -REM echo Erweiterung: %EXT% -REM echo Verzeichnis: %DIR% -REM -REM Namen der Ergebnisdateien -set RESULT_DXF=%FILENAME%_cs.dxf - -if exist "%~dp0_setenv.bat" ( - echo Lade lokale Umgebungseinstellungen aus _setenv.bat... - call "%~dp0_setenv.bat" -) -REM Zielverzeichnis -set TARGET_DIR=%PROJECT_WORK% -mkdir "%TARGET_DIR%" - -echo. -echo === Extracting TEXT, MTEXT and symbols, translating to CS === -call translate.bat --filename %1 --translate CS --todxf %RESULT_DXF% -if not exist "%PROJECT_WORK%\%RESULT_DXF% -" ( - @echo == failed: extracting texts - pause - goto :eof -) -echo. -echo === Translation file created: %PROJECT_WORK%\%RESULT_DXF% === -pause -goto :eof - - -:usage -@echo Usage: %0 ^ -exit /B 1 -goto :eof - - +call "%~dp0tr2dxf.bat" CS %1 diff --git a/bin/tr2dxf_en.bat b/bin/tr2dxf_en.bat index 62f0d31..84dda74 100644 --- a/bin/tr2dxf_en.bat +++ b/bin/tr2dxf_en.bat @@ -1,46 +1,5 @@ @echo off +REM Wrapper für Englisch-Übersetzungen +REM Ruft tr2dxf.bat mit EN als Sprachparameter auf -if [%1]==[] goto usage -for %%i in ("%~1") do ( - set "FILENAME=%%~ni" - set "EXT=%%~xi" - set "DIR=%%~dpi" -) -call C:\kabellaengen\bin\setenv.bat - -REM echo Dateiname ohne Erweiterung: %FILENAME% -REM echo Erweiterung: %EXT% -REM echo Verzeichnis: %DIR% -REM -REM Namen der Ergebnisdateien -set RESULT_DXF=%FILENAME%_en.dxf - -if exist "%~dp0_setenv.bat" ( - echo Lade lokale Umgebungseinstellungen aus _setenv.bat... - call "%~dp0_setenv.bat" -) -REM Zielverzeichnis -set TARGET_DIR=%PROJECT_WORK% -mkdir "%TARGET_DIR%" - -echo. -echo === Extracting TEXT, MTEXT and symbols, translating to EN === -call translate.bat --filename %1 --translate EN --todxf %RESULT_DXF% -if not exist "%PROJECT_WORK%\%RESULT_DXF% -" ( - @echo == failed: extracting texts - pause - goto :eof -) -echo. -echo === Translation file created: %PROJECT_WORK%\%RESULT_DXF% === -pause -goto :eof - - -:usage -@echo Usage: %0 ^ -exit /B 1 -goto :eof - - +call "%~dp0tr2dxf.bat" EN %1 diff --git a/bin/tr2dxf_es.bat b/bin/tr2dxf_es.bat index 8cf99f0..9125b8b 100644 --- a/bin/tr2dxf_es.bat +++ b/bin/tr2dxf_es.bat @@ -1,46 +1,5 @@ @echo off +REM Wrapper für Spanisch-Übersetzungen +REM Ruft tr2dxf.bat mit ES als Sprachparameter auf -if [%1]==[] goto usage -for %%i in ("%~1") do ( - set "FILENAME=%%~ni" - set "EXT=%%~xi" - set "DIR=%%~dpi" -) -call C:\kabellaengen\bin\setenv.bat - -REM echo Dateiname ohne Erweiterung: %FILENAME% -REM echo Erweiterung: %EXT% -REM echo Verzeichnis: %DIR% -REM -REM Namen der Ergebnisdateien -set RESULT_DXF=%FILENAME%_es.dxf - -if exist "%~dp0_setenv.bat" ( - echo Lade lokale Umgebungseinstellungen aus _setenv.bat... - call "%~dp0_setenv.bat" -) -REM Zielverzeichnis -set TARGET_DIR=%PROJECT_WORK% -mkdir "%TARGET_DIR%" - -echo. -echo === Extracting TEXT, MTEXT and symbols, translating to ES === -call translate.bat --filename %1 --translate ES --todxf %RESULT_DXF% -if not exist "%PROJECT_WORK%\%RESULT_DXF% -" ( - @echo == failed: extracting texts - pause - goto :eof -) -echo. -echo === Translation file created: %PROJECT_WORK%\%RESULT_DXF% === -pause -goto :eof - - -:usage -@echo Usage: %0 ^ -exit /B 1 -goto :eof - - +call "%~dp0tr2dxf.bat" ES %1 diff --git a/bin/tr2dxf_fr.bat b/bin/tr2dxf_fr.bat index e6bb468..2109ed6 100644 --- a/bin/tr2dxf_fr.bat +++ b/bin/tr2dxf_fr.bat @@ -1,46 +1,5 @@ @echo off +REM Wrapper für Französisch-Übersetzungen +REM Ruft tr2dxf.bat mit FR als Sprachparameter auf -if [%1]==[] goto usage -for %%i in ("%~1") do ( - set "FILENAME=%%~ni" - set "EXT=%%~xi" - set "DIR=%%~dpi" -) -call C:\kabellaengen\bin\setenv.bat - -REM echo Dateiname ohne Erweiterung: %FILENAME% -REM echo Erweiterung: %EXT% -REM echo Verzeichnis: %DIR% -REM -REM Namen der Ergebnisdateien -set RESULT_DXF=%FILENAME%_fr.dxf - -if exist "%~dp0_setenv.bat" ( - echo Lade lokale Umgebungseinstellungen aus _setenv.bat... - call "%~dp0_setenv.bat" -) -REM Zielverzeichnis -set TARGET_DIR=%PROJECT_WORK% -mkdir "%TARGET_DIR%" - -echo. -echo === Extracting TEXT, MTEXT and symbols, translating to FR === -call translate.bat --filename %1 --translate FR --todxf %RESULT_DXF% -if not exist "%PROJECT_WORK%\%RESULT_DXF% -" ( - @echo == failed: extracting texts - pause - goto :eof -) -echo. -echo === Translation file created: %PROJECT_WORK%\%RESULT_DXF% === -pause -goto :eof - - -:usage -@echo Usage: %0 ^ -exit /B 1 -goto :eof - - +call "%~dp0tr2dxf.bat" FR %1 diff --git a/bin/tr2dxf_it.bat b/bin/tr2dxf_it.bat index 17d31f1..8a0d9da 100644 --- a/bin/tr2dxf_it.bat +++ b/bin/tr2dxf_it.bat @@ -1,46 +1,5 @@ @echo off +REM Wrapper für Italienisch-Übersetzungen +REM Ruft tr2dxf.bat mit IT als Sprachparameter auf -if [%1]==[] goto usage -for %%i in ("%~1") do ( - set "FILENAME=%%~ni" - set "EXT=%%~xi" - set "DIR=%%~dpi" -) -call C:\kabellaengen\bin\setenv.bat - -REM echo Dateiname ohne Erweiterung: %FILENAME% -REM echo Erweiterung: %EXT% -REM echo Verzeichnis: %DIR% -REM -REM Namen der Ergebnisdateien -set RESULT_DXF=%FILENAME%_it.dxf - -if exist "%~dp0_setenv.bat" ( - echo Lade lokale Umgebungseinstellungen aus _setenv.bat... - call "%~dp0_setenv.bat" -) -REM Zielverzeichnis -set TARGET_DIR=%PROJECT_WORK% -mkdir "%TARGET_DIR%" - -echo. -echo === Extracting TEXT, MTEXT and symbols, translating to IT === -call translate.bat --filename %1 --translate IT --todxf %RESULT_DXF% -if not exist "%PROJECT_WORK%\%RESULT_DXF% -" ( - @echo == failed: extracting texts - pause - goto :eof -) -echo. -echo === Translation file created: %PROJECT_WORK%\%RESULT_DXF% === -pause -goto :eof - - -:usage -@echo Usage: %0 ^ -exit /B 1 -goto :eof - - +call "%~dp0tr2dxf.bat" IT %1 diff --git a/bin/tr2txt_cs.bat b/bin/tr2txt.bat similarity index 96% rename from bin/tr2txt_cs.bat rename to bin/tr2txt.bat index 0474150..ebcd6a8 100644 --- a/bin/tr2txt_cs.bat +++ b/bin/tr2txt.bat @@ -25,7 +25,7 @@ mkdir "%TARGET_DIR%" echo. echo === Extracting TEXT, MTEXT and symbols, translating to CS === -call translate.bat --filename %1 --extract -t json,text --outname %RESULT_JSON% --translate CS +call translate.bat --filename %1 --extract -t json,text --outname %RESULT_JSON% if not exist "%PROJECT_WORK%\%RESULT_JSON% " ( @echo == failed: extracting texts