diff --git a/include/class.translation.php b/include/class.translation.php index 7d9deabe75db6310a159104fd2727c0270498c28..ada080cd23211d99c2ad80338c284aefe8eab575 100644 --- a/include/class.translation.php +++ b/include/class.translation.php @@ -698,7 +698,7 @@ class TextDomain { $this->path = $path; } - static function configureForUser($user) { + static function configureForUser($user=false) { if ($user && method_exists($user, 'getLanguage')) $lang = $user->getLanguage(); else diff --git a/include/staff/header.inc.php b/include/staff/header.inc.php index eecf6424649f0707b22a4a1220feade132665268..3499e2dd7ffef7c589a59bed1e54599a7cc76715 100644 --- a/include/staff/header.inc.php +++ b/include/staff/header.inc.php @@ -55,7 +55,7 @@ ?> <div id="header"> <a href="index.php" class="no-pjax" id="logo">osTicket — <?php echo __('Customer Support System'); ?></a> - <p id="info"><?php echo sprintf(__('Welcome, %s'), '<strong>'.$thisstaff->getFirstName().'</strong>.'); ?> + <p id="info"><?php echo sprintf(__('Welcome, %s.'), '<strong>'.$thisstaff->getFirstName().'</strong>'); ?> <?php if($thisstaff->isAdmin() && !defined('ADMINPAGE')) { ?> | <a href="admin.php" class="no-pjax"><?php echo __('Admin Panel'); ?></a> diff --git a/scp/login.php b/scp/login.php index 6ec0b6e33232380e5de1d69ce17bae84dace61d4..ad07a831b9d329c5044339fb08b5b726b178baa9 100644 --- a/scp/login.php +++ b/scp/login.php @@ -16,6 +16,10 @@ require_once('../main.inc.php'); if(!defined('INCLUDE_DIR')) die('Fatal Error. Kwaheri!'); +// Bootstrap gettext translations. Since no one is yet logged in, use the +// system or browser default +TextDomain::configureForUser(); + require_once(INCLUDE_DIR.'class.staff.php'); require_once(INCLUDE_DIR.'class.csrf.php');