Merge pull request #1257 from ActiveState/dgreen/localize_clean_cache_err-176827634

Remove errors.New+locale.T usage

Author: daved

internal/prompt/helpers.go

@@ -1,7 +1,6 @@
 package prompt
 
 import (
-	"errors"
 	"math"
 	"reflect"
 	"strings"
@@ -53,7 +52,7 @@ func inputRequired(val interface{}) error {
 
 	// if the value passed in is the zero value of the appropriate type
 	if isZero(value) && value.Kind() != reflect.Bool && value.Kind() != reflect.Int {
-		return errors.New(locale.T("err_value_required"))
+		return locale.NewError("err_value_required")
 	}
 	return nil
 }

internal/runners/clean/cache.go

@@ -1,7 +1,6 @@
 package clean
 
 import (
-	"errors"
 	"os"
 
 	"github.com/ActiveState/cli/internal/config"
@@ -42,7 +41,7 @@ func newCache(output output.Outputer, cfg configurable, confirm confirmAble) *Ca
 
 func (c *Cache) Run(params *CacheParams) error {
 	if os.Getenv(constants.ActivatedStateEnvVarName) != "" {
-		return errors.New(locale.T("err_clean_cache_activated"))
+		return locale.NewError("err_clean_cache_activated")
 	}
 
 	if params.Project != "" {

internal/runners/clean/config.go

@@ -1,7 +1,6 @@
 package clean
 
 import (
-	"errors"
 	"os"
 
 	"github.com/ActiveState/cli/internal/constants"
@@ -42,7 +41,7 @@ func newConfig(out output.Outputer, confirm confirmAble, cfg configurable) *Conf
 
 func (c *Config) Run(params *ConfigParams) error {
 	if os.Getenv(constants.ActivatedStateEnvVarName) != "" {
-		return errors.New(locale.T("err_clean_cache_activated"))
+		return locale.NewError("err_clean_cache_activated")
 	}
 
 	if !params.Force {

internal/runners/clean/uninstall.go

@@ -1,7 +1,6 @@
 package clean
 
 import (
-	"errors"
 	"os"
 
 	"github.com/ActiveState/cli/internal/constants"
@@ -51,7 +50,7 @@ func newUninstall(out output.Outputer, confirm confirmAble, cfg configurable) (*
 
 func (u *Uninstall) Run(params *UninstallParams) error {
 	if os.Getenv(constants.ActivatedStateEnvVarName) != "" {
-		return errors.New(locale.T("err_uninstall_activated"))
+		return locale.NewError("err_uninstall_activated")
 	}
 
 	if !params.Force {

internal/runners/languages/install.go

@@ -1,7 +1,6 @@
 package languages
 
 import (
-	"errors"
 	"strings"
 
 	"github.com/ActiveState/cli/internal/locale"
@@ -85,7 +84,7 @@ func parseLanguage(langName string) (*model.Language, error) {
 
 	split := strings.Split(langName, "@")
 	if len(split) != 2 {
-		return nil, errors.New(locale.T("err_language_format"))
+		return nil, locale.NewError("err_language_format")
 	}
 	name := split[0]
 	version := split[1]
@@ -108,7 +107,7 @@ func ensureLanguagePlatform(language *model.Language) error {
 		}
 	}
 
-	return errors.New(locale.Tr("err_update_not_found", language.Name))
+	return locale.NewError("err_update_not_found", language.Name)
 }
 
 func ensureLanguageProject(language *model.Language, project *project.Project) error {

pkg/cmdlets/auth/signup.go

@@ -1,7 +1,6 @@
 package auth
 
 import (
-	"errors"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -234,7 +233,7 @@ func UsernameValidator(val interface{}) error {
 	params.SetUsername(value)
 	res, err := mono.Get().Users.UniqueUsername(params)
 	if err != nil || *res.Payload.Code != int64(200) {
-		return errors.New(locale.T("err_username_taken"))
+		return locale.NewError("err_username_taken")
 	}
 	return nil
 }