Skip to content

Commit 6f955ef

Browse files
Dean KarnDean Karn
Dean Karn
authored and
Dean Karn
committed
correct error with param index calculation in normal translations.
1 parent 432f72c commit 6f955ef

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## universal-translator
22
<img align="right" src="https://raw.githubusercontent.com/go-playground/universal-translator/master/logo.png">
3-
![Project status](https://img.shields.io/badge/version-0.12.0-green.svg)
3+
![Project status](https://img.shields.io/badge/version-0.12.1-green.svg)
44
[![Build Status](https://semaphoreci.com/api/v1/joeybloggs/universal-translator/branches/master/badge.svg)](https://semaphoreci.com/joeybloggs/universal-translator)
55
[![Coverage Status](https://coveralls.io/repos/github/go-playground/universal-translator/badge.svg)](https://coveralls.io/github/go-playground/universal-translator)
66
[![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/universal-translator)](https://goreportcard.com/report/github.com/go-playground/universal-translator)

translator.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,19 +107,16 @@ func (t *translator) Add(key interface{}, text string, override bool) error {
107107

108108
var i int
109109
var idx int
110-
var cum int
111110

112111
for {
113112
s := "{" + strconv.Itoa(i) + "}"
114-
idx = strings.Index(text[idx:], s)
113+
idx = strings.Index(text, s)
115114
if idx == -1 {
116115
break
117116
}
118117

119-
trans.indexes = append(trans.indexes, idx+cum)
120-
idx += len(s)
121-
trans.indexes = append(trans.indexes, idx+cum)
122-
cum += idx
118+
trans.indexes = append(trans.indexes, idx)
119+
trans.indexes = append(trans.indexes, idx+len(s))
123120
i++
124121
}
125122

@@ -261,6 +258,8 @@ func (t *translator) T(key interface{}, params ...string) (string, error) {
261258

262259
var start, end, count int
263260

261+
fmt.Println(trans)
262+
264263
for i := 0; i < len(trans.indexes); i++ {
265264
end = trans.indexes[i]
266265
b = append(b, trans.text[start:end]...)

0 commit comments

Comments
 (0)