Skip to content

Commit 49f9bc8

Browse files
Merge pull request #11721 from sharifelgamal/windows-locale
let windows users use the LC_ALL env var to set locale
2 parents c020ce1 + 867ad61 commit 49f9bc8

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

pkg/minikube/translate/translate.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package translate
1919
import (
2020
"encoding/json"
2121
"fmt"
22+
"os"
23+
"runtime"
2224
"strings"
2325

2426
"github.com/cloudfoundry-attic/jibber_jabber"
@@ -60,10 +62,18 @@ func T(s string) string {
6062

6163
// DetermineLocale finds the system locale and sets the preferred language for output appropriately.
6264
func DetermineLocale() {
63-
locale, err := jibber_jabber.DetectIETF()
64-
if err != nil {
65-
klog.V(1).Infof("Getting system locale failed: %v", err)
66-
locale = ""
65+
var locale string
66+
// Allow windows users to overload the same env vars as unix users
67+
if runtime.GOOS == "windows" {
68+
locale = os.Getenv("LC_ALL")
69+
}
70+
if locale == "" {
71+
var err error
72+
locale, err = jibber_jabber.DetectIETF()
73+
if err != nil {
74+
klog.V(1).Infof("Getting system locale failed: %v", err)
75+
locale = ""
76+
}
6777
}
6878
SetPreferredLanguage(locale)
6979

0 commit comments

Comments
 (0)