Merge pull request #11721 from sharifelgamal/windows-locale
let windows users use the LC_ALL env var to set localepull/11708/head
commit
49f9bc868a
|
@ -19,6 +19,8 @@ package translate
|
|||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"runtime"
|
||||
"strings"
|
||||
|
||||
"github.com/cloudfoundry-attic/jibber_jabber"
|
||||
|
@ -60,10 +62,18 @@ 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" {
|
||||
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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue