]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/application_controller.rb
Merge branch 'master' into cancancan
[rails.git] / app / controllers / application_controller.rb
index 20fcc5f4739ff1bbb42054feec5c7042fa5fa28d..1df6dd7d14cf41e1fad3ac04eb4512fe231eec13 100644 (file)
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
       # don't allow access to any auth-requiring part of the site unless
       # the new CTs have been seen (and accept/decline chosen).
       elsif !current_user.terms_seen && flash[:skip_terms].nil?
-        flash[:notice] = t "user.terms.you need to accept or decline"
+        flash[:notice] = t "users.terms.you need to accept or decline"
         if params[:referer]
           redirect_to :controller => "users", :action => "terms", :referer => params[:referer]
         else