From 891f054bfea2c1612bb6ce737b90fe7d226343dc Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 22 Feb 2026 20:24:34 -0500 Subject: [PATCH] rename merge/isolate --- src/kiri/app/platform.js | 4 ++-- web/kiri/index.html | 8 +------- web/kiri/lang/da.js | 4 ++-- web/kiri/lang/de-de.js | 4 ++-- web/kiri/lang/en.js | 4 ++-- web/kiri/lang/es-es.js | 4 ++-- web/kiri/lang/fr.js | 4 ++-- web/kiri/lang/pl-pl.js | 4 ++-- web/kiri/lang/pt.js | 4 ++-- web/kiri/lang/zh.js | 4 ++-- 10 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/kiri/app/platform.js b/src/kiri/app/platform.js index 3b387298..8763bbae 100644 --- a/src/kiri/app/platform.js +++ b/src/kiri/app/platform.js @@ -172,14 +172,14 @@ function update_size(updateDark = true) { space.platform.setGrid(gridMajor, gridMinor, scheme.grid.major, scheme.grid.minor); space.platform.opacity(0.05); space.sky.set({ color: 0, ambient: { intensity: 0.6 } }); - document.documentElement.classList.add('dark'); + document.documentElement.setAttribute('data-theme', 'dark'); } else { space.platform.set({ light: 0.08 }); space.platform.setFont({rulerColor:'#333333'}); space.platform.setGrid(gridMajor, gridMinor, scheme.grid.major, scheme.grid.minor); space.platform.opacity(0.2); space.sky.set({ color: 0xffffff, ambient: { intensity: 1.1 } }); - document.documentElement.classList.remove('dark'); + document.documentElement.setAttribute('data-theme', 'light'); } space.platform.setSize(); } diff --git a/web/kiri/index.html b/web/kiri/index.html index 11cab06a..834afe22 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -22,13 +22,7 @@ function setDarkLight(isDark) { const dde = document.documentElement; dde.setAttribute('data-theme', isDark ? 'dark' : 'light'); - if (isDark) { - dde.classList.add('dark'); - dde.style.background = '#000000'; - } else { - dde.classList.remove('dark'); - dde.style.background = '#ffffff'; - } + dde.style.background = isDark ? '#000000' : '#ffffff'; } setDarkLight(isDark); diff --git a/web/kiri/lang/da.js b/web/kiri/lang/da.js index f31f5a42..bebf8207 100644 --- a/web/kiri/lang/da.js +++ b/web/kiri/lang/da.js @@ -90,8 +90,8 @@ self.lang['da-dk'] = { rc_xobj: "eksporter OBJ", rc_xstl: "eksporter STL", sb_info: ["print hastighed","i mm/s"], - rc_merg: "flet objekt meshes", - rc_splt: "isoler legemer", + rc_merg: "flet objekter", + rc_splt: "isoler objekter", // DEVICE MENU and related dialogs dm_sldt: "vælg en enhedstype", diff --git a/web/kiri/lang/de-de.js b/web/kiri/lang/de-de.js index 5f3468e6..b0000115 100644 --- a/web/kiri/lang/de-de.js +++ b/web/kiri/lang/de-de.js @@ -91,8 +91,8 @@ self.lang['de-de'] = { rc_xobj: "Als OBJ exportieren", rc_xstl: "Als STL exportieren", sb_info: ["Druckgeschwindigkeit","in mm/s"], - rc_merg: "Objekt-Meshes zusammenführen", - rc_splt: "Körper isolieren", + rc_merg: "Objekte zusammenführen", + rc_splt: "Objekte isolieren", // DEVICE MENU and related dialogs dm_sldt: "Wähle einen Geräte-Typ aus", diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index cbbd3f7b..5f59075a 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -92,8 +92,8 @@ self.lang['en-us'] = { rc_xobj: "export OBJ", rc_xstl: "export STL", sb_info: ["print speed","in mm/s"], - rc_merg: "merge object meshes", - rc_splt: "isolate bodies", + rc_merg: "merge objects", + rc_splt: "isolate objects", // DEVICE MENU and related dialogs dm_sldt: "select a device type", diff --git a/web/kiri/lang/es-es.js b/web/kiri/lang/es-es.js index e36ff2b4..dff63474 100644 --- a/web/kiri/lang/es-es.js +++ b/web/kiri/lang/es-es.js @@ -91,8 +91,8 @@ self.lang['es-es'] = { rc_xobj: "exportar OBJ", rc_xstl: "exportar STL", sb_info: ["velocidad de impresión","en mm/s"], - rc_merg: "fusionar mallas de objeto", - rc_splt: "aislar cuerpos", + rc_merg: "fusionar objetos", + rc_splt: "aislar objetos", // DEVICE MENU and related dialogs dm_sldt: "seleccionar un tipo de dispositivo", diff --git a/web/kiri/lang/fr.js b/web/kiri/lang/fr.js index 93c33410..c24e51e6 100644 --- a/web/kiri/lang/fr.js +++ b/web/kiri/lang/fr.js @@ -91,8 +91,8 @@ self.lang['fr-fr'] = { rc_xobj: "exporter OBJ", rc_xstl: "exporter STL", sb_info: ["vitesse d'impression","en mm/s"], - rc_merg: "fusionner les maillages d'objets", - rc_splt: "isoler les corps", + rc_merg: "fusionner les objets", + rc_splt: "isoler les objets", // DEVICE MENU and related dialogs dm_sldt: "sélectionner un type d'appareil", diff --git a/web/kiri/lang/pl-pl.js b/web/kiri/lang/pl-pl.js index 23ea8458..edd833e7 100644 --- a/web/kiri/lang/pl-pl.js +++ b/web/kiri/lang/pl-pl.js @@ -90,8 +90,8 @@ self.lang['pl-pl'] = { rc_xobj: "eksportuj OBJ", rc_xstl: "eksportuj STL", sb_info: ["prędkość druku","w mm/s"], - rc_merg: "połącz siatki obiektu", - rc_splt: "wyizoluj bryły", + rc_merg: "połącz obiekty", + rc_splt: "wyizoluj obiekty", // DEVICE MENU and related dialogs dm_sldt: "wybierz typ urządzenia", diff --git a/web/kiri/lang/pt.js b/web/kiri/lang/pt.js index 5aceb291..dbaa2dbb 100644 --- a/web/kiri/lang/pt.js +++ b/web/kiri/lang/pt.js @@ -91,8 +91,8 @@ self.lang['pt-pt'] = { rc_xobj: "exportar OBJ", rc_xstl: "exportar STL", sb_info: ["velocidade de impressão","em mm/s"], - rc_merg: "fundir malhas de objecto", - rc_splt: "isolar corpos", + rc_merg: "fundir objectos", + rc_splt: "isolar objectos", // DEVICE MENU and related dialogs dm_sldt: "seleccione um tipo de dispositivo", diff --git a/web/kiri/lang/zh.js b/web/kiri/lang/zh.js index 8ce7f2e2..24dd5ebe 100644 --- a/web/kiri/lang/zh.js +++ b/web/kiri/lang/zh.js @@ -85,8 +85,8 @@ self.lang['zh'] = { rc_xobj: "导出OBJ", rc_xstl: "导出STL", sb_info: ["打印速度","单位：毫米/秒"], - rc_merg: "合并对象网格", - rc_splt: "分离实体", + rc_merg: "合并对象", + rc_splt: "分离对象", // 设备菜单及相关对话框 dm_sldt: "选择设备类型",