From 52d62137d4473752921b7a9721e1e0e3d35d1f98 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Thu, 13 Nov 2025 15:21:14 -0500 Subject: [PATCH] add more missing lang keys, fix bambu mod load order, workflow dep --- .github/workflows/prod-test.yml | 2 +- mods/bambu/bambu.js | 2 +- package.json | 3 +- src/kiri/mode/cam/init-menu.js | 2 +- web/kiri/index.html | 52 ++++++++++++++++----------------- web/kiri/lang/da.js | 33 +++++++++++++++++++-- web/kiri/lang/de-de.js | 33 +++++++++++++++++++-- web/kiri/lang/en.js | 33 +++++++++++++++++++-- web/kiri/lang/es-es.js | 33 +++++++++++++++++++-- web/kiri/lang/fr.js | 33 +++++++++++++++++++-- web/kiri/lang/pl-pl.js | 33 +++++++++++++++++++-- web/kiri/lang/pt.js | 33 +++++++++++++++++++-- web/kiri/lang/zh.js | 34 +++++++++++++++++++-- 13 files changed, 279 insertions(+), 47 deletions(-) diff --git a/.github/workflows/prod-test.yml b/.github/workflows/prod-test.yml index a94ec631..aba0391f 100644 --- a/.github/workflows/prod-test.yml +++ b/.github/workflows/prod-test.yml @@ -24,4 +24,4 @@ jobs: run: npm run setup - name: dry run production build - run: npm run prod-dryrun + run: npm run dryrun-prod diff --git a/mods/bambu/bambu.js b/mods/bambu/bambu.js index 76b43dfa..d272f05f 100644 --- a/mods/bambu/bambu.js +++ b/mods/bambu/bambu.js @@ -661,7 +661,7 @@ self.kiri.load(api => { } }); - api.event.on("load-done", function() { + api.event.on("init-done", function() { if (init) { return; } diff --git a/package.json b/package.json index a673f931..48659509 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,8 @@ "docs-check": "prettier --config ./conf/prettier.config.js ./docs --check", "docs-dev": "docusaurus start --config conf/docusaurus.config.js", "docs-serve": "docusaurus serve --config conf/docusaurus.config.js", - "dryrun": "gs-app-server --debug --single --alt --dryrun", + "dryrun": "gs-app-server --debug --single --dryrun", + "dryrun-prod": "gs-app-server --single --dryrun", "mac-verify": "spctl --assess -vv --type install dist/*/*.app", "mk-links": "find src web -type l | xargs -I{} sh -c 'echo \"{},$(readlink {})\"' > conf/links.csv", "pack-dev": "npm run webpack-src && npm run dryrun && npm run bundle:dev", diff --git a/src/kiri/mode/cam/init-menu.js b/src/kiri/mode/cam/init-menu.js index 9cc96073..ce654c00 100644 --- a/src/kiri/mode/cam/init-menu.js +++ b/src/kiri/mode/cam/init-menu.js @@ -105,7 +105,7 @@ export function menu() { separator: newBlank({ class:"set-sep", driven }), camEaseAngle: newInput(LANG.ou_eang_s, {title:LANG.ou_eang_l, convert:toFloat, bound:bound(0.1,85), show:() => ui.camEaseDown.checked}), camFullEngage: newInput(LANG.ou_feng_s, {title:LANG.ou_feng_l, convert:toFloat, bound:bound(0.1,1.0)}), - _____: newGroup(LANG.co_menu, $('cam-origin'), { modes:CAM, driven, separator }), + _____: newGroup(LANG.or_menu, $('cam-origin'), { modes:CAM, driven, separator }), camOriginTop: newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l}), camOriginCenter: newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l}), separator: newBlank({ class:"set-sep", driven }), diff --git a/web/kiri/index.html b/web/kiri/index.html index fccf01b7..b537ed7c 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -92,7 +92,7 @@
- +
@@ -120,7 +120,7 @@ - +
@@ -158,7 +158,7 @@ - +
@@ -195,7 +195,7 @@ - +
@@ -421,8 +421,8 @@
-
-
+
+
@@ -633,27 +633,27 @@
-
+
-
+
-
+
@@ -661,7 +661,7 @@
-
+
@@ -675,8 +675,8 @@
-
-
+
+
@@ -684,25 +684,25 @@
-
+
-
+
- +
-
+
-
+
diff --git a/web/kiri/lang/da.js b/web/kiri/lang/da.js index 80733a28..572f31c1 100644 --- a/web/kiri/lang/da.js +++ b/web/kiri/lang/da.js @@ -228,6 +228,10 @@ self.lang['da-dk'] = { mo_lazr: "laser skæring", mo_cncm: "CNC fræsning", + // MODE INFO (right panel) + mi_devi: "Enhed", + mi_prof: "Profil", + // SETUP su_menu: "setup", su_devi: "enheder", @@ -262,6 +266,11 @@ self.lang['da-dk'] = { ws_save: "gem", ws_cler: "ryd", + // RIGHT PANEL + rp_objs: "objekter", + rp_rngs: "områder", + rp_opls: "operationsliste", + // OPTIONS op_menu: "brugerflade", op_disp: "skærm", @@ -849,7 +858,7 @@ self.lang['da-dk'] = { or_offy_l: "udgangspunkt forskydning Y", // CAM ORIGIN - co_menu: "udgangspunkt", + or_menu: "udgangspunkt", co_offx_s: "forskydning x", co_offx_l: ["forskyd udgangspunkt langs x akse","i arbejdsområde enheder"], co_offy_s: "forskydning y", @@ -979,5 +988,25 @@ self.lang['da-dk'] = { sa_opzo_s: "z forskydning", sa_opzo_l: ["z lag forskydning","næsten altid 0.0","0.0-1.0 i millimeter"], sa_opaa_s: "anti alias", - sa_opaa_l: ["aktiver anti-aliasing","producerer større filer","kan sløre detaljer"] + sa_opaa_l: ["aktiver anti-aliasing","producerer større filer","kan sløre detaljer"], + + // EXPORT DIALOG + ex_job: "job", + ex_fnam: "filnavn", + ex_fsiz: "filstørrelse (bytes)", + ex_time: "tidsestimat (h:m:s)", + ex_matl: "materiale", + ex_dens: "filamenttæthed (g/cm^3)", + ex_fuse: "filament brugt (mm)", + ex_wght: "printet vægt (g)", + ex_gcpv: "gcode forhåndsvisning", + ex_dwnl: "download", + ex_bamb: "send til bambu", + ex_octo: "octoprint", + ex_host: "vært", + ex_akey: "nøgle", + ex_rsnm: "harpiks brugt ML", + ex_layr: "lag", + ex_ptim: "printtid", + ex_segs: "segmenter" }; diff --git a/web/kiri/lang/de-de.js b/web/kiri/lang/de-de.js index 82e4f40a..d6a9902c 100644 --- a/web/kiri/lang/de-de.js +++ b/web/kiri/lang/de-de.js @@ -228,6 +228,10 @@ self.lang['de-de'] = { mo_lazr: "Laser-Schnitt", mo_cncm: "CNC-Fräsen", + // MODE INFO (right panel) + mi_devi: "Gerät", + mi_prof: "Profil", + // SETUP su_menu: "Setup", su_devi: "Geräte", @@ -262,6 +266,11 @@ self.lang['de-de'] = { ws_save: "Speichern", ws_cler: "Leeren", + // RIGHT PANEL + rp_objs: "Objekte", + rp_rngs: "Bereiche", + rp_opls: "Operationsliste", + // OPTIONS op_menu: "Interface", op_disp: "Anzeige", @@ -849,7 +858,7 @@ self.lang['de-de'] = { or_offy_l: "Nullpunkt Offset Y", // CAM ORIGIN - co_menu: "Nullpunkt", + or_menu: "Nullpunkt", co_offx_s: "Offset X", co_offx_l: ["Nullpunkt entlang X-Achse offsetieren","in Arbeitsbereich-Einheiten"], co_offy_s: "Offset Y", @@ -979,5 +988,25 @@ self.lang['de-de'] = { sa_opzo_s: "Z-Offset", sa_opzo_l: ["Z-Schicht-Offset","fast immer 0.0","0.0-1.0 in mm"], sa_opaa_s: "Anti-Alias", - sa_opaa_l: ["Anti-Aliasing aktivieren","produziert größere Dateien","kann Details verwischen"] + sa_opaa_l: ["Anti-Aliasing aktivieren","produziert größere Dateien","kann Details verwischen"], + + // EXPORT DIALOG + ex_job: "Auftrag", + ex_fnam: "Dateiname", + ex_fsiz: "Dateigröße (Bytes)", + ex_time: "Zeitschätzung (h:m:s)", + ex_matl: "Material", + ex_dens: "Filamentdichte (g/cm^3)", + ex_fuse: "Filamentverbrauch (mm)", + ex_wght: "Druckgewicht (g)", + ex_gcpv: "GCode-Vorschau", + ex_dwnl: "Herunterladen", + ex_bamb: "An Bambu senden", + ex_octo: "OctoPrint", + ex_host: "Host", + ex_akey: "Schlüssel", + ex_rsnm: "Harzverbrauch ML", + ex_layr: "Schichten", + ex_ptim: "Druckzeit", + ex_segs: "Segmente" }; diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 22c2f64e..fe19359e 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -228,6 +228,10 @@ self.lang['en-us'] = { mo_lazr: "Laser Cut", mo_cncm: "CNC Mill", + // MODE INFO (right panel) + mi_devi: "Device", + mi_prof: "Profile", + // SETUP su_menu: "setup", su_devi: "Devices", @@ -262,6 +266,11 @@ self.lang['en-us'] = { ws_save: "Save", ws_cler: "Clear", + // RIGHT PANEL + rp_objs: "objects", + rp_rngs: "ranges", + rp_opls: "operation list", + // OPTIONS op_menu: "interface", op_disp: "display", @@ -849,7 +858,7 @@ self.lang['en-us'] = { or_offy_l: "origin offset Y", // CAM ORIGIN - co_menu: "origin", + or_menu: "origin", co_offx_s: "offset x", co_offx_l: ["offset origin along x axis","in workspace units"], co_offy_s: "offset y", @@ -979,5 +988,25 @@ self.lang['en-us'] = { sa_opzo_s: "z offset", sa_opzo_l: ["z layer offset","almost always 0.0","0.0-1.0 in millimeters"], sa_opaa_s: "anti alias", - sa_opaa_l: ["enable anti-aliasing","produces larger files","can blur details"] + sa_opaa_l: ["enable anti-aliasing","produces larger files","can blur details"], + + // EXPORT DIALOG + ex_job: "job", + ex_fnam: "file name", + ex_fsiz: "file size (bytes)", + ex_time: "time estimate (h:m:s)", + ex_matl: "material", + ex_dens: "filament density (g/cm^3)", + ex_fuse: "filament used (mm)", + ex_wght: "printed weight (g)", + ex_gcpv: "gcode preview", + ex_dwnl: "download", + ex_bamb: "send to bambu", + ex_octo: "octoprint", + ex_host: "host", + ex_akey: "key", + ex_rsnm: "resin used ML", + ex_layr: "layers", + ex_ptim: "print time", + ex_segs: "segments" }; diff --git a/web/kiri/lang/es-es.js b/web/kiri/lang/es-es.js index ec71ee71..47e4663f 100644 --- a/web/kiri/lang/es-es.js +++ b/web/kiri/lang/es-es.js @@ -228,6 +228,10 @@ self.lang['es-es'] = { mo_lazr: "Corte láser", mo_cncm: "Fresado CNC", + // MODE INFO (right panel) + mi_devi: "Dispositivo", + mi_prof: "Perfil", + // SETUP su_menu: "configuración", su_devi: "Dispositivos", @@ -262,6 +266,11 @@ self.lang['es-es'] = { ws_save: "Guardar", ws_cler: "Limpiar", + // RIGHT PANEL + rp_objs: "objetos", + rp_rngs: "rangos", + rp_opls: "lista de operaciones", + // OPTIONS op_menu: "interfaz", op_disp: "pantalla", @@ -849,7 +858,7 @@ self.lang['es-es'] = { or_offy_l: "desplazamiento de origen Y", // CAM ORIGIN - co_menu: "origen", + or_menu: "origen", co_offx_s: "desplazamiento x", co_offx_l: ["desplazar origen a lo largo del eje x","en unidades de espacio de trabajo"], co_offy_s: "desplazamiento y", @@ -979,5 +988,25 @@ self.lang['es-es'] = { sa_opzo_s: "desplazamiento z", sa_opzo_l: ["desplazamiento de capa z","casi siempre 0.0","0.0-1.0 en milímetros"], sa_opaa_s: "antialiasing", - sa_opaa_l: ["habilitar antialiasing","produce archivos más grandes","puede difuminar detalles"] + sa_opaa_l: ["habilitar antialiasing","produce archivos más grandes","puede difuminar detalles"], + + // EXPORT DIALOG + ex_job: "trabajo", + ex_fnam: "nombre de archivo", + ex_fsiz: "tamaño de archivo (bytes)", + ex_time: "estimación de tiempo (h:m:s)", + ex_matl: "material", + ex_dens: "densidad de filamento (g/cm^3)", + ex_fuse: "filamento usado (mm)", + ex_wght: "peso impreso (g)", + ex_gcpv: "vista previa gcode", + ex_dwnl: "descargar", + ex_bamb: "enviar a bambu", + ex_octo: "octoprint", + ex_host: "host", + ex_akey: "clave", + ex_rsnm: "resina usada ML", + ex_layr: "capas", + ex_ptim: "tiempo de impresión", + ex_segs: "segmentos" }; diff --git a/web/kiri/lang/fr.js b/web/kiri/lang/fr.js index 007dc5d1..ca266268 100644 --- a/web/kiri/lang/fr.js +++ b/web/kiri/lang/fr.js @@ -228,6 +228,10 @@ self.lang['fr-fr'] = { mo_lazr: "Découpe Laser", mo_cncm: "Fraisage CNC", + // MODE INFO (right panel) + mi_devi: "Périphérique", + mi_prof: "Profil", + // SETUP su_menu: "configuration", su_devi: "Appareils", @@ -262,6 +266,11 @@ self.lang['fr-fr'] = { ws_save: "Sauvegarder", ws_cler: "Effacer", + // RIGHT PANEL + rp_objs: "objets", + rp_rngs: "plages", + rp_opls: "liste des opérations", + // OPTIONS op_menu: "interface", op_disp: "affichage", @@ -849,7 +858,7 @@ self.lang['fr-fr'] = { or_offy_l: "décalage d'origine Y", // CAM ORIGIN - co_menu: "origine", + or_menu: "origine", co_offx_s: "décalage x", co_offx_l: ["décaler l'origine le long de l'axe x","en unités d'espace de travail"], co_offy_s: "décalage y", @@ -979,5 +988,25 @@ self.lang['fr-fr'] = { sa_opzo_s: "décalage z", sa_opzo_l: ["décalage de couche z","presque toujours 0.0","0.0-1.0 en millimètres"], sa_opaa_s: "anti-crénelage", - sa_opaa_l: ["activer l'anti-crénelage","produit des fichiers plus volumineux","peut flouter les détails"] + sa_opaa_l: ["activer l'anti-crénelage","produit des fichiers plus volumineux","peut flouter les détails"], + + // EXPORT DIALOG + ex_job: "travail", + ex_fnam: "nom de fichier", + ex_fsiz: "taille du fichier (octets)", + ex_time: "estimation du temps (h:m:s)", + ex_matl: "matériau", + ex_dens: "densité du filament (g/cm^3)", + ex_fuse: "filament utilisé (mm)", + ex_wght: "poids imprimé (g)", + ex_gcpv: "aperçu gcode", + ex_dwnl: "télécharger", + ex_bamb: "envoyer à bambu", + ex_octo: "octoprint", + ex_host: "hôte", + ex_akey: "clé", + ex_rsnm: "résine utilisée ML", + ex_layr: "couches", + ex_ptim: "temps d'impression", + ex_segs: "segments" }; diff --git a/web/kiri/lang/pl-pl.js b/web/kiri/lang/pl-pl.js index 7699a4e5..845ae624 100644 --- a/web/kiri/lang/pl-pl.js +++ b/web/kiri/lang/pl-pl.js @@ -227,6 +227,10 @@ self.lang['pl-pl'] = { mo_lazr: "Cięcie laserowe", mo_cncm: "Frezowanie CNC", + // MODE INFO (right panel) + mi_devi: "Urządzenie", + mi_prof: "Profil", + // SETUP su_menu: "konfiguracja", su_devi: "Urządzenia", @@ -261,6 +265,11 @@ self.lang['pl-pl'] = { ws_save: "Zapisz", ws_cler: "Wyczyść", + // RIGHT PANEL + rp_objs: "obiekty", + rp_rngs: "zakresy", + rp_opls: "lista operacji", + // OPTIONS op_menu: "interfejs", op_disp: "wyświetlanie", @@ -848,7 +857,7 @@ self.lang['pl-pl'] = { or_offy_l: "przesunięcie odniesienia Y", // CAM ORIGIN - co_menu: "odniesienie", + or_menu: "odniesienie", co_offx_s: "przesunięcie x", co_offx_l: ["przesuń odniesienie wzdłuż osi x","w jednostkach przestrzeni roboczej"], co_offy_s: "przesunięcie y", @@ -978,5 +987,25 @@ self.lang['pl-pl'] = { sa_opzo_s: "przesunięcie z", sa_opzo_l: ["przesunięcie warstwy z","prawie zawsze 0.0","0.0-1.0 w milimetrach"], sa_opaa_s: "antyaliasing", - sa_opaa_l: ["włącz antyaliasing","tworzy większe pliki","może rozmyć szczegóły"] + sa_opaa_l: ["włącz antyaliasing","tworzy większe pliki","może rozmyć szczegóły"], + + // EXPORT DIALOG + ex_job: "zadanie", + ex_fnam: "nazwa pliku", + ex_fsiz: "rozmiar pliku (bajty)", + ex_time: "szacowany czas (h:m:s)", + ex_matl: "materiał", + ex_dens: "gęstość filamentu (g/cm^3)", + ex_fuse: "użyty filament (mm)", + ex_wght: "waga wydruku (g)", + ex_gcpv: "podgląd gcode", + ex_dwnl: "pobierz", + ex_bamb: "wyślij do bambu", + ex_octo: "octoprint", + ex_host: "host", + ex_akey: "klucz", + ex_rsnm: "użyta żywica ML", + ex_layr: "warstwy", + ex_ptim: "czas druku", + ex_segs: "segmenty" }; diff --git a/web/kiri/lang/pt.js b/web/kiri/lang/pt.js index a30870d1..be495ff2 100644 --- a/web/kiri/lang/pt.js +++ b/web/kiri/lang/pt.js @@ -228,6 +228,10 @@ self.lang['pt-pt'] = { mo_lazr: "Corte Laser", mo_cncm: "Fresadora CNC", + // MODE INFO (right panel) + mi_devi: "Dispositivo", + mi_prof: "Perfil", + // SETUP su_menu: "configurar", su_devi: "Dispositivos", @@ -262,6 +266,11 @@ self.lang['pt-pt'] = { ws_save: "Guardar", ws_cler: "Limpar", + // RIGHT PANEL + rp_objs: "objectos", + rp_rngs: "intervalos", + rp_opls: "lista de operações", + // OPTIONS op_menu: "interface", op_disp: "exibir", @@ -849,7 +858,7 @@ self.lang['pt-pt'] = { or_offy_l: "desvio de origem Y", // CAM ORIGIN - co_menu: "origem", + or_menu: "origem", co_offx_s: "desvio x", co_offx_l: ["desviar origem ao longo do eixo x","em unidades de espaço de trabalho"], co_offy_s: "desvio y", @@ -979,5 +988,25 @@ self.lang['pt-pt'] = { sa_opzo_s: "desvio z", sa_opzo_l: ["desvio de camada z","quase sempre 0.0","0.0-1.0 em milímetros"], sa_opaa_s: "anti-aliasing", - sa_opaa_l: ["activar anti-aliasing","produz ficheiros maiores","pode desfocar detalhes"] + sa_opaa_l: ["activar anti-aliasing","produz ficheiros maiores","pode desfocar detalhes"], + + // EXPORT DIALOG + ex_job: "trabalho", + ex_fnam: "nome do ficheiro", + ex_fsiz: "tamanho do ficheiro (bytes)", + ex_time: "estimativa de tempo (h:m:s)", + ex_matl: "material", + ex_dens: "densidade do filamento (g/cm^3)", + ex_fuse: "filamento usado (mm)", + ex_wght: "peso impresso (g)", + ex_gcpv: "pré-visualização gcode", + ex_dwnl: "transferir", + ex_bamb: "enviar para bambu", + ex_octo: "octoprint", + ex_host: "anfitrião", + ex_akey: "chave", + ex_rsnm: "resina usada ML", + ex_layr: "camadas", + ex_ptim: "tempo de impressão", + ex_segs: "segmentos" }; diff --git a/web/kiri/lang/zh.js b/web/kiri/lang/zh.js index 1c4d4529..e9486793 100644 --- a/web/kiri/lang/zh.js +++ b/web/kiri/lang/zh.js @@ -227,6 +227,10 @@ self.lang['zh'] = { mo_lazr: "激光切割", mo_cncm: "CNC铣削", + // MODE INFO (right panel) + mi_devi: "设备", + mi_prof: "配置", + // 设置 su_menu: "设置", su_devi: "设备", @@ -261,6 +265,11 @@ self.lang['zh'] = { ws_save: "保存", ws_cler: "清除", + // RIGHT PANEL + rp_objs: "对象", + rp_rngs: "范围", + rp_opls: "操作列表", + // 选项 op_menu: "界面", op_disp: "显示", @@ -401,7 +410,6 @@ self.lang['zh'] = { fl_lahi_s: "层高", fl_lahi_l: ["每个切片的高度","单位：毫米","应该 >= 切片高度"], fl_rate_s: "外壳速度", - fl_rate_s: "外壳速度", fl_rate_l: ["外壳打印最大速度","单位：毫米/秒"], fl_frat_s: "填充速度", fl_frat_l: ["填充打印最大速度","单位：毫米/秒"], @@ -849,7 +857,7 @@ self.lang['zh'] = { or_offy_l: "原点Y偏移", // CAM 原点 - co_menu: "原点", + or_menu: "原点", co_offx_s: "X偏移", co_offx_l: ["沿X轴偏移原点","单位：工作区单位"], co_offy_s: "Y偏移", @@ -979,5 +987,25 @@ self.lang['zh'] = { sa_opzo_s: "Z偏移", sa_opzo_l: ["Z层偏移","几乎总是0.0","0.0-1.0（毫米）"], sa_opaa_s: "抗锯齿", - sa_opaa_l: ["启用抗锯齿","产生更大的文件","可能模糊细节"] + sa_opaa_l: ["启用抗锯齿","产生更大的文件","可能模糊细节"], + + // EXPORT DIALOG + ex_job: "任务", + ex_fnam: "文件名", + ex_fsiz: "文件大小 (字节)", + ex_time: "时间估计 (h:m:s)", + ex_matl: "材料", + ex_dens: "材料密度 (g/cm^3)", + ex_fuse: "已用材料 (mm)", + ex_wght: "打印重量 (g)", + ex_gcpv: "G代码预览", + ex_dwnl: "下载", + ex_bamb: "发送到拓竹", + ex_octo: "OctoPrint", + ex_host: "主机", + ex_akey: "密钥", + ex_rsnm: "树脂用量 ML", + ex_layr: "层数", + ex_ptim: "打印时间", + ex_segs: "段数" };