Skip to content

Commit 19d19ad

Browse files
author
Dean Karn
authored
Merge pull request #29 from go-playground/update-deps
update deps
2 parents 3f09364 + 1cbeb47 commit 19d19ad

File tree

5 files changed

+32
-8
lines changed

5 files changed

+32
-8
lines changed

Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
GOCMD=GO111MODULE=on go
2+
3+
linters-install:
4+
@golangci-lint --version >/dev/null 2>&1 || { \
5+
echo "installing linting tools..."; \
6+
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.41.1; \
7+
}
8+
9+
lint: linters-install
10+
golangci-lint run
11+
12+
test:
13+
$(GOCMD) test -cover -race ./...
14+
15+
bench:
16+
$(GOCMD) test -bench=. -benchmem ./...
17+
18+
.PHONY: test lint linters-install

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/go-playground/universal-translator
22

33
go 1.13
44

5-
require github.com/go-playground/locales v0.13.0
5+
require github.com/go-playground/locales v0.14.0

go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
22
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
3+
github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
4+
github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
35
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
6+
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
47
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

import_export_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,10 @@ func TestBadExport(t *testing.T) {
772772
}
773773
defer os.RemoveAll(dirname)
774774

775-
en.Add("day", "this is a day", false)
775+
err = en.Add("day", "this is a day", false)
776+
if err != nil {
777+
t.Fatalf("Expected '%v' Got '%s'", nil, err)
778+
}
776779

777780
expected := "open testdata/readonly/en.json: permission denied"
778781
err = uni.Export(FormatJSON, dirname)

translator.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,13 @@ func (t *translator) AddCardinal(key interface{}, text string, rule locales.Plur
159159
}
160160

161161
} else {
162-
tarr = make([]*transText, 7, 7)
162+
tarr = make([]*transText, 7)
163163
t.cardinalTanslations[key] = tarr
164164
}
165165

166166
trans := &transText{
167167
text: text,
168-
indexes: make([]int, 2, 2),
168+
indexes: make([]int, 2),
169169
}
170170

171171
tarr[rule] = trans
@@ -211,13 +211,13 @@ func (t *translator) AddOrdinal(key interface{}, text string, rule locales.Plura
211211
}
212212

213213
} else {
214-
tarr = make([]*transText, 7, 7)
214+
tarr = make([]*transText, 7)
215215
t.ordinalTanslations[key] = tarr
216216
}
217217

218218
trans := &transText{
219219
text: text,
220-
indexes: make([]int, 2, 2),
220+
indexes: make([]int, 2),
221221
}
222222

223223
tarr[rule] = trans
@@ -261,13 +261,13 @@ func (t *translator) AddRange(key interface{}, text string, rule locales.PluralR
261261
}
262262

263263
} else {
264-
tarr = make([]*transText, 7, 7)
264+
tarr = make([]*transText, 7)
265265
t.rangeTanslations[key] = tarr
266266
}
267267

268268
trans := &transText{
269269
text: text,
270-
indexes: make([]int, 4, 4),
270+
indexes: make([]int, 4),
271271
}
272272

273273
tarr[rule] = trans

0 commit comments

Comments
 (0)