diff options
| author | Oliver <oliver@mohlin.dev> | 2025-01-22 08:55:38 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-02-03 08:56:15 +0100 |
| commit | 6cb6442b3e9cd5b95f25f7068a812a5fd096dec8 (patch) | |
| tree | fcd0c34d8828934f760c5abb74f986cff9ad31c6 | |
| parent | 2ee27df9ceccb6c52bdb6f9851f2b745590744ce (diff) | |
| download | mullvadvpn-6cb6442b3e9cd5b95f25f7068a812a5fd096dec8.tar.xz mullvadvpn-6cb6442b3e9cd5b95f25f7068a812a5fd096dec8.zip | |
Move strings to constants
15 files changed, 23 insertions, 23 deletions
diff --git a/desktop/packages/mullvad-vpn/src/config.json b/desktop/packages/mullvad-vpn/src/config.json index 8490c32bf7..0967ef424b 100644 --- a/desktop/packages/mullvad-vpn/src/config.json +++ b/desktop/packages/mullvad-vpn/src/config.json @@ -1,10 +1 @@ -{ - "supportEmail": "support@mullvadvpn.net", - "strings": { - "wireguard": "WireGuard", - "openvpn": "OpenVPN", - "splitTunneling": "Split tunneling", - "daita": "DAITA", - "daitaFull": "Defence against AI-guided Traffic Analysis" - } -} +{} diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx index db8fe0c42e..f19707b5a0 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx @@ -2,7 +2,7 @@ import React, { useCallback } from 'react'; import { sprintf } from 'sprintf-js'; import styled from 'styled-components'; -import { strings } from '../../config.json'; +import { strings } from '../../shared/constants'; import { messages } from '../../shared/gettext'; import { useAppContext } from '../context'; import { Flex } from '../lib/components'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/ErrorBoundary.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/ErrorBoundary.tsx index 40615e44f4..84425471cf 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/ErrorBoundary.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/ErrorBoundary.tsx @@ -1,7 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import { supportEmail } from '../../config.json'; +import { strings } from '../../shared/constants'; import { messages } from '../../shared/gettext'; import log from '../../shared/logging'; import ErrorView from './ErrorView'; @@ -40,7 +40,7 @@ export default class ErrorBoundary extends React.Component<IProps, IState> { messages .pgettext('error-boundary-view', 'Something went wrong. Please contact us at %(email)s') .split('%(email)s', 2); - reachBackMessage.splice(1, 0, <Email>{supportEmail}</Email>); + reachBackMessage.splice(1, 0, <Email>{strings.supportEmail}</Email>); return <ErrorView settingsUnavailable>{reachBackMessage}</ErrorView>; } else { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx index d885dd8533..fcc4111e9e 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react'; import { sprintf } from 'sprintf-js'; -import { strings } from '../../config.json'; +import { strings } from '../../shared/constants'; import { messages } from '../../shared/gettext'; import log from '../../shared/logging'; import { Flex } from '../lib/components'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx index d1288b30a1..36097f76b5 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react'; import { sprintf } from 'sprintf-js'; import styled from 'styled-components'; -import { strings } from '../../config.json'; +import { strings } from '../../shared/constants'; import { BridgeState, RelayProtocol, diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Settings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/Settings.tsx index e99fe19ed2..5a50224d80 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/Settings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/Settings.tsx @@ -1,6 +1,6 @@ import { useCallback } from 'react'; -import { strings } from '../../config.json'; +import { strings } from '../../shared/constants'; import { messages } from '../../shared/gettext'; import { useAppContext } from '../context'; import { Button, TitleBig } from '../lib/components'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx index 849b420cd1..1fba8b4d53 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx @@ -2,12 +2,12 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useSelector } from 'react-redux'; import { sprintf } from 'sprintf-js'; -import { strings } from '../../config.json'; import { IApplication, ILinuxSplitTunnelingApplication, ISplitTunnelingApplication, } from '../../shared/application-types'; +import { strings } from '../../shared/constants'; import { messages } from '../../shared/gettext'; import { useAppContext } from '../context'; import { Button, Container, Flex, FootnoteMini } from '../lib/components'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx index c79a5eaa5d..46b0f8014e 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react'; import { sprintf } from 'sprintf-js'; import styled from 'styled-components'; -import { strings } from '../../config.json'; +import { strings } from '../../shared/constants'; import { IDnsOptions, TunnelProtocol, wrapConstraint } from '../../shared/daemon-rpc-types'; import { messages } from '../../shared/gettext'; import log from '../../shared/logging'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/WireguardSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/WireguardSettings.tsx index 450ced9d31..2d54fa1f47 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/WireguardSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/WireguardSettings.tsx @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react'; import { sprintf } from 'sprintf-js'; import styled from 'styled-components'; -import { strings } from '../../config.json'; +import { strings } from '../../shared/constants'; import { Constraint, IpVersion, diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx index cac4f654fe..a80371ae77 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/main-view/FeatureIndicators.tsx @@ -2,7 +2,7 @@ import { useEffect, useRef } from 'react'; import { sprintf } from 'sprintf-js'; import styled from 'styled-components'; -import { strings } from '../../../config.json'; +import { strings } from '../../../shared/constants'; import { FeatureIndicator } from '../../../shared/daemon-rpc-types'; import { messages } from '../../../shared/gettext'; import { Colors } from '../../lib/foundations'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx index e06d2f86b8..d650fd1802 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react'; import { sprintf } from 'sprintf-js'; -import { strings } from '../../../config.json'; +import { strings } from '../../../shared/constants'; import { Ownership } from '../../../shared/daemon-rpc-types'; import { messages } from '../../../shared/gettext'; import { IconButton } from '../../lib/components'; diff --git a/desktop/packages/mullvad-vpn/src/shared/constants/index.ts b/desktop/packages/mullvad-vpn/src/shared/constants/index.ts index 26f360af9e..9326f8434e 100644 --- a/desktop/packages/mullvad-vpn/src/shared/constants/index.ts +++ b/desktop/packages/mullvad-vpn/src/shared/constants/index.ts @@ -1 +1,2 @@ export * from './links'; +export * from './strings'; diff --git a/desktop/packages/mullvad-vpn/src/shared/constants/strings.ts b/desktop/packages/mullvad-vpn/src/shared/constants/strings.ts new file mode 100644 index 0000000000..4e3ef56ba5 --- /dev/null +++ b/desktop/packages/mullvad-vpn/src/shared/constants/strings.ts @@ -0,0 +1,8 @@ +export const strings = { + wireguard: 'WireGuard', + openvpn: 'OpenVPN', + splitTunneling: 'Split tunneling', + daita: 'DAITA', + daitaFull: 'Defence against AI-guided Traffic Analysis', + supportEmail: 'support@mullvadvpn.net', +} as const; diff --git a/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts b/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts index 2f3df718b6..67ab96fb4a 100644 --- a/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts +++ b/desktop/packages/mullvad-vpn/src/shared/notifications/block-when-disconnected.ts @@ -1,7 +1,7 @@ import { sprintf } from 'sprintf-js'; -import { strings } from '../../config.json'; import { messages } from '../../shared/gettext'; +import { strings } from '../constants'; import { TunnelState } from '../daemon-rpc-types'; import { InAppNotification, diff --git a/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts b/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts index 42e550c466..1d3bc169d4 100644 --- a/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts +++ b/desktop/packages/mullvad-vpn/src/shared/notifications/error.ts @@ -1,6 +1,6 @@ import { sprintf } from 'sprintf-js'; -import { strings } from '../../config.json'; +import { strings } from '../constants'; import { AuthFailedError, ErrorStateCause, |
