1
0
mirror of https://github.com/kataras/iris.git synced 2026-01-09 21:15:56 +00:00

resolve conflicts with current master v11.1.1

Former-commit-id: 659ff392e889f3a8552d7da3d44848f1a364f7b2
This commit is contained in:
Gerasimos (Makis) Maropoulos
2019-07-23 19:20:07 +03:00
41 changed files with 406 additions and 70 deletions

View File

@@ -22,10 +22,10 @@ func newApp() *iris.Application {
// it tries to find the language by:
// ctx.Values().GetString("language")
// if that was empty then
// it tries to find from the URLParameter setted on the configuration
// it tries to find from the URLParameter set on the configuration
// if not found then
// it tries to find the language by the "language" cookie
// if didn't found then it it set to the Default setted on the configuration
// if didn't found then it it set to the Default set on the configuration
// hi is the key, 'iris' is the %s on the .ini file
// the second parameter is optional