From 57e3f21ad961381bd11c1ef7445bb7291ff59b28 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Fri, 18 Aug 2006 03:13:11 +0000 Subject: [PATCH] r1067: Making it truly en_US by removing all outward signs of "favourite" in favor of "favorite" --- admin/user.php | 2 +- favorite.php | 6 +++--- includes/class_notification.php | 6 +++--- includes/permissions.php | 2 +- includes/settings.php | 2 +- search.php | 6 +++--- showreport.php | 4 ++-- templates/favourites.tpl | 2 +- templates/header.tpl | 2 +- templates/search.tpl | 14 +++++++------- templates/showreport.tpl | 2 +- templates/userctrl.tpl | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/admin/user.php b/admin/user.php index 2bfc2a9..37da372 100644 --- a/admin/user.php +++ b/admin/user.php @@ -232,7 +232,7 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add') } } - $admin->table_column_head(array('', _('Reporter'), _('Assignee'), _('Favourite'), _('Voter'), _('Commenter'))); + $admin->table_column_head(array('', _('Reporter'), _('Assignee'), _('Favorite'), _('Voter'), _('Commenter'))); // ------------------------------------------------------------------- diff --git a/favorite.php b/favorite.php index ae8abbf..5b58022 100644 --- a/favorite.php +++ b/favorite.php @@ -26,7 +26,7 @@ if (empty($_REQUEST['do'])) $_REQUEST['do'] = 'manage'; } -$focus[ ($_REQUEST['do'] == 'handle' ? 'showreport' : 'favourites') ] = 'focus'; +$focus[ ($_REQUEST['do'] == 'handle' ? 'showreport' : 'favorites') ] = 'focus'; $fetchtemplates = array( 'favourites', @@ -54,12 +54,12 @@ if ($_REQUEST['do'] == 'handle') if ($db->query_first("SELECT * FROM " . TABLE_PREFIX . "favourite WHERE userid = " . $bugsys->userinfo['userid'] . " AND bugid = " . $bugsys->in['bugid'])) { $db->query("DELETE FROM " . TABLE_PREFIX . "favourite WHERE userid = " . $bugsys->userinfo['userid'] . " AND bugid = " . $bugsys->in['bugid']); - $message->redirect(_('This bug has been removed from your favourites list.'), "showreport.php?bugid=" . $bugsys->in['bugid']); + $message->redirect(_('This bug has been removed from your favorites list.'), "showreport.php?bugid=" . $bugsys->in['bugid']); } else { $db->query("INSERT INTO " . TABLE_PREFIX . "favourite (userid, bugid) VALUES (" . $bugsys->userinfo['userid'] . ", " . $bugsys->in['bugid'] . ")"); - $message->redirect(_('This bug has been added to your favourites list.'), "showreport.php?bugid=" . $bugsys->in['bugid']); + $message->redirect(_('This bug has been added to your favorites list.'), "showreport.php?bugid=" . $bugsys->in['bugid']); } } diff --git a/includes/class_notification.php b/includes/class_notification.php index e14a016..a91c3f1 100644 --- a/includes/class_notification.php +++ b/includes/class_notification.php @@ -70,7 +70,7 @@ class NotificationCenter '-notapplicable-' => array(), 'reporter' => array(), 'assignee' => array(), - 'favourite' => array(), + 'favorite' => array(), 'voter' => array(), 'commenter' => array() ); @@ -156,7 +156,7 @@ class NotificationCenter $favourites = $this->registry->db->query("SELECT userid FROM " . TABLE_PREFIX . "favourite WHERE bugid = " . $this->registry->clean($this->bug['bugid'], TYPE_UINT)); while ($fav = $this->registry->db->fetch_array($favourites)) { - $this->roles['favourite']["$fav[userid]"] = $fav['userid']; + $this->roles['favorite']["$fav[userid]"] = $fav['userid']; } $voters = $this->registry->db->query_first("SELECT userids FROM " . TABLE_PREFIX . "vote WHERE bugid = " . $this->registry->clean($this->bug['bugid'], TYPE_UINT)); @@ -168,7 +168,7 @@ class NotificationCenter $this->roles['commenter']["$comment[userid]"] = $comment['userid']; } - $masterids = array_merge($this->roles['-notapplicable-'], $this->roles['reporter'], $this->roles['assignee'], $this->roles['favourite'], $this->roles['voter'], $this->roles['commenter']); + $masterids = array_merge($this->roles['-notapplicable-'], $this->roles['reporter'], $this->roles['assignee'], $this->roles['favorite'], $this->roles['voter'], $this->roles['commenter']); $masterids = $this->registry->funct->array_strip_empty(array_unique($masterids)); $userinfo = $this->registry->db->query(" diff --git a/includes/permissions.php b/includes/permissions.php index f70ffa6..abe55b3 100644 --- a/includes/permissions.php +++ b/includes/permissions.php @@ -53,7 +53,7 @@ $bugsys->emailoptions = array( '-notapplicable-' => 0, // not applicable 'reporter' => 1, // report the bug 'assignee' => 2, // assigned to the bug - 'favourite' => 4, // on the favourites list + 'favorite' => 4, // on the favorites list 'voter' => 8, // voted for the bug 'commenter' => 16 // left a comment on the bug ), diff --git a/includes/settings.php b/includes/settings.php index e1a6f4d..ea1fe2a 100755 --- a/includes/settings.php +++ b/includes/settings.php @@ -67,7 +67,7 @@ $settings = array( 'display' => array( ':lang' => _('Bug Listing Display Options'), - 'hidestatuses' => array('" . construct_option_select("setting[hidestatuses]", $bugsys->datastore["status"], $bugsys->options["hidestatuses"], "statusid", "status", 0, true) . "', '0', false, _('Hide Statuses on Bug Listings'), _('Here you can specify which statuses to hide on the bug list displays. Users have options in their controls to change this from these values, and this does not affect searches or the favourites list.')), + 'hidestatuses' => array('" . construct_option_select("setting[hidestatuses]", $bugsys->datastore["status"], $bugsys->options["hidestatuses"], "statusid", "status", 0, true) . "', '0', false, _('Hide Statuses on Bug Listings'), _('Here you can specify which statuses to hide on the bug list displays. Users have options in their controls to change this from these values, and this does not affect searches or the favorites list.')), 'defaultsortkey' => array('" . construct_option_select("setting[defaultsortkey]", ListSorter::fetch_by_text(false), $bugsys->options["defaultsortkey"]) . "', 'lastpost', false, _('Default Sort Column'), _('Select the column to sort bugs by on listings. This is only a default setting which users can override in their preferences.')), 'defaultsortas' => array('" . construct_option_select("setting[defaultsortas]", ListSorter::fetch_as_text(false), $bugsys->options["defaultsortas"]) . "', 'desc', false, _('Default Sort Direction'), _('Specify the default direction to sort bugs in the selected column. This works with and follows the same rules as the Sort Column.')) ), diff --git a/search.php b/search.php index c5d6c75..a1cb733 100644 --- a/search.php +++ b/search.php @@ -179,15 +179,15 @@ if ($_REQUEST['do'] == 'process') } // ------------------------------------------------------------------- - // favourites - if (($bugsys->in['favourite'] == 1 OR $bugsys->in['favourite'] == 0) AND $bugsys->userinfo['userid']) + // favoritess + if (($bugsys->in['favorite'] == 1 OR $bugsys->in['favorite'] == 0) AND $bugsys->userinfo['userid']) { $favourites = $db->query("SELECT * FROM " . TABLE_PREFIX . "favourite WHERE userid = " . $bugsys->userinfo['userid']); while ($favourite = $db->fetch_array($favourites)) { $ids[] = $favourite['bugid']; } - $querybuild['favourites'] = "AND bug.bugid " . ($bugsys->in['favourite'] == 0 ? "NOT IN" : "IN") . " (" . implode(', ', $ids) . ")"; + $querybuild['favorites'] = "AND bug.bugid " . ($bugsys->in['favorite'] == 0 ? "NOT IN" : "IN") . " (" . implode(', ', $ids) . ")"; } // ------------------------------------------------------------------- diff --git a/showreport.php b/showreport.php index 4243411..77ceb4f 100644 --- a/showreport.php +++ b/showreport.php @@ -203,8 +203,8 @@ else $show['subscribe'] = can_perform('cansubscribe', $bug['product']); -$favourite = (bool)$db->query_first("SELECT * FROM " . TABLE_PREFIX . "favourite WHERE bugid = $bug[bugid] AND userid = " . $bugsys->userinfo['userid']); -$favouritetext = ($favourite ? _('Remove from Favourites') : _('Add to Favourites')); +$favorite = (bool)$db->query_first("SELECT * FROM " . TABLE_PREFIX . "favourite WHERE bugid = $bug[bugid] AND userid = " . $bugsys->userinfo['userid']); +$favoritetext = ($favorite ? _('Remove from Favorites') : _('Add to Favorites')); $bug['userinfo'] = construct_user_display($bug); $bug['datetime'] = $datef->format($bugsys->options['dateformat'], $bug['dateline']); diff --git a/templates/favourites.tpl b/templates/favourites.tpl index 5a6dfe7..4b5f41a 100644 --- a/templates/favourites.tpl +++ b/templates/favourites.tpl @@ -2,7 +2,7 @@ $doctype $headinclude - {$bugsys->options['trackertitle']} - {@"My Favourite Bugs"} + {$bugsys->options['trackertitle']} - {@"My Favorite Bugs"} diff --git a/templates/header.tpl b/templates/header.tpl index ff49328..4181031 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -23,7 +23,7 @@ {@"Search"} - {@"My Favourites"} + {@"My Favorites"} userinfo['userid']">userctrl.php">{@"My Controls"}login.php">{@"Login/Register"} diff --git a/templates/search.tpl b/templates/search.tpl index 295148c..62d6083 100644 --- a/templates/search.tpl +++ b/templates/search.tpl @@ -141,18 +141,18 @@ $header - +
- {@"Favourite"} + {@"Favorite"}
- + + +
- + $customfields[right] diff --git a/templates/showreport.tpl b/templates/showreport.tpl index 2b042f2..f64698d 100644 --- a/templates/showreport.tpl +++ b/templates/showreport.tpl @@ -35,7 +35,7 @@ $header / [{@"Show Bug History"}] - / [$favouritetext] + / [$favoritetext] / [{@"Delete"}] diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl index f69d836..30c538f 100644 --- a/templates/userctrl.tpl +++ b/templates/userctrl.tpl @@ -117,7 +117,7 @@ $header   {@"Reporter"} {@"Assignee"} - {@"Favourite"} + {@"Favorite"} {@"Voter"} {@"Commenter"} -- 2.43.5