summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/import.go4
-rw-r--r--i18n/en.json4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/import.go b/app/import.go
index 0a607e68e..ac5232309 100644
--- a/app/import.go
+++ b/app/import.go
@@ -1081,14 +1081,14 @@ func ImportDirectPost(data *DirectPostImportData, dryRun bool) *model.AppError {
if len(userIds) == 2 {
ch, err := createDirectChannel(userIds[0], userIds[1])
if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR {
- return model.NewAppError("BulkImport", "app.import.import_direct_channel.create_direct_channel.error", nil, "", http.StatusBadRequest)
+ return model.NewAppError("BulkImport", "app.import.import_direct_post.create_direct_channel.error", nil, "", http.StatusBadRequest)
} else {
channel = ch
}
} else {
ch, err := createGroupChannel(userIds, userIds[0])
if err != nil && err.Id != store.CHANNEL_EXISTS_ERROR {
- return model.NewAppError("BulkImport", "app.import.import_direct_channel.create_group_channel.error", nil, "", http.StatusBadRequest)
+ return model.NewAppError("BulkImport", "app.import.import_direct_post.create_group_channel.error", nil, "", http.StatusBadRequest)
} else {
channel = ch
}
diff --git a/i18n/en.json b/i18n/en.json
index 2e2efc52d..95fab33e2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3060,11 +3060,11 @@
"translation": "Could not find channel member when importing direct channel post"
},
{
- "id": "app.import.import_direct_channel.create_direct_channel.error",
+ "id": "app.import.import_direct_post.create_direct_channel.error",
"translation": "Failed to get direct channel"
},
{
- "id": "app.import.import_direct_channel.create_group_channel.error",
+ "id": "app.import.import_direct_post.create_group_channel.error",
"translation": "Failed to get group channel"
},
{