diff --git a/bootstrap.php b/bootstrap.php
index 712f5bc4536f13b530103abe2ff0736a44c03019..c782bf208d3a8518742e761a73954468d47f9fd5 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -164,9 +164,9 @@ class Bootstrap {
);
if (!db_connect(DBHOST, DBUSER, DBPASS, $options)) {
- $ferror=sprintf(_S('Unable to connect to the database — %s'),db_connect_error());
+ $ferror=sprintf('Unable to connect to the database — %s',db_connect_error());
}elseif(!db_select_database(DBNAME)) {
- $ferror=sprintf(_S('Unknown or invalid database: %s'),DBNAME);
+ $ferror=sprintf('Unknown or invalid database: %s',DBNAME);
}
if($ferror) //Fatal error
@@ -269,11 +269,11 @@ class Bootstrap {
}
function croak($message) {
- $msg = _S($message)."\n\n".THISPAGE;
- Mailer::sendmail(ADMIN_EMAIL, _S('osTicket Fatal Error'), $msg,
- '"'._S('osTicket Alerts').sprintf('" <%s>', ADMIN_EMAIL));
+ $msg = $message."\n\n".THISPAGE;
+ Mailer::sendmail(ADMIN_EMAIL, 'osTicket Fatal Error', $msg,
+ '"'.'osTicket Alerts'.sprintf('" <%s>', ADMIN_EMAIL));
//Display generic error to the user
- Http::response(500, _S("<b>Fatal Error:</b> Contact system administrator."));
+ Http::response(500, "<b>Fatal Error:</b> Contact system administrator.");
}
}
diff --git a/include/ajax.content.php b/include/ajax.content.php
index 95241717e19ba1ce3f4c5cb51143545d48737026..57ede7c6a9756cc91a55e53fe04bfda103a12a51 100644
--- a/include/ajax.content.php
+++ b/include/ajax.content.php
@@ -59,17 +59,17 @@ class ContentAjaxAPI extends AjaxController {
<tr><td>%{ticket.phone}</td><td>'.__('Phone number | ext').'</td></tr>
<tr><td>%{ticket.status}</td><td>'.__('Status').'</td></tr>
<tr><td>%{ticket.priority}</td><td>'.__('Priority').'</td></tr>
- <tr><td>%{ticket.assigned}</td><td>Assigned staff and/or team</td></tr>
+ <tr><td>%{ticket.assigned}</td><td>Assigned agent and/or team</td></tr>
<tr><td>%{ticket.create_date}</td><td>'.__('Date created').'</td></tr>
<tr><td>%{ticket.due_date}</td><td>'.__('Due date').'</td></tr>
<tr><td>%{ticket.close_date}</td><td>'.__('Date closed').'</td></tr>
<tr><td>%{recipient.ticket_link}</td><td>'.__('Auth. token used for auto-login').'</td></tr>
<tr><td>%{ticket.client_link}</td><td>'.__('Client\'s ticket view link').'</td></tr>
- <tr><td>%{recipient.ticket_link}</td><td>'.__('Staff\'s ticket view link').'</td></tr>
+ <tr><td>%{recipient.ticket_link}</td><td>'.__('Agent\'s ticket view link').'</td></tr>
<tr><td colspan="2" style="padding:5px 0 5px 0;"><em>'.__('Expandable Variables (See Wiki)').'</em></td></tr>
<tr><td>%{ticket.<b>topic</b>}</td><td>'.__('Help topic').'</td></tr>
<tr><td>%{ticket.<b>dept</b>}</td><td>'.__('Department').'</td></tr>
- <tr><td>%{ticket.<b>staff</b>}</td><td>'.__('Assigned/closing staff').'</td></tr>
+ <tr><td>%{ticket.<b>staff</b>}</td><td>'.__('Assigned/closing agent').'</td></tr>
<tr><td>%{ticket.<b>team</b>}</td><td>'.__('Assigned/closing team').'</td></tr>
</table>
</td>
@@ -79,8 +79,8 @@ class ContentAjaxAPI extends AjaxController {
<tr><td>%{response}</td><td>'.__('Outgoing response').'</td></tr>
<tr><td>%{comments}</td><td>'.__('Assign/transfer comments').'</td></tr>
<tr><td>%{note}</td><td>'.__('Internal note <em>(expandable)</em>').'</td></tr>
- <tr><td>%{assignee}</td><td>'.__('Assigned staff/team').'</td></tr>
- <tr><td>%{assigner}</td><td>'.__('Staff assigning the ticket').'</td></tr>
+ <tr><td>%{assignee}</td><td>'.__('Assigned agent/team').'</td></tr>
+ <tr><td>%{assigner}</td><td>'.__('Agent assigning the ticket').'</td></tr>
<tr><td>%{url}</td><td>'.__('osTicket\'s base url (FQDN)').'</td></tr>
<tr><td>%{reset_link}</td>
<td>'.__('Reset link used by the password reset feature').'</td></tr>
diff --git a/include/ajax.reports.php b/include/ajax.reports.php
index 89874bb44ab4cc5df4e46da5c5397a7000c6e7ad..e9e660a8c69b36f0c876ca63724b8735789aae94 100644
--- a/include/ajax.reports.php
+++ b/include/ajax.reports.php
@@ -31,7 +31,7 @@ class OverviewReportAjaxAPI extends AjaxController {
return $this->encode(array("dept"=>__("Department"), "topic"=>__("Topics"),
# XXX: This will be relative to permissions based on the
# logged-in-staff. For basic staff, this will be 'My Stats'
- "staff"=>__("Staff")));
+ "staff"=>__("Agent")));
}
function getData() {
@@ -63,7 +63,7 @@ class OverviewReportAjaxAPI extends AjaxController {
"pk" => 'staff_id',
"sort" => 'name',
"fields" => "CONCAT_WS(' ', T1.firstname, T1.lastname) as name",
- "headers" => array(__('Staff Member')),
+ "headers" => array(__('Agent')),
"filter" =>
('T1.staff_id=S1.staff_id
AND
diff --git a/include/class.auth.php b/include/class.auth.php
index ba925088b889d73c660058e50cae3839835b929f..4a97ab01adb25d60a6bfb74f69628de824772c4a 100644
--- a/include/class.auth.php
+++ b/include/class.auth.php
@@ -423,7 +423,7 @@ abstract class StaffAuthenticationBackend extends AuthenticationBackend {
return false;
//Log debug info.
- $ost->logDebug(_S('Staff login'),
+ $ost->logDebug(_S('Agent login'),
sprintf(_S("%s logged in [%s], via %s"), $staff->getUserName(),
$_SERVER['REMOTE_ADDR'], get_class($bk))); //Debug.
@@ -466,7 +466,7 @@ abstract class StaffAuthenticationBackend extends AuthenticationBackend {
$_SESSION['_auth']['staff'] = array();
unset($_SESSION[':token']['staff']);
- $ost->logDebug(_S('Staff logout'),
+ $ost->logDebug(_S('Agent logout'),
sprintf(_S("%s logged out [%s]"),
$staff->getUserName(),
$_SERVER['REMOTE_ADDR'])); //Debug.
@@ -826,7 +826,7 @@ class StaffAuthStrikeBackend extends AuthStrikeBackend {
if($authsession['strikes']>$cfg->getStaffMaxLogins()) {
$authsession['laststrike']=time();
$timeout = $cfg->getStaffLoginTimeout()/60;
- $alert=_S('Excessive login attempts by a staff member?')."\n"
+ $alert=_S('Excessive login attempts by an agent?')."\n"
._S('Username').": $username\n"
._S('IP').": {$_SERVER['REMOTE_ADDR']}\n"
._S('Time').": ".date('M j, Y, g:i a T')."\n\n"
@@ -841,7 +841,7 @@ class StaffAuthStrikeBackend extends AuthStrikeBackend {
._S('IP').": {$_SERVER['REMOTE_ADDR']}\n"
._S('Time').": ".date('M j, Y, g:i a T')."\n\n"
._S('Attempts').": {$authsession['strikes']}";
- $ost->logWarning(sprintf(_S('Failed staff login attempt (%s)'),$username),
+ $ost->logWarning(sprintf(_S('Failed agent login attempt (%s)'),$username),
$alert, false);
}
}
diff --git a/include/class.email.php b/include/class.email.php
index a6d1a24119307b8f16484a500e916292d91bbbbd..8e489b4bb698261127b649788739bcc28454196d 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -257,7 +257,7 @@ class Email {
}elseif($cfg && !strcasecmp($cfg->getAdminEmail(), $vars['email'])) {
$errors['email']=__('Email already used as admin email!');
}elseif(Staff::getIdByEmail($vars['email'])) { //make sure the email doesn't belong to any of the staff
- $errors['email']=__('Email in use by a staff member');
+ $errors['email']=__('Email in use by an agent');
}
if(!$vars['name'])
diff --git a/include/class.export.php b/include/class.export.php
index 048c1fb4de9ebe16f5be6e51d9e36580bed1c606..3860c80f803a8fbeebed01e1a7025b3077c810c7 100644
--- a/include/class.export.php
+++ b/include/class.export.php
@@ -72,7 +72,7 @@ class Export {
'isoverdue' => __('Overdue'),
'isanswered' => __('Answered'),
'assigned' => __('Assigned To'),
- 'staff' => __('Staff Assigned'),
+ 'staff' => __('Agent Assigned'),
'team' => __('Team Assigned'),
'thread_count' => __('Thread Count'),
'attachments' => __('Attachment Count'),
diff --git a/include/class.nav.php b/include/class.nav.php
index 3b6a54cf9520fcb4cc200f15751f2a6c4e305925..d07fd22a462702c4fce8a408da2cd78256848a2f 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -100,7 +100,7 @@ class StaffNav {
function getTabs(){
if(!$this->tabs) {
$this->tabs=array();
- $this->tabs['dashboard'] = array('desc'=>__('Dashboard'),'href'=>'dashboard.php','title'=>__('Staff Dashboard'));
+ $this->tabs['dashboard'] = array('desc'=>__('Dashboard'),'href'=>'dashboard.php','title'=>__('Agent Dashboard'));
$this->tabs['users'] = array('desc' => __('Users'), 'href' => 'users.php', 'title' => __('User Directory'));
$this->tabs['tickets'] = array('desc'=>__('Tickets'),'href'=>'tickets.php','title'=>__('Ticket Queue'));
$this->tabs['kbase'] = array('desc'=>__('Knowledgebase'),'href'=>'kb.php','title'=>__('Knowledgebase'));
@@ -138,7 +138,7 @@ class StaffNav {
break;
case 'dashboard':
$subnav[]=array('desc'=>__('Dashboard'),'href'=>'dashboard.php','iconclass'=>'logs');
- $subnav[]=array('desc'=>__('Staff Directory'),'href'=>'directory.php','iconclass'=>'teams');
+ $subnav[]=array('desc'=>__('Agent Directory'),'href'=>'directory.php','iconclass'=>'teams');
$subnav[]=array('desc'=>__('My Profile'),'href'=>'profile.php','iconclass'=>'users');
break;
case 'users':
@@ -196,7 +196,7 @@ class AdminNav extends StaffNav{
$tabs['settings']=array('desc'=>__('Settings'),'href'=>'settings.php','title'=>__('System Settings'));
$tabs['manage']=array('desc'=>__('Manage'),'href'=>'helptopics.php','title'=>__('Manage Options'));
$tabs['emails']=array('desc'=>__('Emails'),'href'=>'emails.php','title'=>__('Email Settings'));
- $tabs['staff']=array('desc'=>__('Staff'),'href'=>'staff.php','title'=>__('Manage Staff'));
+ $tabs['staff']=array('desc'=>__('Agents'),'href'=>'staff.php','title'=>__('Manage Agents'));
if (count($this->getRegisteredApps()))
$tabs['apps']=array('desc'=>__('Applications'),'href'=>'apps.php','title'=>__('Applications'));
$this->tabs=$tabs;
@@ -244,7 +244,7 @@ class AdminNav extends StaffNav{
$subnav[]=array('desc'=>__('Diagnostic'),'href'=>'emailtest.php', 'title'=>__('Email Diagnostic'), 'iconclass'=>'emailDiagnostic');
break;
case 'staff':
- $subnav[]=array('desc'=>__('Staff Members'),'href'=>'staff.php','iconclass'=>'users');
+ $subnav[]=array('desc'=>__('Agents'),'href'=>'staff.php','iconclass'=>'users');
$subnav[]=array('desc'=>__('Teams'),'href'=>'teams.php','iconclass'=>'teams');
$subnav[]=array('desc'=>__('Groups'),'href'=>'groups.php','iconclass'=>'groups');
$subnav[]=array('desc'=>__('Departments'),'href'=>'departments.php','iconclass'=>'departments');
diff --git a/include/class.organization.php b/include/class.organization.php
index 6776e2e26d6ba324ce542f1d6ef9bc0d6fa8e25a..757ba9476ea7c7746eaac8dc20843c39eca63b57 100644
--- a/include/class.organization.php
+++ b/include/class.organization.php
@@ -275,7 +275,7 @@ class Organization extends OrganizationModel {
&& $team = Team::lookup(substr($vars['manager'], 1)))
break;
default:
- $errors['manager'] = __('Select a staff member or team from the list');
+ $errors['manager'] = __('Select an agent or team from the list');
}
}
diff --git a/include/class.staff.php b/include/class.staff.php
index e4250ef77c736e84d5afb5be312fc695a89cc387..a7adf6878210b5d42a82b44ca13817a4fbac798f 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -455,7 +455,7 @@ class Staff extends AuthenticatedUser {
elseif(Email::getIdByEmail($vars['email']))
$errors['email']=__('Already in-use as system email');
elseif(($uid=Staff::getIdByEmail($vars['email'])) && $uid!=$this->getId())
- $errors['email']=__('Email already in-use by another staff member');
+ $errors['email']=__('Email already in-use by another agent');
if($vars['phone'] && !Validator::is_phone($vars['phone']))
$errors['phone']=__('Valid phone number is required');
@@ -691,8 +691,8 @@ class Staff extends AuthenticatedUser {
Signal::send('auth.pwreset.email', $this, $info);
if ($info['log'])
- $ost->logWarning(_S('Staff Password Reset'), sprintf(
- _S('Password reset was attempted for staff member: %1$s<br><br>
+ $ost->logWarning(_S('Agent Password Reset'), sprintf(
+ _S('Password reset was attempted for agent: %1$s<br><br>
Requested-User-Id: %2$s<br>
Source-Ip: %3$s<br>
Email-Sent-To: %4$s<br>
@@ -741,7 +741,7 @@ class Staff extends AuthenticatedUser {
elseif(Email::getIdByEmail($vars['email']))
$errors['email']=__('Already in use system email');
elseif(($uid=Staff::getIdByEmail($vars['email'])) && $uid!=$id)
- $errors['email']=__('Email already in use by another staff member');
+ $errors['email']=__('Email already in use by another agent');
if($vars['phone'] && !Validator::is_phone($vars['phone']))
$errors['phone']=__('Valid phone number is required');
diff --git a/include/class.template.php b/include/class.template.php
index 3e6dbfd2fd89a418f3a4a8f24a6512aa293abc91..afdcf6039c09a71f8ccf0dbaebccdbfcc5866d77 100644
--- a/include/class.template.php
+++ b/include/class.template.php
@@ -24,7 +24,7 @@ class EmailTemplateGroup {
static $all_groups = array(
'sys' => /* trans */ 'System Management Templates',
'ticket.user' => /* trans */ 'End-User Ticket Templates',
- 'ticket.staff' => /* trans */ 'Staff Ticket Templates',
+ 'ticket.staff' => /* trans */ 'Agent Ticket Templates',
);
static $all_names=array(
'ticket.autoresp'=>array(
@@ -42,7 +42,7 @@ class EmailTemplateGroup {
'ticket.notice'=>array(
'group'=>'ticket.user',
'name'=>/* trans */ 'New Ticket Notice',
- 'desc'=>/* trans */ 'Notice sent to user, if enabled, on new ticket created by staff on their behalf (e.g phone calls).'),
+ 'desc'=>/* trans */ 'Notice sent to user, if enabled, on new ticket created by an agent on their behalf (e.g phone calls).'),
'ticket.overlimit'=>array(
'group'=>'ticket.user',
'name'=>/* trans */ 'Over Limit Notice',
@@ -58,27 +58,27 @@ class EmailTemplateGroup {
'ticket.alert'=>array(
'group'=>'ticket.staff',
'name'=>/* trans */ 'New Ticket Alert',
- 'desc'=>/* trans */ 'Alert sent to staff, if enabled, on new ticket.'),
+ 'desc'=>/* trans */ 'Alert sent to agents, if enabled, on new ticket.'),
'message.alert'=>array(
'group'=>'ticket.staff',
'name'=>/* trans */ 'New Message Alert',
- 'desc'=>/* trans */ 'Alert sent to staff, if enabled, when user replies to an existing ticket.'),
+ 'desc'=>/* trans */ 'Alert sent to agents, if enabled, when user replies to an existing ticket.'),
'note.alert'=>array(
'group'=>'ticket.staff',
'name'=>/* trans */ 'Internal Note Alert',
- 'desc'=>/* trans */ 'Alert sent to selected staff, if enabled, on new internal note.'),
+ 'desc'=>/* trans */ 'Alert sent to selected agents, if enabled, on new internal note.'),
'assigned.alert'=>array(
'group'=>'ticket.staff',
'name'=>/* trans */ 'Ticket Assignment Alert',
- 'desc'=>/* trans */ 'Alert sent to staff on ticket assignment.'),
+ 'desc'=>/* trans */ 'Alert sent to agents on ticket assignment.'),
'transfer.alert'=>array(
'group'=>'ticket.staff',
'name'=>/* trans */ 'Ticket Transfer Alert',
- 'desc'=>/* trans */ 'Alert sent to staff on ticket transfer.'),
+ 'desc'=>/* trans */ 'Alert sent to agents on ticket transfer.'),
'ticket.overdue'=>array(
'group'=>'ticket.staff',
'name'=>/* trans */ 'Overdue Ticket Alert',
- 'desc'=>/* trans */ 'Alert sent to staff on stale or overdue tickets.'),
+ 'desc'=>/* trans */ 'Alert sent to agents on stale or overdue tickets.'),
);
function EmailTemplateGroup($id){
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 9a13107ba20e9c9281df7c25067aab62ea4de4d4..9d5cb0ba29de60c7b5fd613c8e8d01ebe9478c87 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -2666,8 +2666,8 @@ class Ticket {
}
else {
// Not assignment and no internal note - log activity
- $ticket->logActivity(_S('New Ticket by Staff'),
- sprintf(_S('Ticket created by staff - %s'), $thisstaff->getName()));
+ $ticket->logActivity(_S('New Ticket by Agent'),
+ sprintf(_S('Ticket created by agent - %s'), $thisstaff->getName()));
}
$ticket->reload();
diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php
index c80ccc14077eb6fcd9c14fc8100b77e6656ed285..eda6bffc2fd2008b0313586c89caf75fcaacfa95 100644
--- a/include/staff/directory.inc.php
+++ b/include/staff/directory.inc.php
@@ -60,7 +60,7 @@ $qstr.='&order='.($order=='DESC'?'ASC':'DESC');
$query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
//echo $query;
?>
-<h2><?php echo __('Staff Members');?>
+<h2><?php echo __('Agents');?>
<i class="help-tip icon-question-sign" href="#staff_members"></i></h2>
<div style="width:700px; float:left;">
<form action="directory.php" method="GET" name="filter">
@@ -91,7 +91,7 @@ $res=db_query($query);
if($res && ($num=db_num_rows($res)))
$showing=$pageNav->showing();
else
- $showing=__('No staff members found!');
+ $showing=__('No agents found!');
?>
<table class="list" border="0" cellspacing="1" cellpadding="0" width="940">
<caption><?php echo $showing; ?></caption>
@@ -128,7 +128,7 @@ else
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
<?php } else {
- echo __('No staff members found!');
+ echo __('No agents found!');
} ?>
</td>
</tr>
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index 8cda5c0051e9a88ebf1fc1021bb1de8bc23b46dc..77223607525f24880593e1ce71dbaec840ed1da4 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -299,7 +299,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<option value="0">— <?php echo __('Unassigned');?> —</option>
<?php
if (($users=Staff::getStaffMembers())) {
- echo '<OPTGROUP label="'.__('Staff Members').'">';
+ echo '<OPTGROUP label="'.__('Agents').'">';
foreach($users as $id => $name) {
$name = new PersonsName($name);
$k="s$id";
diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index 31e6819c10a364d410d7af5c6b581cdc01a682a4..f77026a5a4983d341aa00f279d1963f9cc7b8230 100644
--- a/include/staff/group.inc.php
+++ b/include/staff/group.inc.php
@@ -31,7 +31,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tr>
<th colspan="2">
<h4><?php echo $title; ?></h4>
- <em><strong><?php echo __('Group Information');?></strong>: <?php echo __('Disabled group will limit staff members access. Admins are exempted.');?></em>
+ <em><strong><?php echo __('Group Information');?></strong>: <?php echo __("Disabled group will limit agents' access. Admins are exempted.");?></em>
</th>
</tr>
</thead>
@@ -91,7 +91,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="radio" name="can_close_tickets" value="1" <?php echo $info['can_close_tickets']?'checked="checked"':''; ?> /><?php echo __('Yes');?>
<input type="radio" name="can_close_tickets" value="0" <?php echo !$info['can_close_tickets']?'checked="checked"':''; ?> /><?php echo __('No');?>
- <i><?php echo __('Ability to close tickets. Staff can still post a response.');?></i>
+ <i><?php echo __('Ability to close tickets. Agents can still post a response.');?></i>
</td>
</tr>
<tr><td><?php echo __('Can <b>Assign</b> Tickets');?></td>
@@ -99,7 +99,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="radio" name="can_assign_tickets" value="1" <?php echo $info['can_assign_tickets']?'checked="checked"':''; ?> /><?php echo __('Yes');?>
<input type="radio" name="can_assign_tickets" value="0" <?php echo !$info['can_assign_tickets']?'checked="checked"':''; ?> /><?php echo __('No');?>
- <i><?php echo __('Ability to assign tickets to staff members.');?></i>
+ <i><?php echo __('Ability to assign tickets to agents.');?></i>
</td>
</tr>
<tr><td><?php echo __('Can <b>Transfer</b> Tickets');?></td>
@@ -142,12 +142,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<i><?php echo __('Ability to add/update/disable/delete knowledgebase categories and FAQs.');?></i>
</td>
</tr>
- <tr><td><?php echo __('Can View Staff Stats.');?></td>
+ <tr><td><?php echo __('Can View Agent Stats');?></td>
<td>
<input type="radio" name="can_view_staff_stats" value="1" <?php echo $info['can_view_staff_stats']?'checked="checked"':''; ?> /><?php echo __('Yes');?>
<input type="radio" name="can_view_staff_stats" value="0" <?php echo !$info['can_view_staff_stats']?'checked="checked"':''; ?> /><?php echo __('No');?>
- <i><?php echo __('Ability to view stats of other staff members in allowed departments.');?></i>
+ <i><?php echo __('Ability to view stats of other agents in allowed departments.');?></i>
</td>
</tr>
<tr>
diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php
index dc8304979dbbd05efc30b9a6c714c2738bb891c5..12331a99b7a205917bae9483f2a8858dd4aa0f74 100644
--- a/include/staff/groups.inc.php
+++ b/include/staff/groups.inc.php
@@ -136,7 +136,7 @@ endif;
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
<font color="red"><strong><?php echo __('Are you sure you want to DELETE selected groups?');?></strong></font>
- <br><br><?php echo __("Deleted groups CANNOT be recovered and might affect staff's access.");?>
+ <br><br><?php echo __("Deleted groups CANNOT be recovered and might affect agents' access.");?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php
index 931987ad52641e20ebd15cce9a7c20b8beb042b9..eecf6424649f0707b22a4a1220feade132665268 100644
--- a/include/staff/header.inc.php
+++ b/include/staff/header.inc.php
@@ -37,27 +37,6 @@
<link type="text/css" rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/loadingbar.css"/>
<script type="text/javascript" src="./js/jquery.dropdown.js"></script>
- <script>
- jQuery(function($){
- $.datepicker.regional["varlang"]={closeText:"<?php echo __('Done');?>",
- prevText:"<?php echo __('Prev');?>",
- nextText:"<?php echo __('Next');?>",
- currentText:"<?php echo __('Today');?>",
- monthNames:["<?php echo __('January');?>","<?php echo __('February');?>","<?php echo __('March');?>","<?php echo __('April');?>","<?php echo __('May');?>","<?php echo __('June');?>","<?php echo __('July');?>","<?php echo __('August');?>","<?php echo __('September');?>","<?php echo __('October');?>","<?php echo __('November');?>","<?php echo __('December');?>"],
- monthNamesShort:["<?php echo __('Jan');?>","<?php echo __('Feb');?>","<?php echo __('Mar');?>","<?php echo __('Apr');?>","<?php echo __('May');?>","<?php echo __('Jun');?>","<?php echo __('Jul');?>","<?php echo __('Aug');?>","<?php echo __('Sep');?>","<?php echo __('Oct');?>","<?php echo __('Nov');?>","<?php echo __('Dec');?>"],
- dayNames:["<?php echo __('Sunday');?>","<?php echo __('Monday');?>","<?php echo __('Tuesday');?>","<?php echo __('Wednesday');?>","<?php echo __('Thursday');?>","<?php echo __('Friday');?>","<?php echo __('Saturday');?>"],
- dayNamesShort:["<?php echo __('Sun');?>","<?php echo __('Mon');?>","<?php echo __('Tue');?>","<?php echo __('Wed');?>","<?php echo __('Thu');?>","<?php echo __('Fri');?>","<?php echo __('Sat');?>"],
- dayNamesMin:["<?php echo __('Su');?>","<?php echo __('Mo');?>","<?php echo __('Tu');?>","<?php echo __('We');?>","<?php echo __('Th');?>","<?php echo __('Fr');?>","<?php echo __('Sa');?>"],
- weekHeader:"<?php echo __('Wk');?>",
- dateFormat:"mm/dd/yy",
- firstDay:0,
- isRTL:!1,
- showMonthAfterYear:!1,
- yearSuffix:""
- };
- $.datepicker.setDefaults($.datepicker.regional['varlang']);
- });
- </script>
<?php
if($ost && ($headers=$ost->getExtraHeaders())) {
echo "\n\t".implode("\n\t", $headers)."\n";
@@ -81,7 +60,7 @@
if($thisstaff->isAdmin() && !defined('ADMINPAGE')) { ?>
| <a href="admin.php" class="no-pjax"><?php echo __('Admin Panel'); ?></a>
<?php }else{ ?>
- | <a href="index.php" class="no-pjax"><?php echo __('Staff Panel'); ?></a>
+ | <a href="index.php" class="no-pjax"><?php echo __('Agent Panel'); ?></a>
<?php } ?>
| <a href="profile.php"><?php echo __('My Preferences'); ?></a>
| <a href="logout.php?auth=<?php echo $ost->getLinkToken(); ?>" class="no-pjax"><?php echo __('Log Out'); ?></a>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index 5b39046171ff81a921b0e8c47d1fa8165cb9541a..67a6bb8959d4b22a17254a198bcc35c3447ca809 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -199,7 +199,7 @@ if ($info['form_id'] == Topic::FORM_USE_PARENT) echo 'selected="selected"';
<option value="0">— <?php echo __('Unassigned'); ?> —</option>
<?php
if (($users=Staff::getStaffMembers())) {
- echo sprintf('<OPTGROUP label="%s">', sprintf(__('Staff Members (%d)'), count($user)));
+ echo sprintf('<OPTGROUP label="%s">', sprintf(__('Agents (%d)'), count($user)));
foreach ($users as $id => $name) {
$name = new PersonsName($name);
$k="s$id";
diff --git a/include/staff/login.header.php b/include/staff/login.header.php
index a3d98f024a1def1a02e3b3f9eb77a844d41b5086..7cf18d895239f5a9425428cb112d6a1aba1827a1 100644
--- a/include/staff/login.header.php
+++ b/include/staff/login.header.php
@@ -6,7 +6,7 @@ defined('OSTSCPINC') or die('Invalid path');
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="7200" />
- <title>osTicket :: <?php echo __('Staff Panel Login'); ?></title>
+ <title>osTicket :: <?php echo __('Agent Login'); ?></title>
<link rel="stylesheet" href="css/login.css" type="text/css" />
<link type="text/css" rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/font-awesome.min.css">
<meta name="robots" content="noindex" />
diff --git a/include/staff/pwreset.login.php b/include/staff/pwreset.login.php
index eedc512545a5ed2530b4cc879c8107619c8ecf28..718170403f6407d4a6e10a25e12b6698149dd679 100644
--- a/include/staff/pwreset.login.php
+++ b/include/staff/pwreset.login.php
@@ -5,7 +5,7 @@ $info = ($_POST)?Format::htmlchars($_POST):array();
?>
<div id="loginBox">
- <h1 id="logo"><a href="index.php">osTicket <?php echo __('Staff Password Reset'); ?></a></h1>
+ <h1 id="logo"><a href="index.php">osTicket <?php echo __('Agent Password Reset'); ?></a></h1>
<h3><?php echo Format::htmlchars($msg); ?></h3>
<form action="pwreset.php" method="post">
diff --git a/include/staff/pwreset.php b/include/staff/pwreset.php
index dc0eb843aac1c840e0207f6347c7599128195895..b2ccfcfb95e60f89aeb0b87a399a805e897c5468 100644
--- a/include/staff/pwreset.php
+++ b/include/staff/pwreset.php
@@ -5,7 +5,7 @@ $info = ($_POST && $errors)?Format::htmlchars($_POST):array();
?>
<div id="loginBox">
- <h1 id="logo"><a href="index.php">osTicket <?php echo __('Staff Password Reset'); ?></a></h1>
+ <h1 id="logo"><a href="index.php">osTicket <?php echo __('Agent Password Reset'); ?></a></h1>
<h3><?php echo Format::htmlchars($msg); ?></h3>
<form action="pwreset.php" method="post">
<?php csrf_token(); ?>
diff --git a/include/staff/pwreset.sent.php b/include/staff/pwreset.sent.php
index e2d62178ec3be9d1270e37909b36e9d4f5adb6d0..2825c0c584872354e48bd58010fdd770bb268563 100644
--- a/include/staff/pwreset.sent.php
+++ b/include/staff/pwreset.sent.php
@@ -5,7 +5,7 @@ $info = ($_POST && $errors)?Format::htmlchars($_POST):array();
?>
<div id="loginBox">
- <h1 id="logo"><a href="index.php">osTicket <?php echo __('Staff Password Reset'); ?></a></h1>
+ <h1 id="logo"><a href="index.php">osTicket <?php echo __('Agent Password Reset'); ?></a></h1>
<h3><?php echo __('A confirmation email has been sent'); ?></h3>
<h3 style="color:black;"><em><?php echo __(
'A password reset email was sent to the email on file for your account. Follow the link in the email to reset your password.'
diff --git a/include/staff/settings-access.inc.php b/include/staff/settings-access.inc.php
index d2e921d816b2802699fc12896722e11ac7504cf5..f3f93a88244cff813bd146d5cfd1faee4eb3627a 100644
--- a/include/staff/settings-access.inc.php
+++ b/include/staff/settings-access.inc.php
@@ -17,7 +17,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<tbody>
<tr>
<th colspan="2">
- <em><b><?php echo __('Staff Authentication Settings'); ?></b></em>
+ <em><b><?php echo __('Agent Authentication Settings'); ?></b></em>
</th>
</tr>
<tr><td><?php echo __('Password Expiration Policy'); ?>:</th>
@@ -50,7 +50,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<font class="error"> <?php echo $errors['pw_reset_window']; ?></font>
</td>
</tr>
- <tr><td><?php echo __('Staff Excessive Logins'); ?>:</td>
+ <tr><td><?php echo __('Agent Excessive Logins'); ?>:</td>
<td>
<select name="staff_max_logins">
<?php
@@ -70,13 +70,13 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</select><?php echo __('minutes locked out'); ?>
</td>
</tr>
- <tr><td><?php echo __('Staff Session Timeout'); ?>:</td>
+ <tr><td><?php echo __('Agent Session Timeout'); ?>:</td>
<td>
<input type="text" name="staff_session_timeout" size=6 value="<?php echo $config['staff_session_timeout']; ?>">
mins <em><?php echo __('(0 to disable)'); ?></em>. <i class="help-tip icon-question-sign" href="#staff_session_timeout"></i>
</td>
</tr>
- <tr><td><?php echo __('Bind Staff Session to IP'); ?>:</td>
+ <tr><td><?php echo __('Bind Agent Session to IP'); ?>:</td>
<td>
<input type="checkbox" name="staff_ip_binding" <?php echo $config['staff_ip_binding']?'checked="checked"':''; ?>>
<i class="help-tip icon-question-sign" href="#bind_staff_session_to_ip"></i>
@@ -99,7 +99,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<?php foreach (array(
'disabled' => __('Disabled — All users are guests'),
'public' => __('Public — Anyone can register'),
- 'closed' => __('Private — Only staff can register users'),)
+ 'closed' => __('Private — Only agents can register users'),)
as $key=>$val) { ?>
<option value="<?php echo $key; ?>" <?php
if ($config['client_registration'] == $key)
@@ -184,7 +184,7 @@ $manage_content = function($title, $content) use ($contents) {
'Authentication and Registration Templates'); ?></b></em>
</th>
</tr>
- <?php $manage_content(__('Staff Members'), 'pwreset-staff'); ?>
+ <?php $manage_content(__('Agents'), 'pwreset-staff'); ?>
<?php $manage_content(__('Clients'), 'pwreset-client'); ?>
<?php $manage_content(__('Guess Ticket Access'), 'access-link'); ?>
<tr>
@@ -192,7 +192,7 @@ $manage_content = function($title, $content) use ($contents) {
<em><b><?php echo __('Sign In Pages'); ?></b></em>
</th>
</tr>
- <?php $manage_content(__('Staff Login Banner'), 'banner-staff'); ?>
+ <?php $manage_content(__('Agent Login Banner'), 'banner-staff'); ?>
<?php $manage_content(__('Client Sign-In Page'), 'banner-client'); ?>
<tr>
<th colspan="2">
@@ -204,10 +204,10 @@ $manage_content = function($title, $content) use ($contents) {
<?php $manage_content(__('Account Confirmed Page'), 'registration-thanks'); ?>
<tr>
<th colspan="2">
- <em><b><?php echo __('Staff Account Registration'); ?></b></em>
+ <em><b><?php echo __('Agent Account Registration'); ?></b></em>
</th>
</tr>
- <?php $manage_content(__('Staff Welcome Email'), 'registration-staff'); ?>
+ <?php $manage_content(__('Agent Welcome Email'), 'registration-staff'); ?>
</tbody>
</table>
<p style="text-align:center">
diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index 5aeb34686c6ae10c59e47e3f6befae8885f7de3b..8c812eb2ee67642af927b30a93e2f4a384559797 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -7,7 +7,7 @@
<thead>
<tr>
<th>
- <h4><?php echo __('Alerts and Notices sent to staff on ticket "events"'); ?></h4>
+ <h4><?php echo __('Alerts and Notices sent to agents on ticket "events"'); ?></h4>
</th>
</tr>
</thead>
@@ -72,7 +72,7 @@
<td>
<input type="checkbox" name="message_alert_assigned" <?php
echo $config['message_alert_assigned']?'checked':''; ?>>
- <?php echo __('Assigned Staff'); ?>
+ <?php echo __('Assigned Agents'); ?>
</td>
</tr>
<tr>
@@ -110,7 +110,7 @@
<tr>
<td>
<input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>>
- <?php echo __('Assigned Staff / Team'); ?>
+ <?php echo __('Assigned Agent / Team'); ?>
</td>
</tr>
<tr>
@@ -135,7 +135,7 @@
<tr>
<td>
<input type="checkbox" name="assigned_alert_staff" <?php echo
- $config['assigned_alert_staff']?'checked':''; ?>> <?php echo __('Assigned Staff'); ?>
+ $config['assigned_alert_staff']?'checked':''; ?>> <?php echo __('Assigned Agents'); ?>
</td>
</tr>
<tr>
@@ -165,7 +165,7 @@
<tr>
<td>
<input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>>
- <?php echo __('Assigned Staff / Team'); ?>
+ <?php echo __('Assigned Agent / Team'); ?>
</td>
</tr>
<tr>
@@ -195,7 +195,7 @@
<tr>
<td>
<input type="checkbox" name="overdue_alert_assigned" <?php
- echo $config['overdue_alert_assigned']?'checked':''; ?>> <?php echo __('Assigned Staff / Team'); ?>
+ echo $config['overdue_alert_assigned']?'checked':''; ?>> <?php echo __('Assigned Agent / Team'); ?>
</td>
</tr>
<tr>
diff --git a/include/staff/settings-autoresp.inc.php b/include/staff/settings-autoresp.inc.php
index dc02652ec289dbf0700c2f3cc94a7c9621a87e7f..14e95796fbd1156f743ea93e0b53f47e72cf0e4c 100644
--- a/include/staff/settings-autoresp.inc.php
+++ b/include/staff/settings-autoresp.inc.php
@@ -23,7 +23,7 @@ echo $config['ticket_autoresponder'] ? 'checked="checked"' : ''; ?>/>
</td>
</tr>
<tr>
- <td width="160"><?php echo __('New Ticket by Staff'); ?>:</td>
+ <td width="160"><?php echo __('New Ticket by Agent'); ?>:</td>
<td>
<input type="checkbox" name="ticket_notice_active" <?php
echo $config['ticket_notice_active'] ? 'checked="checked"' : ''; ?>/>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index a874448aded33a8563c98f9e4158a223ccc9b98d..9550425c31ee64dbc301f09499e74538200bcfb1 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -126,10 +126,10 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
</td>
</tr>
<tr>
- <td><?php echo __('Staff Identity Masking'); ?>:</td>
+ <td><?php echo __('Agent Identity Masking'); ?>:</td>
<td>
<input type="checkbox" name="hide_staff_name" <?php echo $config['hide_staff_name']?'checked="checked"':''; ?>>
- <?php echo __("Hide staff's name on responses."); ?>
+ <?php echo __("Hide agent's name on responses."); ?>
<i class="help-tip icon-question-sign" href="#staff_identity_masking"></i>
</td>
</tr>
@@ -198,7 +198,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
</td>
</tr>
<tr>
- <td><?php echo __('Maximum Staff File Uploads');?>:</td>
+ <td><?php echo __('Maximum Agent File Uploads');?>:</td>
<td>
<select name="max_staff_file_uploads">
<?php
@@ -209,7 +209,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<?php
} ?>
</select>
- <em><?php echo __('(Number of files the staff is allowed to upload simultaneously)');?></em>
+ <em><?php echo __('(Number of files an agent is allowed to upload simultaneously)');?></em>
<font class="error"> <?php echo $errors['max_staff_file_uploads']; ?></font>
</td>
</tr>
diff --git a/include/staff/staff.inc.php b/include/staff/staff.inc.php
index 6ddba17e9506e2e2921dbc2ddc57bde5644db486..353e40470c1f015f45e89d0c2aaa9992a086e388 100644
--- a/include/staff/staff.inc.php
+++ b/include/staff/staff.inc.php
@@ -5,7 +5,7 @@ $info=array();
$qstr='';
if($staff && $_REQUEST['a']!='add'){
//Editing Department.
- $title=__('Update Staff');
+ $title=__('Update Agent');
$action='update';
$submit_text=__('Save Changes');
$passwd_text=__('To reset the password enter a new one below');
@@ -15,9 +15,9 @@ if($staff && $_REQUEST['a']!='add'){
$info['signature'] = Format::viewableImages($info['signature']);
$qstr.='&id='.$staff->getId();
}else {
- $title=__('Add New Staff');
+ $title=__('Add New Agent');
$action='create';
- $submit_text=__('Add Staff');
+ $submit_text=__('Add Agent');
$passwd_text=__('Temporary password required only for "Local" authenication');
//Some defaults for new staff.
$info['change_passwd']=1;
@@ -36,7 +36,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('Staff Account');?></h2>
+ <h2><?php echo __('Agent Account');?></h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
@@ -189,7 +189,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tbody>
<tr>
<th colspan="2">
- <em><strong><?php echo __("Staff's Signature");?></strong>:
+ <em><strong><?php echo __("Agent's Signature");?></strong>:
<?php echo __('Optional signature used on outgoing emails.');?>
<span class="error"> <?php echo $errors['signature']; ?></span></em>
<i class="help-tip icon-question-sign" href="#agents_signature"></i></em>
@@ -214,7 +214,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<td>
<input type="radio" name="isadmin" value="1" <?php echo $info['isadmin']?'checked="checked"':''; ?>>
<font color="red"><strong><?php echo __('Admin');?></strong></font>
- <input type="radio" name="isadmin" value="0" <?php echo !$info['isadmin']?'checked="checked"':''; ?>><strong><?php echo __('Staff');?></strong>
+ <input type="radio" name="isadmin" value="0" <?php echo !$info['isadmin']?'checked="checked"':''; ?>><strong><?php echo __('Agent');?></strong>
<span class="error"> <?php echo $errors['isadmin']; ?></span>
</td>
</tr>
@@ -270,7 +270,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __("Staff's Time Zone");?>:
+ <?php echo __("Agent's Time Zone");?>:
</td>
<td>
<select name="timezone_id" id="timezone_id">
@@ -317,7 +317,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</td>
<td>
<input type="checkbox" name="isvisible" value="1" <?php echo $info['isvisible']?'checked="checked"':''; ?>> <?php
- echo __('Make visible in the Staff Directory'); ?>
+ echo __('Make visible in the Agent Directory'); ?>
<i class="help-tip icon-question-sign" href="#directory_listing"></i>
</td>
</tr>
@@ -337,7 +337,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
if(($res=db_query($sql)) && db_num_rows($res)){ ?>
<tr>
<th colspan="2">
- <em><strong><?php echo __('Assigned Teams');?></strong>: <?php echo __("Staff will have access to tickets assigned to a team they belong to regardless of the ticket's department.");?> </em>
+ <em><strong><?php echo __('Assigned Teams');?></strong>: <?php echo __("Agent will have access to tickets assigned to a team they belong to regardless of the ticket's department.");?> </em>
</th>
</tr>
<?php
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index 4513462d65438e957dd79363508dc0f026d16370..c3d1bdf45d06dbe08300afe61084ca42d44165b6 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -54,7 +54,7 @@ $qstr.='&order='.($order=='DESC'?'ASC':'DESC');
$query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
//echo $query;
?>
-<h2><?php echo __('Staff Members');?></h2>
+<h2><?php echo __('Agents');?></h2>
<div style="width:700px; float:left;">
<form action="staff.php" method="GET" name="filter">
<input type="hidden" name="a" value="filter" >
@@ -106,14 +106,14 @@ $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".
<input type="submit" name="submit" value="<?php echo __('Apply');?>"/>
</form>
</div>
-<div style="float:right;text-align:right;padding-right:5px;"><b><a href="staff.php?a=add" class="Icon newstaff"><?php echo __('Add New Staff');?></a></b></div>
+<div style="float:right;text-align:right;padding-right:5px;"><b><a href="staff.php?a=add" class="Icon newstaff"><?php echo __('Add New Agent');?></a></b></div>
<div class="clear"></div>
<?php
$res=db_query($query);
if($res && ($num=db_num_rows($res)))
$showing=$pageNav->showing() . ' ' . _N('agent', 'agents', $num);
else
- $showing=__('No staff members found!');
+ $showing=__('No agents found!');
?>
<form action="staff.php" method="POST" name="staff" >
<?php csrf_token(); ?>
@@ -165,7 +165,7 @@ else
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
<?php }else{
- echo __('No staff members found!');
+ echo __('No agents found!');
} ?>
</td>
</tr>
@@ -192,15 +192,15 @@ endif;
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
<p class="confirm-action" style="display:none;" id="enable-confirm">
- <?php echo __('Are you sure want to <b>enable</b> (unlock) selected staff?');?>
+ <?php echo __('Are you sure want to <b>enable</b> (unlock) selected agent?');?>
</p>
<p class="confirm-action" style="display:none;" id="disable-confirm">
- <?php echo __('Are you sure want to <b>disable</b> (lock) selected staff?');?>
+ <?php echo __('Are you sure want to <b>disable</b> (lock) selected agent?');?>
<br><br><?php echo __("Locked staff won't be able to login to Staff Control Panel.");?>
</p>
<p class="confirm-action" style="display:none;" id="delete-confirm">
- <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected staff?');?></strong></font>
- <br><br><?php echo __('Deleted staff CANNOT be recovered.');?>
+ <font color="red"><strong><?php echo __('Are you sure you want to DELETE selected agent?');?></strong></font>
+ <br><br><?php echo __('Deleted agent CANNOT be recovered.');?>
</p>
<div><?php echo __('Please confirm to continue.');?></div>
<hr style="margin-top:1em"/>
diff --git a/include/staff/templates/org-profile.tmpl.php b/include/staff/templates/org-profile.tmpl.php
index a65c65ffb585ad26f72c14cce9bdd3d38c40192a..5da85dfcf3a936c528bf320e050e9f56d5bbca46 100644
--- a/include/staff/templates/org-profile.tmpl.php
+++ b/include/staff/templates/org-profile.tmpl.php
@@ -53,7 +53,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
echo __('None'); ?> —</option><?php
if ($users=Staff::getAvailableStaffMembers()) { ?>
<optgroup label="<?php
- echo sprintf(__('Staff Members (%s)', count($users))); ?>">
+ echo sprintf(__('Agents (%d)', count($users))); ?>">
<?php foreach($users as $id => $name) {
$k = "s$id";
echo sprintf('<option value="%s" %s>%s</option>',
diff --git a/include/staff/ticket-edit.inc.php b/include/staff/ticket-edit.inc.php
index a39404d633824bad0f2fcf9894ec401c0ac581b6..406d6967196bc9d8fe2d72e4ff2e8528719ffb65 100644
--- a/include/staff/ticket-edit.inc.php
+++ b/include/staff/ticket-edit.inc.php
@@ -23,7 +23,7 @@ if ($_POST)
if(!$info['user_id'] || !($user = User::lookup($info['user_id'])))
$user = $ticket->getUser();
?>
- <tr><td><?php echo _('User'); ?>:</td><td>
+ <tr><td><?php echo __('User'); ?>:</td><td>
<div id="client-info">
<a href="#" onclick="javascript:
$.userLookup('ajax.php/users/<?php echo $ticket->getOwnerId(); ?>/edit',
@@ -45,7 +45,7 @@ if ($_POST)
$('#client-email').text('<'+user.email+'>');
});
return false;
- "><i class="icon-edit"></i> <?php echo _('Change'); ?></a>
+ "><i class="icon-edit"></i> <?php echo __('Change'); ?></a>
<input type="hidden" name="user_id" id="user_id"
value="<?php echo $info['user_id']; ?>" />
</div>
diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php
index be63e445270a90169362c079c4a0201a0fd38583..8aa896126dcf2a96c79cfc4e470d325af8867409 100644
--- a/include/staff/ticket-open.inc.php
+++ b/include/staff/ticket-open.inc.php
@@ -222,10 +222,10 @@ if ($_POST)
<td width="160"><?php echo __('Assign To');?>:</td>
<td>
<select id="assignId" name="assignId">
- <option value="0" selected="selected">— <?php echo __('Select Staff Member OR a Team');?> —</option>
+ <option value="0" selected="selected">— <?php echo __('Select an Agent OR a Team');?> —</option>
<?php
if(($users=Staff::getAvailableStaffMembers())) {
- echo '<OPTGROUP label="'.sprintf(__('Staff Members (%d)'), count($users)).'">';
+ echo '<OPTGROUP label="'.sprintf(__('Agents (%d)'), count($users)).'">';
foreach($users as $id => $name) {
$k="s$id";
echo sprintf('<option value="%s" %s>%s</option>',
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index e2231b88037af78b744d8fda45689d0267861ffd..d163133535751b5a4f7a5eec3b81964c52ce4b4c 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -824,7 +824,7 @@ $tcount+= $ticket->getNumNotes();
</td>
<td>
<select id="assignId" name="assignId">
- <option value="0" selected="selected">— <?php echo __('Select Staff Member OR a Team');?> —</option>
+ <option value="0" selected="selected">— <?php echo __('Select an Agent OR a Team');?> —</option>
<?php
if($ticket->isOpen() && !$ticket->isAssigned())
echo sprintf('<option value="%d">'.__('Claim Ticket (comments optional)').'</option>', $thisstaff->getId());
@@ -837,7 +837,7 @@ $tcount+= $ticket->getNumNotes();
$users = Staff::getAvailableStaffMembers();
if ($users) {
- echo '<OPTGROUP label="'.sprintf(__('Staff Members (%d)'), count($users)).'">';
+ echo '<OPTGROUP label="'.sprintf(__('Agents (%d)'), count($users)).'">';
$staffId=$ticket->isAssigned()?$ticket->getStaffId():0;
foreach($users as $id => $name) {
if($staffId && $staffId==$id)
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 1be913b4c6e057a63149f07da09d27540f0e7e33..f6044da73f73352f547a5b347eb7d78e6c5f9a5f 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -353,7 +353,7 @@ if ($results) {
if(!strcasecmp($status,'closed')) { ?>
<th width="150">
<a <?php echo $staff_sort; ?> href="tickets.php?sort=staff&order=<?php echo $negorder; ?><?php echo $qstr; ?>"
- title="<?php echo sprintf(__('Sort by %s %s'), __('Closing Staff Name'), __($negorder)); ?>"><?php echo __('Closed By'); ?></a></th>
+ title="<?php echo sprintf(__('Sort by %s %s'), __("Closing Agent's Name"), __($negorder)); ?>"><?php echo __('Closed By'); ?></a></th>
<?php
} else { //assigned to ?>
<th width="150">
@@ -584,7 +584,7 @@ if ($results) {
<option value="<?php echo $thisstaff->getId(); ?>"><?php echo __('Me');?></option>
<?php
if(($users=Staff::getStaffMembers())) {
- echo '<OPTGROUP label="'.__('Staff Members').' ('.count($users).')">';
+ echo '<OPTGROUP label="'.sprintf(__('Agents (%d)'),count($users)).'">';
foreach($users as $id => $name) {
$k="s$id";
echo sprintf('<option value="%s">%s</option>', $k, $name);
diff --git a/scp/dashboard.php b/scp/dashboard.php
index 049dc0a6f63a0cfa17b927d65f0ba1e6aee6be8f..8e48056787a4c86402040162f362f86a440cda95 100644
--- a/scp/dashboard.php
+++ b/scp/dashboard.php
@@ -61,7 +61,7 @@ require(STAFFINC_DIR.'header.inc.php');
<hr/>
<h2><?php echo __('Statistics'); ?> <i class="help-tip icon-question-sign" href="#statistics"></i></h2>
-<p><?php echo __('Statistics of tickets organized by department, help topic, and staff.');?></p>
+<p><?php echo __('Statistics of tickets organized by department, help topic, and agent.');?></p>
<ul class="nav nav-tabs" id="tabular-navigation"></ul>
<div id="table-here"></div>
diff --git a/scp/departments.php b/scp/departments.php
index 76b7e609a5efac0e1cc3b5d2ac0a11402dbec139..9bb773cb2cb8a63e2eb0e276a0460ed93bee48f2 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -77,7 +77,7 @@ if($_POST){
.' WHERE dept_id IN ('.implode(',', db_input($_POST['ids'])).')';
list($members)=db_fetch_row(db_query($sql));
if($members)
- $errors['err']=__('Departments with staff can not be deleted. Move staff first.');
+ $errors['err']=__('Departments with agents can not be deleted. Move the agents first.');
else {
$i=0;
foreach($_POST['ids'] as $k=>$v) {
diff --git a/scp/profile.php b/scp/profile.php
index 41d3ea20d3fc434517a48d7c95a630b7020989b1..3796ae1adb62d2f7ea7f87c2c2e824e99751f923 100644
--- a/scp/profile.php
+++ b/scp/profile.php
@@ -23,7 +23,7 @@ if($_POST && $_POST['id']!=$thisstaff->getId()) { //Check dummy ID used on the f
} elseif(!$errors && $_POST) { //Handle post
if(!$staff)
- $errors['err']=__('Unknown or invalid staff.');
+ $errors['err']=__('Unknown or invalid agent.');
elseif($staff->updateProfile($_POST,$errors)){
$msg=__('Profile updated successfully');
$thisstaff->reload();
diff --git a/scp/staff.php b/scp/staff.php
index da823a5841efe2ddccde63a9fd39453225367b5f..71bb7c3e035ac6cbff9fea8c3c7dc8b37e114f5b 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -17,17 +17,17 @@ require('admin.inc.php');
$staff=null;
if($_REQUEST['id'] && !($staff=Staff::lookup($_REQUEST['id'])))
- $errors['err']=__('Unknown or invalid staff ID.');
+ $errors['err']=__('Unknown or invalid agent.');
if($_POST){
switch(strtolower($_POST['do'])){
case 'update':
if(!$staff){
- $errors['err']=__('Unknown or invalid staff.');
+ $errors['err']=__('Unknown or invalid agent.');
}elseif($staff->update($_POST,$errors)){
- $msg=__('Staff updated successfully');
+ $msg=__('Agent updated successfully');
}elseif(!$errors['err']){
- $errors['err']=__('Unable to update staff. Correct any error(s) below and try again!');
+ $errors['err']=__('Unable to update agent. Correct any error(s) below and try again!');
}
break;
case 'create':
@@ -35,12 +35,12 @@ if($_POST){
$msg=sprintf(__('%s added successfully'),Format::htmlchars($_POST['firstname']));
$_REQUEST['a']=null;
}elseif(!$errors['err']){
- $errors['err']=__('Unable to add staff. Correct any error(s) below and try again.');
+ $errors['err']=__('Unable to add agent. Correct any error(s) below and try again.');
}
break;
case 'mass_process':
if(!$_POST['ids'] || !is_array($_POST['ids']) || !count($_POST['ids'])) {
- $errors['err'] = __('You must select at least one staff member.');
+ $errors['err'] = __('You must select at least one agent.');
} elseif(in_array($thisstaff->getId(),$_POST['ids'])) {
$errors['err'] = __('You can not disable/delete yourself - you could be the only admin!');
} else {
@@ -52,11 +52,11 @@ if($_POST){
if(db_query($sql) && ($num=db_affected_rows())) {
if($num==$count)
- $msg = __('Selected staff activated');
+ $msg = _N('Selected agent activated', 'Selected agents activated', $count);
else
- $warn = sprintf(__('%1$d of %2$d selected staff activated'), $num, $count);
+ $warn = sprintf(__('%1$d of %2$d selected agents activated'), $num, $count);
} else {
- $errors['err'] = __('Unable to activate selected staff');
+ $errors['err'] = __('Unable to activate selected agents');
}
break;
case 'disable':
@@ -65,11 +65,11 @@ if($_POST){
if(db_query($sql) && ($num=db_affected_rows())) {
if($num==$count)
- $msg = __('Selected staff disabled');
+ $msg = _N('Selected agent disabled', 'Selected agents disabled', $count);
else
- $warn = sprintf(__('%1$d of %2$d selected staff disabled'), $num, $count);
+ $warn = sprintf(__('%1$d of %2$d selected agents disabled'), $num, $count);
} else {
- $errors['err'] = __('Unable to disable selected staff');
+ $errors['err'] = __('Unable to disable selected agents');
}
break;
case 'delete':
@@ -79,11 +79,11 @@ if($_POST){
}
if($i && $i==$count)
- $msg = __('Selected staff deleted successfully');
+ $msg = _N('Selected agent deleted successfully', 'Selected agents deleted successfully', $count);
elseif($i>0)
- $warn = sprintf(__('%1$d of %2$d selected staff deleted'), $i, $count);
+ $warn = sprintf(__('%1$d of %2$d selected agents deleted'), $i, $count);
elseif(!$errors['err'])
- $errors['err'] = __('Unable to delete selected staff.');
+ $errors['err'] = __('Unable to delete selected agents.');
break;
default:
$errors['err'] = __('Unknown action. Get technical help!');
diff --git a/scp/tickets.php b/scp/tickets.php
index 7dac90f67c2a4b5295d691c59edf2f12cd3a9a6d..269105c8a65e562003dda7cc4c15bcbbed80dcaf 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -133,7 +133,7 @@ if($_POST && !$errors):
$errors['assignId']=__('Invalid assignee ID - get technical support');
elseif($ticket->isAssigned()) {
if($_POST['assignId'][0]=='s' && $id==$ticket->getStaffId())
- $errors['assignId']=__('Ticket already assigned to the staff.');
+ $errors['assignId']=__('Ticket already assigned to the agent.');
elseif($_POST['assignId'][0]=='t' && $id==$ticket->getTeamId())
$errors['assignId']=__('Ticket already assigned to the team.');
}
diff --git a/setup/cli/modules/i18n.php b/setup/cli/modules/i18n.php
index d090db54b4c92debc923a163fd8dcaa5ad1bdaf7..fb5b0687fb3498cfadc7695fb010289600925921 100644
--- a/setup/cli/modules/i18n.php
+++ b/setup/cli/modules/i18n.php
@@ -9,9 +9,14 @@ class i18n_Compiler extends Module {
var $prologue = "Manages translation files from Crowdin";
var $arguments = array(
- "command" => "Action to be performed.
- list - Show list of available translations
- make-pot - Build the PO file for gettext translations"
+ "command" => array(
+ 'help' => "Action to be performed.",
+ "options" => array(
+ 'list' => 'Show list of available translations',
+ 'build' => 'Compile a language pack',
+ 'make-pot' => 'Build the PO file for gettext translations',
+ ),
+ ),
);
var $options = array(