Merge branch 'master' into openid

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index aaa8d17ef114524cff62490b5db150279dee5d6c..2af95e5fafc83e8a961e08a216af915fd8ffbdb7 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -253,7 +253,8 @@ class GeocoderController < ApplicationController
       type = place.attributes["type"].to_s
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
-      prefix = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
+      prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
+      prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name
 
       @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 861caaf358e238969325d975fdd04a7fc3878ff4..3b1d325359055c1ad6d82b34abdeaa10b7dec76c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -414,6 +414,7 @@ en:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:
+      prefix_format: "{{name}}"
       prefix:
         amenity:
           airport: "Airport"