X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2651db7254e4173de4698351eeeb2dc5ae66bdd1..94dc8cd8d72515c4698e83093b5fd34f2dcbda4f:/lib/osm.rb diff --git a/lib/osm.rb b/lib/osm.rb index a4ac7fc57..a6d740677 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -247,10 +247,6 @@ module OSM ## # raised when user input couldn't be parsed class APIBadUserInput < APIError - def initialize(message) - super message - end - def status :bad_request end @@ -259,10 +255,6 @@ module OSM ## # raised when bounding box is invalid class APIBadBoundingBox < APIError - def initialize(message) - super message - end - def status :bad_request end @@ -505,8 +497,8 @@ module OSM # Return the terms and conditions text for a given country def self.legal_text_for_country(country_code) - file_name = Rails.root.join("config", "legales", country_code.to_s + ".yml") - file_name = Rails.root.join("config", "legales", Settings.default_legale + ".yml") unless File.exist? file_name + file_name = Rails.root.join("config", "legales", "#{country_code}.yml") + file_name = Rails.root.join("config", "legales", "#{Settings.default_legale}.yml") unless File.exist? file_name YAML.load_file(file_name).transform_values!(&:html_safe) end