Credit the whole of UCL, rather than just the Bartlett / VR centre.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index cd3a2156c82b5bfa89f46567776f233d0c48ac41..80b68c2a95bdbeeb4d8201614994865638c321aa 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -559,8 +559,8 @@ module OSM
 
   # Return the terms and conditions text for a given country
   def self.legal_text_for_country(country_code)
-    file_name = File.join(Rails.root, "config", "legales", country_code.to_s + ".yml")
-    file_name = File.join(Rails.root, "config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
+    file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml")
+    file_name = Rails.root.join("config", "legales", DEFAULT_LEGALE + ".yml") unless File.exist? file_name
     YAML.load_file(file_name)
   end
 
@@ -569,11 +569,6 @@ module OSM
     @http_client ||= Faraday.new
   end
 
-  # Set the HTTP client to use
-  def self.http_client=(client)
-    @http_client = client
-  end
-
   # Return the GeoIP database handle
   def self.geoip_database
     @geoip_database ||= GeoIP.new(GEOIP_DATABASE) if defined?(GEOIP_DATABASE)