diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2020-04-20 13:58:44 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2020-04-20 13:58:44 +0200 |
| commit | 450e082066748c188372bb32946325b9884173a3 (patch) | |
| tree | 130a65dd19a7bd5bd11b05cd0fb66dd06f81abe1 | |
| parent | d718db4b02b7a605e1d344eb718b8f9f28078aac (diff) | |
| parent | e8b5869195882fd7aec2aa8993d00450de901e4d (diff) | |
| download | mullvadvpn-450e082066748c188372bb32946325b9884173a3.tar.xz mullvadvpn-450e082066748c188372bb32946325b9884173a3.zip | |
Merge branch 'update-node-gettext-typings'
| -rw-r--r-- | gui/package-lock.json | 6 | ||||
| -rw-r--r-- | gui/package.json | 2 | ||||
| -rw-r--r-- | gui/src/shared/gettext.ts | 5 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 6 |
4 files changed, 9 insertions, 10 deletions
diff --git a/gui/package-lock.json b/gui/package-lock.json index 1003724c9d..5a05bb60e2 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -352,9 +352,9 @@ "dev": true }, "@types/node-gettext": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/node-gettext/-/node-gettext-3.0.0.tgz", - "integrity": "sha512-rLLEKuX6Y+JZgIvny7+O+3GzbqEaWVlRQWe3yRqNi+tprQ/TdHXps7W+xi6Mgts6xDAgCSobX9A+7QwZEkLPAg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/node-gettext/-/node-gettext-3.0.1.tgz", + "integrity": "sha512-0Htf0kkFSRsl10MuixVoQ6iPzxpH+D9+qb/7otIJvV6UKUAZEf/POwqRArvF+N8zlgn7FJHxmFJFJm38wNprsA==", "dev": true }, "@types/parse5": { diff --git a/gui/package.json b/gui/package.json index bc1880425b..5247e3caec 100644 --- a/gui/package.json +++ b/gui/package.json @@ -47,7 +47,7 @@ "@types/mkdirp": "^1.0.0", "@types/mocha": "^5.2.6", "@types/node": "^10.12.3", - "@types/node-gettext": "^3.0.0", + "@types/node-gettext": "^3.0.1", "@types/rbush": "^2.0.2", "@types/react": "^16.8.8", "@types/react-dom": "^16.8.2", diff --git a/gui/src/shared/gettext.ts b/gui/src/shared/gettext.ts index ee8e8bf8d0..cf7e91830a 100644 --- a/gui/src/shared/gettext.ts +++ b/gui/src/shared/gettext.ts @@ -21,10 +21,7 @@ export function loadTranslations(currentLocale: string, catalogue: Gettext) { preferredLocales.push(language); } - // NOTE: domain is not publicly exposed - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const domain = (catalogue as any).domain; - + const domain = catalogue.domain; for (const locale of preferredLocales) { if (parseTranslation(locale, domain, catalogue)) { log.info(`Loaded translations ${locale}/${domain}`); diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 0a9a6ad465..61d9f2ae7a 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -128,7 +128,8 @@ const config = { '/opt/Mullvad VPN/resources/mullvad-daemon.conf', distAssets('mullvad') + '=/usr/bin/', distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report', - distAssets('shell-completions/mullvad.bash') + '=/usr/share/bash-completion/completions/mullvad', + distAssets('shell-completions/mullvad.bash') + + '=/usr/share/bash-completion/completions/mullvad', distAssets('shell-completions/_mullvad') + '=/usr/local/share/zsh/site-functions/_mullvad', ], afterInstall: distAssets('linux/after-install.sh'), @@ -150,7 +151,8 @@ const config = { '/opt/Mullvad VPN/resources/mullvad-daemon.conf', distAssets('mullvad') + '=/usr/bin/', distAssets('linux/problem-report-link') + '=/usr/bin/mullvad-problem-report', - distAssets('shell-completions/mullvad.bash') + '=/usr/share/bash-completion/completions/mullvad', + distAssets('shell-completions/mullvad.bash') + + '=/usr/share/bash-completion/completions/mullvad', distAssets('shell-completions/_mullvad') + '=/usr/local/share/zsh/site-functions/_mullvad', ], afterInstall: distAssets('linux/after-install.sh'), |