Improve translatability of nominatim results. Closes #2498.

app/controllers/geocoder_controller.rb

@@ -239,15 +239,10 @@ class GeocoderController < ApplicationController
       lat = place.attributes["lat"].to_s
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s
-      type = place.attributes["type"].to_s.gsub("_", " ")
+      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(",")
-
-      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,

config/locales/af.yml

@@ -339,8 +339,6 @@ af:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: Pad van tipe {{type}}
   javascripts: 
     map: 
       base: 

config/locales/br.yml

@@ -396,8 +396,6 @@ br:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} eus {{parentname}})"
       suffix_place: " {{distance}} {{direction}} diouzh {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: hent {{type}}
   javascripts: 
     map: 
       base: 

config/locales/de.yml

@@ -407,8 +407,6 @@ de:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} Straße"
   javascripts: 
     map: 
       base: 

config/locales/dsb.yml

@@ -406,8 +406,6 @@ dsb:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} wót {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} wót {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: Droga typa {{type}}
   javascripts: 
     map: 
       base: 

config/locales/en.yml

@@ -391,8 +391,19 @@ en:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:
-      prefix_highway: "{{type}} road"
-      prefix_other: "{{type}}"
+      prefix_motorway: "Motorway"
+      prefix_trunk: "Trunk road"
+      prefix_primary: "Primary road"
+      prefix_secondary: "Secondary road"
+      prefix_tertiary: "Tertiary road"
+      prefix_unclassified: "Unclassified road"
+      prefix_residential: "Residential road"
+      prefix_city: "City"
+      prefix_town: "Town"
+      prefix_suburb: "Suburb"
+      prefix_village: "Village"
+      prefix_hamlet: "Hamlet"
+      prefix_station: "Station"
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'

config/locales/eo.yml

@@ -328,8 +328,6 @@ eo:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} vojo"
   layouts: 
     donate: Subtenu OpenStreetMap {{link}} al Fonduso de Ĝisdatigo de Aparataro.
     donate_link_text: donacante

config/locales/es.yml

@@ -398,8 +398,6 @@ es:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: vía {{type}}
   javascripts: 
     map: 
       base: 

config/locales/fr.yml

@@ -402,8 +402,6 @@ fr:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: route {{type}}
   javascripts: 
     map: 
       base: 

config/locales/hr.yml

@@ -402,8 +402,6 @@ hr:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} od {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} cesta"
   javascripts: 
     map: 
       base: 

config/locales/hsb.yml

@@ -406,8 +406,6 @@ hsb:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} wot {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} z {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: Dróha typa {{type}}
   javascripts: 
     map: 
       base: 

config/locales/hu.yml

@@ -401,8 +401,6 @@ hu:
       suffix_parent: "{{suffix}} ({{parentdistance}}-re {{parentdirection}} innen: {{parentname}})"
       suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}"
       suffix_suburb: "{{suffix}} ({{parentname}})"
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} út"
   javascripts: 
     map: 
       base: 

config/locales/ia.yml

@@ -396,8 +396,6 @@ ia:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} al {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} al {{direction}} de {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: cammino {{type}}
   javascripts: 
     map: 
       base: 

config/locales/is.yml

@@ -396,8 +396,6 @@ is:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} af {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} vegur"
   javascripts: 
     map: 
       base: 

config/locales/mk.yml

@@ -396,8 +396,6 @@ mk:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} од {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} од {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} пат"
   javascripts: 
     map: 
       base: 

config/locales/nds.yml

@@ -228,8 +228,6 @@ nds:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: Straat von’n Typ {{type}}
   javascripts: 
     map: 
       base: 

config/locales/nl.yml

@@ -398,8 +398,6 @@ nl:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} van {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} van {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: Weg van type {{type}}
   javascripts: 
     map: 
       base: 

config/locales/pl.yml

@@ -379,8 +379,6 @@ pl:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} względem {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} względem {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: droga {{type}}
   layouts: 
     donate: Wspomóż Projekt OpenStreetMap {{link}} na Konto Aktualizacji Naszego Sprzętu.
     donate_link_text: dokonując darowizny

config/locales/pt-BR.yml

@@ -395,9 +395,6 @@ pt-BR:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
       suffix_suburb: "{{suffix}}, {{parentname}}"
-    search_osm_nominatim: 
-      prefix_highway: via {{type}}
-      prefix_other: "{{type}}"
   javascripts: 
     map: 
       base: 

config/locales/ru.yml

@@ -398,8 +398,6 @@ ru:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} дорога"
   javascripts: 
     map: 
       base: 

config/locales/te.yml

@@ -153,8 +153,6 @@ te:
         ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a> నుండి ఫలితాలు
         geonames: <a href="http://www.geonames.org/">GeoNames</a> నుండి ఫలితాలు
         us_postcode: <a href="http://geocoder.us/">Geocoder.us</a> నుండి ఫలితాలు
-    search_osm_nominatim: 
-      prefix_highway: "{{type}} రహదారి"
   javascripts: 
     map: 
       base: 

config/locales/vi.yml

@@ -394,8 +394,6 @@ vi:
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} về phía {{parentdirection}} của {{parentname}})"
       suffix_place: ", {{distance}} về phía {{direction}} của {{placename}}"
-    search_osm_nominatim: 
-      prefix_highway: Đường {{type}}
   javascripts: 
     map: 
       base: