i18n: Translate the password-reset feature

include/client/pwreset.request.php

@@ -19,7 +19,7 @@ $userid=Format::input($_POST['userid']);
         <input id="username" type="text" name="userid" size="30" value="<?php echo $userid; ?>">
     </div>
     <p>
-        <input class="btn" type="submit" value="Send Email">
+        <input class="btn" type="submit" value="<?php echo __('Send Email'); ?>">
     </p>
     </div>
 </form>

include/staff/pwreset.login.php

@@ -14,7 +14,7 @@ $info = ($_POST)?Format::htmlchars($_POST):array();
         <input type="hidden" name="token" value="<?php echo Format::htmlchars($_REQUEST['token']); ?>"/>
         <fieldset>
             <input type="text" name="userid" id="name" value="<?php echo
-                $info['userid']; ?>" placeholder="username or email"
+                $info['userid']; ?>" placeholder="<?php echo __('Email or Username'); ?>"
                 autocorrect="off" autocapitalize="off"/>
         </fieldset>
         <input class="submit" type="submit" name="submit" value="Login"/>

include/staff/pwreset.php

@@ -12,10 +12,10 @@ $info = ($_POST && $errors)?Format::htmlchars($_POST):array();
         <input type="hidden" name="do" value="sendmail">
         <fieldset>
             <input type="text" name="userid" id="name" value="<?php echo
-                $info['userid']; ?>" placeholder="username" autocorrect="off"
+            $info['userid']; ?>" placeholder="<?php echo __('Email or Username'); ?>" autocorrect="off"
                 autocapitalize="off">
         </fieldset>
-        <input class="submit" type="submit" name="submit" value="Send Email"/>
+        <input class="submit" type="submit" name="submit" value="<?php echo __('Send Email'); ?>"/>
     </form>
 
 </div>

include/staff/templates/user-lookup.tmpl.php

@@ -9,7 +9,7 @@ if (!isset($info['lookup']) || $info['lookup'] !== false) { ?>
 ); ?></p></div>
 <div style="margin-bottom:10px;">
     <input type="text" class="search-input" style="width:100%;"
-    placeholder="Search by email, phone or name" id="user-search"
+    placeholder="<?php echo __('Search by email, phone or name'); ?>" id="user-search"
     autocorrect="off" autocomplete="off"/>
 </div>
 <?php

include/staff/ticket-view.inc.php

@@ -658,7 +658,7 @@ $tcount+= $ticket->getNumNotes();
                     </div>
                     <br/>
                     <textarea name="note" id="internal_note" cols="80"
-                        placeholder="Note details"
+                        placeholder="<?php echo __('Note details'); ?>"
                         rows="9" wrap="soft" data-draft-namespace="ticket.note"
                         data-draft-object-id="<?php echo $ticket->getId(); ?>"
                         class="richtext ifhtml draft draft-delete"><?php echo $info['note'];

scp/pwreset.php

@@ -24,6 +24,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');
 

scp/settings.php

@@ -43,7 +43,6 @@ if (isset($settingOptions[$target]))
 if($page && $_POST && !$errors) {
     if($cfg && $cfg->updateSettings($_POST,$errors)) {
         $msg=sprintf(__('Successfully updated %s'), Format::htmlchars($page[0]));
-        $cfg->reload();
     } elseif(!$errors['err']) {
         $errors['err']=__('Unable to update settings - correct errors below and try again');
     }