a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The lang template function now accepts dynamic variables.

This commit is contained in:
Azareal 2019-10-11 10:36:45 +10:00
parent 30de658e15
commit dcd4d7d7eb
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/templates/templates.go
View File

@ -1110,14 +1110,21 @@ ArgLoop:
if len(leftOperand) == 0 { if len(leftOperand) == 0 {
panic("The left operand for the language string cannot be left blank") panic("The left operand for the language string cannot be left blank")
} }
if leftOperand[0] != '"' { if leftOperand[0] == '"' {
panic("Phrase names cannot be dynamic")
}
// ! Slightly crude but it does the job // ! Slightly crude but it does the job
leftParam := strings.Replace(leftOperand, "\"", "", -1) leftParam := strings.Replace(leftOperand, "\"", "", -1)
c.langIndexToName = append(c.langIndexToName, leftParam) c.langIndexToName = append(c.langIndexToName, leftParam)
notident = true notident = true
con.PushPhrase(len(c.langIndexToName) - 1) con.PushPhrase(len(c.langIndexToName) - 1)
} else {
leftParam := leftOperand
if leftOperand[0] != '"' {
leftParam, _ = c.compileIfVarSub(con, leftParam)
}
// TODO: Add an optimisation if it's a string literal passsed in from a parent template rather than a true dynamic
litString("phrases.GetTmplPhrasef("+leftParam+")", false)
c.importMap[langPkg] = langPkg
}
break ArgLoop break ArgLoop
case "langf": case "langf":
// TODO: Implement string literals properly // TODO: Implement string literals properly