diff options
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/utils/config.go b/utils/config.go index aa5b50146..af15c5e93 100644 --- a/utils/config.go +++ b/utils/config.go @@ -21,6 +21,7 @@ import ( "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" + "net/http" ) const ( @@ -179,14 +180,14 @@ func SaveConfig(fileName string, config *model.Config) *model.AppError { b, err := json.MarshalIndent(config, "", " ") if err != nil { - return model.NewLocAppError("SaveConfig", "utils.config.save_config.saving.app_error", - map[string]interface{}{"Filename": fileName}, err.Error()) + return model.NewAppError("SaveConfig", "utils.config.save_config.saving.app_error", + map[string]interface{}{"Filename": fileName}, err.Error(), http.StatusBadRequest) } err = ioutil.WriteFile(fileName, b, 0644) if err != nil { - return model.NewLocAppError("SaveConfig", "utils.config.save_config.saving.app_error", - map[string]interface{}{"Filename": fileName}, err.Error()) + return model.NewAppError("SaveConfig", "utils.config.save_config.saving.app_error", + map[string]interface{}{"Filename": fileName}, err.Error(), http.StatusInternalServerError) } return nil @@ -592,12 +593,12 @@ func ValidateLocales(cfg *model.Config) *model.AppError { locales := GetSupportedLocales() if _, ok := locales[*cfg.LocalizationSettings.DefaultServerLocale]; !ok { *cfg.LocalizationSettings.DefaultServerLocale = model.DEFAULT_LOCALE - err = model.NewLocAppError("ValidateLocales", "utils.config.supported_server_locale.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.supported_server_locale.app_error", nil, "", http.StatusBadRequest) } if _, ok := locales[*cfg.LocalizationSettings.DefaultClientLocale]; !ok { *cfg.LocalizationSettings.DefaultClientLocale = model.DEFAULT_LOCALE - err = model.NewLocAppError("ValidateLocales", "utils.config.supported_client_locale.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.supported_client_locale.app_error", nil, "", http.StatusBadRequest) } if len(*cfg.LocalizationSettings.AvailableLocales) > 0 { @@ -606,7 +607,7 @@ func ValidateLocales(cfg *model.Config) *model.AppError { if _, ok := locales[word]; !ok { *cfg.LocalizationSettings.AvailableLocales = "" isDefaultClientLocaleInAvailableLocales = true - err = model.NewLocAppError("ValidateLocales", "utils.config.supported_available_locales.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.supported_available_locales.app_error", nil, "", http.StatusBadRequest) break } @@ -619,7 +620,7 @@ func ValidateLocales(cfg *model.Config) *model.AppError { if !isDefaultClientLocaleInAvailableLocales { availableLocales += "," + *cfg.LocalizationSettings.DefaultClientLocale - err = model.NewLocAppError("ValidateLocales", "utils.config.add_client_locale.app_error", nil, "") + err = model.NewAppError("ValidateLocales", "utils.config.add_client_locale.app_error", nil, "", http.StatusBadRequest) } *cfg.LocalizationSettings.AvailableLocales = strings.Join(RemoveDuplicatesFromStringArray(strings.Split(availableLocales, ",")), ",") |