fix windows links, lang self references

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));

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

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",

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'] =
+self.lang['da'] =
-kiri.lang['da-dk'] = {
+self.lang['da-dk'] = {
     version:        "version",
     enable:         "enable",
     settings:       "indstillinger",

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'] =
+self.lang['de'] =
-kiri.lang['de-de'] = {
+self.lang['de-de'] = {
     // common keys and menus
     animate:        "Animieren",        // CAM animate button
     arrange:        "Anordnen",         // layout workspace objects

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.lang['en'] =
-self.kiri.lang['en-us'] = {
+self.lang['en-us'] = {
     // common keys and menus
     animate:        "animate",      // CAM animate button
     arrange:        "arrange",      // layout workspace objects

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'] =
+self.lang['es'] =
-kiri.lang['es-es'] = {
+self.lang['es-es'] = {
     // common keys and menus
     animate:        "animar",       // CAM animate button
     arrange:        "organizar",    // layout workspace objects

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'] =
+self.lang['fr'] =
-kiri.lang['fr-fr'] = {
+self.lang['fr-fr'] = {
     // common keys and menus
     animate:        "animer",       // CAM animate button
     arrange:        "organiser",    // layout workspace objects

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'] =
+self.lang['pl'] =
-kiri.lang['pl-pl'] = {
+self.lang['pl-pl'] = {
     // hasło i tłumaczenie
     animate:        "animacja",     // CAM animate button
     arrange:        "rozmieść",     // layout workspace objects

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'] =
+self.lang['pt'] =
-kiri.lang['pt-pt'] = {
+self.lang['pt-pt'] = {
     // common keys and menus
     animate:        "animar",      // CAM animate button
     arrange:        "organizar",      // layout workspace objects

web/kiri/lang/zh.js

@@ -1,6 +1,6 @@
 // 英文。其他语言地图将遵循英语内容
 // 映射缺少的键/值对
-kiri.lang['zh'] = {
+self.lang['zh'] = {
     // 通用键及菜单
     animate:        "动画",       // CAM动画按钮
     arrange:        "排布",       // 对工作区对象排版