Skip to content

Commit daf1ef2

Browse files
Dean KarnDean Karn
authored andcommitted
update examples for locales changes, now returns string
1 parent e8c26d4 commit daf1ef2

File tree

2 files changed

+30
-26
lines changed

2 files changed

+30
-26
lines changed

README.md

Lines changed: 17 additions & 13 deletions
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.2-green.svg)
3+
![Project status](https://img.shields.io/badge/version-0.13.2-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)
@@ -64,7 +64,7 @@ func main() {
6464
e := en.New()
6565
universalTraslator = ut.New(e, e, en_CA.New(), nl.New(), fr.New())
6666

67-
en := universalTraslator.GetTranslator("en")
67+
en, _ := universalTraslator.GetTranslator("en")
6868

6969
// generally used after parsing an http 'Accept-Language' header
7070
// and this will try to find a matching locale you support or
@@ -98,23 +98,27 @@ func main() {
9898

9999
fmt.Println(en.T("welcome", "Joeybloggs"))
100100

101-
fmt.Println(en.C("days", 1, 0, string(en.FmtNumber(1, 0)))) // you'd normally have variables defined for 1 and 0
102-
fmt.Println(en.C("days", 2, 0, string(en.FmtNumber(2, 0))))
103-
fmt.Println(en.C("days", 10456.25, 2, string(en.FmtNumber(10456.25, 2))))
101+
fmt.Println(en.C("days", 1, 0, en.FmtNumber(1, 0))) // you'd normally have variables defined for 1 and 0
102+
fmt.Println(en.C("days", 2, 0, en.FmtNumber(2, 0)))
103+
fmt.Println(en.C("days", 10456.25, 2, en.FmtNumber(10456.25, 2)))
104104

105-
fmt.Println(en.O("day-of-month", 1, 0, string(en.FmtNumber(1, 0))))
106-
fmt.Println(en.O("day-of-month", 2, 0, string(en.FmtNumber(2, 0))))
107-
fmt.Println(en.O("day-of-month", 3, 0, string(en.FmtNumber(3, 0))))
108-
fmt.Println(en.O("day-of-month", 4, 0, string(en.FmtNumber(4, 0))))
109-
fmt.Println(en.O("day-of-month", 10456.25, 0, string(en.FmtNumber(10456.25, 0))))
105+
fmt.Println(en.O("day-of-month", 1, 0, en.FmtNumber(1, 0)))
106+
fmt.Println(en.O("day-of-month", 2, 0, en.FmtNumber(2, 0)))
107+
fmt.Println(en.O("day-of-month", 3, 0, en.FmtNumber(3, 0)))
108+
fmt.Println(en.O("day-of-month", 4, 0, en.FmtNumber(4, 0)))
109+
fmt.Println(en.O("day-of-month", 10456.25, 0, en.FmtNumber(10456.25, 0)))
110110

111-
fmt.Println(en.R("between", 0, 0, 1, 0, string(en.FmtNumber(0, 0)), string(en.FmtNumber(1, 0))))
112-
fmt.Println(en.R("between", 1, 0, 2, 0, string(en.FmtNumber(1, 0)), string(en.FmtNumber(2, 0))))
113-
fmt.Println(en.R("between", 1, 0, 100, 0, string(en.FmtNumber(1, 0)), string(en.FmtNumber(100, 0))))
111+
fmt.Println(en.R("between", 0, 0, 1, 0, en.FmtNumber(0, 0), en.FmtNumber(1, 0)))
112+
fmt.Println(en.R("between", 1, 0, 2, 0, en.FmtNumber(1, 0), en.FmtNumber(2, 0)))
113+
fmt.Println(en.R("between", 1, 0, 100, 0, en.FmtNumber(1, 0), en.FmtNumber(100, 0)))
114114
}
115115
```
116116

117117
Help With Tests
118118
---------------
119119
To anyone interesting in helping or contributing, I sure could use some help creating tests for each language.
120120
Please see issue [here](https://github.com/go-playground/locales/issues/1) for details.
121+
122+
License
123+
------
124+
Distributed under MIT License, please see license file in code for more details.

examples/basic/main.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ func main() {
5454

5555
fmt.Println(en.T("welcome", "Joeybloggs"))
5656

57-
fmt.Println(en.C("days", 1, 0, string(en.FmtNumber(1, 0)))) // you'd normally have variables defined for 1 and 0
58-
fmt.Println(en.C("days", 2, 0, string(en.FmtNumber(2, 0))))
59-
fmt.Println(en.C("days", 10456.25, 2, string(en.FmtNumber(10456.25, 2))))
60-
61-
fmt.Println(en.O("day-of-month", 1, 0, string(en.FmtNumber(1, 0))))
62-
fmt.Println(en.O("day-of-month", 2, 0, string(en.FmtNumber(2, 0))))
63-
fmt.Println(en.O("day-of-month", 3, 0, string(en.FmtNumber(3, 0))))
64-
fmt.Println(en.O("day-of-month", 4, 0, string(en.FmtNumber(4, 0))))
65-
fmt.Println(en.O("day-of-month", 10456.25, 0, string(en.FmtNumber(10456.25, 0))))
66-
67-
fmt.Println(en.R("between", 0, 0, 1, 0, string(en.FmtNumber(0, 0)), string(en.FmtNumber(1, 0))))
68-
fmt.Println(en.R("between", 1, 0, 2, 0, string(en.FmtNumber(1, 0)), string(en.FmtNumber(2, 0))))
69-
fmt.Println(en.R("between", 1, 0, 100, 0, string(en.FmtNumber(1, 0)), string(en.FmtNumber(100, 0))))
57+
fmt.Println(en.C("days", 1, 0, en.FmtNumber(1, 0))) // you'd normally have variables defined for 1 and 0
58+
fmt.Println(en.C("days", 2, 0, en.FmtNumber(2, 0)))
59+
fmt.Println(en.C("days", 10456.25, 2, en.FmtNumber(10456.25, 2)))
60+
61+
fmt.Println(en.O("day-of-month", 1, 0, en.FmtNumber(1, 0)))
62+
fmt.Println(en.O("day-of-month", 2, 0, en.FmtNumber(2, 0)))
63+
fmt.Println(en.O("day-of-month", 3, 0, en.FmtNumber(3, 0)))
64+
fmt.Println(en.O("day-of-month", 4, 0, en.FmtNumber(4, 0)))
65+
fmt.Println(en.O("day-of-month", 10456.25, 0, en.FmtNumber(10456.25, 0)))
66+
67+
fmt.Println(en.R("between", 0, 0, 1, 0, en.FmtNumber(0, 0), en.FmtNumber(1, 0)))
68+
fmt.Println(en.R("between", 1, 0, 2, 0, en.FmtNumber(1, 0), en.FmtNumber(2, 0)))
69+
fmt.Println(en.R("between", 1, 0, 100, 0, en.FmtNumber(1, 0), en.FmtNumber(100, 0)))
7070
}

0 commit comments

Comments
 (0)