fixed interpolation error introduced in [16237]

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index f286ab9d3401046e51828e1e8e430e8f58338e22..622e700afb01c055bf2eada01580e6fe049b3609 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,6 +3,8 @@ class GeocoderController < ApplicationController
   require 'net/http'
   require 'rexml/document'
 
   require 'net/http'
   require 'rexml/document'
 

+  before_filter :set_locale
+

   def search
     query = params[:query]
     results = Array.new
   def search
     query = params[:query]
     results = Array.new


@@ -160,14 +162,14 @@ private
         prefix = ""
         name = type
       else
         prefix = ""
         name = type
       else

-        prefix = "#{type} "
+        prefix =  t "geocoder.results.namefinder.prefix", :type => type

       end
 
       if place
         distance = format_distance(place.attributes["approxdistance"].to_i)
         direction = format_direction(place.attributes["direction"].to_i)
         placename = format_name(place.attributes["name"].to_s)
       end
 
       if place
         distance = format_distance(place.attributes["approxdistance"].to_i)
         direction = format_direction(place.attributes["direction"].to_i)
         placename = format_name(place.attributes["name"].to_s)

-        suffix = ", #{distance} #{direction} of #{placename}"
+        suffix = t "geocoder.results.namefinder.suffix_place", :distance => distance, :direction => direction, :placename => placename

 
         if place.attributes["rank"].to_i <= 30
           parent = nil
 
         if place.attributes["rank"].to_i <= 30
           parent = nil


@@ -191,11 +193,11 @@ private
             parentname = format_name(parent.attributes["name"].to_s)
 
             if  place.attributes["info"].to_s == "suburb"
             parentname = format_name(parent.attributes["name"].to_s)
 
             if  place.attributes["info"].to_s == "suburb"

-              suffix = "#{suffix}, #{parentname}"
+              suffix = t "geocoder.results.namefinder.suffix_suburb", :suffix => suffix, :parentname => parentname

             else
               parentdistance = format_distance(parent.attributes["approxdistance"].to_i)
               parentdirection = format_direction(parent.attributes["direction"].to_i)
             else
               parentdistance = format_distance(parent.attributes["approxdistance"].to_i)
               parentdirection = format_direction(parent.attributes["direction"].to_i)

-              suffix = "#{suffix} (#{parentdistance} #{parentdirection} of #{parentname})"
+              suffix = t "geocoder.results.namefinder.suffix_parent", :suffix => suffix, :parentdistance => parentdistance, :parentdirection => parentdirection, :parentname => parentname

             end
           end
         end
             end
           end
         end


@@ -291,19 +293,18 @@ private
   end
 
   def format_distance(distance)
   end
 
   def format_distance(distance)

-    return "less than 1km" if distance == 0
-    return "about #{distance}km"
+    return t("geocoder.results.distance", :count => distance)

   end
 
   def format_direction(bearing)
   end
 
   def format_direction(bearing)

-    return "south-west" if bearing >= 22.5 and bearing < 67.5
-    return "south" if bearing >= 67.5 and bearing < 112.5
-    return "south-east" if bearing >= 112.5 and bearing < 157.5
-    return "east" if bearing >= 157.5 and bearing < 202.5
-    return "north-east" if bearing >= 202.5 and bearing < 247.5
-    return "north" if bearing >= 247.5 and bearing < 292.5
-    return "north-west" if bearing >= 292.5 and bearing < 337.5
-    return "west"
+    return t("geocoder.results.direction.south_west") if bearing >= 22.5 and bearing < 67.5
+    return t("geocoder.results.direction.south") if bearing >= 67.5 and bearing < 112.5
+    return t("geocoder.results.direction.south_east") if bearing >= 112.5 and bearing < 157.5
+    return t("geocoder.results.direction.east") if bearing >= 157.5 and bearing < 202.5
+    return t("geocoder.results.direction.north_east") if bearing >= 202.5 and bearing < 247.5
+    return t("geocoder.results.direction.north") if bearing >= 247.5 and bearing < 292.5
+    return t("geocoder.results.direction.north_west") if bearing >= 292.5 and bearing < 337.5
+    return t("geocoder.results.direction.west")

   end
 
   def format_name(name)
   end
 
   def format_name(name)