From 0117b87f90984ef0d03b623cacfebb0b3a6111df Mon Sep 17 00:00:00 2001
From: Michael <Chefkeks@users.noreply.github.com>
Date: Fri, 16 Dec 2016 09:18:14 +0100
Subject: [PATCH] Update/Unify all the `Get tech(nical) help/support`phrases to
`Get technical help!` :)
---
include/class.config.php | 2 +-
include/class.email.php | 4 ++--
include/upgrader/aborted.inc.php | 2 +-
main.inc.php | 2 +-
scp/apikeys.php | 2 +-
scp/banlist.php | 2 +-
scp/categories.php | 2 +-
scp/departments.php | 2 +-
scp/emails.php | 2 +-
scp/filters.php | 2 +-
scp/helptopics.php | 2 +-
scp/js/scp.js | 2 +-
scp/logs.php | 2 +-
scp/orgs.php | 2 +-
scp/pages.php | 2 +-
scp/slas.php | 2 +-
scp/staff.inc.php | 2 +-
scp/staff.php | 2 +-
scp/teams.php | 2 +-
scp/templates.php | 2 +-
scp/users.php | 4 ++--
21 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/include/class.config.php b/include/class.config.php
index 277741525..8f10d777a 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -1089,7 +1089,7 @@ class OsticketConfig extends Config {
return $this->updateKBSettings($vars, $errors);
break;
default:
- $errors['err']=__('Unknown setting option. Get technical support.');
+ $errors['err']=sprintf('%s - %s', __('Unknown setting option'), __('Get technical help!'));
}
return false;
diff --git a/include/class.email.php b/include/class.email.php
index 2cd7fe3ef..c1542113e 100644
--- a/include/class.email.php
+++ b/include/class.email.php
@@ -248,7 +248,7 @@ class Email extends VerySimpleModel {
$id = isset($this->email_id) ? $this->getId() : 0;
if($id && $id!=$vars['id'])
- $errors['err']=__('Get technical help.')
+ $errors['err']=__('Get technical help!')
.' '.__('Internal error occurred');
if(!$vars['email'] || !Validator::is_email($vars['email'])) {
@@ -274,7 +274,7 @@ class Email extends VerySimpleModel {
&& $vars['userid']
&& !Crypto::encrypt($vars['passwd'], SECRET_SALT, $vars['userid'])
)
- $errors['passwd'] = __('Unable to encrypt password - get technical support');
+ $errors['passwd'] = sprintf('%s - %s', __('Unable to encrypt password'), __('Get technical help!'));
}
list($vars['mail_protocol'], $encryption) = explode('/', $vars['mail_proto']);
diff --git a/include/upgrader/aborted.inc.php b/include/upgrader/aborted.inc.php
index 846d5cd72..c34a4e7d2 100644
--- a/include/upgrader/aborted.inc.php
+++ b/include/upgrader/aborted.inc.php
@@ -17,7 +17,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D
echo sprintf('<li>%s</li>',$error);
echo '</ul>';
} else {
- echo '<b><font color="red">'.__('Internal error occurred - get technical help.').'</font></b>';
+ echo '<b><font color="red">'.__('Internal error occurred').' - '.__('Get technical help!').'</font></b>';
}
?>
<p><b><?php echo sprintf(__('For details - please view %s or check your email.'),
diff --git a/main.inc.php b/main.inc.php
index e92ec4a71..383156038 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -31,7 +31,7 @@ Bootstrap::connect();
$_SERVER['REMOTE_ADDR'] = osTicket::get_client_ip();
if(!($ost=osTicket::start()) || !($cfg = $ost->getConfig()))
-Bootstrap::croak(__('Unable to load config info from DB. Get tech support.'));
+Bootstrap::croak(__('Unable to load config info from DB.').' '.__('Get technical help!'));
//Init
$session = $ost->getSession();
diff --git a/scp/apikeys.php b/scp/apikeys.php
index 9d9336a30..1f84789a9 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -96,7 +96,7 @@ if($_POST){
_N('selected API key', 'selected API keys', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/banlist.php b/scp/banlist.php
index 7dafe2f15..a905f6853 100644
--- a/scp/banlist.php
+++ b/scp/banlist.php
@@ -123,7 +123,7 @@ if($_POST && !$errors && $filter){
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/categories.php b/scp/categories.php
index 22e9fab69..bea8e9a24 100644
--- a/scp/categories.php
+++ b/scp/categories.php
@@ -111,7 +111,7 @@ if($_POST){
_N('selected category', 'selected categories', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/departments.php b/scp/departments.php
index 45cafc653..c1d860488 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -118,7 +118,7 @@ if($_POST){
}
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/emails.php b/scp/emails.php
index f19e65576..b119d11b4 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -73,7 +73,7 @@ if($_POST){
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/filters.php b/scp/filters.php
index b8b0d634d..9e4d63193 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -103,7 +103,7 @@ if($_POST){
_N('selected ticket filter', 'selected ticket filters', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/helptopics.php b/scp/helptopics.php
index 2dd0dc7fe..b00c231d5 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -135,7 +135,7 @@ if($_POST){
}
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/js/scp.js b/scp/js/scp.js
index ae2512f63..c825c051c 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -93,7 +93,7 @@ var scp_prep = function() {
else
formObj = $(this).closest('form');
if($('.dialog#confirm-action p#'+name+'-confirm').length === 0) {
- alert('Unknown action '+name+' - get technical help.');
+ alert('Unknown action '+name+' - Get technical help!');
} else if(checkbox_checker(formObj, 1)) {
var action = name;
$('.dialog#confirm-action').undelegate('.confirm');
diff --git a/scp/logs.php b/scp/logs.php
index 26767bd58..7e4eea9f9 100644
--- a/scp/logs.php
+++ b/scp/logs.php
@@ -38,7 +38,7 @@ if($_POST){
$errors['err']=sprintf(__('Unable to delete %s.'),
_N('selected log entry', 'selected log entries', $count));
} else {
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/orgs.php b/scp/orgs.php
index d08400fc9..8a70dcf2b 100644
--- a/scp/orgs.php
+++ b/scp/orgs.php
@@ -78,7 +78,7 @@ if ($_POST) {
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
if (!$errors['err'] && !$count) {
$errors['err'] = __('Unable to manage any of the selected organizations');
diff --git a/scp/pages.php b/scp/pages.php
index 31b3cab3b..c7dc6a068 100644
--- a/scp/pages.php
+++ b/scp/pages.php
@@ -107,7 +107,7 @@ if($_POST) {
_N('selected site page', 'selected site pages', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/slas.php b/scp/slas.php
index 61bab1e55..22e3e44e6 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -114,7 +114,7 @@ if($_POST){
_N('selected SLA plan', 'selected SLA plans', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/staff.inc.php b/scp/staff.inc.php
index e486cde88..a91b15a2f 100644
--- a/scp/staff.inc.php
+++ b/scp/staff.inc.php
@@ -15,7 +15,7 @@
**********************************************************************/
if(basename($_SERVER['SCRIPT_NAME'])==basename(__FILE__)) die('Access denied'); //Say hi to our friend..
-if(!file_exists('../main.inc.php')) die('Fatal error... get technical support');
+if(!file_exists('../main.inc.php')) die('Fatal error... Get technical help!');
require_once('../main.inc.php');
diff --git a/scp/staff.php b/scp/staff.php
index 5ee374366..9b2f4a999 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -158,7 +158,7 @@ if($_POST){
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
diff --git a/scp/teams.php b/scp/teams.php
index 600d14883..8f154b97c 100644
--- a/scp/teams.php
+++ b/scp/teams.php
@@ -110,7 +110,7 @@ if($_POST){
_N('selected team', 'selected teams', $count));
break;
default:
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/templates.php b/scp/templates.php
index e5a8decd0..929e220d5 100644
--- a/scp/templates.php
+++ b/scp/templates.php
@@ -146,7 +146,7 @@ if($_POST){
_N('selected template set', 'selected template sets', $count));
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
}
break;
diff --git a/scp/users.php b/scp/users.php
index 4223f651f..047d0f91c 100644
--- a/scp/users.php
+++ b/scp/users.php
@@ -126,7 +126,7 @@ if ($_POST) {
case 'setorg':
if (!($org = Organization::lookup($_POST['org_id'])))
- $errors['err'] = __('Unknown action - get technical help.');
+ $errors['err'] = sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
foreach ($users as $U) {
if ($U->setOrganization($org))
$count++;
@@ -134,7 +134,7 @@ if ($_POST) {
break;
default:
- $errors['err']=__('Unknown action - get technical help.');
+ $errors['err']=sprintf('%s - %s', __('Unknown action'), __('Get technical help!'));
}
if (!$errors['err'] && !$count) {
$errors['err'] = __('Unable to manage any of the selected end users');
--
GitLab