Refactor #pretty_country to show flag by default

Author: TrumanBlurbank

app/decorators/merchant_decorator.rb

@@ -83,7 +83,7 @@ def all_links
     ].compact_blank
   end
 
-  def pretty_country(show_flag: false)
+  def pretty_country(show_flag: true)
     pretty_country_html(country, show_flag: show_flag)
   end
 

app/helpers/application_helper.rb

@@ -37,7 +37,7 @@ def select_options_for(klass, enum_name)
     enum.keys.map { |k| [klass.human_enum_name(enum_name, k), k] }
   end
 
-  def pretty_country_html(country, show_flag: false)
+  def pretty_country_html(country, show_flag: true)
     c = ISO3166::Country[country]
 
     name = c.translations[I18n.locale.to_s] ||

app/models/merchant_proposal.rb

@@ -86,7 +86,7 @@ def to_osm
 
     if country
       properties['addr:country'] = country
-      extra_keys['country'] = model.pretty_country(show_flag: true)
+      extra_keys['country'] = model.pretty_country
     end
 
     extra_keys['latitude'] = latitude if latitude

app/presenters/statistics_presenter.rb

@@ -92,21 +92,21 @@ def merchants_monero_by_country
     base_merchants.monero.group(:country).count.map do |k, v|
       next unless v >= 3
 
-      [pretty_country_html(k, show_flag: true), v]
+      [pretty_country_html(k), v]
     end.compact_blank
   end
 
   def merchants_june_by_country
     base_merchants.june.group(:country).count.map do |k, v|
-      [pretty_country_html(k, show_flag: true), v]
+      [pretty_country_html(k), v]
     end
   end
 
   def merchants_by_countries
     base_merchants
       .where(country: WEST_EUROPEAN_COUNTRIES)
       .group(:country).count.map do |k, v|
-      [pretty_country_html(k, show_flag: true), v]
+      [pretty_country_html(k), v]
     end
   end
 
@@ -134,7 +134,7 @@ def merchants_by_area_and_days(
     range = range_start..range_end
 
     area.each_with_object({}) do |country, hash|
-      label = pretty_country_html(country, show_flag: true)
+      label = pretty_country_html(country)
       base_merchants
         .where(country: country)
         .where(created_at: range)

app/services/merchants/check_and_report_removed_on_osm.rb

@@ -59,7 +59,7 @@ def merchants
     def merchants_list
       @merchants_list ||= MerchantDecorator.wrap(merchants).map do |merchant|
         <<~MARKDOWN
-          - [ ] **#{merchant.name}** [##{merchant.identifier}] #{pretty_country_html(merchant.country, show_flag: true)}
+          - [ ] **#{merchant.name}** [##{merchant.identifier}] #{pretty_country_html(merchant.country)}
             - Date: #{I18n.l(merchant.deleted_at)}
             - [On Bank-Exit](#{merchant_url(merchant, debug: 'true')})
             - [On OpenStreetMap](#{merchant.osm_link})

app/views/admin/comments/_comment.html.slim

@@ -8,7 +8,7 @@ tr
     .text-xs.truncate
       span.font-bold= comment.pseudonym
       |< [
-      = pretty_country_html(comment.language, show_flag: true)
+      = pretty_country_html(comment.language)
       | ]
 
   td

app/views/admin/directories/_directory.html.slim

@@ -26,7 +26,7 @@ tr.hover:bg-primary/5.transition-colors data-update-url=update_position_admin_di
     - if address&.geocoded?
       - if address.country_code
         span title=address.label
-          = pretty_country_html(address.country_code, show_flag: true)
+          = pretty_country_html(address.country_code)
       - else
         span= address.label
 

app/views/delivery_zones/_formatted_geocoder_details.html.slim

@@ -9,7 +9,7 @@ ruby:
     region = t("FR-#{region}", scope: 'regions')
   end
 
-  country = pretty_country_html(country_code, show_flag: true)
+  country = pretty_country_html(country_code)
   continent = t(continent_code, scope: 'continents')
 
   sentence = [city, region, country, continent].compact_blank

app/views/delivery_zones/_formatted_zone_by_mode.html.slim

@@ -1,7 +1,7 @@
 - if delivery_zone.world?
   = lucide_icon 'earth'
 - elsif delivery_zone.country?
-  = pretty_country_html(delivery_zone.country_code, show_flag: true)
+  = pretty_country_html(delivery_zone.country_code)
 - elsif delivery_zone.continent?
   span
     = I18n.t(delivery_zone.continent_code, scope: 'continents')
@@ -13,4 +13,4 @@
       = t(delivery_zone.region_code, scope: 'regions') if delivery_zone.region?
 
     span.text-base-content/70.text-sm.ml-1<
-      = "(#{pretty_country_html(delivery_zone.country_code, show_flag: true)})"
+      = "(#{pretty_country_html(delivery_zone.country_code)})"

app/views/maps/_merchants_table_row.html.slim

@@ -13,7 +13,7 @@ tr.odd:hover:bg-base-200.transition-colors
         = t(merchant.category, scope: 'categories')
 
   td
-    == pretty_country_html(merchant.country, show_flag: true)
+    == pretty_country_html(merchant.country)
 
   td
     .flex.items-center.gap-2