From 86fe96a6e2f06b09d1cb5243e3e76834594ddb9c Mon Sep 17 00:00:00 2001
From: Corey Hulen <corey@hulen.com>
Date: Mon, 5 Jun 2017 13:36:59 -0700
Subject: Tweaking strings and adding them to the loc files for the signature
 v2 fix (#6527)

* Tweaking strings and adding them to the loc files

* Fixing spacing

* Removing V2 from config
---
 .../components/admin_console/storage_settings.jsx  | 23 +---------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx
index 74c53770a..1400b673c 100644
--- a/webapp/components/admin_console/storage_settings.jsx
+++ b/webapp/components/admin_console/storage_settings.jsx
@@ -34,7 +34,6 @@ export default class StorageSettings extends AdminSettings {
         config.FileSettings.AmazonS3Bucket = this.state.amazonS3Bucket;
         config.FileSettings.AmazonS3Endpoint = this.state.amazonS3Endpoint;
         config.FileSettings.AmazonS3SSL = this.state.amazonS3SSL;
-        config.FileSettings.AmazonS3SignV2 = this.state.amazonS3SignV2;
 
         return config;
     }
@@ -49,8 +48,7 @@ export default class StorageSettings extends AdminSettings {
             amazonS3SecretAccessKey: config.FileSettings.AmazonS3SecretAccessKey,
             amazonS3Bucket: config.FileSettings.AmazonS3Bucket,
             amazonS3Endpoint: config.FileSettings.AmazonS3Endpoint,
-            amazonS3SSL: config.FileSettings.AmazonS3SSL,
-            amazonS3SignV2: config.FileSettings.AmazonS3SignV2
+            amazonS3SSL: config.FileSettings.AmazonS3SSL
         };
     }
 
@@ -203,25 +201,6 @@ export default class StorageSettings extends AdminSettings {
                     onChange={this.handleChange}
                     disabled={this.state.driverName !== DRIVER_S3}
                 />
-                <BooleanSetting
-                    id='amazonS3SignV2'
-                    label={
-                        <FormattedMessage
-                            id='admin.image.amazonS3SignV2Title'
-                            defaultMessage='Enable Signature V2 for S3 Connections:'
-                        />
-                    }
-                    placeholder={Utils.localizeMessage('admin.image.amazonS3SignV2Example', 'Ex "false"')}
-                    helpText={
-                        <FormattedMessage
-                            id='admin.image.amazonS3SignV2Desc'
-                            defaultMessage='When true, allow signature v2 to Amazon S3. Defaults to Signature V4 requests.'
-                        />
-                    }
-                    value={this.state.amazonS3SignV2}
-                    onChange={this.handleChange}
-                    disabled={this.state.driverName !== DRIVER_S3}
-                />
                 <BooleanSetting
                     id='enableFileAttachments'
                     label={
-- 
cgit v1.2.3-1-g7c22