summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2023-03-27 16:11:07 +0200
committerOskar Nyberg <oskar@mullvad.net>2023-03-27 16:11:07 +0200
commit7f7f4f82038f54808bd3632196bd341ab0350748 (patch)
tree866bbeb1348c298f5ab9d8e4252bd2575f47da58 /gui/src/renderer
parentddbf915cd7377a2a7900e6b63fc035d1db1c83fc (diff)
parenta7fcfeee3cf86593a4192c813b125a71a1bbf63a (diff)
downloadmullvadvpn-7f7f4f82038f54808bd3632196bd341ab0350748.tar.xz
mullvadvpn-7f7f4f82038f54808bd3632196bd341ab0350748.zip
Merge branch 'fix-many-typos'
Diffstat (limited to 'gui/src/renderer')
-rw-r--r--gui/src/renderer/components/MacOsScrollbarDetection.tsx2
-rw-r--r--gui/src/renderer/components/SplitTunnelingSettings.tsx2
-rw-r--r--gui/src/renderer/components/TransitionContainer.tsx2
-rw-r--r--gui/src/renderer/components/select-location/select-location-hooks.ts2
-rw-r--r--gui/src/renderer/lib/ip.ts4
5 files changed, 6 insertions, 6 deletions
diff --git a/gui/src/renderer/components/MacOsScrollbarDetection.tsx b/gui/src/renderer/components/MacOsScrollbarDetection.tsx
index 79910c3cdd..de636827bd 100644
--- a/gui/src/renderer/components/MacOsScrollbarDetection.tsx
+++ b/gui/src/renderer/components/MacOsScrollbarDetection.tsx
@@ -15,7 +15,7 @@ const StyledContainer = styled.div({
height: '0px',
});
-// This component is used to determine wheter scrollbars should be always visible or only visible
+// This component is used to determine whether scrollbars should be always visible or only visible
// while scrolling when the system setting for this is set to "Automatic". This is detected by
// testing if any space is taken by a scrollbar.
export default function MacOsScrollbarDetection() {
diff --git a/gui/src/renderer/components/SplitTunnelingSettings.tsx b/gui/src/renderer/components/SplitTunnelingSettings.tsx
index bf3b7f58b8..c8242cdd88 100644
--- a/gui/src/renderer/components/SplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettings.tsx
@@ -184,7 +184,7 @@ function LinuxSplitTunnelingSettings(props: IPlatformSplitTunnelingSettingsProps
type={ModalAlertType.warning}
iconColor={colors.red}
message={sprintf(
- // TRANSLATORS: Error message showed in a dialog when an application failes to launch.
+ // TRANSLATORS: Error message showed in a dialog when an application fails to launch.
messages.pgettext(
'split-tunneling-view',
'Unable to launch selection. %(detailedErrorMessage)s',
diff --git a/gui/src/renderer/components/TransitionContainer.tsx b/gui/src/renderer/components/TransitionContainer.tsx
index ce9900927f..53f149ba6a 100644
--- a/gui/src/renderer/components/TransitionContainer.tsx
+++ b/gui/src/renderer/components/TransitionContainer.tsx
@@ -180,7 +180,7 @@ export default class TransitionContainer extends React.Component<IProps, IState>
this.state.currentItem.view.props.routePath === candidate.props.routePath
) {
// There's no transition in progress and the newest candidate has the same path as the
- // current. In this sitation the app should just remain in the same view.
+ // current. In this situation the app should just remain in the same view.
this.setState(
{
currentItem: TransitionContainer.makeItem(this.props),
diff --git a/gui/src/renderer/components/select-location/select-location-hooks.ts b/gui/src/renderer/components/select-location/select-location-hooks.ts
index 0cefdecb4f..188a1c9aef 100644
--- a/gui/src/renderer/components/select-location/select-location-hooks.ts
+++ b/gui/src/renderer/components/select-location/select-location-hooks.ts
@@ -24,7 +24,7 @@ export function useOnSelectExitLocation() {
return useCallback(
async (relayLocation: LocationSelection<undefined>) => {
if (relayLocation.value === undefined) {
- throw new Error('relayLocation should never be undefiend');
+ throw new Error('relayLocation should never be undefined');
}
history.pop();
diff --git a/gui/src/renderer/lib/ip.ts b/gui/src/renderer/lib/ip.ts
index 369d66a479..2f68b68d78 100644
--- a/gui/src/renderer/lib/ip.ts
+++ b/gui/src/renderer/lib/ip.ts
@@ -25,7 +25,7 @@ export abstract class IpAddress<G extends number[]> {
export abstract class IpRange<G extends number[]> {
public constructor(public readonly groups: G, public readonly prefixSize: number) {}
- // Returns whether or not this subnet includes the privided IP
+ // Returns whether or not this subnet includes the provided IP
protected includes<T extends IpAddress<G>>(ip: T, groupSize: number): boolean {
return IpRange.match(groupSize, ip.groups, [this.groups, this.prefixSize]);
}
@@ -159,7 +159,7 @@ export class IPv6Address extends IpAddress<IPv6Groups> {
return localSubnets.some((subnet) => subnet.includes(this));
}
- // Parses IPv6 addresses where the groups are seperated by ':' and supports shortened addresses.
+ // Parses IPv6 addresses where the groups are separated by ':' and supports shortened addresses.
public static fromString(ip: string): IPv6Address {
try {
const groups = IPv6Address.groupsFromString(ip);