summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/locales/en/users.en.yml16
-rw-r--r--test/functional/users_controller_test.rb1
2 files changed, 9 insertions, 8 deletions
diff --git a/config/locales/en/users.en.yml b/config/locales/en/users.en.yml
index 65014bb..e2a880c 100644
--- a/config/locales/en/users.en.yml
+++ b/config/locales/en/users.en.yml
@@ -55,14 +55,14 @@ en:
tickets: "Create and check support tickets."
email: "Modify email settings."
account: "Destroy your account."
- actions:
- toggle_user: "Enable / Disable User"
- enable_user: "Enable User"
- disable_user: "Disable User"
- confirm_user_deactivation: "Are you sure you want to deactive user with username '%{username}'?"
- confirm_user_activation: "Are you sure you want to activate user with username '%{username}'?"
- user_disabled_message: "User with username '%{username}' has been disabled."
- user_enabled_message: "User with username '%{username}' has been enabled."
+ actions:
+ toggle_user: "Enable / Disable User"
+ enable_user: "Enable User"
+ disable_user: "Disable User"
+ confirm_user_deactivation: "Are you sure you want to deactive user with username '%{username}'?"
+ confirm_user_activation: "Are you sure you want to activate user with username '%{username}'?"
+ user_disabled_message: "User with username '%{username}' has been disabled."
+ user_enabled_message: "User with username '%{username}' has been enabled."
#
# rails
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 7d1745c..70f483e 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -158,6 +158,7 @@ class UsersControllerTest < ActionController::TestCase
login :is_admin? => true
+ @request.env['HTTP_REFERER'] = 'http://test.com/sessions/new'
post :deactivate, :id => user.id
assert !assigns(:user).enabled?
end