From c4785a70d98224d6e8971a8dd87f52a79f013d0a Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Fri, 10 Jun 2005 06:19:23 +0000 Subject: [PATCH] r259: Switching from phrase() to lang::p() --- admin/fields.php | 20 ++++---- admin/global.php | 10 ++-- admin/options.php | 16 +++---- admin/priority.php | 28 +++++------ admin/product.php | 72 ++++++++++++++--------------- admin/resolution.php | 28 +++++------ admin/severity.php | 24 +++++----- admin/status.php | 26 +++++------ admin/usergroup.php | 36 +++++++-------- includes/adminfunctions.php | 22 ++++----- includes/class_message_reporter.php | 8 ++-- includes/functions.php | 2 +- 12 files changed, 146 insertions(+), 146 deletions(-) diff --git a/admin/fields.php b/admin/fields.php index 46808a3..b5a8e04 100644 --- a/admin/fields.php +++ b/admin/fields.php @@ -37,7 +37,7 @@ if ($_REQUEST['do'] == 'kill') $field = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bugfield WHERE fieldid = " . intval($bugsys->in['fieldid'])); if (!$field) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $db->query("DELETE FROM " . TABLE_PREFIX . "bugfield WHERE fieldid = $field[fieldid]"); @@ -55,7 +55,7 @@ if ($_REQUEST['do'] == 'delete') $field = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bugfield WHERE fieldid = " . intval($bugsys->in['fieldid'])); if (!$field) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $admin->page_confirm('Are you sure you want to delete this bug field? Doing so will remove everything for this field and it cannot be undone!', "fields.php?do=kill&fieldid=$field[fieldid]"); @@ -75,7 +75,7 @@ if ($_REQUEST['do'] == 'update') $field = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bugfield WHERE fieldid = " . intval($bugsys->in['fieldid'])); if (!$field) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $edit = true; @@ -173,7 +173,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') $typeselect = (($add AND empty($bugsys->in['step'])) ? true : false); $edit = (($add) ? false : true); - $admin->page_start(phrase((($add) ? 'add_new_field' : 'edit_field'))); + $admin->page_start(lang::p((($add) ? 'add_new_field' : 'edit_field'))); $admin->form_start('fields.php', (($typeselect) ? 'add' : 'update')); if ($add AND !$typeselect) { @@ -188,7 +188,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') else { $admin->table_start(); - $admin->table_head((($add) ? phrase('add_new_field') . ' - ' . $TYPES[ $bugsys->in['type'] ] : phrase('edit_field'))); + $admin->table_head((($add) ? lang::p('add_new_field') . ' - ' . $TYPES[ $bugsys->in['type'] ] : lang::p('edit_field'))); } if ($edit) @@ -196,7 +196,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') $field = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bugfield WHERE fieldid = " . intval($bugsys->in['fieldid'])); if (!$field) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $admin->form_hidden_field('fieldid', $field['fieldid']); @@ -224,7 +224,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') { if (!isset($TYPES["$type"])) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } // global fields @@ -269,10 +269,10 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') if ($_REQUEST['do'] == 'modify') { - $admin->page_start(phrase('additional_bug_fields')); + $admin->page_start(lang::p('additional_bug_fields')); $admin->table_start(); - $admin->table_head(phrase('additional_bug_fields'), 3); + $admin->table_head(lang::p('additional_bug_fields'), 3); $admin->table_column_head(array('Display Name/Description', 'Field ID', 'Actions')); $fields = $db->query("SELECT * FROM " . TABLE_PREFIX . "bugfield ORDER BY fieldid ASC"); @@ -287,7 +287,7 @@ if ($_REQUEST['do'] == 'modify') ); } - $admin->row_span('', 'tfoot', 'center', 3); + $admin->row_span('', 'tfoot', 'center', 3); $admin->table_end(); $admin->page_end(); diff --git a/admin/global.php b/admin/global.php index 2397764..91ecf4e 100755 --- a/admin/global.php +++ b/admin/global.php @@ -58,10 +58,10 @@ function admin_login() $admin->form_start('../login.php', 'cplogin', false, 'cplogin'); $admin->table_start(true, '425'); - $admin->table_head(phrase('bugstrike_login')); - $admin->row_input(phrase('email'), 'email', $bugsys->userinfo['email'], 2, 35, false, false, 'middle'); - $admin->row_input(phrase('password'), 'password', '', 2, 35, false, true, 'middle'); - $admin->row_submit('', phrase('login')); + $admin->table_head(lang::p('bugstrike_login')); + $admin->row_input(lang::p('email'), 'email', $bugsys->userinfo['email'], 2, 35, false, false, 'middle'); + $admin->row_input(lang::p('password'), 'password', '', 2, 35, false, true, 'middle'); + $admin->row_submit('', lang::p('login')); $admin->table_end(); $admin->form_end(); @@ -79,7 +79,7 @@ if ($_COOKIE[COOKIE_PREFIX . 'adminsession']) if (md5(md5($bugsys->userinfo['authkey']) . md5($bugsys->userinfo['email']) . md5($bugsys->userinfo['userid'])) != $_COOKIE[COOKIE_PREFIX . 'adminsession']) { $funct->cookie(COOKIE_PREFIX . 'adminsession', ''); - $admin->error(phrase('invalid_admin_session_terminated')); + $admin->error(lang::p('invalid_admin_session_terminated')); } else { diff --git a/admin/options.php b/admin/options.php index a267175..b10682c 100755 --- a/admin/options.php +++ b/admin/options.php @@ -76,18 +76,18 @@ if ($_REQUEST['do'] == 'modify') foreach ($define AS $group) { $admin->table_start(); - $admin->table_head(phrase('settinggroup_' . $group)); + $admin->table_head(lang::p('settinggroup_' . $group)); foreach ($settings["$group"] AS $opt) { - $admin->row_span('" . phrase('setting_' . $opt[1] . '_title') . "", 'thead'); + $admin->row_span('" . lang::p('setting_' . $opt[1] . '_title') . "", 'thead'); switch ($opt[2]) { case 'textbox': - $admin->row_input(phrase('setting_' . $opt[1] . '_desc'), 'setting[' . $opt[1] . ']', $options["$opt[1]"]); + $admin->row_input(lang::p('setting_' . $opt[1] . '_desc'), 'setting[' . $opt[1] . ']', $options["$opt[1]"]); break; case 'textarea': - $admin->row_textarea(phrase('setting_' . $opt[1] . '_desc'), 'setting[' . $opt[1] . ']', $options["$opt[1]"]); + $admin->row_textarea(lang::p('setting_' . $opt[1] . '_desc'), 'setting[' . $opt[1] . ']', $options["$opt[1]"]); break; case 'yesno': @@ -96,14 +96,14 @@ if ($_REQUEST['do'] == 'modify') $options["$opt[1]"] = $opt[3]; } - $admin->list_item(phrase('yes'), '1', (($options["$opt[1]"]) ? true : false)); - $admin->list_item(phrase('no'), '0', (($options["$opt[1]"]) ? false : true)); - $admin->row_list(phrase('setting_' . $opt[1] . '_desc'), 'setting[' . $opt[1] . ']', false); + $admin->list_item(lang::p('yes'), '1', (($options["$opt[1]"]) ? true : false)); + $admin->list_item(lang::p('no'), '0', (($options["$opt[1]"]) ? false : true)); + $admin->row_list(lang::p('setting_' . $opt[1] . '_desc'), 'setting[' . $opt[1] . ']', false); break; default: eval('$optcode = "' . $opt[2] . '";'); - $admin->row_text(phrase('setting_' . $opt[1] . '_desc'), $optcode); + $admin->row_text(lang::p('setting_' . $opt[1] . '_desc'), $optcode); break; } } diff --git a/admin/priority.php b/admin/priority.php index 81ce86a..ec7af23 100755 --- a/admin/priority.php +++ b/admin/priority.php @@ -38,7 +38,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(phrase('confirm_delete_priority'), 'priority.php?do=kill&priorityid=' . intval($bugsys->in['priorityid'])); + $admin->page_confirm(lang::p('confirm_delete_priority'), 'priority.php?do=kill&priorityid=' . intval($bugsys->in['priorityid'])); } // ################################################################### @@ -55,13 +55,13 @@ if ($_POST['do'] == 'insert') if ($_REQUEST['do'] == 'add') { - $admin->page_start(phrase('add_new_priority')); + $admin->page_start(lang::p('add_new_priority')); $admin->form_start('priority.php', 'insert'); $admin->table_start(); - $admin->table_head(phrase('new_priority')); - $admin->row_input(phrase('priority_title'), 'priority'); - $admin->row_input(phrase('priority_display_order'), 'displayorder'); + $admin->table_head(lang::p('new_priority')); + $admin->row_input(lang::p('priority_title'), 'priority'); + $admin->row_input(lang::p('priority_display_order'), 'displayorder'); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -85,17 +85,17 @@ if ($_REQUEST['do'] == 'edit') $priority = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "priority WHERE priorityid = " . intval($bugsys->in['priorityid'])); if (!is_array($priority)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } - $admin->page_start(phrase('edit_priority')); + $admin->page_start(lang::p('edit_priority')); $admin->form_start('priority.php', 'update'); $admin->form_hidden_field('priorityid', $priority['priorityid']); $admin->table_start(); - $admin->table_head(phrase('edit_priority_title', $priority['priority'], $priority['priorityid'])); - $admin->row_input(phrase('priority_title'), 'priority', $priority['priority']); - $admin->row_input(phrase('priority_display_order'), 'displayorder', $priority['displayorder']); + $admin->table_head(lang::p('edit_priority_title', $priority['priority'], $priority['priorityid'])); + $admin->row_input(lang::p('priority_title'), 'priority', $priority['priority']); + $admin->row_input(lang::p('priority_display_order'), 'displayorder', $priority['displayorder']); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -107,21 +107,21 @@ if ($_REQUEST['do'] == 'edit') if ($_REQUEST['do'] == 'modify') { - $admin->page_start(phrase('priority_manager')); + $admin->page_start(lang::p('priority_manager')); $priorities = $db->query("SELECT * FROM " . TABLE_PREFIX . "priority ORDER BY displayorder"); $admin->form_start('priority.php', 'null'); $admin->table_start(); - $admin->table_head(phrase('priority_manager')); + $admin->table_head(lang::p('priority_manager')); while ($priority = $db->fetch_array($priorities)) { - $admin->row_text("$priority[displayorder]: $priority[priority]", "(priorityid: $priority[priorityid]) " . phrase('edit_wraplink') . " " . phrase('delete_wraplink') . ""); + $admin->row_text("$priority[displayorder]: $priority[priority]", "(priorityid: $priority[priorityid]) " . lang::p('edit_wraplink') . " " . lang::p('delete_wraplink') . ""); } $db->free_result($priorityes); - $admin->row_span('', 'tfoot', 'center', 3); + $admin->row_span('', 'tfoot', 'center', 3); $admin->table_end(); $admin->form_end(); diff --git a/admin/product.php b/admin/product.php index bbd2d5c..5368b38 100755 --- a/admin/product.php +++ b/admin/product.php @@ -36,12 +36,12 @@ function construct_option_list($type, $id, $edit, $addcomponent, $addversion, $d if ($addcomponent) { - $opt .= ''; + $opt .= ''; } if ($addversion) { - $opt .= ''; + $opt .= ''; } $type = strtolower($type); @@ -50,7 +50,7 @@ function construct_option_list($type, $id, $edit, $addcomponent, $addversion, $d $displayorder = (($displayorder != -1) ? ' ' : ''); - return $displayorder . ' '; + return $displayorder . ' '; } // ################################################################### @@ -76,7 +76,7 @@ if ($_REQUEST['do'] == 'killversion') if ($_REQUEST['do'] == 'deleteversion') { - $admin->page_confirm(phrase('confirm_delete_version'), 'product.php?do=killversion&versionid=' . intval($bugsys->in['versionid'])); + $admin->page_confirm(lang::p('confirm_delete_version'), 'product.php?do=killversion&versionid=' . intval($bugsys->in['versionid'])); } // ################################################################### @@ -92,14 +92,14 @@ if ($_REQUEST['do'] == 'insertversion') if ($_REQUEST['do'] == 'addversion') { - $admin->page_start(phrase('add_version')); + $admin->page_start(lang::p('add_version')); if ($bugsys->in['productid'] != -1) { $product = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . intval($bugsys->in['productid'])); if (!is_array($product)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } } else @@ -110,9 +110,9 @@ if ($_REQUEST['do'] == 'addversion') $admin->form_start('product.php', 'insertversion'); $admin->form_hidden_field('productid', intval($bugsys->in['productid'])); $admin->table_start(); - $admin->table_head(phrase('add_new_version')); - $admin->row_input(phrase('version_title'), 'version'); - $admin->row_input(phrase('version_display_order'), 'displayorder'); + $admin->table_head(lang::p('add_new_version')); + $admin->row_input(lang::p('version_title'), 'version'); + $admin->row_input(lang::p('version_display_order'), 'displayorder'); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -126,7 +126,7 @@ if ($_REQUEST['do'] == 'updateversion') { if (empty($bugsys->in['version'])) { - $admin->error(phrase('fill_in_version_number')); + $admin->error(lang::p('fill_in_version_number')); } $db->query("UPDATE " . TABLE_PREFIX . "version SET version = '" . $bugsys->in['version'] . "', displayorder = " . intval($bugsys->in['displayorder']) . " WHERE versionid = " . intval($bugsys->in['versionid'])); @@ -139,20 +139,20 @@ if ($_REQUEST['do'] == 'updateversion') if ($_REQUEST['do'] == 'editversion') { - $admin->page_start(phrase('edit_version')); + $admin->page_start(lang::p('edit_version')); $version = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "version WHERE versionid = " . intval($bugsys->in['versionid'])); if (!is_array($version)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $admin->form_start('product.php', 'updateversion'); $admin->form_hidden_field('versionid', $version['versionid']); $admin->table_start(); - $admin->table_head(phrase('edit_version_title', $version['version'])); - $admin->row_input(phrase('version_title'), 'version', $version['version']); - $admin->row_input(phrase('version_display_order'), 'displayorder', $version['displayorder']); + $admin->table_head(lang::p('edit_version_title', $version['version'])); + $admin->row_input(lang::p('version_title'), 'version', $version['version']); + $admin->row_input(lang::p('version_display_order'), 'displayorder', $version['displayorder']); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -183,7 +183,7 @@ if ($_REQUEST['do'] == 'killproduct') if ($_REQUEST['do'] == 'deleteproduct') { - $admin->page_confirm(phrase('confirm_delete_product'), 'product.php?do=killproduct&productid=' . intval($bugsys->in['productid'])); + $admin->page_confirm(lang::p('confirm_delete_product'), 'product.php?do=killproduct&productid=' . intval($bugsys->in['productid'])); } // ################################################################### @@ -192,7 +192,7 @@ if ($_REQUEST['do'] == 'insertproduct') { if (empty($bugsys->in['shortname']) OR empty($bugsys->in['title'])) { - $admin->error(phrase('go_back_and_fill_both_fields')); + $admin->error(lang::p('go_back_and_fill_both_fields')); } $db->query(" @@ -211,16 +211,16 @@ if ($_REQUEST['do'] == 'insertproduct') if ($_REQUEST['do'] == 'addproduct') { - $admin->page_start(phrase('add_new_product')); + $admin->page_start(lang::p('add_new_product')); $admin->form_start('product.php', 'insertproduct'); $admin->form_hidden_field('componentmother', intval($bugsys->in['productid'])); $admin->table_start(); - $admin->table_head(phrase('add_product')); - $admin->row_input(phrase('product_shortname'), 'shortname'); - $admin->row_input(phrase('product_title'), 'title'); - $admin->row_textarea(phrase('product_description'), 'description'); - $admin->row_input(phrase('product_display_order'), 'displayorder'); + $admin->table_head(lang::p('add_product')); + $admin->row_input(lang::p('product_shortname'), 'shortname'); + $admin->row_input(lang::p('product_title'), 'title'); + $admin->row_textarea(lang::p('product_description'), 'description'); + $admin->row_input(lang::p('product_display_order'), 'displayorder'); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -234,12 +234,12 @@ if ($_REQUEST['do'] == 'updateproduct') { if (empty($bugsys->in['shortname']) OR empty($bugsys->in['title'])) { - $admin->error(phrase('go_back_and_fill_both_fields')); + $admin->error(lang::p('go_back_and_fill_both_fields')); } if (empty($bugsys->in['productid'])) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $db->query("UPDATE " . TABLE_PREFIX . "product SET title = '" . $bugsys->in['title'] . "', shortname = '" . $bugsys->in['shortname'] . "', description = '" . $bugsys->in['description'] . "', displayorder = " . intval($bugsys->in['displayorder']) . " WHERE productid = " . intval($bugsys->in['productid'])); @@ -252,22 +252,22 @@ if ($_REQUEST['do'] == 'updateproduct') if ($_REQUEST['do'] == 'editproduct') { - $admin->page_start(phrase('edit_product')); + $admin->page_start(lang::p('edit_product')); $product = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . intval($bugsys->in['productid'])); if (!is_array($product)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $admin->form_start('product.php', 'updateproduct'); $admin->form_hidden_field('productid', $product['productid']); $admin->table_start(); - $admin->table_head(phrase('edit_product_title', $product['title'])); - $admin->row_input(phrase('product_title'), 'title', $product['title']); - $admin->row_input(phrase('product_shortname'), 'shortname', $product['shortname']); - $admin->row_textarea(phrase('product_description'), 'description', $product['description']); - $admin->row_input(phrase('product_display_order'), 'displayorder', $product['displayorder']); + $admin->table_head(lang::p('edit_product_title', $product['title'])); + $admin->row_input(lang::p('product_title'), 'title', $product['title']); + $admin->row_input(lang::p('product_shortname'), 'shortname', $product['shortname']); + $admin->row_textarea(lang::p('product_description'), 'description', $product['description']); + $admin->row_input(lang::p('product_display_order'), 'displayorder', $product['displayorder']); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -298,7 +298,7 @@ if ($_POST['do'] == 'displayorder') if ($_REQUEST['do'] == 'modify') { - $admin->page_start(phrase('products_and_versions')); + $admin->page_start(lang::p('products_and_versions')); $javascript = << @@ -338,12 +338,12 @@ EOF; $versions = (array)$version; $admin->table_start(); - $admin->table_head(phrase('products_versions')); + $admin->table_head(lang::p('products_versions')); // Handle our global versions if (is_array($versions['0'])) { - $admin->row_text(phrase('global_versions'), construct_option_list('product', -1, 0, 0, 1, 0, -1), 'middle', 2, 'alt3'); + $admin->row_text(lang::p('global_versions'), construct_option_list('product', -1, 0, 0, 1, 0, -1), 'middle', 2, 'alt3'); foreach ($versions['0'] AS $version) { $admin->row_text('-- ' . $version['version'], construct_option_list('version', $version['versionid'], 1, 0, 0, 1, $version['displayorder']), 'middle', 2, 'alt2'); @@ -375,7 +375,7 @@ EOF; } } - $admin->row_span(' ', 'tfoot', 'center'); + $admin->row_span(' ', 'tfoot', 'center'); $admin->table_end(); diff --git a/admin/resolution.php b/admin/resolution.php index 39c2f52..9a038e6 100755 --- a/admin/resolution.php +++ b/admin/resolution.php @@ -38,7 +38,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(phrase('confirm_delete_resolution'), 'resolution.php?do=kill&resolutionid=' . intval($bugsys->in['resolutionid'])); + $admin->page_confirm(lang::p('confirm_delete_resolution'), 'resolution.php?do=kill&resolutionid=' . intval($bugsys->in['resolutionid'])); } // ################################################################### @@ -54,13 +54,13 @@ if ($_POST['do'] == 'insert') if ($_REQUEST['do'] == 'add') { - $admin->page_start(phrase('add_new_resolution')); + $admin->page_start(lang::p('add_new_resolution')); $admin->form_start('resolution.php', 'insert'); $admin->table_start(); - $admin->table_head(phrase('new_resolution')); - $admin->row_input(phrase('resolution_title'), 'resolution'); - $admin->row_input(phrase('resolution_display_order'), 'displayorder'); + $admin->table_head(lang::p('new_resolution')); + $admin->row_input(lang::p('resolution_title'), 'resolution'); + $admin->row_input(lang::p('resolution_display_order'), 'displayorder'); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -84,17 +84,17 @@ if ($_REQUEST['do'] == 'edit') $resolution = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "resolution WHERE resolutionid = " . intval($bugsys->in['resolutionid'])); if (!is_array($resolution)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } - $admin->page_start(phrase('edit_resolution')); + $admin->page_start(lang::p('edit_resolution')); $admin->form_start('resolution.php', 'update'); $admin->form_hidden_field('resolutionid', $resolution['resolutionid']); $admin->table_start(); - $admin->table_head(phrase('edit_resolution_title', $resolution['resolution'], $resolution['resolutionid'])); - $admin->row_input(phrase('resolution_title'), 'resolution', $resolution['resolution']); - $admin->row_input(phrase('resolution_display_order'), 'displayorder', $resolution['displayorder']); + $admin->table_head(lang::p('edit_resolution_title', $resolution['resolution'], $resolution['resolutionid'])); + $admin->row_input(lang::p('resolution_title'), 'resolution', $resolution['resolution']); + $admin->row_input(lang::p('resolution_display_order'), 'displayorder', $resolution['displayorder']); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -106,21 +106,21 @@ if ($_REQUEST['do'] == 'edit') if ($_REQUEST['do'] == 'modify') { - $admin->page_start(phrase('resolution_manager')); + $admin->page_start(lang::p('resolution_manager')); $resolutions = $db->query("SELECT * FROM " . TABLE_PREFIX . "resolution ORDER BY displayorder"); $admin->form_start('resolution.php', 'null'); $admin->table_start(); - $admin->table_head(phrase('resolution_manager')); + $admin->table_head(lang::p('resolution_manager')); while ($resolution = $db->fetch_array($resolutions)) { - $admin->row_text("$resolution[displayorder]: $resolution[resolution]", "(resolutionid: $resolution[resolutionid]) " . phrase('edit_wraplink') . " " . phrase('delete_wraplink') . ""); + $admin->row_text("$resolution[displayorder]: $resolution[resolution]", "(resolutionid: $resolution[resolutionid]) " . lang::p('edit_wraplink') . " " . lang::p('delete_wraplink') . ""); } $db->free_result($resolutiones); - $admin->row_span('', 'tfoot', 'center', 3); + $admin->row_span('', 'tfoot', 'center', 3); $admin->table_end(); $admin->form_end(); diff --git a/admin/severity.php b/admin/severity.php index 8fe5fdd..3b0d5c9 100755 --- a/admin/severity.php +++ b/admin/severity.php @@ -38,7 +38,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(phrase('confirm_delete_severity'), 'severity.php?do=kill&severityid=' . intval($bugsys->in['severityid'])); + $admin->page_confirm(lang::p('confirm_delete_severity'), 'severity.php?do=kill&severityid=' . intval($bugsys->in['severityid'])); } // ################################################################### @@ -54,13 +54,13 @@ if ($_POST['do'] == 'insert') if ($_REQUEST['do'] == 'add') { - $admin->page_start(phrase('add_new_severity')); + $admin->page_start(lang::p('add_new_severity')); $admin->form_start('severity.php', 'insert'); $admin->table_start(); - $admin->table_head(phrase('new_severity')); - $admin->row_input(phrase('severity_title'), 'severity'); - $admin->row_input(phrase('severity_display_order'), 'displayorder'); + $admin->table_head(lang::p('new_severity')); + $admin->row_input(lang::p('severity_title'), 'severity'); + $admin->row_input(lang::p('severity_display_order'), 'displayorder'); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -85,17 +85,17 @@ if ($_REQUEST['do'] == 'edit') $severity = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "severity WHERE severityid = " . intval($bugsys->in['severityid'])); if (!is_array($severity)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } - $admin->page_start(phrase('edit_severity')); + $admin->page_start(lang::p('edit_severity')); $admin->form_start('severity.php', 'update'); $admin->form_hidden_field('severityid', $severity['severityid']); $admin->table_start(); - $admin->table_head(phrase('edit_severity_title', $severity['severity'], $severity['severityid'])); - $admin->row_input(phrase('severity_title'), 'severity', $severity['severity']); - $admin->row_input(phrase('severity_display_order'), 'displayorder', $severity['displayorder']); + $admin->table_head(lang::p('edit_severity_title', $severity['severity'], $severity['severityid'])); + $admin->row_input(lang::p('severity_title'), 'severity', $severity['severity']); + $admin->row_input(lang::p('severity_display_order'), 'displayorder', $severity['displayorder']); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -117,11 +117,11 @@ if ($_REQUEST['do'] == 'modify') while ($severity = $db->fetch_array($severities)) { - $admin->row_text("$severity[displayorder]: $severity[severity]", "(severityid: $severity[severityid]) " . phrase('edit_wraplink') . " " . phrase('delete_wraplink') . ""); + $admin->row_text("$severity[displayorder]: $severity[severity]", "(severityid: $severity[severityid]) " . lang::p('edit_wraplink') . " " . lang::p('delete_wraplink') . ""); } $db->free_result($severityes); - $admin->row_span('', 'tfoot', 'center', 3); + $admin->row_span('', 'tfoot', 'center', 3); $admin->table_end(); $admin->form_end(); diff --git a/admin/status.php b/admin/status.php index 26d0b0f..304089c 100755 --- a/admin/status.php +++ b/admin/status.php @@ -38,7 +38,7 @@ if ($_REQUEST['do'] == 'kill') if ($_REQUEST['do'] == 'delete') { - $admin->page_confirm(phrase('confirm_delete_status'), 'status.php?do=kill&statusid=' . intval($bugsys->in['statusid'])); + $admin->page_confirm(lang::p('confirm_delete_status'), 'status.php?do=kill&statusid=' . intval($bugsys->in['statusid'])); } // ################################################################### @@ -54,13 +54,13 @@ if ($_POST['do'] == 'insert') if ($_REQUEST['do'] == 'add') { - $admin->page_start(phrase('add_new_status')); + $admin->page_start(lang::p('add_new_status')); $admin->form_start('status.php', 'insert'); $admin->table_start(); - $admin->table_head(phrase('new_status')); - $admin->row_input(phrase('status_title'), 'status'); - $admin->row_input(phrase('status_display_order'), 'displayorder'); + $admin->table_head(lang::p('new_status')); + $admin->row_input(lang::p('status_title'), 'status'); + $admin->row_input(lang::p('status_display_order'), 'displayorder'); $admin->row_input(phraes('status_color'), 'color'); $admin->row_submit(); $admin->table_end(); @@ -85,18 +85,18 @@ if ($_REQUEST['do'] == 'edit') $status = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "status WHERE statusid = " . intval($bugsys->in['statusid'])); if (!is_array($status)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } - $admin->page_start(phrase('edit_status')); + $admin->page_start(lang::p('edit_status')); $admin->form_start('status.php', 'update'); $admin->form_hidden_field('statusid', $status['statusid']); $admin->table_start(); - $admin->table_head(phrase('edit_status_title', $status['status'], $status['statusid'])); - $admin->row_input(phrase('status_title'), 'status', $status['status']); - $admin->row_input(phrase('status_display_order'), 'displayorder', $status['displayorder']); - $admin->row_input(phrase('status_color'), 'color', $status['color']); + $admin->table_head(lang::p('edit_status_title', $status['status'], $status['statusid'])); + $admin->row_input(lang::p('status_title'), 'status', $status['status']); + $admin->row_input(lang::p('status_display_order'), 'displayorder', $status['displayorder']); + $admin->row_input(lang::p('status_color'), 'color', $status['color']); $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -119,11 +119,11 @@ if ($_REQUEST['do'] == 'modify') while ($status = $db->fetch_array($statuses)) { $colourblock = '
'; - $admin->row_text("$colourblock$status[displayorder]: $status[status]", "(statusid: $status[statusid]) " . phrase('edit_wraplink') . " " . phrase('delete_wraplink') . ""); + $admin->row_text("$colourblock$status[displayorder]: $status[status]", "(statusid: $status[statusid]) " . lang::p('edit_wraplink') . " " . lang::p('delete_wraplink') . ""); } $db->free_result($statuses); - $admin->row_span('', 'tfoot', 'center', 3); + $admin->row_span('', 'tfoot', 'center', 3); $admin->table_end(); $admin->form_end(); diff --git a/admin/usergroup.php b/admin/usergroup.php index ab9046c..a9f2136 100755 --- a/admin/usergroup.php +++ b/admin/usergroup.php @@ -31,7 +31,7 @@ if ($_REQUEST['do'] == 'kill') { if ($bugsys->in['usergroupid'] < 7) { - $admin->error(phrase('cant_delete_default_usergroup')); + $admin->error(lang::p('cant_delete_default_usergroup')); } $db->query("DELETE FROM " . TABLE_PREFIX . "usergroup WHERE usergroupid = " . intval($bugsys->in['usergroupid'])); @@ -49,10 +49,10 @@ if ($_REQUEST['do'] == 'delete') { if ($bugsys->in['usergroupid'] < 7) { - $admin->error(phrase('cant_delete_default_usergroup')); + $admin->error(lang::p('cant_delete_default_usergroup')); } - $admin->page_confirm(phrase('confirm_delete_usergroup'), 'usergroup.php?do=kill&usergroupid=' . intval($bugsys->in['usergroupid'])); + $admin->page_confirm(lang::p('confirm_delete_usergroup'), 'usergroup.php?do=kill&usergroupid=' . intval($bugsys->in['usergroupid'])); } // ################################################################### @@ -62,7 +62,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') $add = (($_REQUEST['do'] == 'add') ? true : false); $edit = (($_REQUEST['do'] == 'edit') ? true : false); - $admin->page_start((($add) ? phrase('new_usergroup') : phrase('edit_usergroup'))); + $admin->page_start((($add) ? lang::p('new_usergroup') : lang::p('edit_usergroup'))); $admin->form_start('usergroup.php', (($add) ? 'insert' : 'update')); @@ -71,7 +71,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') $usergroup = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "usergroup WHERE usergroupid = " . intval($bugsys->in['usergroupid'])); if (!is_array($usergroup)) { - $admin->error(phrase('error_invalid_id')); + $admin->error(lang::p('error_invalid_id')); } $admin->form_hidden_field('usergroupid', $usergroup['usergroupid']); @@ -83,11 +83,11 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') // Details $admin->table_start(); - $admin->table_head(phrase('usergroup_details')); - $admin->row_input(phrase('usergroup_title'), 'title', $bugsys->sanitize($usergroup['title'])); - $admin->row_input(phrase('usergroup_display_title'), 'displaytitle', $bugsys->sanitize($usergroup['displaytitle'])); - $admin->row_input(phrase('usergroup_open_markup'), 'opentag', $bugsys->sanitize($usergroup['opentag'])); - $admin->row_input(phrase('usergroup_close_markup'), 'closetag', $bugsys->sanitize($usergroup['closetag'])); + $admin->table_head(lang::p('usergroup_details')); + $admin->row_input(lang::p('usergroup_title'), 'title', $bugsys->sanitize($usergroup['title'])); + $admin->row_input(lang::p('usergroup_display_title'), 'displaytitle', $bugsys->sanitize($usergroup['displaytitle'])); + $admin->row_input(lang::p('usergroup_open_markup'), 'opentag', $bugsys->sanitize($usergroup['opentag'])); + $admin->row_input(lang::p('usergroup_close_markup'), 'closetag', $bugsys->sanitize($usergroup['closetag'])); $admin->table_end(); // Permission @@ -124,14 +124,14 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') 'canadmintools') ); - $admin->table_head(phrase('usergroup_permission_settings')); + $admin->table_head(lang::p('usergroup_permission_settings')); foreach ($permissions AS $group => $settings) { - $admin->row_span(phrase("permissions_group_$group"), 'thead', 'center'); + $admin->row_span(lang::p("permissions_group_$group"), 'thead', 'center'); foreach ($settings AS $setting) { - $admin->row_yesno(phrase("permissions_$setting"), "perm[$setting]", ($usergroup['permissions'] & $_PERMISSION["$setting"])); + $admin->row_yesno(lang::p("permissions_$setting"), "perm[$setting]", ($usergroup['permissions'] & $_PERMISSION["$setting"])); } } @@ -254,11 +254,11 @@ if ($_POST['do'] == 'update') if ($_REQUEST['do'] == 'modify') { - $admin->page_start(phrase('usergroup_manager')); + $admin->page_start(lang::p('usergroup_manager')); $admin->form_start('usergroup.php', 'null'); $admin->table_start(); - $admin->table_head(phrase('usergroup_manager'), 3); + $admin->table_head(lang::p('usergroup_manager'), 3); $groups = $db->query("SELECT * FROM " . TABLE_PREFIX . "usergroup ORDER BY usergroupid ASC"); while ($group = $db->fetch_array($groups)) @@ -279,13 +279,13 @@ if ($_REQUEST['do'] == 'modify') $usergroups["$group[usergroupid]"]['total'] = $group['total']; } - $admin->table_column_head(array(phrase('usergroup'), phrase('number_of_users'), phrase('action'))); + $admin->table_column_head(array(lang::p('usergroup'), lang::p('number_of_users'), lang::p('action'))); foreach ($usergroups AS $group) { - $admin->row_multi_item(array("$group[title]" => 'l', ((!$group['total']) ? '-' : $group['total']) => 'c', "" . phrase('edit_wraplink') . "" . (($group['usergroupid'] > 6) ? "" . phrase('delete_wraplink') . "" : '') => 'c')); + $admin->row_multi_item(array("$group[title]" => 'l', ((!$group['total']) ? '-' : $group['total']) => 'c', "" . lang::p('edit_wraplink') . "" . (($group['usergroupid'] > 6) ? "" . lang::p('delete_wraplink') . "" : '') => 'c')); } - $admin->row_span('', 'tfoot', 'center', 3); + $admin->row_span('', 'tfoot', 'center', 3); $admin->table_end(); $admin->form_end(); diff --git a/includes/adminfunctions.php b/includes/adminfunctions.php index f7d49dd..4cfda22 100755 --- a/includes/adminfunctions.php +++ b/includes/adminfunctions.php @@ -39,17 +39,17 @@ class Admin_Print_Class EOD; - $this->page_start(phrase('redirect'), ':default:', 15, $js); + $this->page_start(lang::p('redirect'), ':default:', 15, $js); - $this->page_message(phrase('redirect'), phrase('wait_to_be_redirected', $location)); + $this->page_message(lang::p('redirect'), lang::p('wait_to_be_redirected', $location)); $this->page_end(); } function error($message) { - $this->page_start(phrase('error')); - $this->page_message(phrase('error'), $message); + $this->page_start(lang::p('error')); + $this->page_message(lang::p('error'), $message); $this->page_end(); exit; @@ -67,7 +67,7 @@ EOD; return; } - $title = 'BugStrike - ' . phrase('administration_x', $actiontitle); + $title = 'BugStrike - ' . lang::p('administration_x', $actiontitle); echo "\n"; echo "\n"; @@ -127,9 +127,9 @@ EOD; function page_confirm($message, $location) { - $this->page_start(phrase('confirm')); + $this->page_start(lang::p('confirm')); - $this->page_message(phrase('confirm'), $message . '

'); + $this->page_message(lang::p('confirm'), $message . '

'); $this->page_end(); } @@ -330,7 +330,7 @@ EOD; { if ($submit === ':save:') { - $submit = " " . phrase('submit') . " "; + $submit = " " . lang::p('submit') . " "; } else { @@ -339,7 +339,7 @@ EOD; if ($reset === ':reset:') { - $reset = " " . phrase('reset') . " "; + $reset = " " . lang::p('reset') . " "; } else { @@ -374,12 +374,12 @@ EOD; $listitem = ''; - $this->row_text($label, "\n" . (($is_jump) ? "\n" : '') . "\n", $colspan); + $this->row_text($label, "\n" . (($is_jump) ? "\n" : '') . "\n", $colspan); } function row_yesno($label, $name, $value, $colspan = 2) { - $this->row_text($label, " " . phrase('yes') . " " . phrase('no'), $colspan); + $this->row_text($label, " " . lang::p('yes') . " " . lang::p('no'), $colspan); } } diff --git a/includes/class_message_reporter.php b/includes/class_message_reporter.php index fd38772..9ed1be4 100755 --- a/includes/class_message_reporter.php +++ b/includes/class_message_reporter.php @@ -29,7 +29,7 @@ class Message_Reporter if (empty($this->process)) { - $this->process = phrase($this->phrase);; + $this->process = lang::p($this->phrase);; } $this->process = (($text) ? $text : $this->process); @@ -50,7 +50,7 @@ class Message_Reporter $this->process = "\n\n

    "; foreach ($this->phrase AS $phrase) { - $this->process .= "\n\t
  1. " . phrase($phrase) . "
    2. "; + $this->process .= "\n\t
  2. " . lang::p($phrase) . "
    3. "; } $this->process .= "\n
"; } @@ -72,7 +72,7 @@ class Message_Reporter if (empty($this->process)) { - $this->process = phrase($this->phrase);; + $this->process = lang::p($this->phrase);; } $this->process = (($text) ? $text : $this->process); @@ -102,7 +102,7 @@ class Message_Reporter if (empty($this->process)) { - $this->process = phrase($this->phrase);; + $this->process = lang::p($this->phrase);; } $this->process = (($text) ? $text : $this->process); diff --git a/includes/functions.php b/includes/functions.php index ab8f55c..2276892 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -419,7 +419,7 @@ function process_custom_fields($bugid, $inputdata = array()) if ($field['required'] AND empty($inputdata["field$field[fieldid]"])) { - $errorlist[] = phrase('field_x_is_required', $field['name']); + $errorlist[] = lang::p('field_x_is_required', $field['name']); continue; } -- 2.22.5