|
|
@@ -107,19 +107,16 @@ func (t *translator) Add(key interface{}, text string, override bool) error {
|
|
|
|
|
|
var i int
|
|
|
var idx int
|
|
|
- var cum int
|
|
|
|
|
|
for {
|
|
|
s := "{" + strconv.Itoa(i) + "}"
|
|
|
- idx = strings.Index(text[idx:], s)
|
|
|
+ idx = strings.Index(text, s)
|
|
|
if idx == -1 {
|
|
|
break
|
|
|
}
|
|
|
|
|
|
- trans.indexes = append(trans.indexes, idx+cum)
|
|
|
- idx += len(s)
|
|
|
- trans.indexes = append(trans.indexes, idx+cum)
|
|
|
- cum += idx
|
|
|
+ trans.indexes = append(trans.indexes, idx)
|
|
|
+ trans.indexes = append(trans.indexes, idx+len(s))
|
|
|
i++
|
|
|
}
|
|
|
|
|
|
@@ -261,6 +258,8 @@ func (t *translator) T(key interface{}, params ...string) (string, error) {
|
|
|
|
|
|
var start, end, count int
|
|
|
|
|
|
+ fmt.Println(trans)
|
|
|
+
|
|
|
for i := 0; i < len(trans.indexes); i++ {
|
|
|
end = trans.indexes[i]
|
|
|
b = append(b, trans.text[start:end]...)
|