Merge pull request #256 from jawher/fix-goimports-diff

Dean Karn · web-flow · commit 335c8e2facd8 · 2016-09-22T19:05:45.000-04:00
Fix universal translator imports so that goimports doesn't get remove them
diff --git a/errors.go b/errors.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/go-playground/universal-translator"
+	ut "github.com/go-playground/universal-translator"
 )
 
 const (
diff --git a/examples/translations/main.go b/examples/translations/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/go-playground/locales/en"
-	"github.com/go-playground/universal-translator"
+	ut "github.com/go-playground/universal-translator"
 	"gopkg.in/go-playground/validator.v9"
 	en_translations "gopkg.in/go-playground/validator.v9/translations/en"
 )
diff --git a/translations.go b/translations.go
@@ -1,6 +1,6 @@
 package validator
 
-import "github.com/go-playground/universal-translator"
+import ut "github.com/go-playground/universal-translator"
 
 // TranslationFunc is the function type used to register or override
 // custom translations
diff --git a/translations/en/en.go b/translations/en/en.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/go-playground/locales"
-	"github.com/go-playground/universal-translator"
+	ut "github.com/go-playground/universal-translator"
 	"gopkg.in/go-playground/validator.v9"
 )
 
diff --git a/translations/en/en_test.go b/translations/en/en_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	english "github.com/go-playground/locales/en"
-	"github.com/go-playground/universal-translator"
+	ut "github.com/go-playground/universal-translator"
 	. "gopkg.in/go-playground/assert.v1"
 	"gopkg.in/go-playground/validator.v9"
 )
diff --git a/validator_instance.go b/validator_instance.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-playground/universal-translator"
+	ut "github.com/go-playground/universal-translator"
 )
 
 const (
diff --git a/validator_test.go b/validator_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/go-playground/locales/en"
 	"github.com/go-playground/locales/fr"
 	"github.com/go-playground/locales/nl"
-	"github.com/go-playground/universal-translator"
+	ut "github.com/go-playground/universal-translator"
 )
 
 // NOTES:

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"reflect"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/go-playground/universal-translator"`
	`9`	`+ ut "github.com/go-playground/universal-translator"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/go-playground/locales/en"`
`7`		`- "github.com/go-playground/universal-translator"`
	`7`	`+ ut "github.com/go-playground/universal-translator"`
`8`	`8`	`"gopkg.in/go-playground/validator.v9"`
`9`	`9`	`en_translations "gopkg.in/go-playground/validator.v9/translations/en"`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"time"`
`10`	`10`
`11`	`11`	`"github.com/go-playground/locales"`
`12`		`- "github.com/go-playground/universal-translator"`
	`12`	`+ ut "github.com/go-playground/universal-translator"`
`13`	`13`	`"gopkg.in/go-playground/validator.v9"`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"time"`
`6`	`6`
`7`	`7`	`english "github.com/go-playground/locales/en"`
`8`		`- "github.com/go-playground/universal-translator"`
	`8`	`+ ut "github.com/go-playground/universal-translator"`
`9`	`9`	`. "gopkg.in/go-playground/assert.v1"`
`10`	`10`	`"gopkg.in/go-playground/validator.v9"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"sync"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- "github.com/go-playground/universal-translator"`
	`11`	`+ ut "github.com/go-playground/universal-translator"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"github.com/go-playground/locales/en"`
`16`	`16`	`"github.com/go-playground/locales/fr"`
`17`	`17`	`"github.com/go-playground/locales/nl"`
`18`		`- "github.com/go-playground/universal-translator"`
	`18`	`+ ut "github.com/go-playground/universal-translator"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// NOTES:`