From 0fb2105112d978d2cc949955bef20a9f51a89a14 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 7 Jul 2014 10:22:34 -0500
Subject: [PATCH] i18n: Make scp sign-in page translatable
---
include/class.translation.php | 2 +-
include/staff/header.inc.php | 2 +-
scp/login.php | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/class.translation.php b/include/class.translation.php
index 7d9deabe7..ada080cd2 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 eecf64246..3499e2dd7 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 6ec0b6e33..ad07a831b 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');
--
GitLab