diff options
author | Dries Buytaert <dries@buytaert.net> | 2008-12-30 16:43:20 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2008-12-30 16:43:20 +0000 |
commit | 92a8adea653b29a9e6ee7778e8628f57b959ca4f (patch) | |
tree | 0fd5b18555aff73bfe4bc5aa3479db3090ad4cf8 /modules | |
parent | cac5dd8a66a07887aca4c4730d56978eaf26c70b (diff) | |
download | brdo-92a8adea653b29a9e6ee7778e8628f57b959ca4f.tar.gz brdo-92a8adea653b29a9e6ee7778e8628f57b959ca4f.tar.bz2 |
- Patch #352470 by scor: fixed typos and grammar in comments.
Diffstat (limited to 'modules')
47 files changed, 96 insertions, 95 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index f69e72220..25e8796be 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -527,7 +527,7 @@ function _block_render_blocks($region_blocks) { * constants). Two block instances can use the same cached content when * they share the same cache_id. * - * Theme and language contexts are automatically differenciated. + * Theme and language contexts are automatically differentiated. * * @param $block * @return diff --git a/modules/block/block.test b/modules/block/block.test index f4a519d4e..a6c812718 100644 --- a/modules/block/block.test +++ b/modules/block/block.test @@ -19,7 +19,7 @@ class BlockTestCase extends DrupalWebTestCase { $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer filters')); $this->drupalLogin($admin_user); - // Define the exising regions + // Define the existing regions $this->regions = array(); $this->regions[] = array('name' => 'header', 'id' => 'header-region'); $this->regions[] = array('name' => 'left', 'id' => 'sidebar-left'); diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module index 1ad44a19d..540c12a55 100644 --- a/modules/blogapi/blogapi.module +++ b/modules/blogapi/blogapi.module @@ -831,7 +831,7 @@ function blogapi_menu() { } /** - * Implementaton of hook_init(). + * Implementation of hook_init(). */ function blogapi_init() { if (drupal_is_front_page()) { diff --git a/modules/blogapi/blogapi.test b/modules/blogapi/blogapi.test index f0156ce16..14242d122 100644 --- a/modules/blogapi/blogapi.test +++ b/modules/blogapi/blogapi.test @@ -19,7 +19,7 @@ class BlogAPITestCase extends DrupalWebTestCase { */ function testBlogAPI() { global $base_url; - // Create admin user and taxononmy for later use. + // Create admin user and taxonomy for later use. $admin_user = $this->drupalCreateUser(array('administer taxonomy')); $this->drupalLogin($admin_user); $vid = $this->addVocabulary('simpletest_vocab'); @@ -53,7 +53,7 @@ class BlogAPITestCase extends DrupalWebTestCase { // Check recent posts. $result = xmlrpc($local, 'blogger.getRecentPosts', $appid, $blog_id, $web_user->name, $web_user->pass_raw, 5); - $this->assertTrue($result, t('Recent post list retreived.')); + $this->assertTrue($result, t('Recent post list retrieved.')); if ($result !== FALSE && array_key_exists('title', $result[0])) { $this->assertEqual($content, $result[0]['title'], t('Post found.')); @@ -89,7 +89,7 @@ class BlogAPITestCase extends DrupalWebTestCase { // Get post categories. $result = xmlrpc($local, 'mt.getPostCategories', $nid, $web_user->name, $web_user->pass_raw); - $this->assertTrue($result, t('Category list successfully retreived.')); + $this->assertTrue($result, t('Category list successfully retrieved.')); if ($result !== FALSE && array_key_exists('categoryId', $result[0])) { $this->assertEqual($term, $result[0]['categoryId'], t('Category list verified.')); @@ -134,8 +134,9 @@ class BlogAPITestCase extends DrupalWebTestCase { * * @param integer $vid * Vocabulary ID. - * @param string $term Term name. - * @return interger + * @param string $term + * Term name. + * @return integer * The Term ID. */ function addTerm($vid, $term) { diff --git a/modules/book/book.install b/modules/book/book.install index 94de935bb..dcc570116 100644 --- a/modules/book/book.install +++ b/modules/book/book.install @@ -141,7 +141,7 @@ function book_update_6000() { return $ret; } else { - // No exising nodes in the hierarchy, so drop the table and re-create it. + // No existing nodes in the hierarchy, so drop the table and re-create it. $ret[] = update_sql("DROP TABLE {book}"); db_create_table($ret, 'book', $schema['book']); return $ret; diff --git a/modules/color/color.module b/modules/color/color.module index 3eb8cca24..e09145003 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -74,7 +74,7 @@ function _color_page_alter(&$vars) { $color_paths = variable_get('color_' . $theme_key . '_stylesheets', array()); if (!empty($color_paths)) { // Loop over theme CSS files and try to rebuild CSS array with rewritten - // stylesheets. Keep the orginal order intact for CSS cascading. + // stylesheets. Keep the original order intact for CSS cascading. $new_theme_css = array(); foreach ($vars['css']['all']['theme'] as $old_path => $old_preprocess) { diff --git a/modules/comment/comment.test b/modules/comment/comment.test index 2de972d03..4a3d08736 100644 --- a/modules/comment/comment.test +++ b/modules/comment/comment.test @@ -483,7 +483,7 @@ class CommentApprovalTest extends CommentHelperCase { function testApprovalAdminInterface() { $this->drupalLogin($this->admin_user); - // Set anonymouse comments to require approval. + // Set anonymous comments to require approval. $this->setAnonymousUserComment(TRUE, FALSE); $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info. $this->drupalLogout(); @@ -517,7 +517,7 @@ class CommentApprovalTest extends CommentHelperCase { function testApprovalNodeInterface() { $this->drupalLogin($this->admin_user); - // Set anonymouse comments to require approval. + // Set anonymous comments to require approval. $this->setAnonymousUserComment(TRUE, FALSE); $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info. $this->drupalLogout(); @@ -528,7 +528,7 @@ class CommentApprovalTest extends CommentHelperCase { $this->postComment($this->node, $subject, $body, TRUE, TRUE); // Set $contact to true so that it won't check for id and message. $this->assertText(t('Your comment has been queued for moderation by site administrators and will be published after approval.'), t('Comment requires approval.')); - // Get unaproved comment id. + // Get unapproved comment id. $this->drupalLogin($this->admin_user); $anonymous_comment4 = $this->getUnapprovedComment($subject); $anonymous_comment4 = (object) array('id' => $anonymous_comment4, 'subject' => $subject, 'comment' => $body); diff --git a/modules/contact/contact.test b/modules/contact/contact.test index b99f9030c..838c60284 100644 --- a/modules/contact/contact.test +++ b/modules/contact/contact.test @@ -21,7 +21,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase { * Test configuration options and site-wide contact form. */ function testSiteWideContact() { - // Create and login administative user. + // Create and login administrative user. $admin_user = $this->drupalCreateUser(array('administer site-wide contact form', 'administer permissions')); $this->drupalLogin($admin_user); diff --git a/modules/filter/filter.api.php b/modules/filter/filter.api.php index b92d00f79..ffd942c75 100644 --- a/modules/filter/filter.api.php +++ b/modules/filter/filter.api.php @@ -51,7 +51,7 @@ * and with what settings. Filters that provide settings should usually store * these settings per format. * - * If the filter's behaviour depends on an extensive list and/or external data + * If the filter's behavior depends on an extensive list and/or external data * (e.g. a list of smileys, a list of glossary terms) then filters are allowed * to provide a separate, global configuration page rather than provide settings * per format. In that case, there should be a link from the format-specific diff --git a/modules/filter/filter.module b/modules/filter/filter.module index c0196c07a..e6adb324a 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -954,7 +954,7 @@ function filter_xss($string, $allowed_tags = array('a', 'em', 'strong', 'cite', } // Store the input format _filter_xss_split($allowed_tags, TRUE); - // Remove NUL characters (ignored by some browsers) + // Remove NULL characters (ignored by some browsers) $string = str_replace(chr(0), '', $string); // Remove Netscape 4 JS entities $string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string); diff --git a/modules/help/help.api.php b/modules/help/help.api.php index 08e35f431..e1814591a 100644 --- a/modules/help/help.api.php +++ b/modules/help/help.api.php @@ -58,7 +58,7 @@ function hook_help($path, $arg) { case 'admin/build/block': return t('<p>Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.</p> <p>If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.</p> -<p>You can configure the behaviour of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>', array('@throttle' => url('admin/settings/throttle'))); +<p>You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.</p>', array('@throttle' => url('admin/settings/throttle'))); } } diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index 5af961dc7..31441892e 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -3,7 +3,7 @@ /** * @file - * Administrative page callbaks for menu module. + * Administrative page callbacks for menu module. */ /** diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 64190c637..e2c88a4f3 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -136,7 +136,7 @@ function menu_menu() { } /** - * Implemenation of hook_theme(). + * Implementation of hook_theme(). */ function menu_theme() { return array( diff --git a/modules/node/node.module b/modules/node/node.module index a8fd56528..11ae9e99b 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -783,7 +783,7 @@ function node_load_multiple($nids = array(), $conditions = array(), $reset = FAL } // Exclude any nodes loaded from cache if they don't match $conditions. - // This ensures the same behaviour whether loading from memory or database. + // This ensures the same behavior whether loading from memory or database. if ($conditions) { foreach ($nodes as $node) { $node_values = (array) $node; @@ -1024,7 +1024,7 @@ function node_save(&$node) { $node->old_vid = $node->vid; } else { - // When updating a node, avoid clobberring an existing log entry with an empty one. + // When updating a node, avoid clobbering an existing log entry with an empty one. if (empty($node->log)) { unset($node->log); } @@ -1077,7 +1077,7 @@ function node_save(&$node) { /** * Helper function to save a revision with the uid of the current user. * - * Node is taken by reference, becuse drupal_write_record() updates the + * Node is taken by reference, because drupal_write_record() updates the * $node with the revision id, and we need to pass that back to the caller. */ function _node_save_revision(&$node, $uid, $update = NULL) { @@ -1607,7 +1607,7 @@ function node_menu() { $items['admin/content/node-settings/rebuild'] = array( 'title' => 'Rebuild permissions', 'page arguments' => array('node_configure_rebuild_confirm'), - // Any user than can potentially trigger a node_acess_needs_rebuild(TRUE) + // Any user than can potentially trigger a node_access_needs_rebuild(TRUE) // has to be allowed access to the 'node access rebuild' confirm form. 'access arguments' => array('access administration pages'), 'type' => MENU_CALLBACK, @@ -2065,7 +2065,7 @@ function node_form_alter(&$form, $form_state, $form_id) { * Form API callback for the search form. Registered in node_form_alter(). */ function node_search_validate($form, &$form_state) { - // Initialise using any existing basic search keywords. + // Initialize using any existing basic search keywords. $keys = $form_state['values']['processed_keys']; // Insert extra restrictions into the search keywords string. @@ -2519,7 +2519,7 @@ function node_access_rebuild($batch_mode = FALSE) { $result = db_query("SELECT nid FROM {node}"); while ($node = db_fetch_object($result)) { $loaded_node = node_load($node->nid, NULL, TRUE); - // To preserve database integrity, only aquire grants if the node + // To preserve database integrity, only acquire grants if the node // loads successfully. if (!empty($loaded_node)) { node_access_acquire_grants($loaded_node); @@ -2542,7 +2542,7 @@ function node_access_rebuild($batch_mode = FALSE) { /** * Batch operation for node_access_rebuild_batch. * - * This is a mutlistep operation : we go through all nodes by packs of 20. + * This is a multistep operation : we go through all nodes by packs of 20. * The batch processing engine interrupts processing and sends progress * feedback after 1 second execution time. */ @@ -2559,7 +2559,7 @@ function _node_access_rebuild_batch_operation(&$context) { $result = db_query_range("SELECT nid FROM {node} WHERE nid > %d ORDER BY nid ASC", $context['sandbox']['current_node'], 0, $limit); while ($row = db_fetch_array($result)) { $loaded_node = node_load($row['nid'], NULL, TRUE); - // To preserve database integrity, only aquire grants if the node + // To preserve database integrity, only acquire grants if the node // loads successfully. if (!empty($loaded_node)) { node_access_acquire_grants($loaded_node); diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index e05485b72..a989fa790 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -304,7 +304,7 @@ function node_body_field(&$node, $label, $word_count) { } /** - * Button sumit function: handle the 'Delete' button on the node form. + * Button submit function: handle the 'Delete' button on the node form. */ function node_form_delete_submit($form, &$form_state) { $destination = ''; diff --git a/modules/node/node.test b/modules/node/node.test index ab2a25f87..419a1dfd3 100644 --- a/modules/node/node.test +++ b/modules/node/node.test @@ -130,7 +130,7 @@ class NodeRevisionsTestCase extends DrupalWebTestCase { } /** - * Check node revision related opperations. + * Check node revision related operations. */ function testRevisions() { $nodes = $this->nodes; diff --git a/modules/openid/openid.module b/modules/openid/openid.module index d024105f4..26902fe9a 100644 --- a/modules/openid/openid.module +++ b/modules/openid/openid.module @@ -422,7 +422,7 @@ function openid_authentication($response) { else { unset($form_state['values']['response']); $account = user_save('', $form_state['values']); - // Terminate if an error occured during user_save(). + // Terminate if an error occurred during user_save(). if (!$account) { drupal_set_message(t("Error saving user account."), 'error'); drupal_goto(); @@ -489,7 +489,7 @@ function openid_authentication_request($claimed_id, $identity, $return_to = '', * Attempt to verify the response received from the OpenID Provider. * * @param $op_endpoint The OpenID Provider URL. - * @param $response Array of repsonse values from the provider. + * @param $response Array of response values from the provider. * * @return boolean */ diff --git a/modules/profile/profile.admin.inc b/modules/profile/profile.admin.inc index 3e154fb83..67e1d0b8e 100644 --- a/modules/profile/profile.admin.inc +++ b/modules/profile/profile.admin.inc @@ -31,7 +31,7 @@ function profile_admin_overview() { $form[$field->fid]['delete'] = array('#markup' => l(t('delete'), "admin/user/profile/delete/$field->fid")); } - // Add the cateogory combo boxes + // Add the category combo boxes $categories = array_unique($categories); foreach ($form as $fid => $field) { foreach ($categories as $cat => $category) { @@ -114,7 +114,7 @@ function theme_profile_admin_overview($form) { $rows[] = array(array('data' => $category, 'colspan' => 7, 'class' => 'category')); $rows[] = array('data' => array(array('data' => '<em>' . t('No fields in this category. If this category remains empty when saved, it will be removed.') . '</em>', 'colspan' => 7)), 'class' => 'category-' . $category_number . '-message category-message category-populated'); - // Make it dragable only if there is more than one field + // Make it draggable only if there is more than one field if (isset($form['submit'])) { drupal_add_tabledrag('profile-fields', 'order', 'sibling', 'profile-weight', 'profile-weight-' . $category_number); drupal_add_tabledrag('profile-fields', 'match', 'sibling', 'profile-category', 'profile-category-' . $category_number); diff --git a/modules/search/search-block-form.tpl.php b/modules/search/search-block-form.tpl.php index f483ddd7a..4798ebca7 100644 --- a/modules/search/search-block-form.tpl.php +++ b/modules/search/search-block-form.tpl.php @@ -18,7 +18,7 @@ * * Since $search is keyed, a direct print of the form element is possible. * Modules can add to the search form so it is recommended to check for their - * existance before printing. The default keys will always exist. + * existence before printing. The default keys will always exist. * * <?php if (isset($search['extra_field'])): ?> * <div class="extra-field"> diff --git a/modules/search/search-result.tpl.php b/modules/search/search-result.tpl.php index 247595fc5..9ea0f4fc5 100644 --- a/modules/search/search-result.tpl.php +++ b/modules/search/search-result.tpl.php @@ -30,7 +30,7 @@ * * Since $info_split is keyed, a direct print of the item is possible. * This array does not apply to user searches so it is recommended to check - * for their existance before printing. The default keys of 'type', 'user' and + * for their existence before printing. The default keys of 'type', 'user' and * 'date' always exist for node searches. Modules may provide other data. * * <?php if (isset($info_split['comment'])) : ?> diff --git a/modules/search/search-results.tpl.php b/modules/search/search-results.tpl.php index f87797ae6..02e1f4e2b 100644 --- a/modules/search/search-results.tpl.php +++ b/modules/search/search-results.tpl.php @@ -6,7 +6,7 @@ * Default theme implementation for displaying search results. * * This template collects each invocation of theme_search_result(). This and - * the child template are dependant to one another sharing the markup for + * the child template are dependent to one another sharing the markup for * definition lists. * * Note that modules may implement their own search type and theme function diff --git a/modules/search/search-theme-form.tpl.php b/modules/search/search-theme-form.tpl.php index 60bc3e45d..bee1ad28b 100644 --- a/modules/search/search-theme-form.tpl.php +++ b/modules/search/search-theme-form.tpl.php @@ -18,7 +18,7 @@ * * Since $search is keyed, a direct print of the form element is possible. * Modules can add to the search form so it is recommended to check for their - * existance before printing. The default keys will always exist. + * existence before printing. The default keys will always exist. * * <?php if (isset($search['extra_field'])): ?> * <div class="extra-field"> diff --git a/modules/search/search.module b/modules/search/search.module index 13193fdb4..6b842d7f0 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -462,7 +462,7 @@ function search_index($sid, $type, $text) { // and begins and ends with a literal (inserting $null as required). $tag = FALSE; // Odd/even counter. Tag or no tag. - $link = FALSE; // State variable for link analyser + $link = FALSE; // State variable for link analyzer $score = 1; // Starting score per word $accum = ' '; // Accumulator for cleaned up data $tagstack = array(); // Stack with open tags @@ -715,9 +715,9 @@ function search_query_insert($keys, $option, $value = '') { * * Arguments for this query part. * * A series of exact word matches OR'd together. * * Arguments for this query part. - * * A bool indicating whether this is a simple query or not. Negative + * * A boolean indicating whether this is a simple query or not. Negative * terms, presence of both AND / OR make this FALSE. - * * A bool indicating the presence of a lowercase or. Maybe the user + * * A boolean indicating the presence of a lowercase or. Maybe the user * wanted to use OR. */ function search_parse_query($text) { diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 0185c632c..a453caa7c 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -193,7 +193,7 @@ class DrupalWebTestCase { $backtrace = debug_backtrace(); // The first element is the call. The second element is the caller. - // We skip calls that occured in one of the methods of DrupalWebTestCase + // We skip calls that occurred in one of the methods of DrupalWebTestCase // or in an assertion function. while (($caller = $backtrace[1]) && ((isset($caller['class']) && $caller['class'] == 'DrupalWebTestCase') || @@ -1000,7 +1000,7 @@ class DrupalWebTestCase { */ protected function parse() { if (!$this->elements) { - // DOM can load HTML soup. But, HTML soup can throw warnings, supress + // DOM can load HTML soup. But, HTML soup can throw warnings, suppress // them. @$htmlDom = DOMDocument::loadHTML($this->content); if ($htmlDom) { @@ -1063,7 +1063,7 @@ class DrupalWebTestCase { * $edit = array(...); * $this->drupalPost(NULL, $edit, t('Save')); * @param $edit - * Field data in an assocative array. Changes the current input fields + * Field data in an associative array. Changes the current input fields * (where possible) to the values indicated. A checkbox can be set to * TRUE to be checked and FALSE to be unchecked. Note that when a form * contains file upload fields, other fields cannot start with the '@' @@ -1314,7 +1314,7 @@ class DrupalWebTestCase { } /** - * Peform an xpath search on the contents of the internal browser. The search + * Perform an xpath search on the contents of the internal browser. The search * is relative to the root element (HTML tag normally) of the page. * * @param $xpath @@ -1606,7 +1606,7 @@ class DrupalWebTestCase { /** * Pass if the text IS found on the text version of the page. The text version - * is the equivilent of what a user would see when viewing through a web browser. + * is the equivalent of what a user would see when viewing through a web browser. * In other words the HTML has been filtered out of the contents. * * @param $text @@ -1624,7 +1624,7 @@ class DrupalWebTestCase { /** * Pass if the text is NOT found on the text version of the page. The text version - * is the equivilent of what a user would see when viewing through a web browser. + * is the equivalent of what a user would see when viewing through a web browser. * In other words the HTML has been filtered out of the contents. * * @param $text @@ -1956,7 +1956,7 @@ class DrupalWebTestCase { * Assert the page responds with the specified response code. * * @param $code - * Reponse code. For example 200 is a successful page request. For a list + * Response code. For example 200 is a successful page request. For a list * of all codes see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html. * @param $message * Message to display. diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module index 6711337ba..53acb6dd2 100644 --- a/modules/simpletest/simpletest.module +++ b/modules/simpletest/simpletest.module @@ -43,7 +43,7 @@ function simpletest_perm() { } /** - * Implemenation of hook_theme(). + * Implementation of hook_theme(). */ function simpletest_theme() { return array( @@ -520,7 +520,7 @@ function simpletest_clean_environment() { } /** - * Removed prefixed talbes from the database that are left over from crashed tests. + * Removed prefixed tables from the database that are left over from crashed tests. */ function simpletest_clean_database() { $tables = db_find_tables(Database::getActiveConnection()->prefixTables('{simpletest}') . '%'); @@ -565,7 +565,7 @@ function simpletest_clean_temporary_directories() { } /** - * Remove all files from specified firectory and then remove directory. + * Remove all files from specified directory and then remove directory. * * @param string $path Directory path. */ diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test index 40d48f435..b6a6d3dcc 100644 --- a/modules/simpletest/simpletest.test +++ b/modules/simpletest/simpletest.test @@ -9,7 +9,7 @@ class SimpleTestTestCase extends DrupalWebTestCase { /** * Store the test ID from each test run for comparison, to ensure they are - * incramenting. + * incrementing. */ protected $test_ids = array(); diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test index d6a3b305f..37c6fac5f 100644 --- a/modules/simpletest/tests/database_test.test +++ b/modules/simpletest/tests/database_test.test @@ -1558,7 +1558,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase { $this->assertEqual($data, $return, t('Corect metadata returned.')); $return = $query->getMetaData('nothere'); - $this->assertNull($return, t('Non-existant key returned NULL.')); + $this->assertNull($return, t('Non-existent key returned NULL.')); } } diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test index 93f24f942..eadafcc83 100644 --- a/modules/simpletest/tests/file.test +++ b/modules/simpletest/tests/file.test @@ -581,7 +581,7 @@ class FileUnmanagedDeleteTest extends FileTestCase { */ function testMissing() { // Try to delete a non-existing file - $this->assertTrue(file_unmanaged_delete(file_directory_path() . '/' . $this->randomName()), t('Returns true when deleting a non-existant file.')); + $this->assertTrue(file_unmanaged_delete(file_directory_path() . '/' . $this->randomName()), t('Returns true when deleting a non-existent file.')); } /** @@ -644,7 +644,7 @@ class FileUnmanagedMoveTest extends FileTestCase { * Try to move a missing file. */ function testMissing() { - // Move non-existant file. + // Move non-existent file. $new_filepath = file_unmanaged_move($this->randomName(), $this->randomName()); $this->assertFalse($new_filepath, t('Moving a missing file fails.')); } @@ -712,10 +712,10 @@ class FileUnmanagedCopyTest extends FileTestCase { } /** - * Copy a non-existant file. + * Copy a non-existent file. */ - function testNonExistant() { - // Copy non-existant file + function testNonExistent() { + // Copy non-existent file $desired_filepath = $this->randomName(); $this->assertFalse(file_exists($desired_filepath), t("Randomly named file doesn't exists.")); $new_filepath = file_unmanaged_copy($desired_filepath, $this->randomName()); @@ -873,7 +873,7 @@ class FileLoadTest extends FileHookTestCase { } /** - * Try to load a non-existant file by fid. + * Try to load a non-existent file by fid. */ function testLoadMissingFid() { $this->assertFalse(file_load(-1), t("Try to load an invalid fid fails.")); @@ -881,7 +881,7 @@ class FileLoadTest extends FileHookTestCase { } /** - * Try to load a non-existant file by filepath. + * Try to load a non-existent file by filepath. */ function testLoadMissingFilepath() { $this->assertFalse(file_load(array('filepath' => 'misc/druplicon.png')), t("Try to load a file that doesn't exist in the database fails.")); @@ -889,7 +889,7 @@ class FileLoadTest extends FileHookTestCase { } /** - * Try to load a non-existant file by status. + * Try to load a non-existent file by status. */ function testLoadInvalidStatus() { $this->assertFalse(file_load(array('status' => -99)), t("Trying to load a file with an invalid status fails.")); diff --git a/modules/simpletest/tests/file_test.module b/modules/simpletest/tests/file_test.module index 6240f4712..4e7c7e965 100644 --- a/modules/simpletest/tests/file_test.module +++ b/modules/simpletest/tests/file_test.module @@ -194,14 +194,14 @@ function file_test_file_update($file) { } /** - * Implemenation of hook_file_copy(). + * Implementation of hook_file_copy(). */ function file_test_file_copy($file, $source) { _file_test_log_call('copy', array($file, $source)); } /** - * Implemenation of hook_file_move(). + * Implementation of hook_file_move(). */ function file_test_file_move($file, $source) { _file_test_log_call('move', array($file, $source)); diff --git a/modules/simpletest/tests/xmlrpc.test b/modules/simpletest/tests/xmlrpc.test index 814c65f8e..c645654b5 100644 --- a/modules/simpletest/tests/xmlrpc.test +++ b/modules/simpletest/tests/xmlrpc.test @@ -66,7 +66,7 @@ class XMLRPCValidator1IncTestCase extends DrupalWebTestCase { $l_res_5[5] = $l_res_5[5]->data; /* override warpping */ $r_res_5 = xmlrpc($xml_url, 'validator1.manyTypesTest', $int_5, $bool_5, $string_5, $double_5, xmlrpc_date($time_5), xmlrpc_base64($base64_5)); /* Contains objects, objects are not equal */ - // See http://drupal.org/node/37766 why this currnetly fails + // See http://drupal.org/node/37766 why this currently fails $this->assertEqual($l_res_5, $r_res_5, 'many types test: %s'); diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test index 2f7602103..2c0ac586c 100644 --- a/modules/statistics/statistics.test +++ b/modules/statistics/statistics.test @@ -31,7 +31,7 @@ class StatisticsBlockVisitorsTestCase extends DrupalWebTestCase { variable_set('statistics_enable_access_log', 1); // Verify the IP address from accesslog appears on the top visitors page - // and that a 'block IP adddress' link is displayed. + // and that a 'block IP address' link is displayed. $this->drupalLogin($this->blocking_user); $this->drupalGet('admin/reports/visitors'); $this->assertText($test_ip_address, t('IP address found.')); diff --git a/modules/system/image.gd.inc b/modules/system/image.gd.inc index d12f168e8..03808d7c4 100644 --- a/modules/system/image.gd.inc +++ b/modules/system/image.gd.inc @@ -62,7 +62,7 @@ function image_gd_settings_validate($form, &$form_state) { * Verify GD2 settings (that the right version is actually installed). * * @return - * A boolean indicating if the GD toolkit is avaiable on this machine. + * A boolean indicating if the GD toolkit is available on this machine. */ function image_gd_check_settings() { if ($check = get_extension_funcs('gd')) { @@ -175,7 +175,7 @@ function image_gd_crop($source, $destination, $x, $y, $width, $height) { * GD helper function to create an image resource from a file. * * @param $file - * A string file path where the iamge should be saved. + * A string file path where the image should be saved. * @param $extension * A string containing one of the following extensions: gif, jpg, jpeg, png. * @return @@ -196,7 +196,7 @@ function image_gd_open($file, $extension) { * @param $res * An image resource created with image_gd_open(). * @param $destination - * A string file path where the iamge should be saved. + * A string file path where the image should be saved. * @param $extension * A string containing one of the following extensions: gif, jpg, jpeg, png. * @return diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php index 2a38a7d5d..78db60b26 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -49,7 +49,7 @@ * - $secondary_menu (array): An array containing the Secondary menu links for * the site, if they have been configured. * - * Page content (in order of occurrance in the default page.tpl.php): + * Page content (in order of occurrence in the default page.tpl.php): * - $left: The HTML for the left sidebar. * * - $breadcrumb: The breadcrumb trail for the current page. diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index c782d9e6f..f3dcfc56f 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -872,7 +872,7 @@ function system_modules_submit($form, &$form_state) { } // If we're not coming from a confirmation form, // search dependencies. Otherwise, the user will have already - // approved of the depdent modules being enabled. + // approved of the dependent modules being enabled. if (empty($form_state['storage'])) { foreach ($form['modules'][$module['group']][$name]['#dependencies'] as $dependency => $string) { if (!$modules[$dependency]['enabled']) { diff --git a/modules/system/system.api.php b/modules/system/system.api.php index e2986a6d9..4738e2347 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -1202,8 +1202,8 @@ function hook_file_download($filepath) { * Drupal itself (by install.php) with an installation profile or later by hand. * As a consequence, install-time requirements must be checked without access * to the full Drupal API, because it is not available during install.php. - * For localisation you should for example use $t = get_t() to - * retrieve the appropriate localisation function name (t() or st()). + * For localization you should for example use $t = get_t() to + * retrieve the appropriate localization function name (t() or st()). * If a requirement has a severity of REQUIREMENT_ERROR, install.php will abort * or at least the module will not install. * Other severity levels have no effect on the installation. diff --git a/modules/system/system.install b/modules/system/system.install index c83fcf2d8..e75b91658 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1997,7 +1997,7 @@ function system_update_6021() { if ($_SESSION['system_update_6021'] >= $_SESSION['system_update_6021_max']) { if (!empty($_SESSION['menu_bogus_menus'])) { // Remove entries in bogus menus. This is secure because we deleted - // every non-alpanumeric character from the menu name. + // every non-alphanumeric character from the menu name. $ret[] = update_sql("DELETE FROM {menu_links} WHERE menu_name IN ('" . implode("', '", $_SESSION['menu_bogus_menus']) . "')"); } @@ -2071,7 +2071,7 @@ function system_update_6021() { unset($_SESSION['menu_menu_map'][1]); // Update the deltas for all menu module blocks. foreach ($_SESSION['menu_menu_map'] as $mid => $menu_name) { - // This is again secure because we deleted every non-alpanumeric + // This is again secure because we deleted every non-alphanumeric // character from the menu name. $ret[] = update_sql("UPDATE {blocks} SET delta = '" . $menu_name . "' WHERE module = 'menu' AND delta = '" . $mid . "'"); $ret[] = update_sql("UPDATE {blocks_roles} SET delta = '" . $menu_name . "' WHERE module = 'menu' AND delta = '" . $mid . "'"); diff --git a/modules/system/system.test b/modules/system/system.test index 64e8a6f03..c751bcdc8 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -27,7 +27,7 @@ class EnableDisableCoreTestCase extends DrupalWebTestCase { /** * Enable a module, check the database for related tables, disable module, - * check for related tables, unistall module, check for related tables. + * check for related tables, uninstall module, check for related tables. * Also check for invocation of the hook_module_action hook. */ function testEnableDisable() { @@ -113,7 +113,7 @@ class EnableDisableCoreTestCase extends DrupalWebTestCase { /** * Assert tables that begin with the specified base table name. * - * @param string $base_table Begginning of table name to look for. + * @param string $base_table Beginning of table name to look for. * @param boolean $count Assert tables that match specified base table. * @return boolean Tables with specified base table. */ diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc index 10f3f74c6..913bc535a 100644 --- a/modules/taxonomy/taxonomy.admin.inc +++ b/modules/taxonomy/taxonomy.admin.inc @@ -882,7 +882,7 @@ function taxonomy_vocabulary_confirm_delete_submit($form, &$form_state) { } /** - * Form builder to confirm reseting a vocabulary to alphabetical order. + * Form builder to confirm resetting a vocabulary to alphabetical order. * * @ingroup forms * @see taxonomy_vocabulary_confirm_reset_alphabetical_submit() diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 2658eb430..851030aa1 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -260,14 +260,14 @@ function taxonomy_vocabulary_delete($vid) { } /** - * Dynamicly check and update the hierarachy flag of a vocabulary. + * Dynamically check and update the hierarchy flag of a vocabulary. * * Checks the current parents of all terms in a vocabulary and updates the * vocabularies hierarchy setting to the lowest possible level. A hierarchy with * no parents in any of its terms will be given a hierarchy of 0. If terms * contain at most a single parent, the vocabulary will be given a hierarchy of * 1. If any term contain multiple parents, the vocabulary will be given a - * hieararchy of 2. + * hierarchy of 2. * * @param $vocabulary * A vocabulary object. @@ -278,7 +278,7 @@ function taxonomy_check_vocabulary_hierarchy($vocabulary, $changed_term) { $tree = taxonomy_get_tree($vocabulary->vid); $hierarchy = 0; foreach ($tree as $term) { - // Update the changed term with the new parent value before comparision. + // Update the changed term with the new parent value before comparison. if ($term->tid == $changed_term['tid']) { $term = (object)$changed_term; $term->parents = $term->parent; @@ -1199,7 +1199,7 @@ function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $descripti /** * Format the selection field for choosing terms - * (by deafult the default selection field is used). + * (by default the default selection field is used). * * @ingroup themeable */ @@ -1215,7 +1215,7 @@ function theme_taxonomy_term_select($element) { * @param $operator * How to interpret multiple IDs in the array. Can be "or" or "and". * @param $depth - * How many levels deep to traverse the taxonomy tree. Can be a nonnegative + * How many levels deep to traverse the taxonomy tree. Can be a non-negative * integer or "all". * @param $pager * Whether the nodes are to be used with a pager (the case on most Drupal diff --git a/modules/tracker/tracker.pages.inc b/modules/tracker/tracker.pages.inc index 7c55ae48d..f5f702b75 100644 --- a/modules/tracker/tracker.pages.inc +++ b/modules/tracker/tracker.pages.inc @@ -18,7 +18,7 @@ function tracker_page($account = NULL, $set_title = FALSE) { if ($set_title) { // When viewed from user/%user/track, display the name of the user // as page title -- the tab title remains Track so this needs to be done - // here and not in the menu definiton. + // here and not in the menu definition. drupal_set_title($account->name); } // TODO: These queries are very expensive, see http://drupal.org/node/105639 diff --git a/modules/translation/translation.test b/modules/translation/translation.test index d8dd43b31..205736e9c 100644 --- a/modules/translation/translation.test +++ b/modules/translation/translation.test @@ -50,7 +50,7 @@ class TranslationTestCase extends DrupalWebTestCase { $node_translation_body = $this->randomName(); $node_translation = $this->createTranslation($node->nid, $node_translation_title, $node_translation_body, 'es'); - // Update origninal and mark translation as outdated. + // Update original and mark translation as outdated. $edit = array(); $edit['body'] = $this->randomName(); $edit['translation[retranslate]'] = TRUE; @@ -73,7 +73,7 @@ class TranslationTestCase extends DrupalWebTestCase { * Install a the specified language if it has not been already. Otherwise make sure that * the language is enabled. * - * @param string $language_code The langauge code the check. + * @param string $language_code The language code the check. */ function addLanguage($language_code) { // Check to make sure that language has not already been installed. @@ -106,7 +106,7 @@ class TranslationTestCase extends DrupalWebTestCase { * * @param string $title Title of page in specified language. * @param string $body Body of page in specified language. - * @param string $language Langauge code. + * @param string $language Language code. */ function createPage($title, $body, $language) { $edit = array(); @@ -129,7 +129,7 @@ class TranslationTestCase extends DrupalWebTestCase { * @param integer $nid Node id of page to create translation for. * @param string $title Title of page in specified language. * @param string $body Body of page in specified language. - * @param string $language Langauge code. + * @param string $language Language code. */ function createTranslation($nid, $title, $body, $language) { $this->drupalGet('node/add/page', array('query' => array('translation' => $nid, 'language' => $language))); @@ -140,7 +140,7 @@ class TranslationTestCase extends DrupalWebTestCase { $this->drupalPost(NULL, $edit, t('Save')); $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Translation created.')); - // Check to make sure that translation was successfull. + // Check to make sure that translation was successful. $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); diff --git a/modules/update/update.fetch.inc b/modules/update/update.fetch.inc index c74914286..0ffb746d7 100644 --- a/modules/update/update.fetch.inc +++ b/modules/update/update.fetch.inc @@ -101,7 +101,7 @@ function _update_build_fetch_url($project, $site_key = '') { * Perform any notifications that should be done once cron fetches new data. * * This method checks the status of the site using the new data and depending - * on the configuration of the site, notifys administrators via email if there + * on the configuration of the site, notifies administrators via email if there * are new releases or missing security updates. * * @see update_requirements() diff --git a/modules/update/update.settings.inc b/modules/update/update.settings.inc index 855ee6497..117edc10b 100644 --- a/modules/update/update.settings.inc +++ b/modules/update/update.settings.inc @@ -44,7 +44,7 @@ function update_settings() { ); $form = system_settings_form($form); - // Custom valiation callback for the email notification setting. + // Custom validation callback for the email notification setting. $form['#validate'][] = 'update_settings_validate'; // We need to call our own submit callback first, not the one from // system_settings_form(), so that we can process and save the emails. diff --git a/modules/upload/upload.test b/modules/upload/upload.test index a39f0ac96..42e58cf9d 100644 --- a/modules/upload/upload.test +++ b/modules/upload/upload.test @@ -191,7 +191,7 @@ class UploadTestCase extends DrupalWebTestCase { /** * Check that uploaded file is accessible and verify the contents against the original. * - * @param string $filename Name of file to verifiy. + * @param string $filename Name of file to verify. */ function checkUploadedFile($filename) { global $base_url; @@ -205,7 +205,7 @@ class UploadTestCase extends DrupalWebTestCase { * Get the role id of the 'simpletest' role associated with a SimpleTest test user. * * @param object $user User object. - * @return interger SimpleTest role id. + * @return integer SimpleTest role id. */ function getSimpletestRoleId($user) { foreach ($user->roles as $rid => $role) { diff --git a/modules/user/user.module b/modules/user/user.module index 6282d35c5..366e92a4f 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1429,7 +1429,7 @@ function user_external_login_register($name, $module) { 'access' => REQUEST_TIME ); $account = user_save('', $userinfo); - // Terminate if an error occured during user_save(). + // Terminate if an error occurred during user_save(). if (!$account) { drupal_set_message(t("Error saving user account."), 'error'); return; @@ -2303,7 +2303,7 @@ function user_register_submit($form, &$form_state) { $merge_data['status'] = variable_get('user_register', 1) == 1; } $account = user_save('', array_merge($form_state['values'], $merge_data)); - // Terminate if an error occured during user_save(). + // Terminate if an error occurred during user_save(). if (!$account) { drupal_set_message(t("Error saving user account."), 'error'); $form_state['redirect'] = ''; diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc index ada98b6fb..757f480d0 100644 --- a/modules/user/user.pages.inc +++ b/modules/user/user.pages.inc @@ -168,7 +168,7 @@ function template_preprocess_user_profile(&$variables) { $variables['profile'] = array(); // Sort sections by weight uasort($variables['account']->content, 'element_sort'); - // Provide keyed variables so themers can print each section independantly. + // Provide keyed variables so themers can print each section independently. foreach (element_children($variables['account']->content) as $key) { $variables['profile'][$key] = drupal_render($variables['account']->content[$key]); } diff --git a/modules/user/user.test b/modules/user/user.test index 01b5b50f7..9c92223c7 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -184,7 +184,7 @@ class UserDeleteTestCase extends DrupalWebTestCase { $this->drupalGet('user/' . $user->uid . '/edit'); $this->drupalPost(NULL, NULL, t('Delete')); $this->assertRaw(t('Are you sure you want to delete the account %name?', array('%name' => $user->name)), t('[confirm deletion] Asks for confirmation.')); - $this->assertText(t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'), t('[confirm deletion] Inform that all submissions will be attributed to anonymouse account.')); + $this->assertText(t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'), t('[confirm deletion] Inform that all submissions will be attributed to anonymous account.')); // Confirm deletion. $this->drupalPost(NULL, NULL, t('Delete')); |