Merge remote-tracking branch 'origin/dev' into dev

app/appearance/langs/en_US.json

@@ -1117,6 +1117,10 @@
     "resetWindow": "Reset window and exit",
     "quit": "Quit application"
   },
+  "_attrView": {
+    "table": "Table",
+    "key": "Primary Key"
+  },
   "_kernel": {
     "0": "Query notebook failed",
     "1": "Duplicated filename",

app/appearance/langs/es_ES.json

@@ -1117,6 +1117,10 @@
     "resetWindow": "Restablecer ventana y salir del programa",
     "quit": "Salir de la aplicación"
   },
+  "_attrView": {
+    "tabla": "Tabla",
+    "clave": "Clave principal"
+  },
   "_kernel": {
     "0": "Consulta al cuaderno de notas fallido",
     "1": "Nombre de archivo duplicado",

app/appearance/langs/fr_FR.json

@@ -1117,6 +1117,10 @@
     "resetWindow": "Réinitialiser la fenêtre et quitter le programme",
     "quit": "Quitter le programme"
   },
+  "_attrView": {
+    "table": "Tableau",
+    "key": "Clé primaire"
+  },
   "_kernel": {
     "0": "Échec du cahier de requêtes",
     "1": "Nom de fichier dupliqué",

app/appearance/langs/zh_CHT.json

@@ -1117,6 +1117,10 @@
     "resetWindow": "重置窗口並退出程序",
     "quit": "退出程序"
   },
+  "_attrView": {
+    "table": "表格",
+    "key": "主鍵"
+  },
   "_kernel": {
     "0": "查詢筆記本失敗",
     "1": "檔案名重複",

app/appearance/langs/zh_CN.json

@@ -1117,6 +1117,10 @@
     "resetWindow": "重置窗口并退出程序",
     "quit": "退出程序"
   },
+  "_attrView": {
+    "table": "表格",
+    "key": "主键"
+  },
   "_kernel": {
     "0": "查询笔记本失败",
     "1": "文件名重复",

kernel/av/av.go

@@ -564,7 +564,7 @@ const (
 func NewTableView() (ret *View) {
 	ret = &View{
 		ID:         ast.NewNodeID(),
-		Name:       "Table",
+		Name:       getI18nName("table"),
 		LayoutType: LayoutTypeTable,
 		Table: &LayoutTable{
 			Spec:     0,
@@ -578,7 +578,7 @@ func NewTableView() (ret *View) {
 }
 
 func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey *Key) {
-	name := "Table"
+	name := getI18nName("table")
 	view = &View{
 		ID:         ast.NewNodeID(),
 		Name:       name,
@@ -591,7 +591,7 @@ func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey *Key) {
 			PageSize: 50,
 		},
 	}
-	blockKey = NewKey(blockKeyID, "Block", "", KeyTypeBlock)
+	blockKey = NewKey(blockKeyID, getI18nName("key"), "", KeyTypeBlock)
 	view.Table.Columns = []*ViewTableColumn{{ID: blockKeyID}}
 	return
 }
@@ -781,6 +781,10 @@ func GetAttributeViewDataPath(avID string) (ret string) {
 	return
 }
 
+func getI18nName(name string) string {
+	return util.AttrViewLangs[util.Lang][name].(string)
+}
+
 var (
 	ErrViewNotFound = errors.New("view not found")
 	ErrKeyNotFound  = errors.New("key not found")

kernel/model/conf.go

@@ -492,6 +492,7 @@ func initLang() {
 		util.TimeLangs[name] = langMap["_time"].(map[string]interface{})
 		util.TaskActionLangs[name] = langMap["_taskAction"].(map[string]interface{})
 		util.TrayMenuLangs[name] = langMap["_trayMenu"].(map[string]interface{})
+		util.AttrViewLangs[name] = langMap["_attrView"].(map[string]interface{})
 	}
 }
 

kernel/util/runtime.go

@@ -139,6 +139,7 @@ var (
 	TimeLangs       = map[string]map[string]interface{}{}
 	TaskActionLangs = map[string]map[string]interface{}{}
 	TrayMenuLangs   = map[string]map[string]interface{}{}
+	AttrViewLangs   = map[string]map[string]interface{}{}
 )
 
 var (