diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-04-11 14:29:09 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-04-11 14:29:09 +0200 |
| commit | 336ca26d259d81d189faee521f4fd2cfa7d13f7e (patch) | |
| tree | 1d56871d35587ebe17c9f96366b9ad898c1f70c1 /gui/src | |
| parent | 8f4b572757de6e2d165c3d3f9a7e016e1c6e1084 (diff) | |
| parent | 2d61a2b8292bcc6dcb5f2500c570bb4d04d0480d (diff) | |
| download | mullvadvpn-336ca26d259d81d189faee521f4fd2cfa7d13f7e.tar.xz mullvadvpn-336ca26d259d81d189faee521f4fd2cfa7d13f7e.zip | |
Merge branch 'electron-4'
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/main/index.ts | 2 | ||||
| -rw-r--r-- | gui/src/shared/gettext.ts | 5 |
2 files changed, 4 insertions, 3 deletions
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; } |