From 8f524263727336414b62fae93c4a9e02b20ee2c1 Mon Sep 17 00:00:00 2001
From: Michael <Chefkeks@users.noreply.github.com>
Date: Fri, 3 Jun 2016 09:12:58 +0200
Subject: [PATCH] Internal error occurred #2
Update three phrases with from "Internal error" to "Internal error occurred" since it's the most common phrase
---
include/class.staff.php | 2 +-
scp/staff.php | 2 +-
setup/inc/class.installer.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/class.staff.php b/include/class.staff.php
index 7f627982c..e5ed7e775 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -969,7 +969,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable {
$vars['lastname']=Format::striptags($vars['lastname']);
if (isset($this->staff_id) && $this->getId() != $vars['id'])
- $errors['err']=__('Internal Error');
+ $errors['err']=__('Internal error occurred');
if(!$vars['firstname'])
$errors['firstname']=__('First name required');
diff --git a/scp/staff.php b/scp/staff.php
index df2854e85..5ee374366 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -137,7 +137,7 @@ if($_POST){
|| !Dept::lookup($_POST['dept_id'])
|| !Role::lookup($_POST['role_id'])
) {
- $errors['err'] = 'Internal error.';
+ $errors['err'] = __('Internal error occurred');
break;
}
foreach ($members as $s) {
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index b382aa0f6..1a1983255 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -146,7 +146,7 @@ class Installer extends SetupWizard {
$schemaFile = INC_DIR."streams/$stream/install-mysql.sql";
if (!file_exists($schemaFile) || !($fp2 = fopen($schemaFile, 'rb')))
$this->errors['err'] = sprintf(
- __('%s: Internal Error - please make sure your download is the latest (#1)'),
+ __('%s: Internal error occurred - please make sure your download is the latest (#1)'),
$stream);
elseif (
// TODO: Make the hash algo configurable in the streams
--
GitLab