From e99a73e16d18646327c6d422a01d46dfd2579c60 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Mon, 18 Jul 2016 12:33:26 +0530 Subject: [PATCH] New AWS S3 Storage Mumbai region added (#4335) * ap-south-1 region added * Update client.en.yml * ap-south-1 region added --- app/models/s3_region_site_setting.rb | 1 + config/locales/client.en.yml | 1 + spec/models/s3_region_site_setting_spec.rb | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb index 06bbe705e..14fbea51d 100644 --- a/app/models/s3_region_site_setting.rb +++ b/app/models/s3_region_site_setting.rb @@ -18,6 +18,7 @@ class S3RegionSiteSetting < EnumSiteSetting 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', + 'ap-south-1', 'ap-northeast-1', 'ap-northeast-2', 'sa-east-1', diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 68e30d5fe..0b2401276 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -183,6 +183,7 @@ en: eu_central_1: "EU (Frankfurt)" ap_southeast_1: "Asia Pacific (Singapore)" ap_southeast_2: "Asia Pacific (Sydney)" + ap_south_1: "Asia Pacific (Mumbai)" ap_northeast_1: "Asia Pacific (Tokyo)" ap_northeast_2: "Asia Pacific (Seoul)" sa_east_1: "South America (Sao Paulo)" diff --git a/spec/models/s3_region_site_setting_spec.rb b/spec/models/s3_region_site_setting_spec.rb index d2d5dccff..fb8b20335 100644 --- a/spec/models/s3_region_site_setting_spec.rb +++ b/spec/models/s3_region_site_setting_spec.rb @@ -14,7 +14,7 @@ describe S3RegionSiteSetting do describe 'values' do it 'returns all the S3 regions' do - expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'ap-northeast-2', 'sa-east-1', 'cn-north-1'].sort) + expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-south-1', 'ap-northeast-1', 'ap-northeast-2', 'sa-east-1', 'cn-north-1'].sort) end end