From d7bc0ae017a28f9c4c09bd75b3cd9e584a5bb8a7 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Mon, 7 Jul 2025 23:31:44 -0400 Subject: [PATCH] fix windows links, lang self references --- bin/install-pre.js | 5 ++++- conf/links.csv | 2 -- package.json | 2 +- 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 | 2 +- 11 files changed, 20 insertions(+), 19 deletions(-) diff --git a/bin/install-pre.js b/bin/install-pre.js index d63b0a86..ee29d5e1 100644 --- a/bin/install-pre.js +++ b/bin/install-pre.js @@ -12,7 +12,7 @@ async function main() { .map(line => line.trim()) .map(line => line.split(',').map(v => v.trim())); - if (os.platform() === 'win32') + if (os.platform() === 'win32') { // convert links to the contents of the files/directories they reference for (let [link, target] of links) { const absoluteTarget = path.resolve(path.dirname(link), target); @@ -24,6 +24,9 @@ async function main() { console.error(`Error creating symlink: ${link} -> ${absoluteTarget}`, err); } } + } else { + console.log('skipping symlink conversion'); + } } main().catch(err => console.error('Error', err)); diff --git a/conf/links.csv b/conf/links.csv index 166efd31..e59091ca 100644 --- a/conf/links.csv +++ b/conf/links.csv @@ -5,8 +5,6 @@ src/ext/earcut.js,../../node_modules/earcut/src/earcut.js src/ext/tween.js,../../node_modules/@tweenjs/tween.js/src/Tween.js src/ext/jszip.js,../../node_modules/jszip/dist/jszip.js src/wasm/manifold.wasm,../../node_modules/manifold-3d/manifold.wasm -src/kiri-dev/fdm/GridBot.Two.json,GridBot.One.json -src/kiri/lang-en.js,../../web/kiri/lang/en.js web/fon2,../node_modules/bootstrap-icons/font/ web/kiri/lang/pl.js,pl-pl.js web/kiri/lang/pt-pt.js,pt.js diff --git a/package.json b/package.json index 449a573a..16ecef30 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "clear-cache": "rm -rf data/cache/* dist/ tmp/*", "prebuild": "npm run setup && node bin/electron-pre.js", "postbuild": "node bin/electron-post.js", - "preinstall": "", + "preinstall": "node bin/install-pre.js", "docs-dev": "docusaurus start --config conf/docusaurus.config.js", "docs-build": "docusaurus build --config conf/docusaurus.config.js", "docs-serve": "docusaurus serve --config conf/docusaurus.config.js", diff --git a/web/kiri/lang/da.js b/web/kiri/lang/da.js index 63112b8c..c6607075 100644 --- a/web/kiri/lang/da.js +++ b/web/kiri/lang/da.js @@ -1,7 +1,7 @@ // Danish localization for Kiri:Moto // Will defer to English map for any missing key/value pairs -kiri.lang['da'] = -kiri.lang['da-dk'] = { +self.lang['da'] = +self.lang['da-dk'] = { version: "version", enable: "enable", settings: "indstillinger", diff --git a/web/kiri/lang/de-de.js b/web/kiri/lang/de-de.js index ce527cf9..82880d59 100644 --- a/web/kiri/lang/de-de.js +++ b/web/kiri/lang/de-de.js @@ -1,7 +1,7 @@ // German localization for Kiri:Moto // Will defer to English map for any missing key/value pairs -kiri.lang['de'] = -kiri.lang['de-de'] = { +self.lang['de'] = +self.lang['de-de'] = { // common keys and menus animate: "Animieren", // CAM animate button arrange: "Anordnen", // layout workspace objects diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 0e90a13a..85179cdd 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -1,7 +1,7 @@ // English language map. Other localization maps will // defer to English map for any missing key/value pairs -self.kiri.lang['en'] = -self.kiri.lang['en-us'] = { +self.lang['en'] = +self.lang['en-us'] = { // common keys and menus animate: "animate", // CAM animate button arrange: "arrange", // layout workspace objects diff --git a/web/kiri/lang/es-es.js b/web/kiri/lang/es-es.js index 944cf279..f83941d5 100644 --- a/web/kiri/lang/es-es.js +++ b/web/kiri/lang/es-es.js @@ -1,7 +1,7 @@ // Spanish localization for Kiri:Moto // Will defer to English map for any missing key/value pairs -kiri.lang['es'] = -kiri.lang['es-es'] = { +self.lang['es'] = +self.lang['es-es'] = { // common keys and menus animate: "animar", // CAM animate button arrange: "organizar", // layout workspace objects diff --git a/web/kiri/lang/fr.js b/web/kiri/lang/fr.js index e30df48f..27536843 100644 --- a/web/kiri/lang/fr.js +++ b/web/kiri/lang/fr.js @@ -1,7 +1,7 @@ // French localization for Kiri:Moto // Will defer to English map for any missing key/value pairs -kiri.lang['fr'] = -kiri.lang['fr-fr'] = { +self.lang['fr'] = +self.lang['fr-fr'] = { // common keys and menus animate: "animer", // CAM animate button arrange: "organiser", // layout workspace objects diff --git a/web/kiri/lang/pl-pl.js b/web/kiri/lang/pl-pl.js index 2545e6e7..6dd105a3 100644 --- a/web/kiri/lang/pl-pl.js +++ b/web/kiri/lang/pl-pl.js @@ -1,6 +1,6 @@ // Polish. Język polski tłumaczony na zasadach własności publicznej -kiri.lang['pl'] = -kiri.lang['pl-pl'] = { +self.lang['pl'] = +self.lang['pl-pl'] = { // hasło i tłumaczenie animate: "animacja", // CAM animate button arrange: "rozmieść", // layout workspace objects diff --git a/web/kiri/lang/pt.js b/web/kiri/lang/pt.js index 21e152bf..e5524a12 100644 --- a/web/kiri/lang/pt.js +++ b/web/kiri/lang/pt.js @@ -1,7 +1,7 @@ // Portuguese localization for Kiri:Moto // Will defer to English map for any missing key/value pairs -kiri.lang['pt'] = -kiri.lang['pt-pt'] = { +self.lang['pt'] = +self.lang['pt-pt'] = { // common keys and menus animate: "animar", // CAM animate button arrange: "organizar", // layout workspace objects diff --git a/web/kiri/lang/zh.js b/web/kiri/lang/zh.js index c801d1e4..34e71397 100644 --- a/web/kiri/lang/zh.js +++ b/web/kiri/lang/zh.js @@ -1,6 +1,6 @@ // 英文。其他语言地图将遵循英语内容 // 映射缺少的键/值对 -kiri.lang['zh'] = { +self.lang['zh'] = { // 通用键及菜单 animate: "动画", // CAM动画按钮 arrange: "排布", // 对工作区对象排版