Merge remote-tracking branch 'upstream/pull/3037'

[rails.git] / lib / country.rb

diff --git a/lib/country.rb b/lib/country.rb
index ab88072ecd048d9b86faadcc198f653ae29ffc98..f6f6791252524e4e1e739d923de3aec138859f75 100644 (file)
--- a/lib/country.rb
+++ b/lib/country.rb
@@ -19,7 +19,7 @@ class Country
 
   def self.load_countries
     countries = {}
 
   def self.load_countries
     countries = {}

-    xml = REXML::Document.new(File.read(Rails.root.join("config", "countries.xml")))
+    xml = REXML::Document.new(File.read(Rails.root.join("config/countries.xml")))

 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s
 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s