diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index 0533975b49e1fee65c56a0f4cea7a6dd2335463e..c32f170d02656aa39530d491f8549d70ffbc002e 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -251,7 +251,7 @@ class TicketsAjaxAPI extends AjaxController {
$uid = md5($_SERVER['QUERY_STRING']);
$_SESSION["adv_$uid"] = $tickets;
$result['success'] = sprintf(__("Search criteria matched %s"),
- _N('%d tickets', '%d ticket', count($tickets)))
+ _N('%d ticket', '%d tickets', count($tickets)))
. " - <a href='tickets.php?advsid=$uid'>".__('view')."</a>";
} else {
$result['fail']=__('No tickets found matching your search criteria.');
diff --git a/include/class.email.php b/include/class.email.php
index 4ccc6b2d55e0f642196a6c4d6267f9b67346b694..699d37a2ed2732f8737f029b7cf7d23dfb3087b7 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -294,7 +294,7 @@ class Email {
if(!$vars['mail_fetchmax'] || !is_numeric($vars['mail_fetchmax']))
$errors['mail_fetchmax']=__('Maximum emails required');
if(!$vars['dept_id'] || !is_numeric($vars['dept_id']))
- $errors['dept_id']=__('You must select a Dept.');
+ $errors['dept_id']=__('You must select a department');
if(!$vars['priority_id'])
$errors['priority_id']=__('You must select a priority');
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 293dbb9240ce9502258662432308a75ca139172c..89edc4285aa495f963da3d2334818de90f8bf974 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -851,10 +851,10 @@ class MailFetcher {
db_query('UPDATE '.EMAIL_TABLE.' SET mail_errors=mail_errors+1, mail_lasterror=NOW() WHERE email_id='.db_input($emailId));
if (++$errors>=$MAXERRORS) {
//We've reached the MAX consecutive errors...will attempt logins at delayed intervals
- $msg="\n".__('osTicket is having trouble fetching emails from the following mail account:')." \n".
- "\n".__('User:')." ".$fetcher->getUsername().
- "\n".__('Host:')." ".$fetcher->getHost().
- "\n".__('Error:')." ".$fetcher->getLastError().
+ $msg="\n".__('osTicket is having trouble fetching emails from the following mail account').": \n".
+ "\n".__('User').": ".$fetcher->getUsername().
+ "\n".__('Host').": ".$fetcher->getHost().
+ "\n".__('Error').": ".$fetcher->getLastError().
"\n\n ".sprintf(__('%1$d consecutive errors. Maximum of %2$d allowed'), $errors, $MAXERRORS).
"\n\n ".sprintf(__('This could be connection issues related to the mail server. Next delayed login attempt in aprox. %d minutes'),$TIMEOUT);
$ost->alertAdmin(__('Mail Fetch Failure Alert'), $msg, true);
diff --git a/include/class.pagenate.php b/include/class.pagenate.php
index f711bd0b9d6ca45d629bc2c5ccd84c11428159e5..361d21f89855a4982661ffdf6421bbeae360a203 100644
--- a/include/class.pagenate.php
+++ b/include/class.pagenate.php
@@ -15,13 +15,13 @@
**********************************************************************/
class PageNate {
-
+
var $start;
var $limit;
var $total;
var $page;
var $pages;
-
+
function PageNate($total,$page,$limit=20,$url='') {
$this->total = intval($total);
@@ -29,7 +29,7 @@ class PageNate {
$this->page = max($page, 1 );
$this->start = max((($page-1)*$this->limit),0);
$this->pages = ceil( $this->total / $this->limit );
-
+
if (($this->limit > $this->total) || ($this->page>ceil($this->total/$this->limit))) {
$this->start = 0;
}
@@ -55,16 +55,16 @@ class PageNate {
function getLimit() {
return $this->limit;
}
-
-
+
+
function getNumPages(){
return $this->pages;
}
-
+
function getPage() {
return ceil(($this->start+1)/$this->limit);
}
-
+
function showing() {
$html = '';
$from= $this->start+1;
@@ -75,13 +75,14 @@ class PageNate {
}
$html=" ".__('Showing')." ";
if ($this->total > 0) {
- $html .= "$from - $to ".__('of')." " .$this->total;
+ $html .= sprintf(__('%1$d - %2$d of %3$d' /* Used in pagination output */),
+ $from, $to, $this->total);
}else{
$html .= " 0 ";
}
return $html;
}
-
+
function getPageLinks() {
$html = '';
$file =$this->url;
@@ -91,15 +92,15 @@ class PageNate {
$last=$this_page-1;
$next=$this_page+1;
-
+
$start_loop = floor($this_page-$displayed_span);
$stop_loop = ceil($this_page + $displayed_span);
-
-
-
+
+
+
$stopcredit =($start_loop<1)?0-$start_loop:0;
$startcredit =($stop_loop>$total_pages)?$stop_loop-$total_pages:0;
-
+
$start_loop =($start_loop-$startcredit>0)?$start_loop-$startcredit:1;
$stop_loop =($stop_loop+$stopcredit>$total_pages)?$total_pages:$stop_loop+$stopcredit;
@@ -107,7 +108,7 @@ class PageNate {
$lastspan=($start_loop-$displayed_span>0)?$start_loop-$displayed_span:1;
$html .= "\n<a href=\"$file&p=$lastspan\" ><strong>«</strong></a>";
}
-
+
for ($i=$start_loop; $i <= $stop_loop; $i++) {
$page = ($i - 1) * $this->limit;
if ($i == $this_page) {
@@ -120,9 +121,9 @@ class PageNate {
$nextspan=($stop_loop+$displayed_span>$total_pages)?$total_pages-$displayed_span:$stop_loop+$displayed_span;
$html .= "\n<a href=\"$file&p=$nextspan\" ><strong>»</strong></a>";
}
-
-
+
+
return $html;
}
diff --git a/include/staff/apikey.inc.php b/include/staff/apikey.inc.php
index 3d2bb753bc55c86593cebb0f3c2803ee39b9184e..1e6f845cf05beb9c4d65710b951346fc239a3fcc 100644
--- a/include/staff/apikey.inc.php
+++ b/include/staff/apikey.inc.php
@@ -38,7 +38,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tbody>
<tr>
<td width="150" class="required">
- <?php echo __('Status:');?>
+ <?php echo __('Status');?>:
</td>
<td>
<input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong><?php echo __('Active');?></strong>
@@ -49,7 +49,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<?php if($api){ ?>
<tr>
<td width="150">
- <?php echo __('IP Address:');?>
+ <?php echo __('IP Address');?>:
</td>
<td>
<span>
@@ -60,14 +60,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="150">
- <?php echo __('API Key:');?>
+ <?php echo __('API Key');?>:
</td>
<td><?php echo $api->getKey(); ?> </td>
</tr>
<?php }else{ ?>
<tr>
<td width="150" class="required">
- <?php echo __('IP Address:');?>
+ <?php echo __('IP Address');?>:
</td>
<td>
<span>
@@ -80,7 +80,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<?php } ?>
<tr>
<th colspan="2">
- <em><strong><?php echo __('Services:');?></strong> <?php echo __('Check applicable API services enabled for the key.');?></em>
+ <em><strong><?php echo __('Services');?>:</strong> <?php echo __('Check applicable API services enabled for the key.');?></em>
</th>
</tr>
<tr>
diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php
index 51d19d78aa990e5f49748c3483a1ae5d680fc0c4..89f4309b2e24b9743cfa3e22ae37d09ae7ca3bc5 100644
--- a/include/staff/banlist.inc.php
+++ b/include/staff/banlist.inc.php
@@ -53,7 +53,7 @@ $query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart().","
<form action="banlist.php" method="GET" name="filter">
<input type="hidden" name="a" value="filter" >
<div>
- <?php echo __('Query:');?> <input name="q" type="text" size="20" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>">
+ <?php echo __('Query');?>: <input name="q" type="text" size="20" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>">
<input type="submit" name="submit" value="<?php echo __('Search');?>"/>
</div>
@@ -68,7 +68,7 @@ else
$showing=__('No banned emails matching the query found!');
if($search)
- $showing=__('Search Results:').' '.$showing;
+ $showing=__('Search Results').': '.$showing;
?>
<form action="banlist.php" method="POST" name="banlist">
@@ -111,7 +111,7 @@ if($search)
<tr>
<td colspan="5">
<?php if($res && $num){ ?>
- <?php echo __('Select:');?>
+ <?php echo __('Select');?>:
<a id="selectAll" href="#ckb"><?php echo __('All');?></a>
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
diff --git a/include/staff/banrule.inc.php b/include/staff/banrule.inc.php
index fdc0aab293fdb6356a3a22a8db078ca6bf57d26a..b3fe52347ccc875025eaa05fb490bd3b4a5be7a5 100644
--- a/include/staff/banrule.inc.php
+++ b/include/staff/banrule.inc.php
@@ -32,7 +32,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tr>
<th colspan="2">
<h4><?php echo $title; ?></h4>
- <em><?php echo __('Valid email address required.');?></em>
+ <em><?php echo __('Valid email address required');?></em>
</th>
</tr>
</thead>
diff --git a/include/staff/cannedresponse.inc.php b/include/staff/cannedresponse.inc.php
index 65a2f574e581d23fc4edd1aa3ca043ddc8523c0c..f2842292d7ebf53ce0c938a14a707b6f9eb61012 100644
--- a/include/staff/cannedresponse.inc.php
+++ b/include/staff/cannedresponse.inc.php
@@ -41,7 +41,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</thead>
<tbody>
<tr>
- <td width="180" class="required"><?php echo __('Status:');?></td>
+ <td width="180" class="required"><?php echo __('Status');?>:</td>
<td>
<label><input type="radio" name="isenabled" value="1" <?php
echo $info['isenabled']?'checked="checked"':''; ?>> <?php echo __('Active'); ?> </label>
@@ -52,7 +52,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</td>
</tr>
<tr>
- <td width="180" class="required"><?php echo __('Department:');?></td>
+ <td width="180" class="required"><?php echo __('Department');?>:</td>
<td>
<select name="dept_id">
<option value="0">— <?php echo __('All Departments');?> —</option>
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index fdd01b1967920e4acab2f1e808a32c05c9032f22..853242f98e3ddafb0737b393d3c163c4c90fe4ed 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -99,7 +99,7 @@ else
<tr>
<td colspan="5">
<?php if($res && $num){ ?>
- <?php echo __('Select:');?>
+ <?php echo __('Select');?>:
<a id="selectAll" href="#ckb"><?php echo __('All');?></a>
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php
index f64476a929271d4d0951d7a391098603a88b4219..82f5049989b08a128c86174bebd2c291561107f4 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -93,7 +93,7 @@ else
<tr>
<td colspan="5">
<?php if($res && $num){ ?>
- <?php echo __('Select:');?>
+ <?php echo __('Select');?>:
<a id="selectAll" href="#ckb"><?php echo __('All');?></a>
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
diff --git a/include/staff/category.inc.php b/include/staff/category.inc.php
index 3d51aa161cc3872665e6a8d41a499ffc77c34be1..ff1ef1f93e558c31c96dd43e800a300519bf333f 100644
--- a/include/staff/category.inc.php
+++ b/include/staff/category.inc.php
@@ -41,7 +41,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</th>
</tr>
<tr>
- <td width="180" class="required"><?php echo __('Category Type:');?></td>
+ <td width="180" class="required"><?php echo __('Category Type');?>:</td>
<td>
<input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><b><?php echo __('Public');?></b> <?php echo __('(publish)');?>
diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index ca5183bc1da4a7396fe196347113148b761d1255..3437f72ae8f398eb643c3840b3d27dec113b0aba 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -44,7 +44,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tbody>
<tr>
<td width="180" class="required">
- <?php echo __('Name:');?>
+ <?php echo __('Name');?>:
</td>
<td>
<input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -53,12 +53,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __('Type:');?>
+ <?php echo __('Type');?>:
</td>
<td>
<input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Public');?></strong>
- <input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Private');?></strong> <?php echo __('(Internal)');?>
+ <input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>><strong><?php echo __('Private');?></strong> <?php echo mb_convert_case(__('(internal)'), MB_CASE_TITLE);?>
<i class="help-tip icon-question-sign" href="#type"></i>
</td>
</tr>
@@ -172,7 +172,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('New Ticket:');?>
+ <?php echo __('New Ticket');?>:
</td>
<td>
<span>
@@ -185,7 +185,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('New Message:');?>
+ <?php echo __('New Message');?>:
</td>
<td>
<span>
diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index c198fc043e92c963982d75a911ddc71a47b1496d..288ba30c7c6b6e6571859ad55bb763be9cd1bda5 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -110,7 +110,7 @@ else
<tr>
<td colspan="6">
<?php if($res && $num){ ?>
- <?php echo __('Select:');?>
+ <?php echo __('Select');?>:
<a id="selectAll" href="#ckb"><?php echo __('All');?></a>
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php
index 679f4cea7593e901f283b971cdf4e89bbdac753c..862eb0b9042fef22eb65a74c65a1f3a61d5d7ea3 100644
--- a/include/staff/emails.inc.php
+++ b/include/staff/emails.inc.php
@@ -97,7 +97,7 @@ else
<tr>
<td colspan="6">
<?php if($res && $num){ ?>
- <?php echo __('Select:');?>
+ <?php echo __('Select');?>:
<a id="selectAll" href="#ckb"><?php echo __('All');?></a>
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index 69cc2e61a228bff38b2da6ebecdccb1706c72b00..73724f98b414d98e8dd1768225480c7aa4d8769b 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -40,7 +40,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tbody>
<tr>
<td width="180" class="required">
- <?php echo __('Filter Name:');?>
+ <?php echo __('Filter Name');?>:
</td>
<td>
<input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -49,7 +49,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __('Execution Order:');?>
+ <?php echo __('Execution Order');?>:
</td>
<td>
<input type="text" size="6" name="execorder" value="<?php echo $info['execorder']; ?>">
@@ -112,7 +112,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td colspan=2>
- <em><?php echo __('Rules Matching Criteria:');?></em>
+ <em><?php echo __('Rules Matching Criteria');?>:</em>
<input type="radio" name="match_all_rules" value="1" <?php echo $info['match_all_rules']?'checked="checked"':''; ?>><?php echo __('Match All');?>
@@ -229,7 +229,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('Department:');?>
+ <?php echo __('Department');?>:
</td>
<td>
<select name="dept_id">
@@ -249,7 +249,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('Priority:');?>
+ <?php echo __('Priority');?>:
</td>
<td>
<select name="priority_id">
@@ -270,7 +270,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('SLA Plan:');?>
+ <?php echo __('SLA Plan');?>:
</td>
<td>
<select name="sla_id">
@@ -290,7 +290,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('Auto-assign To:');?>
+ <?php echo __('Auto-assign To');?>:
</td>
<td>
<select name="assign">
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index 7d7e91a39425db253e74499fdaa0b181c4a4dafe..21b79cae083db9ce42e215ca3f04ae9dce54b2f8 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -98,7 +98,7 @@ else
<tr>
<td colspan="8">
<?php if($res && $num){ ?>
- <?php echo __('Select:');?>
+ <?php echo __('Select');?>:
<a id="selectAll" href="#ckb"><?php echo __('All');?></a>
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
diff --git a/include/staff/group.inc.php b/include/staff/group.inc.php
index 7f8df8e3cbee611a5d914472c0343b0d9096bae7..31e6819c10a364d410d7af5c6b581cdc01a682a4 100644
--- a/include/staff/group.inc.php
+++ b/include/staff/group.inc.php
@@ -38,7 +38,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tbody>
<tr>
<td width="180" class="required">
- <?php echo __('Name:');?>
+ <?php echo __('Name');?>:
</td>
<td>
<input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -47,7 +47,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __('Status:');?>
+ <?php echo __('Status');?>:
</td>
<td>
<input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong><?php echo __('Active');?></strong>
diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php
index d1ea436b922c876102c84965a42420ba57e406c5..dc8304979dbbd05efc30b9a6c714c2738bb891c5 100644
--- a/include/staff/groups.inc.php
+++ b/include/staff/groups.inc.php
@@ -100,7 +100,7 @@ else
<tr>
<td colspan="7">
<?php if($res && $num){ ?>
- <?php echo __('Select:');?>
+ <?php echo __('Select');?>:
<a id="selectAll" href="#ckb"><?php echo __('All');?></a>
<a id="selectNone" href="#ckb"><?php echo __('None');?></a>
<a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index 22410b1a5ca71a6e1b6cde3e1c56c5d78b387bad..b3bf3ae295b8bb083745f3d2bc068e0ed5ea07c2 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -40,7 +40,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tbody>
<tr>
<td width="180" class="required">
- <?php echo __('Topic:');?>
+ <?php echo __('Topic');?>:
</td>
<td>
<input type="text" size="30" name="topic" value="<?php echo $info['topic']; ?>">
@@ -49,7 +49,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __('Status:');?>
+ <?php echo __('Status');?>:
</td>
<td>
<input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><?php echo __('Active'); ?>
@@ -59,7 +59,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __('Type:');?>
+ <?php echo __('Type');?>:
</td>
<td>
<input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><?php echo __('Public'); ?>
@@ -69,7 +69,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('Parent Topic:');?>
+ <?php echo __('Parent Topic');?>:
</td>
<td>
<select name="topic_pid">
@@ -152,7 +152,7 @@ if ($info['form_id'] == Topic::FORM_USE_PARENT) echo 'selected="selected"';
</tr>
<tr>
<td width="180">
- <?php echo __('SLA Plan:');?>:
+ <?php echo __('SLA Plan');?>:
</td>
<td>
<select name="sla_id">
diff --git a/include/staff/slaplan.inc.php b/include/staff/slaplan.inc.php
index 4c0ab218ff751d74a8bb867e2305e1dbf51a5500..a8b9dcd2a6067995f4fa69cc7b27a70262fd5084 100644
--- a/include/staff/slaplan.inc.php
+++ b/include/staff/slaplan.inc.php
@@ -38,7 +38,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<tbody>
<tr>
<td width="180" class="required">
- <?php echo __('Name:');?>
+ <?php echo __('Name');?>:
</td>
<td>
<input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
@@ -47,7 +47,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __('Grace Period:');?>
+ <?php echo __('Grace Period');?>:
</td>
<td>
<input type="text" size="10" name="grace_period" value="<?php echo $info['grace_period']; ?>">
@@ -57,7 +57,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180" class="required">
- <?php echo __('Status:');?>
+ <?php echo __('Status');?>:
</td>
<td>
<input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong><?php echo __('Active');?></strong>
@@ -77,7 +77,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<td width="180">
- <?php echo __('Ticket Overdue Alerts:');?>
+ <?php echo __('Ticket Overdue Alerts');?>:
</td>
<td>
<input type="checkbox" name="disable_overdue_alerts" value="1" <?php echo $info['disable_overdue_alerts']?'checked="checked"':''; ?> >
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index 07bcd6c7f96f68874ccf0a099005ce8869d0616b..efd2e61ffea02e4fd14ea8efa6d0da4038bbd3b7 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -125,7 +125,7 @@ else
<tr>
<th width="7px"> </th>
<th width="200"><a <?php echo $name_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th>
- <th width="100"><a <?php echo $username_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=username"><?php echo __('UserName');?></a></th>
+ <th width="100"><a <?php echo $username_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=username"><?php echo __('Username');?></a></th>
<th width="100"><a <?php echo $status_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th>
<th width="120"><a <?php echo $group_sort; ?>href="staff.php?<?php echo $qstr; ?>&sort=group"><?php echo __('Group');?></a></th>
<th width="150"><a <?php echo $dept_sort; ?>href="staff.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th>
diff --git a/scp/apikeys.php b/scp/apikeys.php
index 9fc46ea16027378390e44e4d2d79523d55bc07ef..1b10a745265dc841c73adf9613bdab2d94ddea1b 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -83,7 +83,7 @@ if($_POST){
$errors['err'] = __('Unable to delete selected API keys');
break;
default:
- $errors['err']=__('Unknown action - get technical help');
+ $errors['err']=__('Unknown action - get technical help.');
}
}
break;
diff --git a/scp/banlist.php b/scp/banlist.php
index ba892fb929ae2d5a15bf060bf83da975be3bdacd..211572128ed5e0d4935f4feb572e9f5343d9e08c 100644
--- a/scp/banlist.php
+++ b/scp/banlist.php
@@ -111,7 +111,7 @@ if($_POST && !$errors && $filter){
break;
default:
- $errors['err'] = __('Unknown action - get technical help');
+ $errors['err'] = __('Unknown action - get technical help.');
}
}
break;
diff --git a/scp/departments.php b/scp/departments.php
index 54cb8af614c4d057466f107a42328284a7337663..76b7e609a5efac0e1cc3b5d2ac0a11402dbec139 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -93,7 +93,7 @@ if($_POST){
}
break;
default:
- $errors['err']=__('Unknown action - get technical help');
+ $errors['err']=__('Unknown action - get technical help.');
}
}
break;
diff --git a/scp/emails.php b/scp/emails.php
index ce3bd7274eab1ce94105acb6299a02bec0f5c20d..ad3bcf5715ff4b3b3a122284b8e04dd48fccb9bb 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -67,7 +67,7 @@ if($_POST){
$errors['err'] = __('Unable to delete selected emails');
} else {
- $errors['err'] = __('Unknown action - get technical help');
+ $errors['err'] = __('Unknown action - get technical help.');
}
}
break;
diff --git a/scp/filters.php b/scp/filters.php
index 30fc26a8550dd1ba754865ffcb8b5aad6990314e..0521be3be836c7fd64ecd886bc6617fdbf5fe016 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -89,7 +89,7 @@ if($_POST){
$errors['err'] = __('Unable to delete selected filters');
break;
default:
- $errors['err']=__('Unknown action - get technical help');
+ $errors['err']=__('Unknown action - get technical help.');
}
}
break;
diff --git a/scp/logs.php b/scp/logs.php
index d1a6bcc6ccda452444bd2e7239bccd0075f2ee81..c4e09ff3fe502c25b34f3e60633af6b91b462899 100644
--- a/scp/logs.php
+++ b/scp/logs.php
@@ -34,7 +34,7 @@ if($_POST){
} elseif(!$errors['err'])
$errors['err']=__('Unable to delete selected logs');
} else {
- $errors['err']=__('Unknown action - get technical help');
+ $errors['err']=__('Unknown action - get technical help.');
}
}
break;
diff --git a/scp/profile.php b/scp/profile.php
index dffed07ef2ac1402ac2889490b31e8797934795a..41d3ea20d3fc434517a48d7c95a630b7020989b1 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 staff.');
elseif($staff->updateProfile($_POST,$errors)){
$msg=__('Profile updated successfully');
$thisstaff->reload();
diff --git a/scp/settings.php b/scp/settings.php
index 015bdc235f8f3f3d9f368dcbe27243c8bb3ba820..da250fa249a805ac2d7e6829c569e9675242ee57 100644
--- a/scp/settings.php
+++ b/scp/settings.php
@@ -42,7 +42,7 @@ if (isset($settingOptions[$target]))
if($page && $_POST && !$errors) {
if($cfg && $cfg->updateSettings($_POST,$errors)) {
- $msg=sprintf(__('%s Updated Successfully', Format::htmlchars($page[0])));
+ $msg=sprintf(__('%s Updated Successfully'), Format::htmlchars($page[0]));
$cfg->reload();
} elseif(!$errors['err']) {
$errors['err']=__('Unable to update settings - correct errors below and try again');
diff --git a/scp/tickets.php b/scp/tickets.php
index cfbc886c918987676ef6f4d1c5c2e8ce2c5df01c..bb7635d88cff19e0fd7dc2e9481090d66026bb55 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -259,7 +259,7 @@ if($_POST && !$errors):
} elseif($ticket->isOpen()) {
$errors['err'] = __('Ticket is already open!');
} elseif($ticket->reopen()) {
- $msg=__('Ticket REOPENED');
+ $msg=__('Ticket Reopened');
if($_POST['ticket_status_notes'])
$note = $_POST['ticket_status_notes'];
@@ -478,7 +478,7 @@ if($_POST && !$errors):
}
break;
default:
- $errors['err']=__('Unknown or unsupported action - get technical help');
+ $errors['err']=__('Unknown or unsupported action - get technical help.');
}
}
break;
diff --git a/scp/upgrade.php b/scp/upgrade.php
index 5466d0bd00c89751c469836afba2f894ac5aaac9..f077c7e4f1d701a4728a9df026113d28b68b3c90 100644
--- a/scp/upgrade.php
+++ b/scp/upgrade.php
@@ -48,7 +48,7 @@ if($_POST && $_POST['s'] && !$upgrader->isAborted()) {
}
break;
default:
- $errors['err']=__('Unknown action!');
+ $errors['err']=__('Unknown action');
}
}
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index 3e90dd994c52f07929fde827d21b42f5496126b5..8fde38370e60ad43f35a43b8307bcaff9ff06bd3 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -84,14 +84,14 @@ class Installer extends SetupWizard {
// Support port number specified in the hostname with a colon (:)
list($host, $port) = explode(':', $vars['dbhost']);
if ($port && is_numeric($port) && ($port < 1 || $port > 65535))
- $this->errors['db'] = _('Invalid database port number');
+ $this->errors['db'] = __('Invalid database port number');
//MYSQL: Connect to the DB and check the version & database (create database if it doesn't exist!)
if(!$this->errors) {
if(!db_connect($vars['dbhost'],$vars['dbuser'],$vars['dbpass']))
$this->errors['db']=sprintf(__('Unable to connect to MySQL server: %s'), db_connect_error());
elseif(explode('.', db_version()) < explode('.', $this->getMySQLVersion()))
- $this->errors['db']=sprintf(__('osTicket requires MySQL %s or later!',$this->getMySQLVersion()));
+ $this->errors['db']=sprintf(__('osTicket requires MySQL %s or later!'),$this->getMySQLVersion());
elseif(!db_select_database($vars['dbname']) && !db_create_database($vars['dbname'])) {
$this->errors['dbname']=__("Database doesn't exist");
$this->errors['db']=__('Unable to create the database.');