From 66816d7a7e4ec1baf4e01ec73cdc5f8a92a245a9 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Sun, 2 Jun 2024 04:51:22 +0100 Subject: [PATCH] More language code fixes I commit in several commits to check autobuild --- programs/develop/libraries/InputBox/Tupfile.lua | 8 ++++---- programs/emulator/e80/trunk/Tupfile.lua | 2 +- programs/games/FindNumbers/trunk/Tupfile.lua | 2 +- programs/games/checkers/trunk/Tupfile.lua | 2 +- programs/games/clicks/trunk/Tupfile.lua | 2 +- programs/games/fara/trunk/Tupfile.lua | 2 +- programs/games/flood-it/trunk/Tupfile.lua | 2 +- programs/games/heliothryx/Tupfile.lua | 4 ++-- programs/games/kosilka/Tupfile.lua | 6 +++--- programs/games/marblematch3/Tupfile.lua | 4 ++-- programs/games/xonix/trunk/Tupfile.lua | 2 +- programs/load_img.inc | 4 ++-- programs/other/Timer/Timer.asm | 10 +++++----- programs/other/cnc_control/Tupfile.lua | 2 +- programs/other/cnc_control/build.bat | 4 ++-- programs/other/cnc_control/cnc_control.inc | 2 +- programs/other/cnc_editor/build_ru.bat | 4 ++-- programs/other/cnc_editor/cnc_editor.inc | 2 +- programs/other/cnc_editor/wnd_new_file.inc | 4 ++-- programs/other/cnc_editor/wnd_point_coords.inc | 2 +- programs/other/cnc_editor/wnd_scale.inc | 2 +- programs/system/RunOD/1/Tupfile.lua | 8 ++++---- programs/system/format/Tupfile.lua | 2 +- programs/system/format/format.asm | 2 +- programs/system/shell/Tupfile.lua | 2 +- 25 files changed, 43 insertions(+), 43 deletions(-) diff --git a/programs/develop/libraries/InputBox/Tupfile.lua b/programs/develop/libraries/InputBox/Tupfile.lua index 8ef1269885..a7d8189470 100644 --- a/programs/develop/libraries/InputBox/Tupfile.lua +++ b/programs/develop/libraries/InputBox/Tupfile.lua @@ -1,12 +1,12 @@ if tup.getconfig('NO_JWASM') ~= "" then return end -if tup.getconfig("LANG") == "it" then +if tup.getconfig("LANG") == "it_IT" then tup.definerule{command = "echo LANG_IT = 1 > %o", outputs = {"lang.inc"}} -elseif tup.getconfig("LANG") == "sp" then +elseif tup.getconfig("LANG") == "es_ES" then tup.definerule{command = "echo LANG_SP = 1 > %o", outputs = {"lang.inc"}} -elseif tup.getconfig("LANG") == "ru" then +elseif tup.getconfig("LANG") == "ru_RU" then tup.definerule{command = "echo LANG_RU = 1 > %o", outputs = {"lang.inc"}} -elseif tup.getconfig("LANG") == "en" then +elseif tup.getconfig("LANG") == "en_US" then tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} else tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} diff --git a/programs/emulator/e80/trunk/Tupfile.lua b/programs/emulator/e80/trunk/Tupfile.lua index 3fdc1d72bd..9d008dfa89 100644 --- a/programs/emulator/e80/trunk/Tupfile.lua +++ b/programs/emulator/e80/trunk/Tupfile.lua @@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig(" tup.include(HELPERDIR .. "/use_gcc.lua") INCLUDES = INCLUDES .. "-I" .. tup.getvariantdir() LDFLAGS = LDFLAGS .. " -T kolibri.ld" -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end diff --git a/programs/games/FindNumbers/trunk/Tupfile.lua b/programs/games/FindNumbers/trunk/Tupfile.lua index f9fbfbbeaa..a637bc7a7e 100644 --- a/programs/games/FindNumbers/trunk/Tupfile.lua +++ b/programs/games/FindNumbers/trunk/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end diff --git a/programs/games/checkers/trunk/Tupfile.lua b/programs/games/checkers/trunk/Tupfile.lua index b78a5376e8..f0765e2cac 100644 --- a/programs/games/checkers/trunk/Tupfile.lua +++ b/programs/games/checkers/trunk/Tupfile.lua @@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig(" tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end diff --git a/programs/games/clicks/trunk/Tupfile.lua b/programs/games/clicks/trunk/Tupfile.lua index 0cd64e9551..84e49886e4 100644 --- a/programs/games/clicks/trunk/Tupfile.lua +++ b/programs/games/clicks/trunk/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end diff --git a/programs/games/fara/trunk/Tupfile.lua b/programs/games/fara/trunk/Tupfile.lua index 7db57f3a5c..5fd2981eaf 100644 --- a/programs/games/fara/trunk/Tupfile.lua +++ b/programs/games/fara/trunk/Tupfile.lua @@ -1,7 +1,7 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_msvc.lua") -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then CFLAGS = CFLAGS .. " /DLANG=RUS" else CFLAGS = CFLAGS .. " /DLANG=ENG" end diff --git a/programs/games/flood-it/trunk/Tupfile.lua b/programs/games/flood-it/trunk/Tupfile.lua index 09e85d8087..47d2b53c5d 100644 --- a/programs/games/flood-it/trunk/Tupfile.lua +++ b/programs/games/flood-it/trunk/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end diff --git a/programs/games/heliothryx/Tupfile.lua b/programs/games/heliothryx/Tupfile.lua index 1232c6b582..3ff74739d8 100644 --- a/programs/games/heliothryx/Tupfile.lua +++ b/programs/games/heliothryx/Tupfile.lua @@ -6,10 +6,10 @@ tup.include(HELPERDIR .. "/use_sound.lua") LDFLAGS = LDFLAGS .. " -T kolibri.ld" tup.append_table(OBJS, tup.rule("start.asm", "fasm %f %o", "start.o")) -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RU" -elseif tup.getconfig("LANG") == "sp" +elseif tup.getconfig("LANG") == "es_ES" then C_LANG = "LANG_SP" -- just for example, other languages are not implemented else C_LANG = "LANG_EN" -- default language is English diff --git a/programs/games/kosilka/Tupfile.lua b/programs/games/kosilka/Tupfile.lua index 1537e945f6..4da2b6d2ce 100644 --- a/programs/games/kosilka/Tupfile.lua +++ b/programs/games/kosilka/Tupfile.lua @@ -1,9 +1,9 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_msvc.lua") -if tup.getconfig("LANG") == "ru" -then CFLAGS = CFLAGS .. " /DLANG=RUS" -else CFLAGS = CFLAGS .. " /DLANG=ENG" +if tup.getconfig("LANG") == "ru_RU" +then CFLAGS += " /DLANG=RUS" +else CFLAGS += " /DLANG=ENG" end compile_msvc{"kosilka.cpp", "KosFile.cpp", "kosSyst.cpp", "mcsmemm.cpp"} link_msvc("kosilka") diff --git a/programs/games/marblematch3/Tupfile.lua b/programs/games/marblematch3/Tupfile.lua index 7272a1ba5d..5b6bdefca3 100644 --- a/programs/games/marblematch3/Tupfile.lua +++ b/programs/games/marblematch3/Tupfile.lua @@ -6,10 +6,10 @@ tup.include(HELPERDIR .. "/use_sound.lua") LDFLAGS = LDFLAGS .. " -T kolibri.ld" tup.append_table(OBJS, tup.rule("start.asm", "fasm %f %o", "start.o")) -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RU" -elseif tup.getconfig("LANG") == "sp" +elseif tup.getconfig("LANG") == "es_ES" then C_LANG = "LANG_SP" -- just for example, other languages are not implemented else C_LANG = "LANG_EN" -- default language is English diff --git a/programs/games/xonix/trunk/Tupfile.lua b/programs/games/xonix/trunk/Tupfile.lua index 609e57c422..ff7cfe2360 100644 --- a/programs/games/xonix/trunk/Tupfile.lua +++ b/programs/games/xonix/trunk/Tupfile.lua @@ -1,7 +1,7 @@ if tup.getconfig("NO_MSVC") ~= "" then return end HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_msvc.lua") -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then CFLAGS = CFLAGS .. " /DLANG=RUS" else CFLAGS = CFLAGS .. " /DLANG=ENG" end diff --git a/programs/load_img.inc b/programs/load_img.inc index 7356ec9236..150951f49c 100644 --- a/programs/load_img.inc +++ b/programs/load_img.inc @@ -33,7 +33,7 @@ align 4 open_b rb 560 txt_err_img_file: -if lang eq ru +if lang eq ru_RU db 'Ошибка N' .n: db '* при открытии файла ' else @@ -181,4 +181,4 @@ end if mov [buf],eax stdcall [img_to_rgb2], ebx,[buf] ;преобразуем изображение к формату rgb stdcall [img_destroy], ebx ;удаляем временный буфер с параметрами изображения -} \ No newline at end of file +} diff --git a/programs/other/Timer/Timer.asm b/programs/other/Timer/Timer.asm index d0f39b4e30..942b478a7c 100644 --- a/programs/other/Timer/Timer.asm +++ b/programs/other/Timer/Timer.asm @@ -1,6 +1,6 @@ ; Timer with three buttons ; -; %define lang "ru" -; %define lang "it" +; %define lang "ru_RU" +; %define lang "it_IT" ORG 0 BITS 32 ; ---------------------------------------------------------------------------- ; @@ -88,7 +88,7 @@ ButtonEvents: .pause dd EmptyProc ; at start Pause must not work .reset dd On_ButtonReset ; ---------------------------------------------------------------------------- ; -%ifidn lang, "ru" +%ifidn lang, "ru_RU" sz_timer db "╥рщьхЁ",0 sz_start: db "ёЄрЁЄ" @@ -97,7 +97,7 @@ ButtonEvents: .end: db 0 sz_reset: db "ёсЁюё" .end: db 0 -%elifidn lang, "it" +%elifidn lang, "it_IT" sz_timer db "Timer",0 sz_start: db "lancio" @@ -390,4 +390,4 @@ TimerStarted: EmptyProc: ret ; ---------------------------------------------------------------------------- ; -END: \ No newline at end of file +END: diff --git a/programs/other/cnc_control/Tupfile.lua b/programs/other/cnc_control/Tupfile.lua index 63aa0fd10d..838fda0a5d 100644 --- a/programs/other/cnc_control/Tupfile.lua +++ b/programs/other/cnc_control/Tupfile.lua @@ -3,6 +3,6 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HEL tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) -tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru_RU" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) tup.rule({"cnc_control.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cnc_control") diff --git a/programs/other/cnc_control/build.bat b/programs/other/cnc_control/build.bat index 11b646755b..179864e6d2 100644 --- a/programs/other/cnc_control/build.bat +++ b/programs/other/cnc_control/build.bat @@ -1,5 +1,5 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm.exe -m 16384 cnc_control.asm cnc_control @erase lang.inc @kpack cnc_control -@pause \ No newline at end of file +@pause diff --git a/programs/other/cnc_control/cnc_control.inc b/programs/other/cnc_control/cnc_control.inc index 29ae44ed1e..5b6b35915e 100644 --- a/programs/other/cnc_control/cnc_control.inc +++ b/programs/other/cnc_control/cnc_control.inc @@ -56,7 +56,7 @@ txt_err_no_1_point_sel db ' txt_min_x db 'min x: ',0 txt_min_y db 'min y: ',0 -if lang eq ru +if lang eq ru_RU ; ; rus ; diff --git a/programs/other/cnc_editor/build_ru.bat b/programs/other/cnc_editor/build_ru.bat index f63c4cd7b6..240d253837 100644 --- a/programs/other/cnc_editor/build_ru.bat +++ b/programs/other/cnc_editor/build_ru.bat @@ -2,8 +2,8 @@ if not exist bin mkdir bin @copy *.nc bin\*.nc @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm.exe -m 32768 cnc_editor.asm bin\cnc_editor.kex @kpack bin\cnc_editor.kex -pause \ No newline at end of file +pause diff --git a/programs/other/cnc_editor/cnc_editor.inc b/programs/other/cnc_editor/cnc_editor.inc index 7ae2a19653..de2d4d9ee8 100644 --- a/programs/other/cnc_editor/cnc_editor.inc +++ b/programs/other/cnc_editor/cnc_editor.inc @@ -56,7 +56,7 @@ txt_err_no_1_point_sel db ' txt_min_x db 'min x: ',0 txt_min_y db 'min y: ',0 -if lang eq ru +if lang eq ru_RU ; ; rus ; diff --git a/programs/other/cnc_editor/wnd_new_file.inc b/programs/other/cnc_editor/wnd_new_file.inc index 4f853c7a31..7e2ffa7767 100644 --- a/programs/other/cnc_editor/wnd_new_file.inc +++ b/programs/other/cnc_editor/wnd_new_file.inc @@ -572,7 +572,7 @@ txt_05: db 'G0 Z' txt_06: db 'G0 M5 X0 Y0 Z' .z: rb 12 -if lang eq ru +if lang eq ru_RU capt_n_file db 'Создать новый файл',0 capt_sel_fig db 'Выберите фигуру:',0 txt_circle: db 'Окружность' @@ -586,4 +586,4 @@ txt_circle: db 'Circle' .end: db 0 txt_rect: db 'Rectangle' .end: db 0 -end if \ No newline at end of file +end if diff --git a/programs/other/cnc_editor/wnd_point_coords.inc b/programs/other/cnc_editor/wnd_point_coords.inc index de8d410862..66c31162af 100644 --- a/programs/other/cnc_editor/wnd_point_coords.inc +++ b/programs/other/cnc_editor/wnd_point_coords.inc @@ -268,7 +268,7 @@ endp align 4 capt_p rb 64 -if lang eq ru +if lang eq ru_RU capt_fig: db 'Команда: ',39 .name: rb 55 capt_poi: db 'Точка: ' diff --git a/programs/other/cnc_editor/wnd_scale.inc b/programs/other/cnc_editor/wnd_scale.inc index 88ccdc6ae0..3430770ab3 100644 --- a/programs/other/cnc_editor/wnd_scale.inc +++ b/programs/other/cnc_editor/wnd_scale.inc @@ -167,7 +167,7 @@ proc timer_funct_scale endp align 4 -if lang eq ru +if lang eq ru_RU capt_opt db 'Настройки',0 capt_sc db 'Масштаб:',0 else diff --git a/programs/system/RunOD/1/Tupfile.lua b/programs/system/RunOD/1/Tupfile.lua index fd15ce2746..3f7afd2f1a 100644 --- a/programs/system/RunOD/1/Tupfile.lua +++ b/programs/system/RunOD/1/Tupfile.lua @@ -1,12 +1,12 @@ if tup.getconfig('NO_JWASM') ~= "" or tup.getconfig("NO_GCC") ~= "" then return end -if tup.getconfig("LANG") == "it" then +if tup.getconfig("LANG") == "it_IT" then tup.definerule{command = "echo LANG_IT = 1 > %o", outputs = {"lang.inc"}} -elseif tup.getconfig("LANG") == "sp" then +elseif tup.getconfig("LANG") == "es_ES" then tup.definerule{command = "echo LANG_SP = 1 > %o", outputs = {"lang.inc"}} -elseif tup.getconfig("LANG") == "ru" then +elseif tup.getconfig("LANG") == "ru_RU" then tup.definerule{command = "echo LANG_RU = 1 > %o", outputs = {"lang.inc"}} -elseif tup.getconfig("LANG") == "en" then +elseif tup.getconfig("LANG") == "en_US" then tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} else tup.definerule{command = "echo LANG_EN = 1 > %o", outputs = {"lang.inc"}} diff --git a/programs/system/format/Tupfile.lua b/programs/system/format/Tupfile.lua index 30ccf9051f..2ee3fff3af 100644 --- a/programs/system/format/Tupfile.lua +++ b/programs/system/format/Tupfile.lua @@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HEL tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) -tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru_RU" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) tup.rule({"format.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "FORMAT") diff --git a/programs/system/format/format.asm b/programs/system/format/format.asm index fdbd099db8..c503acec9a 100644 --- a/programs/system/format/format.asm +++ b/programs/system/format/format.asm @@ -346,7 +346,7 @@ ch2 check_box2 Otstup shl 16 + 12, (190+dy) shl 16 + 12, 6, 0xFFFFFFFF, 0xAABBCC browse db '...', 0 -if lang eq ru ;RU language +if lang eq ru_RU ;RU language title db "Formatting Disk Utility", 0 diff --git a/programs/system/shell/Tupfile.lua b/programs/system/shell/Tupfile.lua index 4b309cbbac..8519d980a5 100644 --- a/programs/system/shell/Tupfile.lua +++ b/programs/system/shell/Tupfile.lua @@ -4,7 +4,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HEL tup.include(HELPERDIR .. "/use_tcc.lua") CFLAGS += " -I" .. tup.getvariantdir() -if tup.getconfig("LANG") == "ru" +if tup.getconfig("LANG") == "ru_RU" then C_LANG = "LANG_RUS" else C_LANG = "LANG_ENG" -- this includes default case without config end