audited all flashes for internationalization. saw failures for every …

…flash & email eubject when locales/en.yml was altered.
thoughtbot · May 17, 2009 · be7d139 · marcelgoerner · May 18, 2009 · be7d139
1 parent ca16aa9
commit be7d139
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/app/controllers/clearance/passwords_controller.rb b/app/controllers/clearance/passwords_controller.rb
@@ -21,7 +21,7 @@ def create
     else
       flash.now[:failure] = translate(:unknown_email,
         :scope   => [:clearance, :controllers, :passwords],
-        :default => "Unknown email")
+        :default => "Unknown email.")
       render :template => 'passwords/new'
     end
   end
@@ -38,9 +38,7 @@ def update
                              params[:user][:password_confirmation])
       @user.confirm_email! unless @user.email_confirmed?
       sign_user_in(@user)
-      flash[:success] = translate(:signed_in,
-        :scope   => [:clearance, :controllers, :passwords],
-        :default => "Signed in.")
+      flash[:success] = translate(:signed_in, :default => "Signed in.")
       redirect_to url_after_update
     else
       render :template => 'passwords/edit'

diff --git a/app/controllers/clearance/sessions_controller.rb b/app/controllers/clearance/sessions_controller.rb
@@ -34,9 +34,7 @@ def create
 
   def destroy
     forget(current_user)
-    flash[:success] = translate(:signed_out,
-      :scope   => [:clearance, :controllers, :sessions],
-      :default =>  "Signed out.")
+    flash[:success] = translate(:signed_out, :default =>  "Signed out.")
     redirect_to url_after_destroy
   end
 

diff --git a/test/rails_root/config/environment.rb b/test/rails_root/config/environment.rb
@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), 'boot')
-require 'md5' # Need this up here to generate the session[:secret] value down there
+require 'md5'
 
 Rails::Initializer.run do |config|
   config.load_paths += Dir.glob(File.join(RAILS_ROOT, 'vendor', 'gems', '*', 'lib'))

diff --git a/test/rails_root/config/locales/en.yml b/test/rails_root/config/locales/en.yml
@@ -1,18 +1,19 @@
 en:
-  clearance: 
+  clearance:
     models:
       clearance_mailer:
-        change_password: Change your password 
-        confirmation: Account confirmation 
+        change_password: Change your password
+        confirmation: Account confirmation
     controllers:
-      confirmations: 
+      confirmations:
         confirmed_email: Confirmed email and signed in.
-      passwords: 
+      passwords:
         deliver_change_password: You will receive an email within the next few minutes. It contains instructions for changing your password.
-        unknown_email: Unknown email
+        unknown_email: Unknown email.
       sessions:
+        bad_email_or_password: Bad email or password.
         unconfirmed_email: User has not confirmed email. Confirmation email will be resent.
       users:
         deliver_confirmation: You will receive an email within the next few minutes. It contains instructions for confirming your account.
-  signed_in: Signed in
-  signed_out: Signed out
+  signed_in: Signed in.
+  signed_out: Signed out.
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -6,7 +6,7 @@
 $: << File.expand_path(File.dirname(__FILE__) + '/..')
 require 'clearance'
 
-gem 'thoughtbot-factory_girl' # from github
+gem 'thoughtbot-factory_girl'
 
 require 'factory_girl'
 require 'redgreen' rescue LoadError