From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Aug 2015 20:21:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1045'
X-Git-Tag: live~4066
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dca0be1886d9b9fcd2cab1b7c82ac4132fbf722b?hp=91bd0b4b12469746a6e867332262907e35b2a013

Merge remote-tracking branch 'openstreetmap/pull/1045'
---

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index d2928068d..9f2e50a6f 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -101,6 +101,8 @@ L.OSM.layers = function(options) {
         map.fire('baselayerchange', {layer: layer});
       });
 
+      item.on('dblclick', toggle);
+
       map.on('layeradd layerremove', function() {
         item.toggleClass('active', map.hasLayer(layer));
         input.prop('checked', map.hasLayer(layer));
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 0f77c87a0..37f9cd7c2 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -45,7 +45,7 @@ class UserController < ApplicationController
         @user.terms_seen = true
 
         if @user.save
-          flash[:notice] = t "user.new.terms declined", :url => t("user.new.terms declined url")
+          flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
         end
 
         if params[:referer]
@@ -330,7 +330,7 @@ class UserController < ApplicationController
       flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
     else
       Notifier.signup_confirm(user, user.tokens.create).deliver_now
-      flash[:notice] = t "user.confirm_resend.success", :email => user.email
+      flash[:notice] = t("user.confirm_resend.success", :email => user.email).html_safe
     end
 
     redirect_to :action => "login"