X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/24f6aeda6a1b657d68a4e66f3a34d14ef408d652..945c9a635ab815753550006cfe5c1f8c4999a68d:/app/helpers/application_helper.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index faf538fa9..17c36bdfe 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -26,11 +26,11 @@ module ApplicationHelper end def friendly_date(date) - tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly)) + tag.time(time_ago_in_words(date), :title => l(date, :format => :friendly), :datetime => date.xmlschema) end def friendly_date_ago(date) - tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly)) + tag.time(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly), :datetime => date.xmlschema) end def body_class @@ -48,23 +48,18 @@ module ApplicationHelper def application_data data = { :locale => I18n.locale, - :preferred_editor => preferred_editor + :preferred_editor => preferred_editor, + :preferred_languages => preferred_languages.expand.map(&:to_s) } if current_user data[:user] = current_user.id.to_json - data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil? + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } if current_user.home_location? end data[:location] = session[:location] if session[:location] - - if oauth_token - data[:token] = oauth_token.token - data[:token_secret] = oauth_token.secret - data[:consumer_key] = oauth_token.client_application.key - data[:consumer_secret] = oauth_token.client_application.secret - end + data[:oauth_token] = oauth_token.token if oauth_token data end @@ -77,5 +72,7 @@ module ApplicationHelper else flash end + rescue StandardError + flash.inspect if Rails.env.development? end end