X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8fb5ad24c5751bd2d43b86e4359381d200af066..dcf56d9376680f924b080ad46ac547e3b7fb7324:/app/controllers/application_controller.rb?ds=inline diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5ee483ed4..97ab5abfc 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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 @@ -370,7 +370,7 @@ class ApplicationController < ActionController::Base rescue ActionView::Template::Error => ex ex = ex.original_exception - if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /^Timeout::Error/ + if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /execution expired/ ex = Timeout::Error.new end @@ -422,6 +422,28 @@ class ApplicationController < ActionController::Base request.body.rewind end + def map_layout + request.xhr? ? false : 'map' + end + + def preferred_editor + editor = if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor + else + DEFAULT_EDITOR + end + + if request.env['HTTP_USER_AGENT'] =~ /MSIE/ and editor == 'id' + editor = 'potlatch2' + end + + editor + end + + helper_method :preferred_editor + private # extract authorisation credentials from headers, returns user = nil if none