Added i18n for facebook logout

envylabs · Mar 4, 2010 · e260edd · e260edd
1 parent 554164b
commit e260edd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/app/controllers/blue_light_special/users_controller.rb b/app/controllers/blue_light_special/users_controller.rb
@@ -13,7 +13,6 @@ def new
   def create
     @user = ::User.new params[:user]
     if @user.save
-      flash_notice_after_create
       redirect_to(url_after_create)
     else
       render :template => 'users/new'
@@ -22,13 +21,6 @@ def create
 
   private
 
-  def flash_notice_after_create
-    flash[:notice] = translate(:deliver_confirmation,
-      :scope   => [:blue_light_special, :controllers, :users],
-      :default => "You will receive an email within the next few minutes. " <<
-                  "It contains instructions for confirming your account.")
-  end
-
   def url_after_create
     sign_in_url
   end

diff --git a/lib/blue_light_special/authentication.rb b/lib/blue_light_special/authentication.rb
@@ -133,9 +133,7 @@ def impersonating?
 
       ##
       # Sets up the facebook session if the logged-in user is from facebook
-      #--
-      # FIXME: Use i18n interface for flash.
-      #++
+      #
       def find_facebook_session
         set_facebook_session
         if facebook_session
@@ -147,7 +145,9 @@ def find_facebook_session
           facebook_sign_out
         end
       rescue Facebooker::Session::SessionExpired
-        flash.now[:error] = "You have logged out of Facebook"
+        flash.now[:error] = translate(:facebook_log_out,
+          :scope   => [:blue_light_special, :authentication],
+          :default => "You have logged out of Facebook")
         facebook_sign_out
       rescue NoMethodError
         facebook_sign_out

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
@@ -38,14 +38,6 @@ class UsersControllerTest < ActionController::TestCase
 
       should_assign_to :user
       should_change 'User.count', :by => 1
-
-      should "send the confirmation email" do
-        assert_sent_email do |email|
-          email.subject =~ /account confirmation/i
-        end
-      end
-
-      should_set_the_flash_to /confirm/i
       should_redirect_to_url_after_create
     end
   end

diff --git a/test/rails_root/config/locales/en.yml b/test/rails_root/config/locales/en.yml
@@ -1,5 +1,7 @@
 en:
   blue_light_special:
+    authentication:
+      facebook_log_out: Bye bye Facebook
     models:
       blue_light_special_mailer:
         change_password: Change your password