Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling: WireGuard and Wi-Fi #397

Merged
merged 7 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ui/src/components/blocks/block-connection-details.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@
class="leftPanelBlock"
:click="onShowWifiConfig"
v-bind:text="wifiSSID"
:description="wifiSSID == '' ? 'No WiFi connection' : 'WiFi network'"
:description="wifiSSID == '' ? 'No Wi-Fi connection' : 'Wi-Fi network'"
:markerText="WiFiMarkerText"
:markerColor="WiFiMarkerColor"
:markerTextColor="'var(--text-color-details)'"
title="WiFi control settings"
title="Wi-Fi control settings"
/>
</div>
</transition>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/settings/settings-advanced.vue
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default {
) {
if (warningMessage) warningMessage += "\n\n";
warningMessage +=
"On application start Trusted WiFi will be disabled until the EAA password is entered.";
"On application start Trusted Wi-Fi will be disabled until the EAA password is entered.";
}

if (
Expand Down
8 changes: 4 additions & 4 deletions ui/src/components/settings/settings-connection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:checked="!isOpenVPN"
@click="onVpnChange"
/>
<label class="defColor" for="wireguard">Wireguard</label>
<label class="defColor" for="wireguard">WireGuard</label>
</div>
</div>

Expand Down Expand Up @@ -251,9 +251,9 @@
</div>
</div>

<!-- Wireguard -->
<!-- WireGuard -->
<div v-show="!isOpenVPN">
<div class="settingsBoldFont" tabindex="0">Wireguard configuration:</div>
<div class="settingsBoldFont" tabindex="0">WireGuard configuration:</div>

<div
v-bind:class="{ disabled: prefferedPorts.length <= 1 }"
Expand Down Expand Up @@ -363,7 +363,7 @@
</div>

<div v-if="IsAccountActive">
<div class="settingsBoldFont" tabindex="0">Wireguard key information:</div>
<div class="settingsBoldFont" tabindex="0">WireGuard key information:</div>

<spinner :loading="isProcessing" />
<div class="flexRow paramBlockDetailedConfig" tabindex="0">
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/settings/settings-firewall.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
3927, 4291, 4193.
</p>
<div class="settingsGrayLongDescriptionFont">
'WiFi control' actions for untrusted networks will override this
'Wi-Fi control' actions for untrusted networks will override this
option.
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/settings/settings-general.vue
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ export default {
isLaunchAtLoginDisableBlockerInfo() {
if (!this.isLaunchAtLogin) return "";
if (this.isWifiActionsInBackground === true)
return `This option can not be disabled\nbecause of 'Allow background daemon to Apply WiFi Control settings' is active`;
return `This option can not be disabled\nbecause of 'Allow background daemon to Apply Wi-Fi Control settings' is active`;
if (this.isAutoconnectOnLaunchDaemon === true)
return `This option can not be disabled\nbecause of 'Allow background daemon to manage autoconnect' is active`;
return "";
Expand Down
26 changes: 13 additions & 13 deletions ui/src/components/settings/settings-networks.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="flexColumn">
<div class="settingsTitle" tabindex="0">WIFI CONTROL SETTINGS</div>
<div class="settingsTitle" tabindex="0">WI-FI CONTROL SETTINGS</div>

<div
class="param" tabindex="0"
Expand All @@ -22,7 +22,7 @@
v-model="canApplyInBackground"
/>
<label class="defColor" for="canApplyInBackground"
>Allow background daemon to Apply WiFi Control settings</label
>Allow background daemon to Apply Wi-Fi Control settings</label
>

<button
Expand All @@ -36,9 +36,9 @@
<ComponentDialog ref="helpCanApplyInBackground" header="Info">
<div>
<p>
By enabling this feature the IVPN daemon will apply the WiFi control
By enabling this feature the IVPN daemon will apply the Wi-Fi control
settings before the IVPN app has been launched. This enables the
WiFi control settings to be applied as quickly as possible as the
Wi-Fi control settings to be applied as quickly as possible as the
daemon is started early in the operating system boot process and
before the IVPN app (The GUI).
</p>
Expand All @@ -54,7 +54,7 @@
v-model="connectVPNOnInsecureNetwork"
/>
<label class="defColor" for="connectVPNOnInsecureNetwork"
>Autoconnect on joining WiFi networks without encryption</label
>Autoconnect on joining Wi-Fi networks without encryption</label
>
</div>

Expand All @@ -66,12 +66,12 @@
v-model="trustedNetworksControl"
/>
<label class="defColor" for="trustedNetworksControl"
>Trusted/Untrusted WiFi network control</label
>Trusted/Untrusted Wi-Fi network control</label
>
</div>
<div class="fwDescription" tabindex="0">
By enabling this feature you can define a WiFi network as trusted or
untrusted and what actions to take when joining the WiFi network
By enabling this feature you can define a Wi-Fi network as trusted or
untrusted and what actions to take when joining the Wi-Fi network
</div>

<div v-if="wifiWarningMessage" class="warningBlock" >
Expand All @@ -89,7 +89,7 @@
class="selectableButtonOff"
v-bind:class="{ selectableButtonOn: !isActionsView }"
>
WiFi networks
Wi-Fi networks
</button>
<button
v-on:click="onActions"
Expand All @@ -106,7 +106,7 @@
<div class="flexColumn" style="min-height: 0px">
<!-- ACTIONS -->
<div v-if="isActionsView" style="flex-grow: 1">
<div class="settingsBoldFont" tabindex="0">Actions for Untrusted WiFi</div>
<div class="settingsBoldFont" tabindex="0">Actions for Untrusted Wi-Fi</div>
<div class="param" tabindex="0">
<input
type="checkbox"
Expand Down Expand Up @@ -154,7 +154,7 @@
</ComponentDialog>
</div>

<div class="settingsBoldFont" tabindex="0">Actions for Trusted WiFi</div>
<div class="settingsBoldFont" tabindex="0">Actions for Trusted Wi-Fi</div>
<div class="param" tabindex="0">
<input
type="checkbox"
Expand Down Expand Up @@ -231,7 +231,7 @@
style="margin: 0px 5px 0px 0px"
/>
<label class="defColor" for="showAllWifi" tabindex="0">
Show all WiFi networks</label
Show all Wi-Fi networks</label
>
</div>

Expand Down Expand Up @@ -353,7 +353,7 @@ export default {
type: "warning",
message: `Enhanced App Authentication`,
detail:
"Warning: On application start Trusted WiFi will be disabled until the EAA password is entered",
"Warning: On application start Trusted Wi-Fi will be disabled until the EAA password is entered",
buttons: ["Enable", "Cancel"],
},
true,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/Component-Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
activeBtn: view === 'networks',
}"
>
WiFi control
Wi-Fi control
</button>

<button
Expand Down
Loading