diff options
author | Jonathan <jonfritz@gmail.com> | 2018-02-07 09:02:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-07 09:02:46 -0500 |
commit | d3e934d07ac0a58a24a435ea7c5b3bd222ef509a (patch) | |
tree | b356b134878ee8686326475b04c90317e195bf86 /i18n | |
parent | b2ee5077931013d308aaf60d790d341e2cb0c3e3 (diff) | |
download | chat-d3e934d07ac0a58a24a435ea7c5b3bd222ef509a.tar.gz chat-d3e934d07ac0a58a24a435ea7c5b3bd222ef509a.tar.bz2 chat-d3e934d07ac0a58a24a435ea7c5b3bd222ef509a.zip |
XYZ-35: Added Support for GlobalRelay Compliance Export Format
* Added username to ChannelMemberHistory struct in anticipation of supporting GlobalRelay in Compliance Export
* Removed translation from debug output - this makes it complicated to use utils functions from tests in the enterprise repo
* Added an advanced email function that allows for greater control over message details. Updated MessageExport config to support GlobalRelay. Added attachment support to InBucket unit tests
* Moving templates in from enterprise to solve test issues
* Added export format to diagnostics
* Changed email attachment code to use FileBackend so that S3 storage is properly supported
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/i18n/en.json b/i18n/en.json index d983e8855..1a04aeeed 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -132,10 +132,6 @@ "translation": "Unable to upload file. File is too large." }, { - "id": "api.api.init.parsing_templates.debug", - "translation": "Parsing server templates at %v" - }, - { "id": "api.api.init.parsing_templates.error", "translation": "Failed to parse server templates %v" }, @@ -4859,6 +4855,14 @@ "translation": "Message export job BatchSize must be a positive integer" }, { + "id": "model.config.is_valid.message_export.export_type.app_error", + "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'" + }, + { + "id": "model.config.is_valid.message_export.global_relay_email_address.app_error", + "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address" + }, + { "id": "model.config.is_valid.message_export.daily_runtime.app_error", "translation": "Message export job DailyRuntime must be a 24-hour time stamp in the form HH:MM." }, @@ -7083,6 +7087,10 @@ "translation": "Failed to authenticate on SMTP server" }, { + "id": "utils.mail.sendMail.attachments.write_error", + "translation": "Failed to write attachment to email" + }, + { "id": "utils.mail.new_client.helo.error", "translation": "Failed to to set the HELO to SMTP server %v" }, @@ -7159,10 +7167,6 @@ "translation": "Failed to create directory watcher %v" }, { - "id": "web.dir_fail.error", - "translation": "Failed in directory watcher %v" - }, - { "id": "web.do_load_channel.error", "translation": "Error in getting users profile for id=%v forcing logout" }, @@ -7267,18 +7271,10 @@ "translation": "Parsing templates at %v" }, { - "id": "web.parsing_templates.error", - "translation": "Failed to parse templates %v" - }, - { "id": "web.post_permalink.app_error", "translation": "Invalid Post ID" }, { - "id": "web.reparse_templates.info", - "translation": "Re-parsing templates because of modified file %v" - }, - { "id": "web.reset_password.expired_link.app_error", "translation": "The password reset link has expired" }, |