Squashed commit of pull request #1954

cmd/translate/main.go

@@ -12,6 +12,7 @@ import (
 	"encoding/json"
 	"log"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -21,44 +22,48 @@ import (
 var trans = make(map[string]string)
 var attrRe = regexp.MustCompile(`\{\{'([^']+)'\s+\|\s+translate\}\}`)
 
-func generalNode(n *html.Node) {
+func generalNode(n *html.Node, filename string) {
 	translate := false
 	if n.Type == html.ElementNode {
-		for _, a := range n.Attr {
-			if a.Key == "translate" {
-				translate = true
-				break
-			} else {
-				if matches := attrRe.FindStringSubmatch(a.Val); len(matches) == 2 {
-					translation(matches[1])
+		if n.Data == "translate" { // for <translate>Text</translate>
+			translate = true
+		} else {
+			for _, a := range n.Attr {
+				if a.Key == "translate" {
+					translate = true
+					break
+				} else {
+					if matches := attrRe.FindStringSubmatch(a.Val); len(matches) == 2 {
+						translation(matches[1])
+					}
 				}
 			}
 		}
 	} else if n.Type == html.TextNode {
 		v := strings.TrimSpace(n.Data)
 		if len(v) > 1 && !(strings.HasPrefix(v, "{{") && strings.HasSuffix(v, "}}")) {
-			log.Println("Untranslated text node:")
+			log.Println("Untranslated text node (" + filename + "):")
 			log.Print("\t" + v)
 		}
 	}
 	for c := n.FirstChild; c != nil; c = c.NextSibling {
 		if translate {
-			inTranslate(c)
+			inTranslate(c, filename)
 		} else {
-			generalNode(c)
+			generalNode(c, filename)
 		}
 	}
 }
 
-func inTranslate(n *html.Node) {
+func inTranslate(n *html.Node, filename string) {
 	if n.Type == html.TextNode {
 		translation(n.Data)
 	} else {
-		log.Println("translate node with non-text child <")
+		log.Println("translate node with non-text child < (" + filename + ")")
 		log.Println(n)
 	}
 	if n.FirstChild != nil {
-		log.Println("translate node has children:")
+		log.Println("translate node has children (" + filename + "):")
 		log.Println(n.Data)
 	}
 }
@@ -72,6 +77,29 @@ func translation(v string) {
 	}
 }
 
+func walkerFor(basePath string) filepath.WalkFunc {
+	return func(name string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if filepath.Ext(name) == ".html" && info.Mode().IsRegular() {
+			fd, err := os.Open(name)
+			if err != nil {
+				log.Fatal(err)
+			}
+			doc, err := html.Parse(fd)
+			if err != nil {
+				log.Fatal(err)
+			}
+			fd.Close()
+			generalNode(doc, filepath.Base(name))
+		}
+
+		return nil
+	}
+}
+
 func main() {
 	fd, err := os.Open(os.Args[1])
 	if err != nil {
@@ -83,17 +111,10 @@ func main() {
 	}
 	fd.Close()
 
-	fd, err = os.Open(os.Args[2])
-	if err != nil {
-		log.Fatal(err)
-	}
-	doc, err := html.Parse(fd)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fd.Close()
+	var guiDir = os.Args[2]
+
+	filepath.Walk(guiDir, walkerFor(guiDir))
 
-	generalNode(doc)
 	bs, err := json.MarshalIndent(trans, "", "   ")
 	if err != nil {
 		log.Fatal(err)