Mirrors/kararas_iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2026-01-26 05:15:56 +00:00
Code Releases Activity

see prev commit

Browse Source
This commit is contained in:
Gerasimos (Makis) Maropoulos
2020-08-16 18:09:10 +03:00
parent 227170fd33
commit 177b05b674
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/router/router_subdomain_redirect_wrapper.go
View File

@@ -150,6 +150,7 @@ func (s *subdomainRedirectWrapper) Wrapper(w http.ResponseWriter, r *http.Reques
return return
} }
/* Think of another way. As it's a breaking change.
if s.isFromRoot && !s.isFromAny { if s.isFromRoot && !s.isFromAny {
// Then we must not continue, // Then we must not continue,
// the subdomain didn't match the "to" but the from // the subdomain didn't match the "to" but the from
@@ -159,8 +160,9 @@ func (s *subdomainRedirectWrapper) Wrapper(w http.ResponseWriter, r *http.Reques
// http://registered_host_but_not_in_app.your.mydomain.com // http://registered_host_but_not_in_app.your.mydomain.com
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
*/
// the from subdomain is not matched and it's not from root. // the from subdomain is not matched and it's not from root.
router(w, r) router(w, r)
return return

6
i18n/loader.go
View File

@@ -188,7 +188,11 @@ func (l MemoryLocalizer) GetLocale(index int) context.Locale {
index = 0 index = 0
} }
return l[index] if locale, ok := l[index]; ok {
return locale
}
return l[0]
} }
// SetDefault changes the default language based on the "index". // SetDefault changes the default language based on the "index".