On Thursday 12 January 2012 16:53:08 Matt Wagner wrote:
Implements
https://bugzilla.redhat.com/show_bug.cgi?id=767210
---
src/app/views/users/show.html.haml | 2 +-
src/config/locales/en.yml | 4 ++--
src/features/user.feature | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/views/users/show.html.haml
b/src/app/views/users/show.html.haml index d1b0f6a..63aa794 100644
--- a/src/app/views/users/show.html.haml
+++ b/src/app/views/users/show.html.haml
@@ -2,7 +2,7 @@
%header.admin-page-header
#obj_actions
=t'users.return_to'
- = link_to "Users & Groups", users_path, :class =>
'rounded-link'
+ = link_to t('users.users_groups'), users_path, :class =>
'rounded-link'
%section.admin-content-section.user
.content
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 895a23e..e74ec9e 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -6,7 +6,7 @@ en:
one: 1 hour
other: %{count} hours
users:
- users_groups: "Users & Groups"
+ users_groups: "Users"
better will be change the key to 'user' also.
The influenced files after the change:
app/views/users/new.html.haml:6
app/views/users/show.html.haml:5
app/views/users/edit.html.haml:9
return_to: "Return to:"
users: Users
confirm_delete: "Are you sure you want to delete this user?"
@@ -1179,7 +1179,7 @@ en:
monitor: Monitor
administer: Administer
second_level:
- users_groups: Users & Groups
+ users_groups: Users
here the same as above.
The influenced files after the change:
config/navigation.rb:23
environments: Environments
content: Content
cloud_providers: Cloud Providers
diff --git a/src/features/user.feature b/src/features/user.feature
index 516dae7..01a8467 100644
--- a/src/features/user.feature
+++ b/src/features/user.feature
@@ -75,7 +75,7 @@ Feature: Manage Users
| First name | Joe |
| Last name | Tester |
| E-mail | testuser2(a)example.com |
- And I follow "Users & Groups"
+ And I follow "Users"
Then I should be on the users page
And there should not be user with login "canceluser"
ACK with an inline suggestion and one nit:
In config/navigation.rb is
first_level.item :administer, t('navigation.first_level.administer'),
users_path, :class => 'administer' do |second_level|
second_level.item :users_and_groups,
t('navigation.second_level.users_groups'), users_path, :link => { :class =>
'users' }, :highlights_on => /\/users|\/roles|\/permissions|\/account/
please change the key :users_and_groups and
t('navigation.second_level.users_groups') according to en.yml(if u change the
key)