diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-06 03:42:18 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-06 03:42:18 +0800 |
commit | 8d680cf64ec7fb6c8b242b8048989d0f0550cb68 (patch) | |
tree | 700d39986d1973b51c875ab9bf50241762fc3e54 /webapp/i18n | |
parent | 7405f66036537095b52c277d9b56969df33bfa57 (diff) | |
download | chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.tar.gz chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.tar.bz2 chat-8d680cf64ec7fb6c8b242b8048989d0f0550cb68.zip |
[PLT-7475] Add S3 region to system console and add S3 validation (#7373)
* add S3 region to system console and add S3 validation
* update translation message
* add bool as return value to Validate* functions
* update Validate* functions to be pure
Diffstat (limited to 'webapp/i18n')
-rwxr-xr-x | webapp/i18n/en.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index f111c5dd5..87da9c943 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -475,7 +475,7 @@ "admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.", "admin.image.amazonS3IdExample": "E.g.: \"AKIADTOVBGERKLCBV\"", "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:", - "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.", + "admin.image.amazonS3RegionDescription": "(Optional) AWS region you selected when creating your S3 bucket. If no region is set, Mattermost attempts to get the appropriate region from AWS, or sets it to 'us-east-1' if none found.", "admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"", "admin.image.amazonS3RegionTitle": "Amazon S3 Region:", "admin.image.amazonS3SSEDescription": "When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <a href=\"https://about.mattermost.com/default-server-side-encryption\">documentation</a> to learn more.", |