diff --git a/include/client/pwreset.request.php b/include/client/pwreset.request.php index 94d59360c2742b1c93250ef92c5fdcf302e174f4..cfadbb2ffb37c89a2a9f66896b03e85168a9108d 100644 --- a/include/client/pwreset.request.php +++ b/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> diff --git a/include/staff/pwreset.login.php b/include/staff/pwreset.login.php index 718170403f6407d4a6e10a25e12b6698149dd679..29670e28f6a1deed29d69fd37887c9f326dd48f7 100644 --- a/include/staff/pwreset.login.php +++ b/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"/> diff --git a/include/staff/pwreset.php b/include/staff/pwreset.php index b2ccfcfb95e60f89aeb0b87a399a805e897c5468..22157a36cb563a50d9421ec88eef736dbb14dd76 100644 --- a/include/staff/pwreset.php +++ b/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> diff --git a/include/staff/templates/user-lookup.tmpl.php b/include/staff/templates/user-lookup.tmpl.php index d6f1aa225135a596e550c8e1191641642293b601..980a032fc4050edd86e7d24e98d8448dfb1edcc7 100644 --- a/include/staff/templates/user-lookup.tmpl.php +++ b/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 diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php index b3c621b8f390f0d78b7c82d66664cf030bd729da..af406fa7a4efa256d5452b4046f4e45b8a2f598c 100644 --- a/include/staff/ticket-view.inc.php +++ b/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']; diff --git a/scp/pwreset.php b/scp/pwreset.php index 5fef286df2fcf218c8aa0edecbb6537097eea9a3..afca9196e44afad867749f0914ae2c86b6969d35 100644 --- a/scp/pwreset.php +++ b/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'); diff --git a/scp/settings.php b/scp/settings.php index c4e3c96695c7a27de0758831655315d4d978832a..b824ef7cabbf0305fae1c56d4c199147ec59b473 100644 --- a/scp/settings.php +++ b/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'); }