Reorganised OAuth clients and tokens details page. Made clients info editable and...

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

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 33f6d0df72fcf1777e7f89f1fe966ac95c45e217..17b66796923f9e4021bb29a93733913e99f95fdc 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,14 +1,16 @@
 class TraceController < ApplicationController
   layout 'site'
 
-  before_filter :set_locale
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user, :only => [:mine, :create, :edit, :delete, :make_public]
   before_filter :authorize, :only => [:api_details, :api_data, :api_create]
   before_filter :check_database_readable, :except => [:api_details, :api_data, :api_create]
   before_filter :check_database_writable, :only => [:create, :edit, :delete, :make_public]
   before_filter :check_api_readable, :only => [:api_details, :api_data]
   before_filter :check_api_writable, :only => [:api_create]
+  before_filter :require_allow_read_gpx, :only => [:api_details, :api_data]
+  before_filter :require_allow_write_gpx, :only => [:api_create]
  
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
@@ -18,6 +20,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
@@ -26,14 +29,14 @@ class TraceController < ApplicationController
 
     # set title
     if target_user.nil?
-      @title = "Public GPS traces"
+      @title = t 'trace.list.public_traces'
     elsif @user and @user == target_user
-      @title = "Your GPS traces"
+      @title = t 'trace.list.your_traces'
     else
-      @title = "Public GPS traces from #{target_user.display_name}"
+      @title = t 'trace.list.public_traces_from', :user => target_user.display_name
     end
 
-    @title += " tagged with #{params[:tag]}" if params[:tag]
+    @title += t 'trace.list.tagged_with', :tags => params[:tag] if params[:tag]
 
     # four main cases:
     # 1 - all traces, logged in = all public traces + all user's (i.e + all mine)
@@ -108,13 +111,13 @@ class TraceController < ApplicationController
 
     if @trace and @trace.visible? and
        (@trace.public? or @trace.user == @user)
-      @title = "Viewing trace #{@trace.name}"
+      @title = t 'trace.view.title', :name => @trace.name
     else
-      flash[:notice] = "Trace not found!"
+      flash[:notice] = t 'trace.view.trace_not_found'
       redirect_to :controller => 'trace', :action => 'list'
     end
   rescue ActiveRecord::RecordNotFound
-    flash[:notice] = "Trace not found!"
+    flash[:notice] = t 'trace.view.trace_not_found'
     redirect_to :controller => 'trace', :action => 'list'
   end
 
@@ -127,7 +130,7 @@ class TraceController < ApplicationController
 
         if @trace.id
           logger.info("id is #{@trace.id}")
-          flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+          flash[:notice] = t 'trace.create.trace_uploaded'
 
           redirect_to :action => 'mine'
         end
@@ -142,6 +145,7 @@ class TraceController < ApplicationController
         @trace.errors.add(:gpx_file, "can't be blank")
       end
     end
+    @title = t 'trace.create.upload_trace'
   end
 
   def data
@@ -164,6 +168,7 @@ class TraceController < ApplicationController
     @trace = Trace.find(params[:id])
 
     if @user and @trace.user == @user
+      @title = t 'trace.edit.title', :name => @trace.name
       if params[:trace]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]
@@ -185,7 +190,7 @@ class TraceController < ApplicationController
       if request.post? and trace.visible?
         trace.visible = false
         trace.save
-        flash[:notice] = 'Track scheduled for deletion'
+        flash[:notice] = t 'trace.delete.scheduled_for_deletion'
         redirect_to :controller => 'traces', :action => 'mine'
       else
         render :nothing => true, :status => :bad_request
@@ -204,7 +209,7 @@ class TraceController < ApplicationController
       if request.post? and !trace.public?
         trace.public = true
         trace.save
-        flash[:notice] = 'Track made public'
+        flash[:notice] = t 'trace.make_public.made_public'
         redirect_to :controller => 'trace', :action => 'view', :id => params[:id]
       else
         render :nothing => true, :status => :bad_request