xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade revel to 0.16

Browse Source
This commit is contained in:
lealife
2017-06-21 18:24:42 +08:00
parent d424395d85
commit 2654b684df
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/init.go
View File

@ -129,7 +129,7 @@ func init() {
if tags == nil || len(tags) == 0 {
return ""
}
locale, _ := renderArgs[revel.CurrentLocaleRenderArg].(string)
locale, _ := renderArgs[revel.CurrentLocaleViewArg].(string)
tagStr := ""
lenTags := len(tags)
@ -183,7 +183,7 @@ func init() {
}
revel.TemplateFuncs["msg"] = func(renderArgs map[string]interface{}, message string, args ...interface{}) template.HTML {
str, ok := renderArgs[revel.CurrentLocaleRenderArg].(string)
str, ok := renderArgs[revel.CurrentLocaleViewArg].(string)
if !ok {
return ""
}
@ -192,7 +192,7 @@ func init() {
// 不用revel的msg
revel.TemplateFuncs["leaMsg"] = func(renderArgs map[string]interface{}, key string) template.HTML {
locale, _ := renderArgs[revel.CurrentLocaleRenderArg].(string)
locale, _ := renderArgs[revel.CurrentLocaleViewArg].(string)
str := i18n.Message(locale, key)
if strings.HasPrefix(str, "???") {
str = key
@ -205,7 +205,7 @@ func init() {
if tags == nil || len(tags) == 0 {
return ""
}
locale, _ := renderArgs[revel.CurrentLocaleRenderArg].(string)
locale, _ := renderArgs[revel.CurrentLocaleViewArg].(string)
tagStr := ""
lenTags := len(tags)
@ -307,7 +307,7 @@ func init() {
// http://stackoverflow.com/questions/14226416/go-lang-templates-always-quotes-a-string-and-removes-comments
revel.TemplateFuncs["rawMsg"] = func(renderArgs map[string]interface{}, message string, args ...interface{}) template.JS {
str, ok := renderArgs[revel.CurrentLocaleRenderArg].(string)
str, ok := renderArgs[revel.CurrentLocaleViewArg].(string)
if !ok {
return ""
}

4
app/lea/i18n/i18n.go
View File

@ -11,7 +11,7 @@ import (
)
const (
CurrentLocaleRenderArg = "currentLocale" // The key for the current locale render arg value
CurrentLocaleViewArg = "currentLocale" // The key for the current locale render arg value
messageFilesDirectory = "messages"
messageFilePattern = `^\w+\.conf$`
@ -193,7 +193,7 @@ func I18nFilter(c *revel.Controller, fc []revel.Filter) {
// Set the current locale controller argument (CurrentLocaleControllerArg) with the given locale.
func setCurrentLocaleControllerArguments(c *revel.Controller, locale string) {
c.Request.Locale = locale
c.ViewArgs[CurrentLocaleRenderArg] = locale
c.ViewArgs[CurrentLocaleViewArg] = locale
}
// Determine whether the given request has valid Accept-Language value.