diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/package-lock.json | 55 | ||||
| -rw-r--r-- | gui/package.json | 4 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 2 | ||||
| -rw-r--r-- | gui/src/shared/gettext.ts | 5 |
4 files changed, 43 insertions, 23 deletions
diff --git a/gui/package-lock.json b/gui/package-lock.json index 1f80b0fe72..df00056c6b 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -1649,6 +1649,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "requires": { "ms": "2.0.0" } @@ -1910,20 +1911,20 @@ "dev": true }, "electron": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.8.tgz", - "integrity": "sha512-UVj+K59lYU/vH/7TxrmDidPssFwGQZ6Ljuupugdr9h6ipMuhwgk3WRO+OlJ2TsyhKhJ6tp3AcJunuN4mprblhQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-4.1.4.tgz", + "integrity": "sha512-MelOjntJvd33izEjR6H4N/Uii7y535z/b2BuYXJGLNSHL6o1IlyhUQmfiT87kWABayERgeuYERgvsyf956OOFw==", "dev": true, "requires": { - "@types/node": "^8.0.24", + "@types/node": "^10.12.18", "electron-download": "^4.1.0", "extract-zip": "^1.0.3" }, "dependencies": { "@types/node": { - "version": "8.10.45", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz", - "integrity": "sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==", + "version": "10.14.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.4.tgz", + "integrity": "sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==", "dev": true } } @@ -5222,7 +5223,8 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true }, "nan": { "version": "2.13.2", @@ -5272,14 +5274,31 @@ } }, "needle": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", - "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz", + "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "optional": true, "requires": { - "debug": "^2.1.2", + "debug": "^4.1.0", "iconv-lite": "^0.4.4", "sax": "^1.2.4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "optional": true + } } }, "negotiator": { @@ -5330,9 +5349,9 @@ } }, "node-pre-gyp": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", - "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", + "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "optional": true, "requires": { "detect-libc": "^1.0.2", @@ -5515,11 +5534,11 @@ } }, "nseventmonitor": { - "version": "0.0.12", - "resolved": "git+https://github.com/mullvad/NSEventMonitor.git#ca0bb54cbed77a56e55d52bff9f0d035cbd33a1b", + "version": "0.0.14", + "resolved": "git+https://github.com/mullvad/NSEventMonitor.git#55e5087e7e375ce4e15b26920fa3c35e56eeceb9", "optional": true, "requires": { - "node-pre-gyp": "^0.11.0" + "node-pre-gyp": "^0.12.0" } }, "nth-check": { diff --git a/gui/package.json b/gui/package.json index b42158c123..48a45c7775 100644 --- a/gui/package.json +++ b/gui/package.json @@ -35,7 +35,7 @@ "validated": "^2.0.1" }, "optionalDependencies": { - "nseventmonitor": "https://github.com/mullvad/NSEventMonitor.git#0.0.12" + "nseventmonitor": "https://github.com/mullvad/NSEventMonitor.git#0.0.14" }, "devDependencies": { "@types/chai": "^4.1.7", @@ -63,7 +63,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^5.1.3", - "electron": "^3.0.8", + "electron": "^4.1.4", "electron-builder": "^20.39.0", "electron-devtools-installer": "^2.2.1", "electron-mocha": "^6.0.4", diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 67bb326465..a934f11121 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -888,7 +888,7 @@ class ApplicationMain { execFile(executable, args, { windowsHide: true }, (error, stdout, stderr) => { if (error) { log.error( - `Failed to collect a problem report: ${error.message} + `Failed to collect a problem report. Stdout: ${stdout.toString()} Stderr: ${stderr.toString()}`, ); diff --git a/gui/src/shared/gettext.ts b/gui/src/shared/gettext.ts index c8cc97969c..d7cd0f8b23 100644 --- a/gui/src/shared/gettext.ts +++ b/gui/src/shared/gettext.ts @@ -64,8 +64,9 @@ function setErrorHandler(catalogue: Gettext) { // NOTE: locale is not publicly exposed const catalogueLocale = (catalogue as any).locale; - // Filter out the "no translation was found" errors for the source language - if (catalogueLocale === SOURCE_LANGUAGE && error.indexOf('No translation was found') !== -1) { + // Filter out the "no translation was found" errors for the source language. + // The catalogue's locale is set to an empty string when using the source translation. + if (catalogueLocale === '' && error.indexOf('No translation was found') !== -1) { return; } |