From 281fbef94faefeb26496c73b3f8caf96f04dbcd7 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 21 Jun 2021 14:21:43 -0700 Subject: [PATCH 1/2] let windows users user the LC_ALL env var to set locale --- pkg/minikube/translate/translate.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/translate/translate.go b/pkg/minikube/translate/translate.go index 2605870cd5..d0c5fbd956 100644 --- a/pkg/minikube/translate/translate.go +++ b/pkg/minikube/translate/translate.go @@ -19,6 +19,8 @@ package translate import ( "encoding/json" "fmt" + "os" + "runtime" "strings" "github.com/cloudfoundry-attic/jibber_jabber" @@ -60,10 +62,20 @@ func T(s string) string { // DetermineLocale finds the system locale and sets the preferred language for output appropriately. func DetermineLocale() { - locale, err := jibber_jabber.DetectIETF() - if err != nil { - klog.V(1).Infof("Getting system locale failed: %v", err) - locale = "" + var locale string + // Allow windows users to overload the same env vars as unix users + if runtime.GOOS == "windows" { + if os.Getenv("LC_ALL") != "" { + locale = os.Getenv("LC_ALL") + } + } + if locale == "" { + var err error + locale, err = jibber_jabber.DetectIETF() + if err != nil { + klog.V(1).Infof("Getting system locale failed: %v", err) + locale = "" + } } SetPreferredLanguage(locale) From 867ad61f7c751be5825e5fa28ab393e36b998758 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 21 Jun 2021 15:29:56 -0700 Subject: [PATCH 2/2] make it simpler --- pkg/minikube/translate/translate.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/minikube/translate/translate.go b/pkg/minikube/translate/translate.go index d0c5fbd956..48e2ab9de3 100644 --- a/pkg/minikube/translate/translate.go +++ b/pkg/minikube/translate/translate.go @@ -65,9 +65,7 @@ func DetermineLocale() { var locale string // Allow windows users to overload the same env vars as unix users if runtime.GOOS == "windows" { - if os.Getenv("LC_ALL") != "" { - locale = os.Getenv("LC_ALL") - } + locale = os.Getenv("LC_ALL") } if locale == "" { var err error