From 8b7e00f0f78cc38506ab27a24855ee2995fcd785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Tue, 4 Aug 2020 11:39:42 +0200
Subject: [PATCH] Fix empty string on app error (#15166)

---
 app/user.go  | 2 +-
 i18n/en.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/user.go b/app/user.go
index f2a3ae7bf9..83b7780c13 100644
--- a/app/user.go
+++ b/app/user.go
@@ -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
diff --git a/i18n/en.json b/i18n/en.json
index 90fa4f9d54..fde6956016 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -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."