cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to http_accept_language 2.x

Browse source
This commit is contained in:
Tom Hughes 2013-09-24 20:22:44 +01:00
parent 029547855f
commit 0e9e6e6f8f
8 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -45,7 +45,7 @@ gem 'oauth-plugin', '>= 0.5.1'
gem 'open_id_authentication', '>= 1.1.0'
gem 'validates_email_format_of', '>= 1.5.1'
gem 'composite_primary_keys', '>= 6.0.0'
gem 'http_accept_language', '~> 1.0.2'
gem 'http_accept_language', '~> 2.0.0'
gem 'paperclip', '~> 3.0'
gem 'deadlock_retry', '>= 1.2.0'
gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'

4
Gemfile.lock
View file

@ -55,7 +55,7 @@ GEM
multipart-post (~> 1.2.0)
hike (1.2.3)
htmlentities (4.3.1)
http_accept_language (1.0.2)
http_accept_language (2.0.0)
httpauth (0.2.0)
httpclient (2.3.4.1)
i18n (0.6.5)
@ -182,7 +182,7 @@ DEPENDENCIES
dynamic_form
ejs
htmlentities
http_accept_language (~> 1.0.2)
http_accept_language (~> 2.0.0)
httpclient
iconv (= 0.1)
jquery-rails

4
app/controllers/amf_controller.rb
View file

@ -185,10 +185,10 @@ class AmfController < ApplicationController
user = getuser(usertoken)
if user && !user.languages.empty?
request.user_preferred_languages = user.languages
http_accept_language.user_preferred_languages = user.languages
end
lang = request.compatible_language_from(getlocales)
lang = http_accept_language.compatible_language_from(getlocales)
(real_lang, localised) = getlocalized(lang)
# Tell Potlatch what language it's using

14
app/controllers/application_controller.rb
View file

@ -284,14 +284,14 @@ class ApplicationController < ActionController::Base
response.header['Vary'] = 'Accept-Language'
if @user && !@user.languages.empty?
request.user_preferred_languages = @user.languages
http_accept_language.user_preferred_languages = @user.languages
response.header['Vary'] = '*'
end
I18n.locale = select_locale
if @user && @user.languages.empty? && !request.user_preferred_languages.empty?
@user.languages = request.user_preferred_languages
if @user && @user.languages.empty? && !http_accept_language.user_preferred_languages.empty?
@user.languages = http_accept_language.user_preferred_languages
@user.save
end
@ -300,11 +300,11 @@ class ApplicationController < ActionController::Base
def select_locale(locales = I18n.available_locales)
if params[:locale]
request.user_preferred_languages = [ params[:locale] ]
http_accept_language.user_preferred_languages = [ params[:locale] ]
end
if request.compatible_language_from(locales).nil?
request.user_preferred_languages = request.user_preferred_languages.collect do |pl|
if http_accept_language.compatible_language_from(locales).nil?
http_accept_language.user_preferred_languages = http_accept_language.user_preferred_languages.collect do |pl|
pls = [ pl ]
while pl.match(/^(.*)-[^-]+$/)
@ -316,7 +316,7 @@ class ApplicationController < ActionController::Base
end.flatten
end
request.compatible_language_from(locales) || I18n.default_locale
http_accept_language.compatible_language_from(locales) || I18n.default_locale
end
helper_method :select_locale

4
app/controllers/geocoder_controller.rb
View file

@ -154,7 +154,7 @@ class GeocoderController < ApplicationController
end
# ask nominatim
response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
# create result array
@results = Array.new
@ -241,7 +241,7 @@ class GeocoderController < ApplicationController
@results = Array.new
# ask nominatim
response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}")
# parse the response
response.elements.each("reversegeocode/result") do |result|

2
app/controllers/user_controller.rb
View file

@ -79,7 +79,7 @@ class UserController < ApplicationController
@user.data_public = true
@user.description = "" if @user.description.nil?
@user.creation_ip = request.remote_ip
@user.languages = request.user_preferred_languages
@user.languages = http_accept_language.user_preferred_languages
@user.terms_agreed = Time.now.getutc
@user.terms_seen = true
@user.openid_url = nil if @user.openid_url and @user.openid_url.empty?

10
config/initializers/http_accept_language.rb
View file

@ -3,10 +3,12 @@
# https://github.com/iain/http_accept_language/pull/6
#
module HttpAcceptLanguage
def compatible_language_from(available_languages)
user_preferred_languages.find do |x|
available_languages.find { |y| y.to_s == x.to_s } ||
available_languages.find { |y| y.to_s =~ /^#{Regexp.escape(x.to_s)}-/ }
class Parser
def compatible_language_from(available_languages)
user_preferred_languages.find do |x|
available_languages.find { |y| y.to_s == x.to_s } ||
available_languages.find { |y| y.to_s =~ /^#{Regexp.escape(x.to_s)}-/ }
end
end
end
end

2
lib/nominatim.rb
View file

@ -3,7 +3,7 @@ module Nominatim
def self.describe_location(lat, lon, zoom = nil, language = nil)
zoom = zoom || 14
language = language || request.user_preferred_languages.join(',')
language = language || http_accept_language.user_preferred_languages.join(',')
Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do
url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"