summaryrefslogtreecommitdiff
path: root/modules/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-08-16 18:02:48 +0000
committerDries Buytaert <dries@buytaert.net>2004-08-16 18:02:48 +0000
commit2f33b939c5dc73364a0e2073ea9410516d66242f (patch)
tree665361c02a1d68d05b55755a00da368417a0dc99 /modules/user.module
parent4545f798a9876716fb9ef56190d879bf62c49fdf (diff)
downloadbrdo-2f33b939c5dc73364a0e2073ea9410516d66242f.tar.gz
brdo-2f33b939c5dc73364a0e2073ea9410516d66242f.tar.bz2
- Patch #9983 by Stefan: usability improvement: made sure all status messages start with a capital letter.
Diffstat (limited to 'modules/user.module')
-rw-r--r--modules/user.module22
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/user.module b/modules/user.module
index 9a47d8f05..6c89b24cc 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1046,7 +1046,7 @@ function user_edit_validate($uid, &$edit) {
// Validate the e-mail address:
if ($error = user_validate_mail($edit['mail'])) {
- form_set_error('mail', $error);
+ form_set_error('mail', ucfirst($error));
}
else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
form_set_error('mail', t('The e-mail address "%s" is already taken.', array('%s' => $edit['mail'])));
@@ -1091,7 +1091,7 @@ function user_edit($category = 'account') {
}
else {
user_save($account, $edit, $category);
- drupal_set_message(t('the changes have been saved.'));
+ drupal_set_message(t('The changes have been saved.'));
drupal_goto("user/$account->uid");
}
}
@@ -1101,13 +1101,13 @@ function user_edit($category = 'account') {
db_query('DELETE FROM {users} WHERE uid = %d', $account->uid);
db_query('DELETE FROM {users_roles} WHERE uid = %d', $account->uid);
db_query('DELETE FROM {authmap} WHERE uid = %d', $account->uid);
- drupal_set_message(t('the account has been deleted.'));
+ drupal_set_message(t('The account has been deleted.'));
module_invoke_all('user', 'delete', $edit, $account);
print theme('page', user_admin_account());
drupal_goto('admin/user');
}
else {
- drupal_set_message(t('failed to delete account: the account has to be blocked first.'), 'error');
+ drupal_set_message(t('Failed to delete account: the account has to be blocked first.'), 'error');
}
}
@@ -1279,7 +1279,7 @@ function user_admin_create($edit = array()) {
user_save('', array('name' => $edit['name'], 'pass' => $edit['pass'], 'init' => $edit['mail'], 'mail' => $edit['mail'], 'roles' => array(_user_authenticated_id()), 'status' => 1));
- drupal_set_message(t('created a new user account. No e-mail has been sent.'));
+ drupal_set_message(t('Created a new user account. No e-mail has been sent.'));
return;
}
@@ -1308,19 +1308,19 @@ function user_admin_access($edit = array()) {
if ($op == t('Add rule')) {
$aid = db_next_id('{access}_aid');
db_query("INSERT INTO {access} (aid, mask, type, status) VALUES ('%s', '%s', '%s', %d)", $aid, $edit['mask'], $type, $edit['status']);
- drupal_set_message(t('the access rule has been added.'));
+ drupal_set_message(t('The access rule has been added.'));
}
else if ($op == t('Check')) {
if (user_deny($type, $edit['test'])) {
- drupal_set_message(t('<em>%test</em> is not allowed.', array('%test' => $edit['test'])));
+ drupal_set_message(t('<em>%test</em> is not allowed.', array('%test' => ucfirst($edit['test']))));
}
else {
- drupal_set_message(t('<em>%test</em> is allowed.', array('%test' => $edit['test'])));
+ drupal_set_message(t('<em>%test</em> is allowed.', array('%test' => ucfirst($edit['test']))));
}
}
else if ($id) {
db_query('DELETE FROM {access} WHERE aid = %d', $id);
- drupal_set_message(t('the access rule has been deleted.'));
+ drupal_set_message(t('The access rule has been deleted.'));
}
$header = array(t('type'), t('mask'), t('operations'));
@@ -1524,14 +1524,14 @@ function user_configure() {
$output = user_admin_access($edit);
break;
case t('Save permissions'):
- drupal_set_message(t('the user permissions have been saved.'));
+ drupal_set_message(t('The user permissions have been saved.'));
case 'permission':
$output = user_admin_perm($edit);
break;
case t('Add role'):
case t('Delete role'):
case t('Save role'):
- drupal_set_message(t('your role changes were saved.'));
+ drupal_set_message(t('Your role changes were saved.'));
case 'role':
$output = user_admin_role($edit);
break;