IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty string on app error (#15166)

Browse Source
This commit is contained in:
Jesús Espino
2020-08-04 11:39:42 +02:00
committed by GitHub
parent d4dac31b04
commit 8b7e00f0f7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/user.go
View File

@@ -2172,7 +2172,7 @@ func (a *App) ConvertBotToUser(bot *model.Bot, userPatch *model.UserPatch, sysad
appErr := a.Srv().Store.Bot().PermanentDelete(bot.UserId)
if appErr != nil {
return nil, model.NewAppError("ConvertBotToUser", "", nil, err.Error(), http.StatusInternalServerError)
return nil, model.NewAppError("ConvertBotToUser", "app.user.convert_bot_to_user.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return user, nil

8
i18n/en.json
View File

@@ -1,8 +1,4 @@
[
{
"id": "",
"translation": ""
},
{
"id": "April",
"translation": "April"
@@ -4434,6 +4430,10 @@
"id": "app.user.complete_switch_with_oauth.blank_email.app_error",
"translation": "Unable to complete SAML login with an empty email address."
},
{
"id": "app.user.convert_bot_to_user.app_error",
"translation": "Unable to convert bot to user."
},
{
"id": "app.user.permanentdeleteuser.internal_error",
"translation": "Unable to delete user."