Update electron version to v14.2.9 (#2214)

Authored-by: rejbasket
Co-authored-by: Kaalleen
Co-authored-by: Lex Neva

2 files changed, 30 insertions, 10 deletions

diff --git a/electron/src/lib/api.js b/electron/src/lib/api.js
index b6aa74e2..63818541 100644
--- a/electron/src/lib/api.js
+++ b/electron/src/lib/api.js
@@ -6,11 +6,19 @@
  *
  */
 
-const axios = require('axios')
-const queryString = require('query-string')
+import axios from 'axios';
+import flaskserverport from './flaskserverport.json'
 
-var port = queryString.parse(global.location.search).port
+if (flaskserverport.port === undefined) {
+    var theflaskport = window.inkstitchAPI.flaskport()
+    console.log("Installed mode")
+    console.log(theflaskport)
+} else {
+    var theflaskport = flaskserverport.port
+    console.log("Dev mode")
+    console.log(theflaskport)
+}
 
-module.exports = axios.create({
-  baseURL: `http://127.0.0.1:${port}/`
+export const inkStitch = axios.create({
+    baseURL: `http://127.0.0.1:${theflaskport}`
 })
diff --git a/electron/src/lib/i18n.js b/electron/src/lib/i18n.js
index de56fc8f..2a7c4f66 100644
--- a/electron/src/lib/i18n.js
+++ b/electron/src/lib/i18n.js
@@ -6,22 +6,33 @@
  *
  */
 
-module.exports.selectLanguage = function (translations) {
+export function selectLanguage(translations, flaskport) {
+  var port = flaskport
+  // get language from flask server, process in modern electron isn't exposed to renderer
+  const request = new XMLHttpRequest();
+  request.open('GET', `http://127.0.0.1:${port}/languages`, false)
+  request.send(null)
+  var process = undefined
+
+  if (request.status === 200) {
+    process =  JSON.parse(request.responseText)
+  }
   // get a list of available translations
   var availableTranslations = ['en_US'];
-  for(var k in translations) availableTranslations.push(k);
+  for (var k in translations) availableTranslations.push(k);
 
   var lang = undefined;
 
   // get system language / Inkscape language
   ['LANG', 'LC_MESSAGES', 'LC_ALL', 'LANGUAGE'].forEach(language => {
-    if (process.env[language]) {
+    if (process[language]) {
       // split encoding information, we don't need it
-      var current_lang = process.env[language].split(".")[0];
+      var current_lang = process[language].split('.')[0];
+  
       if (current_lang.length == 2) {
         // current language has only two letters (e.g. en),
         // compare with available languages and if present, set to a long locale name (e.g. en_US)
-        lang = availableTranslations.find(elem => elem.startsWith(current_lang));
+        lang = availableTranslations.find((elem) => elem.startsWith(current_lang));
       } else {
         lang = current_lang;
       }
@@ -33,3 +44,4 @@ module.exports.selectLanguage = function (translations) {
   }
   return lang
 }
+