Merge pull request #3678 from AntonKhorev/close-button-margins

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

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index a9dbc85396cb675381b074c88cfe8503e020fbe1..23f8ce7ec51c138f903349d7780ab62bf236a276 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -28,7 +28,7 @@ class TracesController < ApplicationController
     @title = if target_user.nil?
                t ".public_traces"
              elsif current_user && current_user == target_user
-               t ".my_traces"
+               t ".my_gps_traces"
              else
                t ".public_traces_from", :user => target_user.display_name
              end
@@ -119,7 +119,7 @@ class TracesController < ApplicationController
                          :description => params[:trace][:description],
                          :visibility => params[:trace][:visibility],
                          :inserted => false, :user => current_user,
-                         :timestamp => Time.now.getutc)
+                         :timestamp => Time.now.utc)
       @trace.valid?
       @trace.errors.add(:gpx_file, "can't be blank")
 
@@ -266,7 +266,7 @@ class TracesController < ApplicationController
       :visibility => visibility,
       :inserted => false,
       :user => current_user,
-      :timestamp => Time.now.getutc,
+      :timestamp => Time.now.utc,
       :file => file
     )