[Update] 修改支持i18n

.gitignore

@@ -17,3 +17,4 @@ go.sum
 vendor/
 config.yml
 host_key
+cmd/coco

Gopkg.lock

@@ -134,6 +134,29 @@
   pruneopts = "UT"
   revision = "a129542de9ae0895210abff9c95d67a1f33cb93d"
 
+[[projects]]
+  digest = "1:137714ae7838cec8b48918205cb3cd96b17afebaa715e35a8213e6e0cc739d56"
+  name = "golang.org/x/text"
+  packages = [
+    "feature/plural",
+    "internal",
+    "internal/catmsg",
+    "internal/format",
+    "internal/gen",
+    "internal/language",
+    "internal/language/compact",
+    "internal/number",
+    "internal/stringset",
+    "internal/tag",
+    "language",
+    "message",
+    "message/catalog",
+    "unicode/cldr",
+  ]
+  pruneopts = "UT"
+  revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"
+  version = "v0.3.2"
+
 [[projects]]
   digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96"
   name = "gopkg.in/yaml.v2"
@@ -156,6 +179,8 @@
     "github.com/xlab/treeprint",
     "golang.org/x/crypto/ssh",
     "golang.org/x/crypto/ssh/terminal",
+    "golang.org/x/text/language",
+    "golang.org/x/text/message",
     "gopkg.in/yaml.v2",
   ]
   solver-name = "gps-cdcl"

Gopkg.toml

@@ -68,3 +68,4 @@
 [prune]
   go-tests = true
   unused-packages = true
+

cmd/hello.go

 package main
+
+import (
+	"bytes"
+	"fmt"
+	"golang.org/x/crypto/ssh/terminal"
+	"io"
+	"io/ioutil"
+	"os"
+)
+
+var f, _ = os.Create("/tmp/new.txt")
+
+var buf, _ = ioutil.ReadFile("/tmp/cmd.text")
+
+type CmdRwParser struct {
+	content []byte
+}
+
+func (c *CmdRwParser) Read(b []byte) (int, error) {
+	for i, v := range c.content {
+		b[i] = v
+	}
+	fmt.Printf("Read %s\n", b)
+	return len(c.content), io.EOF
+}
+
+func (c *CmdRwParser) Write(b []byte) (int, error) {
+	fmt.Printf("Write %s\n", b)
+	return len(b), nil
+}
+
+func main() {
+	nb := new(bytes.Buffer)
+	term := terminal.NewTerminal(nb, ">")
+	nb.Write(buf)
+	nb.Write([]byte("\r"))
+	fmt.Printf("Buf: %s\n", buf)
+
+	line, _ := term.ReadLine()
+	f.WriteString(line)
+	fmt.Printf("Line: %s\n", []byte(line))
+	fmt.Println(".......................")
+	fmt.Printf(nb.String())
+	f.Close()
+}

cmd/locale/en_US/LC_MESSAGES/coco.po

+msgid ""
+msgstr ""
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: xgotext\n"
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:16
+msgid "Welcome to use Jumpserver open source fortress system"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:30
+msgid "\t%d) Enter {{.GreenBoldColor}}%s{{.ColorEnd}} to %s.%s"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:44
+msgid "directly login"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:45
+msgid "part IP, Hostname, Comment"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:45
+msgid "to search login if unique"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:46
+msgid "/ + IP, Hostname, Comment"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:46
+msgid "to search, such as: /192.168"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:47
+msgid "display the host you have permission"
+msgstr ""

cmd/locale/zh_CN/LC_MESSAGES/coco.po

+msgid ""
+msgstr ""
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: xgotext\n"
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:16
+msgid "Welcome to use Jumpserver open source fortress system"
+msgstr "欢迎使用Jumpserver开源堡垒机系统"
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:30
+msgid "\t%d) Enter {{.GreenBoldColor}}%s{{.ColorEnd}} to %s.%s"
+msgstr "\t%d) 输入 {{.GreenBoldColor}}%s{{.ColorEnd}} 进行 %s.%s"
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:44
+msgid "directly login"
+msgstr "直接登陆"
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:45
+msgid "part IP, Hostname, Comment"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:45
+msgid "to search login if unique"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:46
+msgid "/ + IP, Hostname, Comment"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:46
+msgid "to search, such as: /192.168"
+msgstr ""
+
+#. i18n.T
+#: pkg/sshd/handler/banner.go:47
+msgid "display the host you have permission"
+msgstr ""

pkg/config/config.go

@@ -38,6 +38,7 @@ type Config struct {
 	HeartbeatDuration   time.Duration     `yaml:"HEARTBEAT_INTERVAL"`
 	RootPath            string
 	Comment             string
+	Language            string
 
 	mux sync.RWMutex
 }
@@ -114,6 +115,7 @@ var Conf = &Config{
 	HostKey:        "",
 	RootPath:       rootPath,
 	Comment:        "Coco",
+	Language:       "zh_CN",
 	ReplayStorage:  map[string]string{},
 	CommandStorage: map[string]string{},
 }

pkg/i18n/i18n.go

+package i18n
+
+import (
+	"path"
+	"strings"
+
+	"github.com/leonelquinteros/gotext"
+
+	"cocogo/pkg/config"
+)
+
+func init() {
+	localePath := path.Join(config.Conf.RootPath, "locale")
+	if strings.HasPrefix(config.Conf.Language, "zh") {
+		gotext.Configure(localePath, "zh_CN", "coco")
+	} else {
+		gotext.Configure(localePath, "en_US", "coco")
+	}
+}
+
+func T(s string) string {
+	return gotext.Get(s)
+}

pkg/i18n/i18n_test.go

+package i18n
+
+import (
+	"fmt"
+	"os"
+	"testing"
+)
+
+func TestT(t *testing.T) {
+	//loc := gotext.NewLocale("./locale", "zh_CN")
+	//loc.AddDomain("coco")
+	fmt.Println(T("Welcome to use Jumpserver open source fortress system"))
+}
+
+func TestMain(m *testing.M) {
+	code := m.Run()
+	os.Exit(code)
+}

pkg/locale/example.go

-package locale

pkg/locale/i18n.go

-package i18n

pkg/locale/messages.go

-package locale

pkg/proxy/proxy.go

@@ -51,10 +51,10 @@ func (p *ProxyServer) Proxy(ctx context.Context) {
 		return
 	}
 	conn := SSHConnection{
-		Host:     "192.168.244.185",
-		Port:     "22",
+		Host:     "127.0.0.1",
+		Port:     "1337",
 		User:     "root",
-		Password: "redhat",
+		Password: "MyRootPW123",
 	}
 	ptyReq, _, ok := p.Session.Pty()
 	if !ok {

pkg/proxybak/switch.go

@@ -7,7 +7,6 @@ import (
 	"github.com/ibuler/ssh"
 
 	"cocogo/pkg/logger"
-	"cocogo/pkg/sdk"
 	"cocogo/pkg/userhome"
 )
 

pkg/sshd/handler/banner.go

@@ -2,17 +2,19 @@ package handler
 
 import (
 	"bytes"
-	"cocogo/pkg/config"
 	"fmt"
 	"io"
 	"text/template"
 
 	"github.com/ibuler/ssh"
 
+	"cocogo/pkg/config"
+	"cocogo/pkg/i18n"
 	"cocogo/pkg/logger"
 )
 
-const defaultTitle = `Welcome to use Jumpserver open source fortress system`
+var defaultTitle string
+var menu Menu
 
 type MenuItem struct {
 	id       int
@@ -26,7 +28,7 @@ func (mi *MenuItem) Text() string {
 		return mi.showText
 	}
 	cm := ColorMeta{GreenBoldColor: "\033[1;32m", ColorEnd: "\033[0m"}
-	line := fmt.Sprintf("\t%d) Enter {{.GreenBoldColor}}%s{{.ColorEnd}} to %s.\r\n", mi.id, mi.instruct, mi.helpText)
+	line := fmt.Sprintf(i18n.T("\t%d) Enter {{.GreenBoldColor}}%s{{.ColorEnd}} to %s.%s"), mi.id, mi.instruct, mi.helpText, "\r\n")
 	tmpl := template.Must(template.New("item").Parse(line))
 	var buf bytes.Buffer
 	err := tmpl.Execute(&buf, cm)
@@ -39,16 +41,20 @@ func (mi *MenuItem) Text() string {
 
 type Menu []MenuItem
 
-var menu = Menu{
-	{id: 1, instruct: "ID", helpText: "directly login or enter"},
-	{id: 2, instruct: "part IP, Hostname, Comment", helpText: "to search login if unique"},
-	{id: 3, instruct: "/ + IP, Hostname, Comment", helpText: "to search, such as: /192.168"},
-	{id: 4, instruct: "p", helpText: "display the host you have permission"},
-	{id: 5, instruct: "g", helpText: "display the node that you have permission"},
-	{id: 6, instruct: "r", helpText: "refresh your assets and nodes"},
-	{id: 7, instruct: "s", helpText: "switch Chinese-english language"},
-	{id: 8, instruct: "h", helpText: "print help"},
-	{id: 9, instruct: "q", helpText: "exit"},
+func init() {
+	fmt.Println("Init bnanner")
+	defaultTitle = i18n.T("Welcome to use Jumpserver open source fortress system")
+	menu = Menu{
+		{id: 1, instruct: "ID", helpText: i18n.T("directly login")},
+		{id: 2, instruct: i18n.T("part IP, Hostname, Comment"), helpText: i18n.T("to search login if unique")},
+		{id: 3, instruct: i18n.T("/ + IP, Hostname, Comment"), helpText: i18n.T("to search, such as: /192.168")},
+		{id: 4, instruct: "p", helpText: i18n.T("display the host you have permission")},
+		{id: 5, instruct: "g", helpText: "display the node that you have permission"},
+		{id: 6, instruct: "r", helpText: "refresh your assets and nodes"},
+		{id: 7, instruct: "s", helpText: "switch Chinese-english language"},
+		{id: 8, instruct: "h", helpText: "print help"},
+		{id: 9, instruct: "q", helpText: "exit"},
+	}
 }
 
 type ColorMeta struct {

tools/message.sh

+#!/usr/bin/env bash
+
+BASE_DIR=$(cd $(dirname $0);pwd)
+PROJECT_DIR=$(dirname ${BASE_DIR})
+
+LANG="zh_CN en_US"
+DOMAIN=coco
+BIN=${PROJECT_DIR}/cmd/geni18n.go
+INPUT=pkg
+OUTPUT=${PROJECT_DIR}/pkg/i18n/locale/
+
+init_message() {
+    for lang in $LANG;do
+         output_dir=${OUTPUT}/${lang}/LC_MESSAGES/
+         go run ${BIN} -domain ${DOMAIN} -in ${INPUT} -out ${output_dir}
+    done
+}
+
+make_message() {
+    go run ${BIN} -domain ${DOMAIN} -in ${INPUT} -out /tmp/
+    for lang in $LANG;do
+         po_file=${OUTPUT}/${lang}/LC_MESSAGES/${DOMAIN}.po
+         msgmerge -U ${po_file} /tmp/${DOMAIN}.po
+    done
+}
+
+compile_message() {
+    for lang in $LANG;do
+         po_file=${OUTPUT}/${lang}/LC_MESSAGES/${DOMAIN}.po
+         msgfmt -o ${po_file/po/mo} ${po_file}
+    done
+}
+
+if [[ $1 == "c" || $1 == "compile" ]];then
+    compile_message
+elif [[ $1 == "i" ]];then
+    init_message
+else
+    make_message
+fi
+
+