1 files changed, 13 insertions, 50 deletions
diff --git a/config/initializers/countries.rb b/config/initializers/countries.rb
index 171c126143c..98d06c9a893 100644
--- a/config/initializers/countries.rb
+++ b/config/initializers/countries.rb
@@ -8,55 +8,18 @@ end
 # This overrides the display name for Ukraine to 'Ukraine (except the Crimea, Donetsk, and Luhansk regions)'
 # See: https://gitlab.com/gitlab-org/gitlab/-/issues/374946
 # To be removed after https://gitlab.com/gitlab-org/gitlab/issues/14784 is implemented
-# Data fetched is based on https://github.com/countries/countries/blob/master/lib/countries/data/countries/UA.yaml
 ISO3166::Data.register(
-  continent: "Europe",
-  address_format: "|-
-  {{recipient}}
-  {{street}}
-  {{city}} {{region_short}}
-  {{postalcode}}
-  {{country}}",
-  alpha2: "UA",
-  alpha3: "UKR",
-  country_code: '380',
-  international_prefix: '810',
-  ioc: "UKR",
-  gec: "UP",
-  name: "Ukraine (except the Crimea, Donetsk, and Luhansk regions)",
-  national_destination_code_lengths: [2],
-  national_number_lengths: [8, 9],
-  national_prefix: '8',
-  number: '804',
-  region: "Europe",
-  subregion: "Eastern Europe",
-  world_region: "EMEA",
-  un_locode: "UA",
-  nationality: "Ukrainian",
-  vat_rates: {
-    standard: 20
-  },
-  reduced: [7],
-  super_reduced: {
-    parking: { postal_code: true }
-  },
-  unofficial_names: %w(Ukraine Ucrania ウクライナ Oekraïne Украина Україна Украіна),
-  languages_official: ["uk"],
-  languages_spoken: ["uk"],
-  geo: {
-    latitude: 48.379433,
-    latitude_dec: '48.92656326293945',
-    longitude: 31.16558,
-    longitude_dec: '31.47578239440918',
-    max_latitude: 52.37958099999999,
-    max_longitude: 40.2285809,
-    min_latitude: 44.2924,
-    min_longitude: 22.137159,
-    bounds: {
-      northeast: { lat: 52.37958099999999, lng: 40.2285809 },
-      southwest: { lat: 44.2924, lng: 22.137159 }
-    }
-  },
-  currency_code: "UAH",
-  start_of_week: "monday"
+  ISO3166::Data.new('UA')
+               .call
+               .deep_symbolize_keys
+               .merge({ name: 'Ukraine (except the Crimea, Donetsk, and Luhansk regions)' })
+)
+
+# Updating the display name of Taiwan, from `Taiwan, Province of China` to `Taiwan`
+# See issue: https://gitlab.com/gitlab-org/gitlab/-/issues/349333
+ISO3166::Data.register(
+  ISO3166::Data.new('TW')
+               .call
+               .deep_symbolize_keys
+               .merge({ name: 'Taiwan' })
 )