i18n several improvements

trigger #1369


Former-commit-id: af16dd8de1a0096d33c4e4c97f29ec12a73302f4

Author: kataras

_examples/miscellaneous/i18n/main.go

@@ -13,11 +13,11 @@ var i18nConfig = i18n.Config{
 		"zh-CN": "./locales/locale_zh-CN.ini", // maps to zh-CN, zh-cn and zh.
 	},
 	// Optionals.
-	Alternatives: map[string]string{ // optional.
-		"english": "en-US", // now english maps to en-US
-		"greek":   "el-GR", // and greek to el-GR
-		"chinese": "zh-CN", // and chinese to zh-CN too.
-	},
+	// LanguagesMap: i18n.Map{
+	// 	"en": "en-US", // now en maps to en-US
+	// 	"el": "el-GR",
+	// 	"zh": "zh-CN",
+	// } or a custom i18n.MapFunc, defaults to accept all lowercase and [en] as [en-US] and e.t.c.
 	URLParameter: "lang",
 	Subdomain:    true,
 	// Cookie: "lang",

_examples/miscellaneous/i18n/main_test.go

@@ -11,12 +11,19 @@ import (
 func TestI18n(t *testing.T) {
 	app := newApp()
 
-	expectedf := "From the language %s translated output: %s"
+	const (
+		expectedf = "From the language %s translated output: %s"
+
+		enUS = "hello, iris"
+		elGR = "γεια, iris"
+		zhCN = "您好，iris"
+	)
+
 	var (
 		tests = map[string]string{
-			"en-US": fmt.Sprintf(expectedf, "en-US", "hello, iris"),
-			"el-GR": fmt.Sprintf(expectedf, "el-GR", "γεια, iris"),
-			"zh-CN": fmt.Sprintf(expectedf, "zh-CN", "您好，iris"),
+			"en-US": fmt.Sprintf(expectedf, "en-US", enUS),
+			"el-GR": fmt.Sprintf(expectedf, "el-GR", elGR),
+			"zh-CN": fmt.Sprintf(expectedf, "zh-CN", zhCN),
 		}
 
 		elgrMulti = fmt.Sprintf("From the language: %s, translated output:\n%s=%s\n%s=%s", "el-GR",
@@ -71,4 +78,9 @@ func TestI18n(t *testing.T) {
 		Body().Equal(elgrMulti)
 	e.GET("/en/multi").Expect().Status(httptest.StatusOK).
 		Body().Equal(enusMulti)
+
+	e.GET("/el-GRtemplates").Expect().Status(httptest.StatusNotFound)
+	e.GET("/el-templates").Expect().Status(httptest.StatusNotFound)
+
+	e.GET("/el/templates").Expect().Status(httptest.StatusOK).Body().Contains(elGR).Contains(zhCN)
 }

go.mod

@@ -19,7 +19,6 @@ require (
 	github.com/hashicorp/go-version v1.2.0 // indirect
 	github.com/iris-contrib/blackfriday v2.0.0+incompatible
 	github.com/iris-contrib/go.uuid v2.0.0+incompatible
-	github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0
 	github.com/iris-contrib/schema v0.0.1
 	github.com/json-iterator/go v1.1.6
 	github.com/kataras/golog v0.0.9
@@ -32,5 +31,6 @@ require (
 	github.com/ryanuber/columnize v2.1.0+incompatible
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
+	gopkg.in/ini.v1 v1.51.0
 	gopkg.in/yaml.v2 v2.2.2
 )

go.sum

@@ -46,7 +46,6 @@ github.com/iris-contrib/blackfriday v2.0.0+incompatible h1:o5sHQHHm0ToHUlAJSTjW9
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible h1:XZubAYg61/JwnJNbZilGjf3b3pB80+OQg2qf6c8BfWE=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
-github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI=
 github.com/iris-contrib/schema v0.0.1 h1:10g/WnoRR+U+XXHWKBHeNy/+tZmM2kcAVGLOsz+yaDA=
 github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
 github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
@@ -116,6 +115,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=