Remove remaining trailing spaces from translations.

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 8195b0d473c511bb7a9d6de108d2283bcff99a18..556cfb36ad4ae53bf04fbadd3097cbdc9bb31dbd 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -77,7 +77,7 @@ class GeocoderController < ApplicationController
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip
       @results.push({:lat => data[0], :lon => data[1],
                      :zoom => APP_CONFIG['postcode_zoom'],
-                     :prefix => "#{data[2]}, #{data[3]}, ",
+                     :prefix => "#{data[2]}, #{data[3]},",
                      :name => data[4]})
     end
 

diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index f1b4e01dd713c2b5d9ffb9364d570e3761cad6b4..e7d0ddf6c1d9cc8c27610ecc8d395a249036c6ca 100644 (file)
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -5,6 +5,7 @@ module GeocoderHelper
     html_options[:href] = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}"
     html = ""
     html << result[:prefix] if result[:prefix]
+    html << " " if result[:prefix] and result[:name]
     html << link_to_function(result[:name],"setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
     html << result[:suffix] if result[:suffix]
     return html

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 37ba9922e7e43edc7c6864c001db07ba58022d60..6fb3a8bdba33c037bf167d5024c90923b6ef3e4e 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -371,7 +371,7 @@ de:
         osm_namefinder: 'Suchergebnisse von <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Suchergebnisse von <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} von {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} von {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -384,7 +384,7 @@ de:
         towns: Städte
         places: Orte
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} von {{type}} "
+      prefix: "{{distance}} {{direction}} von {{type}}"
     results:
       no_results: "Keine Ergebnisse"
     distance:

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e3c539ce945626157b9df77d124de65caf463fa1..9331e91e7e447cd21d108add4d4eea36db03db81 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -373,7 +373,7 @@ en:
         osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} of {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -386,7 +386,7 @@ en:
         towns: Towns
         places: Places
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} of {{type}} "
+      prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
     distance:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c933c95fe1d75d35bd6ff454a1acb1f0eb817242..e737f2f455da623aad3d6c111302e70c57b0dea4 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -371,7 +371,7 @@ hu:
         osm_namefinder: 'Eredmények az <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>ről'
         geonames: 'Eredmények a <a href="http://www.geonames.org/">GeoNames</a>ről'
     search_osm_namefinder:
-      prefix: "{{type}}: "
+      prefix: "{{type}}:"
       suffix_place: " {{distance}}-re {{direction}} innen: {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}}-re {{parentdirection}} innen: {{parentname}})"
       suffix_suburb: "{{suffix}} ({{parentname}})"
@@ -384,7 +384,7 @@ hu:
         towns: Városok
         places: Helyek
     description_osm_namefinder:
-      prefix: "{{type}}: {{distance}}-re {{direction}} "
+      prefix: "{{type}}: {{distance}}-re {{direction}}"
     results:
       no_results: "Nem találhatók eredmények"
     distance:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 722b83778e713ca0ab1dedd7ccaa943f94fb12bf..4937338074db0ad49d14bf071b2d91ee6272c0ee 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -371,7 +371,7 @@ is:
         osm_namefinder: 'Niðurstöður frá <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} af {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -384,7 +384,7 @@ is:
         towns: Bæir
         places: Staðir
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} af{{type}} "
+      prefix: "{{distance}} {{direction}} af{{type}}"
     results:
       no_results: "Ekkert fannst"
     distance:

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index b9579b8d88138cb230fdcd066c2860700bfd8522..97c4292a5e56495899b5961f67e1b6345323ce3b 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -358,7 +358,7 @@ pt-BR:
         osm_namefinder: 'Resultados do <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Resultados do <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -371,7 +371,7 @@ pt-BR:
         towns: "Cidades"
         places: "Lugares"
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} de {{type}} "
+      prefix: "{{distance}} {{direction}} de {{type}}"
     results:
       no_results: "Nenhum resultado encontrado"
     distance:

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 1f35e133511e034bb1f24dc7147d2f26c03cf8a6..5faee46b62880bc8e7e5aba651689514d54733b4 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -346,7 +346,7 @@ ro:
         osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} of {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -359,7 +359,7 @@ ro:
         towns: Towns
         places: Places
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} of {{type}} "
+      prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
     distance:

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 40e153eb71469d89e0912e8c7bf50ad6a52bf760..b5362bd915a13ced59fb8bddce4b5d3414063c9a 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -373,7 +373,7 @@ sl:
         osm_namefinder: 'Zadetki iz <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Zadetki iz <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} od {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} od {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -386,7 +386,7 @@ sl:
         towns: Mesta
         places: Kraji
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} od {{type}} "
+      prefix: "{{distance}} {{direction}} od {{type}}"
     results:
       no_results: "Ni zadetkov"
     distance:

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 2a36af5147cf2f6b9fb1c8596622e33ffc92800b..c741faaebf4a8b81a2102318189a0fa5c18d4e8f 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -374,7 +374,7 @@ vi:
         osm_namefinder: 'Kết quả <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         geonames: 'Kết quả <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{distance}} về phía {{direction}} của {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} về phía {{parentdirection}} của {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -387,7 +387,7 @@ vi:
         towns: "Thị xã"
         places: "Địa điểm"
     description_osm_namefinder:
-      prefix: "{{distance}} về phía {{direction}} của {{type}} "
+      prefix: "{{distance}} về phía {{direction}} của {{type}}"
     results:
       no_results: "Không tìm thấy kết quả"
     distance:

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 383b0c4c6071d4be28de02266bb53df4a3833e04..cef1a237779741c52b238da93c6a119d28d116f2 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -367,7 +367,7 @@ zh-TW:
         osm_namefinder: '來自<a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>的結果'
         geonames: '來自<a href="http://www.geonames.org/">GeoNames</a>的結果'
     search_osm_namefinder:
-      prefix: "{{type}} "
+      prefix: "{{type}}"
       suffix_place: ", {{direction}} {{distance}} ／ {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} ／ {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
@@ -380,7 +380,7 @@ zh-TW:
         towns: "鄉鎮"
         places: "地區"
     description_osm_namefinder:
-      prefix: "{{distance}} {{direction}} ／ {{type}} "
+      prefix: "{{distance}} {{direction}} ／ {{type}}"
     results:
       no_results: "找不到任何結果"
     distance: