From 4b21f0d30004b63dd6ad4070179b05ffcff7a184 Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Thu, 26 Oct 2017 05:10:40 +0300 Subject: [PATCH] We need your help with translations into your native language. Instructions can be found at: https://github.com/kataras/iris/issues/796 written by @speedwheel --- CONTRIBUTING.md | 2 +- HISTORY.md | 2 +- _examples/README.md | 2 +- version.go | 16 ++-------------- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6bcba9aa7..bad67bad3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ We need your help with translations into your native language. Iris needs your help, please think about contributing to the translation of the [README](README.md) and https://iris-go.com, you will be rewarded. -Chinese: https://github.com/kataras/iris/issues/796 +Instructions can be found at: https://github.com/kataras/iris/issues/796 ## Share diff --git a/HISTORY.md b/HISTORY.md index 3ea9a659b..765f21419 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -33,7 +33,7 @@ Not any new features or fixes (all reported bugs are fixed) in this version, jus Iris needs your help, please think about contributing to the translation of the [README](README.md) and https://iris-go.com, you will be rewarded. -For Chinese Gophers: https://github.com/kataras/iris/issues/796 +Instructions can be found at: https://github.com/kataras/iris/issues/796 # Su, 22 October 2017 | v8.5.3 diff --git a/_examples/README.md b/_examples/README.md index 1729a5df3..0cd77a5ad 100644 --- a/_examples/README.md +++ b/_examples/README.md @@ -26,7 +26,7 @@ Structuring depends on your own needs. We can't tell you how to design your own - [Bootstrapper](structuring/bootstrap) - [MVC with Repository and Service layer Overview](structuring/mvc-plus-repository-and-service-layers) -- [Login (MVC with Single Responsibility package)](structuring/login-mvc-single-responsible-package) +- [Login (MVC with Single Responsibility package)](structuring/login-mvc-single-responsibility-package) - [Login (MVC with Datamodels, Datasource, Repository and Service layer)](structuring/login-mvc) ### HTTP Listening diff --git a/version.go b/version.go index 626aab16a..f22b1b9ed 100644 --- a/version.go +++ b/version.go @@ -34,7 +34,7 @@ type versionInfo struct { } func checkVersion() { - client := netutil.Client(30 * time.Second) + client := netutil.Client(25 * time.Second) r, err := client.PostForm("https://iris-go.com/version", url.Values{"current_version": {Version}}) if err != nil { @@ -60,18 +60,6 @@ func checkVersion() { return } - if !v.UpdateAvailable { - return - } - - // shouldUpdate := false - // prompt := &survey.Confirm{ - // Message: shouldUpdateNowMsg, - // } - - // if err := survey.AskOne(prompt, &shouldUpdate, nil); err != nil { - // return - // } var qs []*survey.Question // on help? when asking for installing the new update @@ -157,7 +145,7 @@ func checkVersion() { } golog.Infof("Update process finished.\nManual rebuild and restart is required to apply the changes...\n") - } else { + } else if v.UpdateAvailable { // if update was available but choosen not to update. golog.Infof(ignoreUpdatesMsg) } }