diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-02-28 04:31:53 -0500 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-02-28 09:31:53 +0000 |
commit | 76fa840b52ea79f05e5e681abca92b279de78182 (patch) | |
tree | cf910b49679e0efcbd05851dde00e42eeefc1632 /i18n | |
parent | cef5028cbeed93b6493f6d1f379afe4ca85535c8 (diff) | |
download | chat-76fa840b52ea79f05e5e681abca92b279de78182.tar.gz chat-76fa840b52ea79f05e5e681abca92b279de78182.tar.bz2 chat-76fa840b52ea79f05e5e681abca92b279de78182.zip |
Move webhook logic from api layer to app layer (#5527)
* Move webhook logic from api layer to app layer
* Consolidate error messages
* Fix permission check and unit test
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/i18n/en.json b/i18n/en.json index 1535bac47..312622ef8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2692,23 +2692,15 @@ "translation": "team hub stopping for teamId=%v" }, { - "id": "api.webhook.create_incoming.disabled.app_error", + "id": "api.incoming_webhook.disabled.app_errror", "translation": "Incoming webhooks have been disabled by the system admin." }, { - "id": "api.webhook.update_incoming.disabled.app_error", - "translation": "Incoming webhooks have been disabled by the system admin." - }, - { - "id": "api.webhook.update_incoming.permissions.app_error", - "translation": "Invalid permissions to update incoming webhook" - }, - { "id": "api.webhook.team_mismatch.app_error", "translation": "Cannot update webhook across teams" }, { - "id": "api.webhook.create_outgoing.disabled.app_error", + "id": "api.outgoing_webhook.disabled.app_error", "translation": "Outgoing webhooks have been disabled by the system admin." }, { @@ -2728,50 +2720,26 @@ "translation": "Either trigger_words or channel_id must be set" }, { - "id": "api.webhook.update_outgoing.disabled.app_error", - "translation": "Outgoing webhooks have been disabled by the system admin." - }, - { - "id": "api.webhook.update_outgoing.intersect.app_error", - "translation": "Outgoing webhooks from the same channel cannot have the same trigger words/callback URLs." + "id": "api.webhook.delete_incoming.permissions.app_errror", + "translation": "Invalid permissions to delete incoming webhook" }, { "id": "api.webhook.update_outgoing.not_open.app_error", "translation": "Outgoing webhooks can only be updated to public channels." }, { - "id": "api.webhook.update_outgoing.permissions.app_error", - "translation": "Invalid permissions to update outgoing webhook." + "id": "api.webhook.update_outgoing.intersect.app_error", + "translation": "Outgoing webhooks from the same channel cannot have the same trigger words/callback URLs." }, { "id": "api.webhook.update_outgoing.triggers.app_error", "translation": "Either trigger_words or channel_id must be set" }, { - "id": "api.webhook.delete_incoming.disabled.app_error", - "translation": "Incoming webhooks have been disabled by the system admin." - }, - { - "id": "api.webhook.delete_incoming.permissions.app_error", - "translation": "Invalid permissions to delete incoming webhook" - }, - { - "id": "api.webhook.delete_outgoing.disabled.app_error", - "translation": "Outgoing webhooks have been disabled by the system admin." - }, - { "id": "api.webhook.delete_outgoing.permissions.app_error", "translation": "Invalid permissions to delete outgoing webhook" }, { - "id": "api.webhook.get_incoming.disabled.app_error", - "translation": "Incoming webhooks have been disabled by the system admin." - }, - { - "id": "api.webhook.get_outgoing.disabled.app_error", - "translation": "Outgoing webhooks have been disabled by the system admin." - }, - { "id": "api.webhook.incoming.debug", "translation": "Incoming webhook received. Content=" }, @@ -2784,10 +2752,6 @@ "translation": "Initializing webhook API routes" }, { - "id": "api.webhook.regen_outgoing_token.disabled.app_error", - "translation": "Outgoing webhooks have been disabled by the system admin." - }, - { "id": "api.webhook.regen_outgoing_token.permissions.app_error", "translation": "Invalid permissions to regenerate outgoing webhook token" }, |