merge 15807:16012 from rails_port

[rails.git] / app / controllers / trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 49a3619153e33c8c29c9078d4438610690db2cac..c05145a7eb8c20cebd389481d253c3a6b843cb2b 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -18,6 +18,7 @@ class TraceController < ApplicationController
     if target_user.nil? and !display_name.blank?
       target_user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, display_name])
       if target_user.nil?
+        @title = t'trace.no_such_user.title'
         @not_found_user = display_name
         render :action => 'no_such_user', :status => :not_found
         return
@@ -114,7 +115,7 @@ class TraceController < ApplicationController
       redirect_to :controller => 'trace', :action => 'list'
     end
   rescue ActiveRecord::RecordNotFound
-    flash[:notice] = t 'trace.view.trace not found'
+    flash[:notice] = t 'trace.view.trace_not_found'
     redirect_to :controller => 'trace', :action => 'list'
   end