Improve translatability of nominatim results. Closes #2498.
[rails.git] / app / controllers / geocoder_controller.rb
index 16d427cfa58cb67f22687002ca832afe90c9cdf3..9210fa8b5ebd31dee7f17b5aad09e0fa7ad2b068 100644 (file)
@@ -240,14 +240,9 @@ class GeocoderController < ApplicationController
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s
       type = place.attributes["type"].to_s
-      name = place.attributes["display_name"].to_s.gsub("_", " ")
+      name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
-
-      if klass == "highway" and ["trunk","primary","secondary","tertiary","unclassified","residential"].include?(type)
-        prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize
-      else
-        prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize
-      end
+      prefix = t "geocoder.search_osm_nominatim.prefix_#{type}", :default => type.gsub("_", " ").capitalize
 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,