diff options
Diffstat (limited to 'openstack_dashboard/dashboards/identity/users')
| -rw-r--r-- | openstack_dashboard/dashboards/identity/users/tables.py | 24 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/identity/users/tests.py | 12 |
2 files changed, 18 insertions, 18 deletions
diff --git a/openstack_dashboard/dashboards/identity/users/tables.py b/openstack_dashboard/dashboards/identity/users/tables.py index d3345c01c..a2b9ba8bd 100644 --- a/openstack_dashboard/dashboards/identity/users/tables.py +++ b/openstack_dashboard/dashboards/identity/users/tables.py @@ -76,13 +76,13 @@ class ToggleEnabled(policy.PolicyTargetMixin, tables.BatchAction): def action_present(count): return ( ungettext_lazy( - u"Enable User", - u"Enable Users", + "Enable User", + "Enable Users", count ), ungettext_lazy( - u"Disable User", - u"Disable Users", + "Disable User", + "Disable Users", count ), ) @@ -91,13 +91,13 @@ class ToggleEnabled(policy.PolicyTargetMixin, tables.BatchAction): def action_past(count): return ( ungettext_lazy( - u"Enabled User", - u"Enabled Users", + "Enabled User", + "Enabled Users", count ), ungettext_lazy( - u"Disabled User", - u"Disabled Users", + "Disabled User", + "Disabled Users", count ), ) @@ -134,16 +134,16 @@ class DeleteUsersAction(policy.PolicyTargetMixin, tables.DeleteAction): @staticmethod def action_present(count): return ungettext_lazy( - u"Delete User", - u"Delete Users", + "Delete User", + "Delete Users", count ) @staticmethod def action_past(count): return ungettext_lazy( - u"Deleted User", - u"Deleted Users", + "Deleted User", + "Deleted Users", count ) policy_rules = (("identity", "identity:delete_user"),) diff --git a/openstack_dashboard/dashboards/identity/users/tests.py b/openstack_dashboard/dashboards/identity/users/tests.py index ebd532a24..232cad62f 100644 --- a/openstack_dashboard/dashboards/identity/users/tests.py +++ b/openstack_dashboard/dashboards/identity/users/tests.py @@ -855,8 +855,8 @@ class UsersViewTests(test.BaseAdminViewTests): res = self.client.post(USERS_INDEX_URL, formData, follow=True) self.assertEqual(list(res.context['messages'])[0].message, - u'You are not allowed to disable user: ' - u'test_user') + 'You are not allowed to disable user: ' + 'test_user') self.assert_mock_multiple_calls_with_same_arguments( self.mock_get_effective_domain_id, 2, @@ -889,8 +889,8 @@ class UsersViewTests(test.BaseAdminViewTests): res = self.client.post(USERS_INDEX_URL, formData, follow=True) self.assertEqual(list(res.context['messages'])[0].message, - u'You are not allowed to disable user: ' - u'test_user') + 'You are not allowed to disable user: ' + 'test_user') self.assert_mock_multiple_calls_with_same_arguments( self.mock_get_effective_domain_id, 2, @@ -919,7 +919,7 @@ class UsersViewTests(test.BaseAdminViewTests): res = self.client.post(USERS_INDEX_URL, formData, follow=True) self.assertEqual(list(res.context['messages'])[0].message, - u'You are not allowed to delete user: %s' + 'You are not allowed to delete user: %s' % self.request.user.username) self.assert_mock_multiple_calls_with_same_arguments( @@ -953,7 +953,7 @@ class UsersViewTests(test.BaseAdminViewTests): res = self.client.post(USERS_INDEX_URL, formData, follow=True) self.assertEqual(list(res.context['messages'])[0].message, - u'You are not allowed to delete user: %s' + 'You are not allowed to delete user: %s' % self.request.user.username) self.assert_mock_multiple_calls_with_same_arguments( |