Correct resource name.

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 8fceef376ad52f1646e53993ef09dfbe40bfb713..1b2ae340b58c38912fe76edb0827b62a6dabf3a4 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -278,7 +278,7 @@ class GeocoderController < ApplicationController
       description = named.elements["description"].to_s
       distance = format_distance(place.attributes["approxdistance"].to_i)
       direction = format_direction((place.attributes["direction"].to_i - 180) % 360)
       description = named.elements["description"].to_s
       distance = format_distance(place.attributes["approxdistance"].to_i)
       direction = format_direction((place.attributes["direction"].to_i - 180) % 360)

-      prefix = t "geocoder.description.osm_namefinder_prefix", :distance => distance, :direction => direction, :type => type
+      prefix = t "geocoder.description_osm_namefinder.prefix", :distance => distance, :direction => direction, :type => type

       @results.push({:lat => lat, :lon => lon, :zoom => zoom,
                      :prefix => prefix.capitalize, :name => name,
                      :description => description})
       @results.push({:lat => lat, :lon => lon, :zoom => zoom,
                      :prefix => prefix.capitalize, :name => name,
                      :description => description})

diff --git a/config/locales/en.yml b/config/locales/en.yml
index cb1fb50a72c7330260a36a7f25bbb7416b4d9e7e..dee97ab91addd251a09fbfd8c91eda49afcc27a9 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -355,11 +355,12 @@ en:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'

-      osm_namefinder_prefix: "{{distance}} {{direction}} of {{type}} "

       types:
         cities: Cities
         towns: Towns
         places: Places
       types:
         cities: Cities
         towns: Towns
         places: Places

+    description_osm_namefinder:
+      prefix: "{{distance}} {{direction}} of {{type}} "

     results:
       no_results: "No results found"
     distance:
     results:
       no_results: "No results found"
     distance:

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1f0bf6d8e93ae23a64a8811304d79b42ae7ac51a..2e5e8740f635efe6ea3557b2a780c22bdcac356d 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -363,11 +363,12 @@ sl:
       title:
         osm_namefinder: '{{types}} iz <a href="http://gazetteer.openstreetmap.org/namefinder/">iskalca po OpenStreetMap-u</a>'
         geonames: 'Lokacija iz <a href="http://www.geonames.org/">GeoNames</a>'
       title:
         osm_namefinder: '{{types}} iz <a href="http://gazetteer.openstreetmap.org/namefinder/">iskalca po OpenStreetMap-u</a>'
         geonames: 'Lokacija iz <a href="http://www.geonames.org/">GeoNames</a>'

-      osm_namefinder_prefix: "{{distance}} {{direction}} od {{type}} "

       types:
         cities: Velemesta
         towns: Mesta
         places: Kraji
       types:
         cities: Velemesta
         towns: Mesta
         places: Kraji

+    description_osm_namefinder:
+      prefix: "{{distance}} {{direction}} od {{type}} "

     results:
       no_results: "Ni zadetkov"
     distance:
     results:
       no_results: "Ni zadetkov"
     distance: