From: Tom Hughes <tom@compton.nu>
Date: Mon, 17 May 2010 23:09:29 +0000 (+0100)
Subject: Tweak resource names to make them fit the normal naming scheme
X-Git-Tag: live~6310^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/798cdc1d193b1a46a791dd1ee77591f856e6de74

Tweak resource names to make them fit the normal naming scheme
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 2071dacce..2af95e5fa 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -254,7 +254,7 @@ class GeocoderController < ApplicationController
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
       prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
-      prefix = t "geocoder.search_osm_nominatim_format.prefix", :name => prefix_name
+      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 c6043fa32..841577fa2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -413,9 +413,8 @@ en:
       suffix_place: ", {{distance}} {{direction}} of {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
-    search_osm_nominatim_format:
-      prefix: "{{name}}"
     search_osm_nominatim:
+      prefix_format: "{{name}}"
       prefix:
         amenity:
           airport: "Airport"