From 2adaef0b3da22c48033d85b0451c6754b950147b Mon Sep 17 00:00:00 2001
From: viniciusnz <viniciusnz@gmail.com>
Date: Mon, 8 Sep 2014 00:12:40 -0300
Subject: [PATCH] Allow language to be set in geocoded_by as proc
---
lib/geocoder/models/active_record.rb | 6 ++++--
lib/geocoder/models/mongo_base.rb | 6 ++++--
lib/geocoder/stores/base.rb | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/geocoder/models/active_record.rb b/lib/geocoder/models/active_record.rb
index 62c81422..75951c00 100644
--- a/lib/geocoder/models/active_record.rb
+++ b/lib/geocoder/models/active_record.rb
@@ -17,7 +17,8 @@ module Geocoder
:geocode_block => block,
:units => options[:units],
:method => options[:method],
- :lookup => options[:lookup]
+ :lookup => options[:lookup],
+ :language => options[:language]
)
end
@@ -33,7 +34,8 @@ module Geocoder
:reverse_block => block,
:units => options[:units],
:method => options[:method],
- :lookup => options[:lookup]
+ :lookup => options[:lookup],
+ :language => options[:language]
)
end
diff --git a/lib/geocoder/models/mongo_base.rb b/lib/geocoder/models/mongo_base.rb
index 1a4dd886..211ac26b 100644
--- a/lib/geocoder/models/mongo_base.rb
+++ b/lib/geocoder/models/mongo_base.rb
@@ -20,7 +20,8 @@ module Geocoder
:units => options[:units],
:method => options[:method],
:skip_index => options[:skip_index] || false,
- :lookup => options[:lookup]
+ :lookup => options[:lookup],
+ :language => options[:language]
)
end
@@ -36,7 +37,8 @@ module Geocoder
:units => options[:units],
:method => options[:method],
:skip_index => options[:skip_index] || false,
- :lookup => options[:lookup]
+ :lookup => options[:lookup],
+ :language => options[:language]
)
end
diff --git a/lib/geocoder/stores/base.rb b/lib/geocoder/stores/base.rb
index fd3ccaee..ff39aa35 100644
--- a/lib/geocoder/stores/base.rb
+++ b/lib/geocoder/stores/base.rb
@@ -101,7 +101,7 @@ module Geocoder
return
end
- query_options = [:lookup, :ip_lookup].inject({}) do |hash, key|
+ query_options = [:lookup, :ip_lookup, :language].inject({}) do |hash, key|
if options.has_key?(key)
val = options[key]
hash[key] = val.respond_to?(:call) ? val.call(self) : val
--
GitLab