From bb59bc1f720a08de074d9877fc99b6764187c213 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Sat, 2 Oct 2021 07:39:49 +0200 Subject: [PATCH] Fix translation variable replacement when extending --- pkg/locale/locale.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/locale/locale.go b/pkg/locale/locale.go index 557a9b912..4578018b0 100644 --- a/pkg/locale/locale.go +++ b/pkg/locale/locale.go @@ -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) }