summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/config.go b/utils/config.go
index 408598558..a779eef65 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -40,9 +40,9 @@ var (
"../../..",
}
- serviceTermsEnabledAndEmpty = model.NewAppError(
+ termsOfServiceEnabledAndEmpty = model.NewAppError(
"Config.IsValid",
- "model.config.is_valid.support.custom_service_terms_text.app_error",
+ "model.config.is_valid.support.custom_terms_of_service_text.app_error",
nil,
"",
http.StatusBadRequest,
@@ -482,10 +482,10 @@ func LoadConfig(fileName string) (*model.Config, string, map[string]interface{},
config.SetDefaults()
- // Don't treat it as an error right now if custom service terms are enabled but text is empty.
- // This is because service terms text will be fetched from database at a later state, but
+ // Don't treat it as an error right now if custom terms of service are enabled but text is empty.
+ // This is because terms of service text will be fetched from database at a later state, but
// the flag indicating it is enabled is fetched from config file right away.
- if err := config.IsValid(); err != nil && err.Id != serviceTermsEnabledAndEmpty.Id {
+ if err := config.IsValid(); err != nil && err.Id != termsOfServiceEnabledAndEmpty.Id {
return nil, "", nil, err
}
@@ -703,7 +703,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
}
if *license.Features.CustomTermsOfService {
- props["EnableCustomServiceTerms"] = strconv.FormatBool(*c.SupportSettings.CustomServiceTermsEnabled)
+ props["EnableCustomTermsOfService"] = strconv.FormatBool(*c.SupportSettings.CustomTermsOfServiceEnabled)
}
}