X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7ccd11ebf3c8e119a04119a2e89ce6a879560578..f75eb6fe9ef1e0a755c1a1810c5ca15ed58d9d08:/app/views/site/_potlatch2.html.erb?ds=inline diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index eb2a59376..bab612491 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -1,7 +1,7 @@ <%= javascript_include_tag "edit/potlatch2" %>
- <% session[:token] = current_user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) -%> + <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%> <% data = { :token => session[:token] } -%> <% data[:lat] = @lat if @lat -%> <% data[:lon] = @lon if @lon -%> @@ -15,5 +15,5 @@ <% end %> <% data[:locale] = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s -%> <% data[:locale_path] = asset_path("potlatch2/locales/#{Potlatch2::LOCALES[data[:locale]]}.swf") -%> - <%= content_tag :div, raw(t("site.edit.flash_player_required")), :id => "potlatch", :data => data %> + <%= content_tag :div, t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>