aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2019-04-30 12:32:47 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-04-30 20:19:50 +0200
commitb694cd17068325e79e03300db2df0cf78d3f437f (patch)
tree7fa96e664467adbd4fd7207a53f7bc9fdcd67c69
parentui: tunnelconfig -> tunneledit (diff)
downloadwireguard-windows-b694cd17068325e79e03300db2df0cf78d3f437f.tar.xz
wireguard-windows-b694cd17068325e79e03300db2df0cf78d3f437f.zip
ui: fix quoting in error strings
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--service/ipc_server.go2
-rw-r--r--ui/tunneleditdialog.go2
-rw-r--r--ui/tunnelspage.go2
-rw-r--r--updater/msirunner_linux.go2
4 files changed, 4 insertions, 4 deletions
diff --git a/service/ipc_server.go b/service/ipc_server.go
index 0b0b3a05..835301b8 100644
--- a/service/ipc_server.go
+++ b/service/ipc_server.go
@@ -86,7 +86,7 @@ func (s *ManagerService) Start(tunnelName string, unused *uintptr) error {
}
trackedTunnelsLock.Unlock()
if len(inTransition) != 0 {
- return fmt.Errorf("Please allow the tunnel \"%s\" to finish activating", inTransition)
+ return fmt.Errorf("Please allow the tunnel ‘%s’ to finish activating", inTransition)
}
go func() {
for _, t := range tt {
diff --git a/ui/tunneleditdialog.go b/ui/tunneleditdialog.go
index 0abed9ed..7efd68d2 100644
--- a/ui/tunneleditdialog.go
+++ b/ui/tunneleditdialog.go
@@ -299,7 +299,7 @@ func (dlg *TunnelEditDialog) onSaveButtonClicked() {
}
for _, name := range names {
- if name == newName {
+ if strings.ToLower(name) == strings.ToLower(newName) {
walk.MsgBox(dlg, "Invalid configuration", fmt.Sprintf("Another tunnel already exists with the name ‘%s’.", newName), walk.MsgBoxIconWarning)
return
}
diff --git a/ui/tunnelspage.go b/ui/tunnelspage.go
index a74b6210..8650ece6 100644
--- a/ui/tunnelspage.go
+++ b/ui/tunnelspage.go
@@ -216,7 +216,7 @@ func (tp *TunnelsPage) importFiles(paths []string) {
configCount := 0
for _, unparsedConfig := range unparsedConfigs {
if existingLowerTunnels[strings.ToLower(unparsedConfig.Name)] {
- lastErr = fmt.Errorf("The tunnel \"%s\" already exists", unparsedConfig.Name)
+ lastErr = fmt.Errorf("Another tunnel already exists with the name ‘%s’", unparsedConfig.Name)
continue
}
config, err := conf.FromWgQuick(unparsedConfig.Config, unparsedConfig.Name)
diff --git a/updater/msirunner_linux.go b/updater/msirunner_linux.go
index 974c0883..cbb52cf6 100644
--- a/updater/msirunner_linux.go
+++ b/updater/msirunner_linux.go
@@ -13,7 +13,7 @@ import (
// This isn't a Linux program, yes, but having the updater package work across platforms is quite helpful for testing.
func runMsi(msiPath string) error {
- return exec.Command("qarma", "--info", "--text", fmt.Sprintf("It seems to be working! Were we on Windows, \"%s\" would be executed.", msiPath)).Run()
+ return exec.Command("qarma", "--info", "--text", fmt.Sprintf("It seems to be working! Were we on Windows, ‘%s’ would be executed.", msiPath)).Run()
}
func msiSaveDirectory() (string, error) {