DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix translation variable replacement when extending

Browse Source
This commit is contained in:
Denis Arh 2021-10-02 07:39:49 +02:00
parent 1e5e956195
commit bb59bc1f72
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/locale/locale.go
View File

@ -65,12 +65,12 @@ func (l *Language) t(ns, key string, rr ...string) string {
l.l.RLock()
defer l.l.RUnlock()
for r := 0; r < len(rr); r += 2 {
rr[r] = fmt.Sprintf("{{%s}}", rr[r])
}
msg, has := l.internal[ns][key]
if has {
for r := 0; r < len(rr); r += 2 {
rr[r] = fmt.Sprintf("{{%s}}", rr[r])
}
return strings.NewReplacer(rr...).Replace(msg)
}
@ -86,12 +86,12 @@ func (l *Language) tResource(ns, key string, rr ...string) string {
l.l.RLock()
defer l.l.RUnlock()
for r := 0; r < len(rr); r += 2 {
rr[r] = fmt.Sprintf("{{%s}}", rr[r])
}
rt, has := l.resources[ns][key]
if has {
for r := 0; r < len(rr); r += 2 {
rr[r] = fmt.Sprintf("{{%s}}", rr[r])
}
return strings.NewReplacer(rr...).Replace(rt.Msg)
}