From a4a3f7b61f557690a9a9c1a7430108a9b5c4f7b9 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 16 May 2014 13:32:49 +0000 Subject: [PATCH] Fix the wrong message for edit and delete group in admin --- admin/inc/class.admin_cmd_delete_account.inc.php | 8 ++++---- admin/inc/class.admin_cmd_edit_group.inc.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/inc/class.admin_cmd_delete_account.inc.php b/admin/inc/class.admin_cmd_delete_account.inc.php index e55ed3e97d..9a1c801fed 100644 --- a/admin/inc/class.admin_cmd_delete_account.inc.php +++ b/admin/inc/class.admin_cmd_delete_account.inc.php @@ -7,13 +7,13 @@ * @package admin * @copyright (c) 2007 by Ralf Becker * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License - * @version $Id$ + * @version $Id$ */ /** * admin command: delete an account (user or group) */ -class admin_cmd_delete_account extends admin_cmd +class admin_cmd_delete_account extends admin_cmd { /** * Constructor @@ -37,7 +37,7 @@ class admin_cmd_delete_account extends admin_cmd /** * delete an account (user or group) - * + * * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself * @return string success message * @throws egw_exception_no_admin @@ -74,7 +74,7 @@ class admin_cmd_delete_account extends admin_cmd } if (!$this->is_user) $GLOBALS['egw']->accounts->delete($account_id); // groups get not deleted via the admin hook, as users - return lang("Account '%1' deleted.",$this->account)."\n\n"; + return lang("'%1' '%2' deleted.",($account_id < 0 ? "Group": "Account"),$this->account)."\n\n"; } /** diff --git a/admin/inc/class.admin_cmd_edit_group.inc.php b/admin/inc/class.admin_cmd_edit_group.inc.php index 31ca491c31..23ce690261 100644 --- a/admin/inc/class.admin_cmd_edit_group.inc.php +++ b/admin/inc/class.admin_cmd_edit_group.inc.php @@ -112,7 +112,7 @@ class admin_cmd_edit_group extends admin_cmd // make new account_id available to caller $this->account = $data['account_id']; - return lang("Account %1 %2", $data['account_lid'] ? $data['account_lid'] : accounts::id2name($this->account), + return lang("Group %1 %2", $data['account_lid'] ? $data['account_lid'] : accounts::id2name($this->account), $update ? lang('updated') : lang("created with id #%1", $this->account)); }