Merge pull request #546 from Googlom/v3-fix-layout-button

demget · web-flow · commit d4c80e623945 · 2022-10-03T15:31:24.000+03:00
fix the order in which template Funcs are applied
diff --git a/layout/layout.go b/layout/layout.go
@@ -282,7 +282,7 @@ func (lt *Layout) ButtonLocale(locale, k string, args ...interface{}) *tele.Btn
 		return nil
 	}
 
-	tmpl, err := lt.template(template.New(k), locale).Funcs(lt.funcs).Parse(string(data))
+	tmpl, err := lt.template(template.New(k).Funcs(lt.funcs), locale).Parse(string(data))
 	if err != nil {
 		log.Println("telebot/layout:", err)
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ func (lt Layout) ButtonLocale(locale, k string, args ...interface{}) tele.Btn`
`282`	`282`	`return nil`
`283`	`283`	`}`
`284`	`284`
`285`		`- tmpl, err := lt.template(template.New(k), locale).Funcs(lt.funcs).Parse(string(data))`
	`285`	`+ tmpl, err := lt.template(template.New(k).Funcs(lt.funcs), locale).Parse(string(data))`
`286`	`286`	`if err != nil {`
`287`	`287`	`log.Println("telebot/layout:", err)`
`288`	`288`	`return nil`