Skip to content

Commit

Permalink
Tweaking strings and adding them to the loc files for the signature v…
Browse files Browse the repository at this point in the history
…2 fix (mattermost#6527)

* Tweaking strings and adding them to the loc files

* Fixing spacing

* Removing V2 from config
  • Loading branch information
coreyhulen authored and jwilander committed Jun 5, 2017
1 parent 9a5244d commit 5bb9a21
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions components/admin_console/storage_settings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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
};
}

Expand Down Expand Up @@ -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={
Expand Down

0 comments on commit 5bb9a21

Please sign in to comment.