Merge branch 'master' into 1920-client-find

This commit is contained in:
ArtemBaskal
2020-09-23 20:29:48 +03:00
75 changed files with 3011 additions and 776 deletions

View File

@@ -407,11 +407,9 @@ func (clients *clientsContainer) check(c *Client) error {
}
sort.Strings(c.Tags)
if len(c.Upstreams) != 0 {
err := dnsforward.ValidateUpstreams(c.Upstreams)
if err != nil {
return fmt.Errorf("invalid upstream servers: %s", err)
}
err := dnsforward.ValidateUpstreams(c.Upstreams)
if err != nil {
return fmt.Errorf("invalid upstream servers: %s", err)
}
return nil

View File

@@ -13,37 +13,39 @@ import (
// internationalization
// --------------------
var allowedLanguages = map[string]bool{
"en": true,
"ru": true,
"vi": true,
"es": true,
"fr": true,
"ja": true,
"sv": true,
"pt-br": true,
"zh-tw": true,
"be": true,
"bg": true,
"zh-cn": true,
"cs": true,
"da": true,
"de": true,
"id": true,
"it": true,
"ko": true,
"no": true,
"nl": true,
"pl": true,
"pt-pt": true,
"sk": true,
"sl": true,
"tr": true,
"sr-cs": true,
"en": true,
"es": true,
"fa": true,
"fr": true,
"hr": true,
"hu": true,
"fa": true,
"th": true,
"id": true,
"it": true,
"ja": true,
"ko": true,
"nl": true,
"no": true,
"pl": true,
"pt-br": true,
"pt-pt": true,
"ro": true,
"ru": true,
"si-lk": true,
"sk": true,
"sl": true,
"sr-cs": true,
"sv": true,
"th": true,
"tr": true,
"vi": true,
"zh-cn": true,
"zh-hk": true,
"zh-tw": true,
}
func isLanguageAllowed(language string) bool {