i118 message

res/messages_en.json

@@ -179,22 +179,27 @@
       "translation": "Test Suite"
     },
     {
-      "id": "test_scripts",
-      "message": "Test Scripts",
-      "translation": "Test Scripts"
+      "id": "test_script",
+      "message": "Test Script",
+      "translation": "Test Script"
     },
     {
       "id": "content",
       "message": "Content",
       "translation": "Content"
     },
+    {
+      "id": "run",
+      "message": "Run",
+      "translation": "Run"
+    },
     {
       "id": "results",
       "message": "Results",
       "translation": "Results"
     },
     {
-      "id": "upload_test_result",
+      "id": "upload_result",
       "message": "Upload Result",
       "translation": "Upload Result"
     },
@@ -258,7 +263,6 @@
       "message": "Switch To",
       "translation": "Switch To"
     },
-    d
     {
       "id": "project_config",
       "message": "",

res/messages_zh.json

@@ -186,13 +186,18 @@
       "message": "Content",
       "translation": "内容"
     },
+    {
+      "id": "run",
+      "message": "Run",
+      "translation": "运行"
+    },
     {
       "id": "results",
       "message": "Results",
       "translation": "结果"
     },
     {
-      "id": "upload_test_result",
+      "id": "upload_result",
       "message": "Upload Result",
       "translation": "上传结果"
     },

src/ui/page/pageReportBug.go

@@ -149,7 +149,7 @@ func reportBug(g *gocui.Gui, v *gocui.View) error {
 
 	if title == "" {
 		v, _ := vari.Cui.View("reportBugMsg")
-		color.New(color.FgMagenta).Fprintf(v, "Title cannot be empty")
+		color.New(color.FgMagenta).Fprintf(v, i118Utils.ReadI18nJson("title_cannot_be_empty"))
 		return nil
 	}
 

src/ui/page/pageSettings.go

@@ -3,6 +3,7 @@ package page
 import (
 	"github.com/easysoft/zentaoatf/src/ui"
 	"github.com/easysoft/zentaoatf/src/ui/widget"
+	i118Utils "github.com/easysoft/zentaoatf/src/utils/i118"
 	"github.com/easysoft/zentaoatf/src/utils/vari"
 	"github.com/jroimartin/gocui"
 )
@@ -11,10 +12,12 @@ var CurrSettingsButton string
 var settingsButtons []string
 
 func InitSettingsPage() error {
-	importLabel := widget.NewLabelWidgetAutoWidth("switch", 0, 2, "Create/Change Project")
+	importLabel := widget.NewLabelWidgetAutoWidth("switch", 0, 2,
+		i118Utils.I118Prt.Sprintf("switch_project"))
 	ui.ViewMap["settings"] = append(ui.ViewMap["settings"], importLabel.Name())
 
-	switchLabel := widget.NewLabelWidgetAutoWidth("import", 0, 3, "Import from Zentao")
+	switchLabel := widget.NewLabelWidgetAutoWidth("import", 0, 3,
+		i118Utils.I118Prt.Sprintf("import_from_zentao"))
 	ui.ViewMap["settings"] = append(ui.ViewMap["settings"], switchLabel.Name())
 
 	keybindingSettingsButton()

src/ui/page/pageSwitch.go

@@ -6,6 +6,7 @@ import (
 	"github.com/easysoft/zentaoatf/src/ui"
 	"github.com/easysoft/zentaoatf/src/ui/widget"
 	constant "github.com/easysoft/zentaoatf/src/utils/const"
+	i118Utils "github.com/easysoft/zentaoatf/src/utils/i118"
 	"github.com/easysoft/zentaoatf/src/utils/log"
 	"github.com/easysoft/zentaoatf/src/utils/vari"
 	"github.com/jroimartin/gocui"
@@ -21,7 +22,8 @@ func InitSwitchPage() error {
 
 	left := slideX + 2
 	right := left + widget.LabelWidth
-	workDirLabel := widget.NewLabelWidget("workDirLabel", left, 1, "WorkDir")
+	workDirLabel := widget.NewLabelWidget("workDirLabel", left, 1,
+		i118Utils.I118Prt.Sprintf("Workdir"))
 	ui.ViewMap["switch"] = append(ui.ViewMap["switch"], workDirLabel.Name())
 
 	left = right + ui.Space
@@ -33,7 +35,8 @@ func InitSwitchPage() error {
 	}
 
 	buttonX := (maxX-constant.LeftWidth)/2 + constant.LeftWidth - widget.ButtonWidth
-	submitInput := widget.NewButtonWidgetAutoWidth("submitInput", buttonX, 4, "Switch", SwitchWorkDir)
+	submitInput := widget.NewButtonWidgetAutoWidth("submitInput", buttonX, 4,
+		i118Utils.I118Prt.Sprintf("switch"), SwitchWorkDir)
 	ui.ViewMap["switch"] = append(ui.ViewMap["switch"], submitInput.Name())
 
 	ui.AddEventForInputWidgets(ui.ViewMap["switch"])

src/ui/page/pageTestResult.go

@@ -8,6 +8,7 @@ import (
 	"github.com/easysoft/zentaoatf/src/ui"
 	"github.com/easysoft/zentaoatf/src/ui/widget"
 	constant "github.com/easysoft/zentaoatf/src/utils/const"
+	i118Utils "github.com/easysoft/zentaoatf/src/utils/i118"
 	"github.com/easysoft/zentaoatf/src/utils/vari"
 	"github.com/jroimartin/gocui"
 	"strconv"
@@ -80,7 +81,8 @@ func selectResultEvent(g *gocui.Gui, v *gocui.View) error {
 	fmt.Fprintln(panelCaseList, strings.Join(content, "\n"))
 
 	maxX, _ := g.Size()
-	uploadButton := widget.NewButtonWidgetAutoWidth("uploadButton", maxX-35, 0, "[Upload Result]", toUploadResult)
+	uploadButton := widget.NewButtonWidgetAutoWidth("uploadButton", maxX-35, 0,
+		"["+i118Utils.I118Prt.Sprintf("upload_result")+"]", toUploadResult)
 	uploadButton.Frame = false
 	runViews = append(runViews, uploadButton.Name())
 
@@ -112,7 +114,8 @@ func selectCaseEvent(g *gocui.Gui, v *gocui.View) error {
 
 	// show submit bug button
 	maxX, _ := g.Size()
-	bugButton := widget.NewButtonWidgetAutoWidth("bugButton", maxX-18, 0, "[Report Bug]", toReportBug)
+	bugButton := widget.NewButtonWidgetAutoWidth("bugButton", maxX-18, 0,
+		"["+i118Utils.I118Prt.Sprintf("report_bug")+"]", toReportBug)
 	bugButton.Frame = false
 	runViews = append(runViews, bugButton.Name())
 

src/ui/page/pageTesting.go

@@ -8,6 +8,7 @@ import (
 	"github.com/easysoft/zentaoatf/src/ui/widget"
 	constant "github.com/easysoft/zentaoatf/src/utils/const"
 	"github.com/easysoft/zentaoatf/src/utils/file"
+	i118Utils "github.com/easysoft/zentaoatf/src/utils/i118"
 	"github.com/easysoft/zentaoatf/src/utils/log"
 	"github.com/easysoft/zentaoatf/src/utils/vari"
 	"github.com/jroimartin/gocui"
@@ -22,13 +23,13 @@ func InitTestingPage() error {
 	caseFiles, suitesFiles := scriptService.LoadAssetFiles()
 	dir := constant.ScriptDir
 
-	content := "Test Suite:" + "\n"
+	content := i118Utils.I118Prt.Sprintf("test_suite") + ":\n"
 	for _, suitePath := range suitesFiles {
 		suiteName := strings.Replace(suitePath, dir, "", -1)
 		content += "  " + suiteName + "\n"
 	}
 
-	content += "Test Scripts:" + "\n"
+	content += i118Utils.I118Prt.Sprintf("test_script") + ":\n"
 	for _, casePath := range caseFiles {
 		caseName := strings.Replace(casePath, dir, "", -1)
 		content += "  " + caseName + "\n"
@@ -73,14 +74,14 @@ func selectScriptEvent(g *gocui.Gui, v *gocui.View) error {
 func showTab() error {
 	g := vari.Cui
 	x := constant.LeftWidth + 1
-	tabContentView := widget.NewLabelWidgetAutoWidth("tabContentView", x, 0, "Content")
+	tabContentView := widget.NewLabelWidgetAutoWidth("tabContentView", x, 0, i118Utils.I118Prt.Sprintf("content"))
 	ui.ViewMap["testing"] = append(ui.ViewMap["testing"], tabContentView.Name())
 	tabs = append(tabs, tabContentView.Name())
 	if err := g.SetKeybinding("tabContentView", gocui.MouseLeft, gocui.ModNone, showContent); err != nil {
 		return nil
 	}
 
-	tabResultView := widget.NewLabelWidgetAutoWidth("tabResultView", x+12, 0, "Results")
+	tabResultView := widget.NewLabelWidgetAutoWidth("tabResultView", x+12, 0, i118Utils.I118Prt.Sprintf("results"))
 	ui.ViewMap["testing"] = append(ui.ViewMap["testing"], tabResultView.Name())
 	tabs = append(tabs, tabResultView.Name())
 	if err := g.SetKeybinding("tabResultView", gocui.MouseLeft, gocui.ModNone, showRun); err != nil {
@@ -105,7 +106,8 @@ func showContent(g *gocui.Gui, v *gocui.View) error {
 		contentViews = append(contentViews, panelFileContent.Name())
 		ui.SupportScroll(panelFileContent.Name())
 
-		runButton := widget.NewButtonWidgetAutoWidth("runButton", maxX-10, 0, "[Run]", run)
+		runButton := widget.NewButtonWidgetAutoWidth("runButton", maxX-10, 0,
+			"["+i118Utils.I118Prt.Sprintf("run")+"]", run)
 		runButton.Frame = false
 		contentViews = append(contentViews, runButton.Name())
 	}