Merge pull request #3194 from openSUSE/depfu/update/countries-5.4.0

Drop country_select
2023-05-08 17:28:54 +02:00 · 2023-05-08 17:28:54 +02:00 · a154d99460
commit a154d99460
parent 8831763f7e d9f86d0564
4 changed files with 5 additions and 16 deletions
--- a/app/models/venue.rb
+++ b/app/models/venue.rb
@ -20,8 +20,7 @@ class Venue < ApplicationRecord
  end

  def country_name
-    name = ISO3166::Country[country]
-    name&.iso_short_name
+    I18nData.countries[country]
  end

  def location?
--- a/app/views/conferences/_header.haml
+++ b/app/views/conferences/_header.haml
@ -22,7 +22,7 @@
                      = sanitize link_to(venue.name, venue.website)
                    - else
                      = venue.city
-                      - if venue.country_name != 'US'
+                      - if venue.country_name
                        &bull;
                        = venue.country_name