Qualify SCALE properly - apparently object visibility when running the

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 0b2ec168a061e2cb97de9cb08e8798442b9f6352..f4ff7fb7098bad18bf7dd28f293ffd4c7d6102ec 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,8 +2,8 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   layout 'site'
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]

-  before_filter :set_locale, :except => [:api_details, :api_gpx_files]

   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]

+  before_filter :set_locale, :except => [:api_details, :api_gpx_files]

   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
   before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]
   before_filter :check_database_writable, :only => [:login, :new, :set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
   before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]
   before_filter :check_database_writable, :only => [:login, :new, :set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]


@@ -12,7 +12,7 @@ class UserController < ApplicationController
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
   def save
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
   def save

-    @title = 'create account'
+    @title = t 'user.new.title'

 
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
 
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'


@@ -23,11 +23,10 @@ class UserController < ApplicationController
       @user.data_public = true
       @user.description = "" if @user.description.nil?
       @user.creation_ip = request.remote_ip
       @user.data_public = true
       @user.description = "" if @user.description.nil?
       @user.creation_ip = request.remote_ip

-      @user.locale = Language.find_by_code(I18n.locale.to_s)
-      @user.locale = Language.find_by_code("en") if @user.locale.nil?
+      @user.languages = request.user_preferred_languages

 
       if @user.save
 
       if @user.save

-        flash[:notice] = I18n.t('user.new.create success message')
+        flash[:notice] = t 'user.new.flash create success message'

         Notifier.deliver_signup_confirm(@user, @user.tokens.create)
         redirect_to :action => 'login'
       else
         Notifier.deliver_signup_confirm(@user, @user.tokens.create)
         redirect_to :action => 'login'
       else


@@ -37,7 +36,8 @@ class UserController < ApplicationController
   end
 
   def account
   end
 
   def account

-    @title = 'edit account'
+    @title = t 'user.account.title'
+

     if params[:user] and params[:user][:display_name] and params[:user][:description]
       if params[:user][:email] != @user.email
         @user.new_email = params[:user][:email]
     if params[:user] and params[:user][:display_name] and params[:user][:description]
       if params[:user][:email] != @user.email
         @user.new_email = params[:user][:email]


@@ -51,15 +51,18 @@ class UserController < ApplicationController
       end
 
       @user.description = params[:user][:description]
       end
 
       @user.description = params[:user][:description]

+      @user.languages = params[:user][:languages].split(",")

       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
       if @user.save
       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
       if @user.save

+        set_locale
+

         if params[:user][:email] == @user.new_email
         if params[:user][:email] == @user.new_email

-          flash[:notice] = I18n.t('user.account.flash update success confirm needed')
+          flash[:notice] = t 'user.account.flash update success confirm needed'

           Notifier.deliver_email_confirm(@user, @user.tokens.create)
         else
           Notifier.deliver_email_confirm(@user, @user.tokens.create)
         else

-          flash[:notice] = I18n.t('user.account.flash update success')
+          flash[:notice] = t 'user.account.flash update success'

         end
       end
     end
         end
       end
     end


@@ -70,7 +73,7 @@ class UserController < ApplicationController
       @user.home_lat = params[:user][:home_lat].to_f
       @user.home_lon = params[:user][:home_lon].to_f
       if @user.save
       @user.home_lat = params[:user][:home_lat].to_f
       @user.home_lon = params[:user][:home_lon].to_f
       if @user.save

-        flash[:notice] = I18n.t('user.set_home.flash success')
+        flash[:notice] = t 'user.set_home.flash success'

         redirect_to :controller => 'user', :action => 'account'
       end
     end
         redirect_to :controller => 'user', :action => 'account'
       end
     end


@@ -79,50 +82,57 @@ class UserController < ApplicationController
   def go_public
     @user.data_public = true
     @user.save
   def go_public
     @user.data_public = true
     @user.save

-    flash[:notice] = I18n.t('user.go_public.flash success')
+    flash[:notice] = t 'user.go_public.flash success'

     redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password
     redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password

-    @title = I18n.t('user.lost_password.title')
+    @title = t 'user.lost_password.title'
+

     if params[:user] and params[:user][:email]
       user = User.find_by_email(params[:user][:email], :conditions => {:visible => true})
 
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)
     if params[:user] and params[:user][:email]
       user = User.find_by_email(params[:user][:email], :conditions => {:visible => true})
 
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)

-        flash[:notice] = I18n.t('user.lost_password.notice.email on way')
+        @notice = t 'user.lost_password.notice email on way'

       else
       else

-        flash[:notice] = I18n.t('user.lost_password.notice email cannot find')
+        @notice = t 'user.lost_password.notice email cannot find'

       end
     end
   end
 
   def reset_password
       end
     end
   end
 
   def reset_password

-    @title = I18n.t('user.reset_password.title')
-    if params['token']
+    @title = t 'user.reset_password.title'
+
+    if params[:token]

       token = UserToken.find_by_token(params[:token])
       token = UserToken.find_by_token(params[:token])

+

       if token
       if token

-        pass = OSM::make_token(8)
-        user = token.user
-        user.pass_crypt = pass
-        user.pass_crypt_confirmation = pass
-        user.active = true
-        user.email_valid = true
-        user.save!
-        token.destroy
-        Notifier.deliver_reset_password(user, pass)
-        flash[:notice] = I18n.t('user.reset_password.flash changed check mail')
+        @user = token.user
+
+        if params[:user]
+          @user.pass_crypt = params[:user][:pass_crypt]
+          @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+          @user.active = true
+          @user.email_valid = true
+
+          if @user.save
+            token.destroy
+            flash[:notice] = t 'user.reset_password.flash changed'
+            redirect_to :action => 'login'
+          end
+        end

       else
       else

-        flash[:notice] = I18n.t('user.reset_password.flash token bad')
+        flash[:notice] = t 'user.reset_password.flash token bad'
+        redirect_to :action => 'lost_password'

       end
     end
       end
     end

-
-    redirect_to :action => 'login'

   end
 
   def new
   end
 
   def new

-    @title = 'create account'
+    @title = t 'user.new.title'
+

     # The user is logged in already, so don't show them the signup page, instead
     # send them to the home page
     redirect_to :controller => 'site', :action => 'index' if session[:user]
     # The user is logged in already, so don't show them the signup page, instead
     # send them to the home page
     redirect_to :controller => 'site', :action => 'index' if session[:user]


@@ -138,7 +148,9 @@ class UserController < ApplicationController
       end
       return
     end
       end
       return
     end

-    @title = 'login'
+
+    @title = t 'user.login.title'
+

     if params[:user]
       email_or_display_name = params[:user][:email]
       pass = params[:user][:password]
     if params[:user]
       email_or_display_name = params[:user][:email]
       pass = params[:user][:password]


@@ -152,9 +164,9 @@ class UserController < ApplicationController
         end
         return
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
         end
         return
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)

-        @notice = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+        @notice = t 'user.login.account not active'

       else
       else

-        @notice = "Sorry, couldn't log in with those details."
+        @notice = t 'user.login.auth failure'

       end
     end
   end
       end
     end
   end


@@ -184,11 +196,11 @@ class UserController < ApplicationController
         @user.email_valid = true
         @user.save!
         token.destroy
         @user.email_valid = true
         @user.save!
         token.destroy

-        flash[:notice] = 'Confirmed your account, thanks for signing up!'
+        flash[:notice] = t 'user.confirm.success'

         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else

-        @notice = 'Something went wrong confirming that user.'
+        @notice = t 'user.confirm.failure'

       end
     end
   end
       end
     end
   end


@@ -204,11 +216,11 @@ class UserController < ApplicationController
         @user.email_valid = true
         @user.save!
         token.destroy
         @user.email_valid = true
         @user.save!
         token.destroy

-        flash[:notice] = 'Confirmed your email address, thanks for signing up!'
+        flash[:notice] = t 'user.confirm_email.success'

         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else

-        @notice = 'Something went wrong confirming that email address.'
+        @notice = t 'user.confirm_email.failure'

       end
     end
   end
       end
     end
   end


@@ -243,6 +255,7 @@ class UserController < ApplicationController
     if @this_user
       @title = @this_user.display_name
     else
     if @this_user
       @title = @this_user.display_name
     else

+      @title = t 'user.no_such_user.title'

       @not_found_user = params[:display_name]
       render :action => 'no_such_user', :status => :not_found
     end
       @not_found_user = params[:display_name]
       render :action => 'no_such_user', :status => :not_found
     end


@@ -257,13 +270,13 @@ class UserController < ApplicationController
       friend.friend_user_id = new_friend.id
       unless @user.is_friends_with?(new_friend)
         if friend.save
       friend.friend_user_id = new_friend.id
       unless @user.is_friends_with?(new_friend)
         if friend.save

-          flash[:notice] = "#{name} is now your friend."
+          flash[:notice] = t 'user.make_friend.success', :name => name

           Notifier.deliver_friend_notification(friend)
         else
           Notifier.deliver_friend_notification(friend)
         else

-          friend.add_error("Sorry, failed to add #{name} as a friend.")
+          friend.add_error(t('user.make_friend.failed', :name => name))

         end
       else
         end
       else

-        flash[:notice] = "You are already friends with #{name}."  
+        flash[:notice] = t 'user.make_friend.already_a_friend', :name => name

       end
 
       redirect_to :controller => 'user', :action => 'view'
       end
 
       redirect_to :controller => 'user', :action => 'view'


@@ -276,9 +289,9 @@ class UserController < ApplicationController
       friend = User.find_by_display_name(name, :conditions => {:visible => true})
       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
       friend = User.find_by_display_name(name, :conditions => {:visible => true})
       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"

-        flash[:notice] = "#{friend.display_name} was removed from your friends."
+        flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name

       else
       else

-        flash[:notice] = "#{friend.display_name} is not one of your friends."
+        flash[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name

       end
 
       redirect_to :controller => 'user', :action => 'view'
       end
 
       redirect_to :controller => 'user', :action => 'view'