Commit 5bb9a215 authored by Corey Hulen's avatar Corey Hulen Committed by Joram Wilander

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
parent 9a5244df
......@@ -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={
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment