Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-08 20:41:57 +00:00
Code Releases Activity

resolve conflicts with current master v11.1.1

Browse Source 
Former-commit-id: 659ff392e889f3a8552d7da3d44848f1a364f7b2
This commit is contained in:
Gerasimos (Makis) Maropoulos
2019-07-23 19:20:07 +03:00
parent 79539b0055 85b1f6fc24
commit 736709aa75
41 changed files with 406 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
middleware/i18n/i18n.go
View File

@@ -102,7 +102,7 @@ func New(c Config) context.Handler {
}
}
}
// if not default language setted then set to the first of the i.config.Languages
// if not default language set then set to the first of the i.config.Languages
if c.Default == "" {
c.Default = firstlanguage
}

4
middleware/logger/config.go
View File

@@ -48,7 +48,7 @@ type Config struct {
// the contents with `ctx.Values().Get(MessageContextKey)`
// and if available then these contents will be
// appended as part of the logs (with `%v`, in order to be able to set a struct too),
// if Columns field was setted to true then
// if Columns field was set to true then
// a new column will be added named 'Message'.
//
// Defaults to empty.
@@ -59,7 +59,7 @@ type Config struct {
// the contents with `ctx.Values().Get(MessageHeaderKey)`
// and if available then these contents will be
// appended as part of the logs (with `%v`, in order to be able to set a struct too),
// if Columns field was setted to true then
// if Columns field was set to true then
// a new column will be added named 'HeaderMessage'.
//
// Defaults to empty.