From 3e24df161b6f3b4946cf702aa780008069161406 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 15 Nov 2007 13:13:35 -0500 Subject: Replace references to Person and People with User and Users --- ipa-server/ipa-gui/ipagui/subcontrollers/user.py | 6 +++--- ipa-server/ipa-gui/ipagui/templates/master.kid | 4 ++-- ipa-server/ipa-gui/ipagui/templates/useredit.kid | 4 ++-- ipa-server/ipa-gui/ipagui/templates/usereditform.kid | 8 ++++---- ipa-server/ipa-gui/ipagui/templates/userlayout.kid | 4 ++-- ipa-server/ipa-gui/ipagui/templates/userlist.kid | 8 ++++---- ipa-server/ipa-gui/ipagui/templates/usernew.kid | 4 ++-- ipa-server/ipa-gui/ipagui/templates/usernewform.kid | 4 ++-- ipa-server/ipa-gui/ipagui/templates/usershow.kid | 8 ++++---- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py index 290ad25cb..7d266f0d5 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py @@ -183,7 +183,7 @@ class UserController(IPAController): rv = client.add_user(new_user) except ipaerror.exception_for(ipaerror.LDAP_DUPLICATE): - turbogears.flash("Person with login '%s' already exists" % + turbogears.flash("User with login '%s' already exists" % kw.get('uid')) return dict(form=user_new_form, user=kw, tg_template='ipagui.templates.usernew') @@ -219,7 +219,7 @@ class UserController(IPAController): try: client.modifyPassword(user_dict['krbprincipalname'], "", kw.get('userpassword')) except ipaerror.IPAError, e: - message = "Person successfully created.
" + message = "User successfully created.
" message += "There was an error setting the password.
" turbogears.flash(message) return dict(form=user_edit_form, user=user_dict, @@ -242,7 +242,7 @@ class UserController(IPAController): failed_adds = dnadds if len(failed_adds) > 0: - message = "Person successfully created.
" + message = "User successfully created.
" message += "There was an error adding groups.
" message += "Failures have been preserved in the add/remove lists." turbogears.flash(message) diff --git a/ipa-server/ipa-gui/ipagui/templates/master.kid b/ipa-server/ipa-gui/ipagui/templates/master.kid index 6b97c73fd..12e54fa1d 100644 --- a/ipa-server/ipa-gui/ipagui/templates/master.kid +++ b/ipa-server/ipa-gui/ipagui/templates/master.kid @@ -70,8 +70,8 @@ -

Edit Person

+

Edit User

+ value="Update User"/> @@ -847,11 +847,11 @@ from ipagui.helpers import ipahelper
+ value="Update User"/> diff --git a/ipa-server/ipa-gui/ipagui/templates/userlayout.kid b/ipa-server/ipa-gui/ipagui/templates/userlayout.kid index bbeb81399..c4e8104e6 100644 --- a/ipa-server/ipa-gui/ipagui/templates/userlayout.kid +++ b/ipa-server/ipa-gui/ipagui/templates/userlayout.kid @@ -15,8 +15,8 @@ diff --git a/ipa-server/ipa-gui/ipagui/templates/userlist.kid b/ipa-server/ipa-gui/ipagui/templates/userlist.kid index fdeeb3169..9ca3753d0 100644 --- a/ipa-server/ipa-gui/ipagui/templates/userlist.kid +++ b/ipa-server/ipa-gui/ipagui/templates/userlist.kid @@ -3,15 +3,15 @@ py:extends="'userlayout.kid'"> -Find People +Find Users -

Find People

+

Find Users