提交 0bf293b0 编写于 作者: S Sharif Elgamal

Move setting locale to start

上级 5cffb33e
......@@ -30,6 +30,7 @@ import (
"time"
"github.com/blang/semver"
"github.com/cloudfoundry-attic/jibber_jabber"
"github.com/docker/machine/libmachine"
"github.com/docker/machine/libmachine/host"
"github.com/docker/machine/libmachine/state"
......@@ -163,6 +164,8 @@ assumes you have already installed one of the VM drivers: virtualbox/parallels/v
// runStart handles the executes the flow of "minikube start"
func runStart(cmd *cobra.Command, args []string) {
determineLocale()
console.OutStyle("happy", "minikube %s on %s (%s)", version.GetVersion(), runtime.GOOS, runtime.GOARCH)
validateConfig()
......@@ -691,3 +694,12 @@ func saveConfig(clusterConfig cfg.Config) error {
}
return nil
}
func determineLocale() {
locale, err := jibber_jabber.DetectIETF()
if err != nil {
glog.Warningf("Getting system locale failed: %s", err)
locale = ""
}
console.SetPreferredLanguage(locale)
}
......@@ -24,7 +24,6 @@ import (
"strconv"
"strings"
"github.com/cloudfoundry-attic/jibber_jabber"
"github.com/golang/glog"
isatty "github.com/mattn/go-isatty"
"golang.org/x/text/language"
......@@ -89,12 +88,6 @@ func OutStyle(style, format string, a ...interface{}) error {
// Out writes a basic formatted string to stdout
func Out(format string, a ...interface{}) error {
locale, err := jibber_jabber.DetectIETF()
if err != nil {
glog.Warningf("Getting system locale failed: %s", err)
locale = ""
}
SetPreferredLanguage(locale)
p := message.NewPrinter(preferredLanguage)
if outFile == nil {
if _, err := p.Fprintf(os.Stdout, "(stdout unset)"+format, a...); err != nil {
......@@ -102,7 +95,7 @@ func Out(format string, a ...interface{}) error {
}
return fmt.Errorf("no output file has been set")
}
_, err = p.Fprintf(outFile, format, a...)
_, err := p.Fprintf(outFile, format, a...)
return err
}
......@@ -131,12 +124,6 @@ func ErrStyle(style, format string, a ...interface{}) error {
// Err writes a basic formatted string to stderr
func Err(format string, a ...interface{}) error {
locale, err := jibber_jabber.DetectIETF()
if err != nil {
glog.Warningf("Getting system locale failed: %s", err)
locale = ""
}
SetPreferredLanguage(locale)
p := message.NewPrinter(preferredLanguage)
if errFile == nil {
if _, err := p.Fprintf(os.Stderr, "(stderr unset)"+format, a...); err != nil {
......@@ -144,7 +131,7 @@ func Err(format string, a ...interface{}) error {
}
return fmt.Errorf("no error file has been set")
}
_, err = p.Fprintf(errFile, format, a...)
_, err := p.Fprintf(errFile, format, a...)
return err
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册