Merge branch 'master' into terms

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 50e31a7ff8a3c3679833184aae7568470dba0fd3..b5f3cb1aa4fa92aea0c32133c865c27b90615c00 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -510,7 +510,7 @@ module OSM
 
   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", "GB.yml") unless File.exist? file_name
+    file_name = File.join(RAILS_ROOT, "config", "legales", APP_CONFIG['default_legale'] + ".yml") unless File.exist? file_name
     YAML::load_file(file_name)
   end