diff --git a/include/ajax.content.php b/include/ajax.content.php index c12d56ab00..0e461b53ee 100644 --- a/include/ajax.content.php +++ b/include/ajax.content.php @@ -61,7 +61,7 @@ function ticket_variables() { %{ticket.phone}'.__('Phone number | ext').' %{ticket.status}'.__('Status').' %{ticket.priority}'.__('Priority').' - %{ticket.assigned}'.__('Assigned agent and/or team').' + %{ticket.assigned}'.__('Assigned Agent / Team').' %{ticket.create_date}'.__('Date created').' %{ticket.due_date}'.__('Due date').' %{ticket.close_date}'.__('Date closed').' @@ -82,7 +82,7 @@ function ticket_variables() { %{response}'.__('Outgoing response').' %{comments}'.__('Assign/transfer comments').' %{note}'.__('Internal note (expandable)').' - %{assignee}'.__('Assigned agent/team').' + %{assignee}'.__('Assigned Agent / Team').' %{assigner}'.__('Agent assigning the ticket').' %{url}'.__('osTicket\'s base url (FQDN)').' %{reset_link} diff --git a/include/ajax.draft.php b/include/ajax.draft.php index c18dca63d0..e1bb78a043 100644 --- a/include/ajax.draft.php +++ b/include/ajax.draft.php @@ -354,14 +354,6 @@ function getFileList() { Http::response(500, 'Unable to lookup files'); $files = array(); - $folders = array( - 'C' => __('Canned Responses'), - 'F' => __('FAQ Articles'), - 'T' => __('Email Templates'), - 'L' => __('Logos'), - 'P' => __('Pages'), - 'H' => __('This Thread'), - ); while (list($id, $type, $name) = db_fetch_row($res)) { $f = AttachmentFile::lookup((int) $id); $url = $f->getDownloadUrl(); @@ -371,7 +363,6 @@ function getFileList() { 'thumb'=>$url.($type != 'H' ? '&s=128' : ''), 'image'=>$url, 'title'=>$name ?: $f->getName(), - 'folder'=>$folders[$type] ); } echo JsonDataEncoder::encode($files); diff --git a/include/ajax.kbase.php b/include/ajax.kbase.php index 3fd1409666..63ff371f57 100644 --- a/include/ajax.kbase.php +++ b/include/ajax.kbase.php @@ -45,7 +45,7 @@ function faq($id, $format='html') { '
%s
%s
-
'.__('Last updated %s').'
+
'.__('Last Updated %s').'
'.__('View').' | '.__('Attachments (%d)').'', $faq->getQuestion(), diff --git a/include/ajax.tasks.php b/include/ajax.tasks.php index 6fa9e05263..ee727bbfdf 100644 --- a/include/ajax.tasks.php +++ b/include/ajax.tasks.php @@ -115,7 +115,7 @@ function edit($tid) { Http::response(404, __('No such task')); if (!$task->checkStaffPerm($thisstaff, Task::PERM_EDIT)) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $info = $errors = array(); $forms = DynamicFormEntry::forObject($task->getId(), @@ -128,7 +128,9 @@ function edit($tid) { if ($task->update($forms, $_POST, $errors)) { Http::response(201, 'Task updated successfully'); } elseif(!$errors['err']) { - $errors['err']=__('Unable to update the task. Correct the errors below and try again!'); + $errors['err']=sprintf( + __('Unable to update %s. Correct any errors below and try again.'), + __('task')); } $info = Format::htmlchars($_POST); } @@ -170,7 +172,7 @@ function massProcess($action, $w=null) { if ($_POST) { if (!$_POST['tids'] || !($count=count($_POST['tids']))) $errors['err'] = sprintf( - __('You must select at least %s.'), + __('You must select at least %s'), __('one task')); } else { $count = $_REQUEST['count']; @@ -289,8 +291,7 @@ function massProcess($action, $w=null) { if (!$i) { $info['error'] = sprintf( - __('Unable to %1$s %2$s'), - __('assign'), + __('Unable to assign %s' /* %s may be pluralized */), _N('selected task', 'selected tasks', $count)); } } @@ -315,8 +316,7 @@ function massProcess($action, $w=null) { if (!$i) { $info['error'] = sprintf( - __('Unable to %1$s %2$s'), - __('transfer'), + __('Unable to transfer %s' /* %s may be pluralized */), _N('selected task', 'selected tasks', $count)); } } @@ -358,9 +358,9 @@ function massProcess($action, $w=null) { // will be checked below. if ($perm && !$thisstaff->hasPerm($perm, false)) $errors['err'] = sprintf( - __('You do not have permission to %s %s'), - __($action), - __('tasks')); + __('You do not have permission to %s tasks' + /* %s will be an action verb */ ), + __($action)); if ($_POST && !$errors) { if (!$_POST['status'] @@ -410,8 +410,7 @@ function massProcess($action, $w=null) { if (!$i) { $info['error'] = sprintf( - __('Unable to %1$s %2$s'), - __('delete'), + __('Unable to delete %s'), _N('selected task', 'selected tasks', $count)); } } @@ -427,7 +426,7 @@ function massProcess($action, $w=null) { if ($i==$count) { $msg = sprintf(__('Successfully %s %s.'), $actions[$action]['verbed'], - sprintf(__('%1$d %2$s'), + sprintf('%1$d %2$s', $count, _N('selected task', 'selected tasks', $count)) ); @@ -443,7 +442,7 @@ function massProcess($action, $w=null) { Http::response(201, 'processed'); } elseif($_POST && !isset($info['error'])) { $info['error'] = $errors['err'] ?: sprintf( - __('Unable to %1$s %2$s'), + __('Unable to %1$s %2$s'), __('process'), _N('selected task', 'selected tasks', $count)); } @@ -476,7 +475,7 @@ function transfer($tid) { Http::response(404, __('No such task')); if (!$task->checkStaffPerm($thisstaff, Task::PERM_TRANSFER)) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $errors = array(); @@ -520,7 +519,7 @@ function assign($tid, $target=null) { if (!$task->checkStaffPerm($thisstaff, Task::PERM_ASSIGN) || !($form=$task->getAssignmentForm($_POST, array( 'target' => $target)))) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $errors = array(); $info = array( @@ -566,7 +565,7 @@ function claim($tid) { // Check for premissions and such if (!$task->checkStaffPerm($thisstaff, Task::PERM_ASSIGN) || !($form = $task->getClaimForm($_POST))) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $errors = array(); $info = array( @@ -621,7 +620,7 @@ function delete($tid) { Http::response(404, __('No such task')); if (!$task->checkStaffPerm($thisstaff, Task::PERM_DELETE)) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $errors = array(); $info = array( @@ -700,8 +699,8 @@ function changeStatus($tid, $status) { if (!$errors && (!$perm || !$task->checkStaffPerm($thisstaff, $perm))) $errors['err'] = sprintf( - __('You do not have permission to %s %s'), - $statuses[$status], __('tasks')); + __('You do not have permission to %s tasks'), + $statuses[$status]); if ($_POST && !$errors) { if ($task->setStatus($status, $_POST['comments'], $errors)) diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php index c20abba7ec..209ea1a2d9 100644 --- a/include/ajax.tickets.php +++ b/include/ajax.tickets.php @@ -381,7 +381,7 @@ function transfer($tid) { Http::response(404, __('No such ticket')); if (!$ticket->checkStaffPerm($thisstaff, Ticket::PERM_TRANSFER)) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $errors = array(); @@ -426,7 +426,7 @@ function assign($tid, $target=null) { if (!$ticket->checkStaffPerm($thisstaff, Ticket::PERM_ASSIGN) || !($form = $ticket->getAssignmentForm($_POST, array('target' => $target)))) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $errors = array(); $info = array( @@ -486,7 +486,7 @@ function claim($tid) { || !$ticket->isOpen() // Claim only open || $ticket->getStaff() // cannot claim assigned ticket || !($form = $ticket->getClaimForm($_POST))) - Http::response(403, __('Permission Denied')); + Http::response(403, __('Permission denied')); $errors = array(); $info = array( @@ -568,7 +568,7 @@ function massProcess($action, $w=null) { if ($_POST) { if (!$_POST['tids'] || !($count=count($_POST['tids']))) $errors['err'] = sprintf( - __('You must select at least %s.'), + __('You must select at least %s'), __('one ticket')); } else { $count = $_REQUEST['count']; @@ -736,9 +736,8 @@ function massProcess($action, $w=null) { // Generic permission check. if (!$thisstaff->hasPerm(Ticket::PERM_DELETE, false)) $errors['err'] = sprintf( - __('You do not have permission to %s %s'), - __('delete'), - __('tickets')); + __('You do not have permission %s'), + __('to delete tickets')) if ($_POST && !$errors) { @@ -768,14 +767,16 @@ function massProcess($action, $w=null) { if ($i==$count) { $msg = sprintf(__('Successfully %s %s.'), $actions[$action]['verbed'], - sprintf(__('%1$d %2$s'), + sprintf('%1$d %2$s', $count, _N('selected ticket', 'selected tickets', $count)) ); $_SESSION['::sysmsgs']['msg'] = $msg; } else { $warn = sprintf( - __('%1$d of %2$d %3$s %4$s'), $i, $count, + __('%1$d of %2$d %3$s %4$s' + /* Tokens are of */), + $i, $count, _N('selected ticket', 'selected tickets', $count), $actions[$action]['verbed']); @@ -784,7 +785,7 @@ function massProcess($action, $w=null) { Http::response(201, 'processed'); } elseif($_POST && !isset($info['error'])) { $info['error'] = $errors['err'] ?: sprintf( - __('Unable to %1$s %2$s'), + __('Unable to %1$s %2$s'), __('process'), _N('selected ticket', 'selected tickets', $count)); } @@ -846,8 +847,8 @@ function changeTicketStatus($tid, $status, $id=0) { break; default: $state = $ticket->getStatus()->getState(); - $info['warn'] = sprintf('%s %s', - __('Unknown or invalid'), __('status')); + $info['warn'] = sprintf(__('%s: Unknown or invalid'), + __('status')); } $info['status_id'] = $id ?: $ticket->getStatusId(); @@ -879,17 +880,17 @@ function setTicketStatus($tid) { case 'open': if (!$role->hasPerm(TicketModel::PERM_CLOSE) && !$role->hasPerm(TicketModel::PERM_CREATE)) - $errors['err'] = sprintf(__('You do not have permission %s.'), + $errors['err'] = sprintf(__('You do not have permission %s'), __('to reopen tickets')); break; case 'closed': if (!$role->hasPerm(TicketModel::PERM_CLOSE)) - $errors['err'] = sprintf(__('You do not have permission %s.'), + $errors['err'] = sprintf(__('You do not have permission %s'), __('to resolve/close tickets')); break; case 'deleted': if (!$role->hasPerm(TicketModel::PERM_DELETE)) - $errors['err'] = sprintf(__('You do not have permission %s.'), + $errors['err'] = sprintf(__('You do not have permission %s'), __('to archive/delete tickets')); break; default: @@ -974,11 +975,11 @@ function setSelectedTicketsStatus($state) { $errors = $info = array(); if (!$thisstaff || !$thisstaff->canManageTickets()) $errors['err'] = sprintf('%s %s', - sprintf(__('You do not have permission %s.'), + sprintf(__('You do not have permission %s'), __('to mass manage tickets')), __('Contact admin for such access')); elseif (!$_REQUEST['tids'] || !count($_REQUEST['tids'])) - $errors['err']=sprintf(__('You must select at least %s.'), + $errors['err']=sprintf(__('You must select at least %s'), __('one ticket')); elseif (!($status= TicketStatus::lookup($_REQUEST['status_id']))) $errors['status_id'] = sprintf('%s %s', @@ -989,17 +990,17 @@ function setSelectedTicketsStatus($state) { case 'open': if (!$thisstaff->hasPerm(TicketModel::PERM_CLOSE, false) && !$thisstaff->hasPerm(TicketModel::PERM_CREATE, false)) - $errors['err'] = sprintf(__('You do not have permission %s.'), + $errors['err'] = sprintf(__('You do not have permission %s'), __('to reopen tickets')); break; case 'closed': if (!$thisstaff->hasPerm(TicketModel::PERM_CLOSE, false)) - $errors['err'] = sprintf(__('You do not have permission %s.'), + $errors['err'] = sprintf(__('You do not have permission %s'), __('to resolve/close tickets')); break; case 'deleted': if (!$thisstaff->hasPerm(TicketModel::PERM_DELETE, false)) - $errors['err'] = sprintf(__('You do not have permission %s.'), + $errors['err'] = sprintf(__('You do not have permission %s'), __('to archive/delete tickets')); break; default: @@ -1031,7 +1032,7 @@ function setSelectedTicketsStatus($state) { if ($i==$count) { if (!strcasecmp($status->getState(), 'deleted')) { - $msg = sprintf(__( 'Successfully deleted %s.'), + $msg = sprintf(__( 'Successfully deleted %s'), _N('selected ticket', 'selected tickets', $count)); } else { @@ -1048,7 +1049,7 @@ function setSelectedTicketsStatus($state) { } else { if (!strcasecmp($status->getState(), 'deleted')) { - $warn = sprintf(__('Successfully deleted %s.'), + $warn = sprintf(__('Successfully deleted %s'), sprintf(__('%1$d of %2$d selected tickets'), $i, $count) ); @@ -1229,7 +1230,7 @@ function addTask($tid) { $info['title'] = sprintf( __( 'Ticket #%1$s: %2$s'), $ticket->getNumber(), - _('Add New Task') + __('Add New Task') ); include STAFFINC_DIR . 'templates/task.tmpl.php'; diff --git a/include/ajax.users.php b/include/ajax.users.php index dd01ac1deb..218f9c0723 100644 --- a/include/ajax.users.php +++ b/include/ajax.users.php @@ -442,7 +442,7 @@ function updateOrg($id, $orgId = 0) { } if ($org && $user->getOrgId() && $org->getId() != $user->getOrgId()) - $info['warning'] = __("Are you sure you want to change user's organization?"); + $info['warning'] = __("Are you sure you want to change the user's organization?"); $tmpl = $tmpl ?: 'org-lookup.tmpl.php'; diff --git a/include/class.api.php b/include/class.api.php index 818b8826e8..fa40b839c8 100644 --- a/include/class.api.php +++ b/include/class.api.php @@ -137,8 +137,8 @@ function save($id, $vars, &$errors) { if(db_query($sql)) return true; - $errors['err']=sprintf(__('Unable to update %s.'), __('this API key')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this API key')) + .' — '.__('Internal error occurred'); } else { $sql='INSERT INTO '.API_KEY_TABLE.' SET '.$sql diff --git a/include/class.auth.php b/include/class.auth.php index a924d9cd5a..afda9c0e9a 100644 --- a/include/class.auth.php +++ b/include/class.auth.php @@ -484,7 +484,7 @@ function login($staff, $bk) { return false; //Log debug info. - $ost->logDebug(_S('Agent login'), + $ost->logDebug(_S('Agent Login'), sprintf(_S("%s logged in [%s], via %s"), $staff->getUserName(), $_SERVER['REMOTE_ADDR'], get_class($bk))); //Debug. @@ -948,7 +948,7 @@ function authstrike($credentials) { _S('Time').": ".date('M j, Y, g:i a T')."\n\n". _S('Attempts').": {$authsession['strikes']}"; $ost->logError(_S('Excessive login attempts (user)'), $alert, ($cfg->alertONLoginError())); - return new AccessDenied(__('Access Denied')); + return new AccessDenied(__('Access denied')); } elseif($authsession['strikes']%3==0) { //Log every third failed login attempt as a warning. $alert=_S('Username').": {$username}\n". _S('IP').": {$_SERVER['REMOTE_ADDR']}\n". diff --git a/include/class.canned.php b/include/class.canned.php index bb126d7408..22f3934d51 100644 --- a/include/class.canned.php +++ b/include/class.canned.php @@ -286,10 +286,10 @@ function update($vars,&$errors) { return true; if ($isnew) - $errors['err'] = sprintf(__('Unable to update %s.'), __('this canned response')); + $errors['err'] = sprintf(__('Unable to update %s'), __('this canned response')); else - $errors['err']=sprintf(__('Unable to create %s.'), __('this canned response')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to create %s'), __('this canned response')) + .' — '.__('Internal error occurred'); return true; } diff --git a/include/class.dept.php b/include/class.dept.php index 397df89c48..eac074c9fd 100644 --- a/include/class.dept.php +++ b/include/class.dept.php @@ -639,11 +639,11 @@ function update($vars, &$errors) { } if (isset($this->id)) - $errors['err']=sprintf(__('Unable to update %s.'), __('this department')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this department')) + .' — '.__('Internal error occurred'); else - $errors['err']=sprintf(__('Unable to create %s.'), __('this department')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to create %s'), __('this department')) + .' — '.__('Internal error occurred'); return false; } diff --git a/include/class.email.php b/include/class.email.php index e0bdb64bd3..eb0ee23b5b 100644 --- a/include/class.email.php +++ b/include/class.email.php @@ -416,12 +416,12 @@ function update($vars, &$errors=false) { return true; if ($id) { //update - $errors['err']=sprintf(__('Unable to update %s.'), __('this email')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this email')) + .' — '.__('Internal error occurred'); } else { - $errors['err']=sprintf(__('Unable to add %s.'), __('this email')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to add %s'), __('this email')) + .' — '.__('Internal error occurred'); } return false; diff --git a/include/class.filter.php b/include/class.filter.php index 20bac5ce53..6d9295978c 100644 --- a/include/class.filter.php +++ b/include/class.filter.php @@ -494,13 +494,13 @@ function save($id,$vars,&$errors) { if($id) { $sql='UPDATE '.FILTER_TABLE.' SET '.$sql.' WHERE id='.db_input($id); if(!db_query($sql)) - $errors['err']=sprintf(__('Unable to update %s.'), __('this ticket filter')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this ticket filter')) + .' — '.__('Internal error occurred'); }else{ $sql='INSERT INTO '.FILTER_TABLE.' SET '.$sql.',created=NOW() '; if(!db_query($sql) || !($id=db_insert_id())) - $errors['err']=sprintf(__('Unable to add %s.'), __('this ticket filter')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to add %s'), __('this ticket filter')) + .' — '.__('Internal error occurred'); } if($errors || !$id) return false; diff --git a/include/class.filter_action.php b/include/class.filter_action.php index 6c687cc6fa..7d639d9d18 100644 --- a/include/class.filter_action.php +++ b/include/class.filter_action.php @@ -369,7 +369,7 @@ function getConfigurationOptions() { array(':new:' => '— '.__('Add New').' —'), 'validators' => function($self, $clean) { if ($clean === ':new:') - $self->addError(__('Select a team')); + $self->addError(__('Select a Team')); } )), ); diff --git a/include/class.forms.php b/include/class.forms.php index 15b32c3063..3722827a57 100644 --- a/include/class.forms.php +++ b/include/class.forms.php @@ -865,10 +865,10 @@ function asVarType() { */ function whatChanged($before, $after) { if ($before) - $desc = __('changed from %2$s to %1$s'); + $desc = __('changed from %1$s to %2$s'); else - $desc = __('set to %1$s'); - return sprintf($desc, $this->display($after), $this->display($before)); + $desc = __('set to %2$s'); + return sprintf($desc, $this->display($before), $this->display($after)); } /** @@ -4215,7 +4215,7 @@ function getFields() { 'label' => __('Department'), 'flags' => hexdec(0X450F3), 'required' => true, - 'validator-error' => __('Department selection required'), + 'validator-error' => __('Department selection is required'), ) ), 'comments' => new TextareaField(array( diff --git a/include/class.page.php b/include/class.page.php index 920c2ee88e..a671d1c718 100644 --- a/include/class.page.php +++ b/include/class.page.php @@ -288,7 +288,7 @@ function update($vars, &$errors, $allowempty=false) { if ($rv) return $rv; - $errors['err']=sprintf(__('Unable to update %s.'), __('this site page')); + $errors['err']=sprintf(__('Unable to update %s'), __('this site page')); return false; } diff --git a/include/class.role.php b/include/class.role.php index f584cfa430..0e0f89af2b 100644 --- a/include/class.role.php +++ b/include/class.role.php @@ -149,7 +149,7 @@ function update($vars, &$errors) { $errors['name'] = __('Name required'); elseif (($r=Role::lookup(array('name'=>$vars['name']))) && $r->getId() != $vars['id']) - $errors['name'] = __('Name already in-use'); + $errors['name'] = __('Name already in use'); elseif (!$vars['perms'] || !count($vars['perms'])) $errors['err'] = __('Must check at least one permission for the role'); diff --git a/include/class.search.php b/include/class.search.php index 25617b27bf..fbb3439868 100644 --- a/include/class.search.php +++ b/include/class.search.php @@ -1132,7 +1132,7 @@ function getChoices($verbose=false) { return array( 'open' => __('Open'), 'closed' => __('Closed'), - 'archived' => __('Archived'), + 'archived' => _P('ticket state name', 'Archived'), 'deleted' => __('Deleted'), ); } diff --git a/include/class.sla.php b/include/class.sla.php index d961ebcba2..e8c82b8342 100644 --- a/include/class.sla.php +++ b/include/class.sla.php @@ -100,7 +100,7 @@ function asVar() { static function getVarScope() { return array( - 'name' => __('SLA Plan'), + 'name' => __('Service Level Agreement'), 'graceperiod' => __("Grace Period (hrs)"), ); } @@ -133,11 +133,11 @@ function update($vars, &$errors) { return true; if (isset($this->id)) { - $errors['err']=sprintf(__('Unable to update %s.'), __('this SLA plan')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this SLA plan')) + .' — '.__('Internal error occurred'); } else { - $errors['err']=sprintf(__('Unable to add %s.'), __('this SLA plan')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to add %s'), __('this SLA plan')) + .' — '.__('Internal error occurred'); } return false; diff --git a/include/class.staff.php b/include/class.staff.php index a5e56c22ad..890ff411ad 100644 --- a/include/class.staff.php +++ b/include/class.staff.php @@ -628,7 +628,7 @@ function updateProfile($vars, &$errors) { $errors['email']=__('Already in-use as system email'); elseif (($uid=static::getIdByEmail($vars['email'])) && (!isset($this->staff_id) || $uid!=$this->getId())) - $errors['email']=__('Email already in-use by another agent'); + $errors['email']=__('Email already in use by another agent'); if($vars['phone'] && !Validator::is_phone($vars['phone'])) $errors['phone']=__('Valid phone number is required'); @@ -894,10 +894,10 @@ static function importCsv($stream, $defaults=array(), $callback=false) { $imported = 0; $fields = array( 'firstname' => new TextboxField(array( - 'label' => __('First name'), + 'label' => __('First Name'), )), 'lastname' => new TextboxField(array( - 'label' => __('Last name'), + 'label' => __('Last Name'), )), 'email' => new TextboxField(array( 'label' => __('Email Address'), @@ -1061,11 +1061,11 @@ function update($vars, &$errors) { } if (isset($this->staff_id)) { - $errors['err']=sprintf(__('Unable to update %s.'), __('this agent')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this agent')) + .' — '.__('Internal error occurred'); } else { - $errors['err']=sprintf(__('Unable to create %s.'), __('this agent')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to create %s'), __('this agent')) + .' — '.__('Internal error occurred'); } return false; } diff --git a/include/class.task.php b/include/class.task.php index 5350d9b606..eb2ba5ed9c 100644 --- a/include/class.task.php +++ b/include/class.task.php @@ -1033,7 +1033,7 @@ function getVar($tag) { static function getVarScope() { $base = array( - 'assigned' => __('Assigned agent and/or team'), + 'assigned' => __('Assigned Agent / Team'), 'close_date' => array( 'class' => 'FormattedDate', 'desc' => __('Date Closed'), ), @@ -1046,7 +1046,7 @@ static function getVarScope() { 'due_date' => array( 'class' => 'FormattedDate', 'desc' => __('Due Date'), ), - 'number' => __('Task number'), + 'number' => __('Task Number'), 'recipients' => array( 'class' => 'UserList', 'desc' => __('List of all recipient names'), ), diff --git a/include/class.team.php b/include/class.team.php index d6963eb921..1810d4b01b 100644 --- a/include/class.team.php +++ b/include/class.team.php @@ -182,11 +182,11 @@ function update($vars, &$errors=array()) { return $this->members->saveAll(); if (isset($this->team_id)) { - $errors['err']=sprintf(__('Unable to update %s.'), __('this team')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this team')) + .' — '.__('Internal error occurred'); } else { - $errors['err']=sprintf(__('Unable to create %s.'), __('this team')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to create %s'), __('this team')) + .' — '.__('Internal error occurred'); } return false; diff --git a/include/class.template.php b/include/class.template.php index 36cf856028..6c7c5ac552 100644 --- a/include/class.template.php +++ b/include/class.template.php @@ -62,7 +62,7 @@ class EmailTemplateGroup { ), 'ticket.overlimit'=>array( 'group'=>'a.ticket.user', - 'name'=>/* @trans */ 'Over Limit Notice', + 'name'=>/* @trans */ 'Overlimit Notice', 'desc'=>/* @trans */ 'A one-time notice sent, if enabled, when user has reached the maximum allowed open tickets.', 'context' => array( 'ticket', 'signature', @@ -469,8 +469,8 @@ function save($id, $vars, &$errors) { if(db_query($sql)) return true; - $errors['err']=sprintf(__('Unable to update %s.'), __('this template set')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this template set')) + .' — '.__('Internal error occurred'); } else { @@ -479,8 +479,8 @@ function save($id, $vars, &$errors) { $sql='INSERT INTO '.EMAIL_TEMPLATE_GRP_TABLE .' SET created=NOW(), '.$sql; if(!db_query($sql) || !($new_id=db_insert_id())) { - $errors['err']=sprintf(__('Unable to create %s.'), __('this template set')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to create %s'), __('this template set')) + .' — '.__('Internal error occurred'); return false; } diff --git a/include/class.ticket.php b/include/class.ticket.php index 453d40dc5e..e6cfe42433 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -1700,7 +1700,7 @@ function onAssign($assignee, $comments, $alert=true) { return false; $user_comments = (bool) $comments; - $comments = $comments ?: _S('Ticket assignment'); + $comments = $comments ?: _S('Ticket Assignment'); $assigner = $thisstaff ?: _S('SYSTEM (Auto Assignment)'); //Log an internal note - no alerts on the internal note. @@ -1883,7 +1883,7 @@ function getVar($tag) { static function getVarScope() { $base = array( - 'assigned' => __('Assigned agent and/or team'), + 'assigned' => __('Assigned Agent / Team'), 'close_date' => array( 'class' => 'FormattedDate', 'desc' => __('Date Closed'), ), @@ -1923,14 +1923,14 @@ static function getVarScope() { 'class' => 'TicketThread', 'desc' => __('Ticket Thread'), ), 'topic' => array( - 'class' => 'Topic', 'desc' => __('Help topic'), + 'class' => 'Topic', 'desc' => __('Help Topic'), ), // XXX: Isn't lastreponse and lastmessage more useful 'last_update' => array( 'class' => 'FormattedDate', 'desc' => __('Time of last update'), ), 'user' => array( - 'class' => 'User', 'desc' => __('Ticket owner'), + 'class' => 'User', 'desc' => __('Ticket Owner'), ), ); @@ -2745,7 +2745,7 @@ function update($vars, &$errors) { $fields['user_id'] = array('type'=>'int', 'required'=>0, 'error'=>__('Invalid user-id')); if (!Validator::process($fields, $vars, $errors) && !$errors['err']) - $errors['err'] = __('Missing or invalid data - check the errors and try again'); + $errors['err'] = __('Missing or invalid data - correct the errors and try again'); $vars['note'] = ThreadEntryBody::clean($vars['note']); @@ -3091,7 +3091,7 @@ static function create($vars, &$errors, $origin, $autorespond=true, $fields=array(); switch (strtolower($origin)) { case 'web': - $fields['topicId'] = array('type'=>'int', 'required'=>1, 'error'=>__('Select a help topic')); + $fields['topicId'] = array('type'=>'int', 'required'=>1, 'error'=>__('Select a Help Topic')); break; case 'staff': $fields['deptId'] = array('type'=>'int', 'required'=>0, 'error'=>__('Department selection is required')); @@ -3109,7 +3109,7 @@ static function create($vars, &$errors, $origin, $autorespond=true, } if(!Validator::process($fields, $vars, $errors) && !$errors['err']) - $errors['err'] =__('Missing or invalid data - check the errors and try again'); + $errors['err'] =__('Missing or invalid data - correct the errors and try again'); // Make sure the due date is valid if ($vars['duedate']) { diff --git a/include/class.topic.php b/include/class.topic.php index c25ab788a4..8196c2df99 100644 --- a/include/class.topic.php +++ b/include/class.topic.php @@ -447,13 +447,13 @@ function update($vars, &$errors) { $this->sort = ($parent->sort ?: 0) + 1; } if (!($rv = $this->save())) { - $errors['err']=sprintf(__('Unable to create %s.'), __('this help topic')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to create %s'), __('this help topic')) + .' — '.__('Internal error occurred'); } } elseif (!($rv = $this->save())) { - $errors['err']=sprintf(__('Unable to update %s.'), __('this help topic')) - .' '.__('Internal error occurred'); + $errors['err']=sprintf(__('Unable to update %s'), __('this help topic')) + .' — '.__('Internal error occurred'); } if ($rv) { if (!$cfg || $cfg->getTopicSortMode() == 'a') { diff --git a/include/class.user.php b/include/class.user.php index 82e1f9cfee..bc36bd7bc2 100644 --- a/include/class.user.php +++ b/include/class.user.php @@ -1096,7 +1096,7 @@ function update($vars, &$errors) { if (!$thisstaff) { - $errors['err'] = __('Access Denied'); + $errors['err'] = __('Access denied'); return false; } diff --git a/include/class.variable.php b/include/class.variable.php index fb968336a6..8b346e0cd3 100644 --- a/include/class.variable.php +++ b/include/class.variable.php @@ -264,12 +264,12 @@ static function getContextForRoot($root) { $contextTypes = array( 'activity' => array('class' => 'ThreadActivity', 'desc' => __('Type of recent activity')), - 'assignee' => array('class' => 'Staff', 'desc' => __('Assigned agent/team')), + 'assignee' => array('class' => 'Staff', 'desc' => __('Assigned Agent / Team')), 'assigner' => array('class' => 'Staff', 'desc' => __('Agent performing the assignment')), 'comments' => __('Assign/transfer comments'), 'link' => __('Access link'), 'message' => array('class' => 'MessageThreadEntry', 'desc' => 'Message from the EndUser'), - 'note' => array('class' => 'NoteThreadEntry', 'desc' => __('Internal note')), + 'note' => array('class' => 'NoteThreadEntry', 'desc' => __('Internal Note')), 'poster' => array('class' => 'User', 'desc' => 'EndUser or Agent originating the message'), // XXX: This could be EndUser -or- Staff object 'recipient' => array('class' => 'TicketUser', 'desc' => 'Message recipient'), diff --git a/include/cli/modules/i18n.php b/include/cli/modules/i18n.php index 60f935abf7..f4c06caec1 100644 --- a/include/cli/modules/i18n.php +++ b/include/cli/modules/i18n.php @@ -548,6 +548,7 @@ function __write_pot_header() { 'msgid ""', 'msgstr ""', '"Project-Id-Version: osTicket '.trim(`git describe`).'\n"', + '"X-Osticket-Major-Version: '.MAJOR_VERSION.'\n"', '"POT-Create-Date: '.date('Y-m-d H:i O').'\n"', '"Report-Msgid-Bugs-To: support@osticket.com\n"', '"Language: en_US\n"', diff --git a/include/client/accesslink.inc.php b/include/client/accesslink.inc.php index b73dae29f1..4f5f5ac810 100644 --- a/include/client/accesslink.inc.php +++ b/include/client/accesslink.inc.php @@ -23,7 +23,7 @@