From 826f7a01e833c3ea16b957a5d6cddc02239e5c1b Mon Sep 17 00:00:00 2001 From: jeessy2 <6205259+jeessy2@users.noreply.github.com> Date: Thu, 11 Jan 2024 18:08:25 +0800 Subject: [PATCH] feat: Change the default language for self-update to English (#970) --- util/semver/version.go | 2 +- util/update/decompress.go | 2 +- util/update/detect.go | 8 ++++---- util/update/errors.go | 4 ++-- util/update/package.go | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/util/semver/version.go b/util/semver/version.go index 35143c3af..df78c094a 100644 --- a/util/semver/version.go +++ b/util/semver/version.go @@ -34,7 +34,7 @@ func init() { func NewVersion(v string) (*Version, error) { m := versionRegex.FindStringSubmatch(v) if m == nil { - return nil, fmt.Errorf("%s 不是有效的语义化版本", v) + return nil, fmt.Errorf("the %s, it's not a semantic version", v) } sv := &Version{} diff --git a/util/update/decompress.go b/util/update/decompress.go index aacb33688..6533edcec 100644 --- a/util/update/decompress.go +++ b/util/update/decompress.go @@ -33,7 +33,7 @@ func decompressCommand(src io.Reader, url, cmd string) (io.Reader, error) { return decompress(src, cmd) } } - log.Print("未压缩文件") + log.Print("It's not a compressed file, skip decompressing") return src, nil } diff --git a/util/update/detect.go b/util/update/detect.go index b017aa0d1..6ee69afb2 100644 --- a/util/update/detect.go +++ b/util/update/detect.go @@ -55,7 +55,7 @@ func findAssetForArch(arch string, rel *Release, } if release == nil { - log.Printf("未找到适用于 %s/%s 的任何 release", runtime.GOOS, runtime.GOARCH) + log.Printf("Cannot find any release for %s/%s", runtime.GOOS, runtime.GOARCH) return nil, nil, false } @@ -64,14 +64,14 @@ func findAssetForArch(arch string, rel *Release, func findAssetFromRelease(rel *Release, suffixes []string) (*Asset, *semver.Version, bool) { if rel == nil { - log.Print("没有源 release 信息") + log.Print("There is no source release information") return nil, nil, false } // 如果无法解析版本文本,则表示该文本不符合语义化版本规范,应该跳过。 ver, err := semver.NewVersion(rel.tagName) if err != nil { - log.Printf("无法解析语义化版本:%s", rel.tagName) + log.Printf("Cannot parse semantic version: %s", rel.tagName) return nil, nil, false } @@ -81,7 +81,7 @@ func findAssetFromRelease(rel *Release, suffixes []string) (*Asset, *semver.Vers } } - log.Printf("未在 release %s 中找到合适的 asset", rel.tagName) + log.Printf("Can't find suitable asset in release %s", rel.tagName) return nil, nil, false } diff --git a/util/update/errors.go b/util/update/errors.go index eefa6aac2..1658a2b79 100644 --- a/util/update/errors.go +++ b/util/update/errors.go @@ -5,6 +5,6 @@ package update import "errors" var ( - errCannotDecompressFile = errors.New("无法解压") - errExecutableNotFoundInArchive = errors.New("找不到可执行文件") + errCannotDecompressFile = errors.New("failed to decompress") + errExecutableNotFoundInArchive = errors.New("executable not found") ) diff --git a/util/update/package.go b/util/update/package.go index 9f5efecc2..384d2c022 100644 --- a/util/update/package.go +++ b/util/update/package.go @@ -16,36 +16,36 @@ func Self(version string) { // 如果不为语义化版本立即退出 v, err := semver.NewVersion(version) if err != nil { - log.Printf("无法更新!因为:%v", err) + log.Printf("Cannot update because: %v", err) return } latest, found, err := detectLatest("jeessy2/ddns-go") if err != nil { - log.Printf("检测最新版本时发生错误:%v", err) + log.Printf("Error happened when detecting latest version: %v", err) return } if !found { - log.Printf("无法从 GitHub 仓库找到 %s/%s 的最新版本", runtime.GOOS, runtime.GOARCH) + log.Printf("Cannot find any release for %s/%s", runtime.GOOS, runtime.GOARCH) return } if v.GreaterThanOrEqual(latest.Version) { - log.Printf("当前版本(%s)是最新的", version) + log.Printf("Current version (%s) is the latest", version) return } exe, err := os.Executable() if err != nil { - log.Printf("找不到可执行路径:%v", err) + log.Printf("Cannot find executable path: %v", err) return } if err = to(latest.URL, latest.Name, exe); err != nil { - log.Printf("更新二进制文件时发生错误:%v", err) + log.Printf("Error happened when updating binary: %v", err) return } - log.Printf("成功更新到 v%s", latest.Version.String()) + log.Printf("Success update to v%s", latest.Version.String()) } // to 从 assetURL 下载可执行文件,并用下载的文件替换当前的可执行文件。 @@ -65,11 +65,11 @@ func downloadAssetFromURL(url string) (rc io.ReadCloser, err error) { client := util.CreateHTTPClient() resp, err := client.Get(url) if err != nil { - return nil, fmt.Errorf("从 %s 下载 release 失败:%v", url, err) + return nil, fmt.Errorf("could not download release from %s: %v", url, err) } if resp.StatusCode >= 300 { resp.Body.Close() - return nil, fmt.Errorf("从 %s 下载 release 失败,返回状态码:%d", url, resp.StatusCode) + return nil, fmt.Errorf("could not download release from %s. Response code: %d", url, resp.StatusCode) } return resp.Body, nil