From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 Jan 2014 21:07:34 +0000 (+0000)
Subject: Pass preferred language to geonames API calls
X-Git-Tag: live~4523
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/339ac9d239c9a243b4d7789c62e18a468ab97abd

Pass preferred language to geonames API calls
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 7eb817333..73422c2f0 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -194,11 +194,14 @@ class GeocoderController < ApplicationController
     # get query parameters
     query = params[:query]
 
+    # get preferred language
+    lang = I18n.locale.to_s.split("-").first
+
     # create result array
     @results = Array.new
 
     # ask geonames.org
-    response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&maxRows=20&username=#{GEONAMES_USERNAME}")
+    response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{GEONAMES_USERNAME}")
 
     # parse the response
     response.elements.each("geonames/geoname") do |geoname|
@@ -255,11 +258,14 @@ class GeocoderController < ApplicationController
     lat = params[:lat]
     lon = params[:lon]
 
+    # get preferred language
+    lang = I18n.locale.to_s.split("-").first
+
     # create result array
     @results = Array.new
 
     # ask geonames.org
-    response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&username=#{GEONAMES_USERNAME}")
+    response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{GEONAMES_USERNAME}")
 
     # parse the response
     response.elements.each("geonames/countrySubdivision") do |geoname|