pass language to metas

Author: HesterG

modules/markup/html.go

@@ -5,11 +5,11 @@ package markup
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"net/url"
 	"path"
 	"path/filepath"
-	"reflect"
 	"regexp"
 	"strings"
 	"sync"
@@ -809,6 +809,8 @@ func fullIssuePatternProcessor(ctx *RenderContext, node *html.Node) {
 	if ctx.Metas == nil {
 		return
 	}
+	fmt.Println("ctx.Metas")
+	fmt.Println(ctx.Metas)
 	next := node.NextSibling
 	for node != nil && node != next {
 		m := getIssueFullPattern().FindStringSubmatchIndex(node.Data)
@@ -828,7 +830,7 @@ func fullIssuePatternProcessor(ctx *RenderContext, node *html.Node) {
 		// if m[4] and m[5] is not -1, then link is to a comment
 		// indicate that in the text by appending (comment)
 		if m[4] != -1 && m[5] != -1 {
-			locale := reflect.ValueOf(ctx.Ctx).Elem().FieldByName("Locale").Interface().(translation.Locale)
+			locale := translation.NewLocale(ctx.Metas["language"])
 			id += " " + locale.Tr("repo.from_comment")
 		}
 

routers/common/markup.go

@@ -73,7 +73,7 @@ func RenderMarkup(ctx *context.Context, mode, text, urlPrefix, filePath string,
 	if mode != "comment" {
 		meta["mode"] = "document"
 	}
-
+	meta["language"] = ctx.Locale.Language()
 	if err := markup.Render(&markup.RenderContext{
 		Ctx:          ctx,
 		URLPrefix:    urlPrefix,

routers/web/repo/issue.go

@@ -1319,10 +1319,11 @@ func ViewIssue(ctx *context.Context) {
 		}
 	}
 	ctx.Data["IssueWatch"] = iw
-
+	metas := ctx.Repo.Repository.ComposeMetas()
+	metas["language"] = ctx.Locale.Language()
 	issue.RenderedContent, err = markdown.RenderString(&markup.RenderContext{
 		URLPrefix: ctx.Repo.RepoLink,
-		Metas:     ctx.Repo.Repository.ComposeMetas(),
+		Metas:     metas,
 		GitRepo:   ctx.Repo.GitRepo,
 		Ctx:       ctx,
 	}, issue.Content)
@@ -2021,10 +2022,11 @@ func UpdateIssueContent(ctx *context.Context) {
 			return
 		}
 	}
-
+	metas := ctx.Repo.Repository.ComposeMetas()
+	metas["language"] = ctx.Locale.Language()
 	content, err := markdown.RenderString(&markup.RenderContext{
 		URLPrefix: ctx.FormString("context"), // FIXME: <- IS THIS SAFE ?
-		Metas:     ctx.Repo.Repository.ComposeMetas(),
+		Metas:     metas,
 		GitRepo:   ctx.Repo.GitRepo,
 		Ctx:       ctx,
 	}, issue.Content)
@@ -2829,10 +2831,11 @@ func UpdateCommentContent(ctx *context.Context) {
 			return
 		}
 	}
-
+	metas := ctx.Repo.Repository.ComposeMetas()
+	metas["language"] = ctx.Locale.Language()
 	content, err := markdown.RenderString(&markup.RenderContext{
 		URLPrefix: ctx.FormString("context"), // FIXME: <- IS THIS SAFE ?
-		Metas:     ctx.Repo.Repository.ComposeMetas(),
+		Metas:     metas,
 		GitRepo:   ctx.Repo.GitRepo,
 		Ctx:       ctx,
 	}, comment.Content)