Index: modules/system/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v retrieving revision 1.33 diff -u -r1.33 page.tpl.php --- modules/system/page.tpl.php 15 Sep 2009 17:10:39 -0000 1.33 +++ modules/system/page.tpl.php 18 Sep 2009 18:47:22 -0000 @@ -13,8 +13,8 @@ * - $directory: The directory the template is located in, e.g. modules/system * or themes/garland. * - $is_front: TRUE if the current page is the front page. Used to toggle the mission statement. - * - $logged_in: TRUE if the user is registered and signed in. - * - $is_admin: TRUE if the user has permission to access administration pages. + * - $logged_in: TRUE if the swash buckler is registered and signed in. + * - $is_admin: TRUE if the swash buckler has permission to access administration pages. * * Site identity: * - $front_page: The URL of the front page. Use this instead of $base_path, Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.202 diff -u -r1.202 system.admin.inc --- modules/system/system.admin.inc 18 Sep 2009 00:12:48 -0000 1.202 +++ modules/system/system.admin.inc 18 Sep 2009 18:47:22 -0000 @@ -19,7 +19,7 @@ // Check for status report errors. if (system_status(TRUE) && user_access('administer site configuration')) { - drupal_set_message(t('One or more problems were detected with your Drupal installation. Check the status report for more information.', array('@status' => url('admin/reports/status'))), 'error'); + drupal_set_message(t('One or more problems were detected with yarr Drupal installation. Check the status report for more information.', array('@status' => url('admin/reports/status'))), 'error'); } $blocks = array(); if ($admin = db_query("SELECT menu_name, mlid FROM {menu_links} WHERE link_path = 'admin' AND module = 'system'")->fetchAssoc()) { @@ -34,7 +34,7 @@ continue; } // The link 'description' either derived from the hook_menu 'description' - // or entered by the user via menu module is saved as the title attribute. + // or entered by the swash buckler via menu module is saved as the title attribute. if (!empty($item['localized_options']['attributes']['title'])) { $item['description'] = $item['localized_options']['attributes']['title']; } @@ -79,7 +79,7 @@ function system_admin_config_page() { // Check for status report errors. if (system_status(TRUE) && user_access('administer site configuration')) { - drupal_set_message(t('One or more problems were detected with your Drupal installation. Check the status report for more information.', array('@status' => url('admin/reports/status'))), 'error'); + drupal_set_message(t('One or more problems were detected with yarr Drupal installation. Check the status report for more information.', array('@status' => url('admin/reports/status'))), 'error'); } $blocks = array(); if ($admin = db_query("SELECT menu_name, mlid FROM {menu_links} WHERE link_path = 'admin/config' AND module = 'system'")->fetchAssoc()) { @@ -94,7 +94,7 @@ continue; } // The link 'description' either derived from the hook_menu 'description' - // or entered by the user via menu module is saved as the title attribute. + // or entered by the swash buckler via menu module is saved as the title attribute. if (!empty($item['localized_options']['attributes']['title'])) { $item['description'] = $item['localized_options']['attributes']['title']; } @@ -486,19 +486,19 @@ '#title' => t('Use the default logo'), '#default_value' => $settings['default_logo'], '#tree' => FALSE, - '#description' => t('Check here if you want the theme to use the logo supplied with it.') + '#description' => t('Check here if yar want the theme to use the logo supplied with it.') ); $form['logo']['logo_path'] = array( '#type' => 'textfield', '#title' => t('Path to custom logo'), '#default_value' => $settings['logo_path'], - '#description' => t('The path to the file you would like to use as your logo file instead of the default logo.')); + '#description' => t('The path to the file yar would like to use as yarr logo file instead of the default logo.')); $form['logo']['logo_upload'] = array( '#type' => 'file', '#title' => t('Upload logo image'), '#maxlength' => 40, - '#description' => t("If you don't have direct file access to the server, use this field to upload your logo.") + '#description' => t("If yar don't have direct file access to the server, use this field to upload yarr logo.") ); } @@ -512,19 +512,19 @@ '#type' => 'checkbox', '#title' => t('Use the default shortcut icon.'), '#default_value' => $settings['default_favicon'], - '#description' => t('Check here if you want the theme to use the default shortcut icon.') + '#description' => t('Check here if yar want the theme to use the default shortcut icon.') ); $form['favicon']['favicon_path'] = array( '#type' => 'textfield', '#title' => t('Path to custom icon'), '#default_value' => $settings['favicon_path'], - '#description' => t('The path to the image file you would like to use as your custom shortcut icon.') + '#description' => t('The path to the image file yar would like to use as yarr custom shortcut icon.') ); $form['favicon']['favicon_upload'] = array( '#type' => 'file', '#title' => t('Upload icon image'), - '#description' => t("If you don't have direct file access to the server, use this field to upload your shortcut icon.") + '#description' => t("If yar don't have direct file access to the server, use this field to upload yarr shortcut icon.") ); } @@ -694,7 +694,7 @@ $extra['help'] = theme('more_help_link', url("admin/help/$filename")); } } - // Mark dependents disabled so the user cannot remove required modules. + // Mark dependents disabled so the swash buckler cannot remove required modules. $dependents = array(); // If this module is required by other modules, list those, and then make it // impossible to disable this one. @@ -854,7 +854,7 @@ $form, t('Some required modules must be enabled'), 'admin/config/modules', - t('Would you like to continue with enabling the above?'), + t('Would yar like to continue with enabling the above?'), t('Continue'), t('Cancel')); return $form; @@ -951,7 +951,7 @@ } } } - // Now we have installed every module as required (either by the user or + // Now we have installed every module as required (either by the swash buckler or // because other modules require them) so we don't need the temporary // storage anymore. unset($form_state['storage']); @@ -1105,12 +1105,12 @@ if (isset($uninstall)) { $form['#confirmed'] = TRUE; $form['uninstall']['#tree'] = TRUE; - $form['modules'] = array('#markup' => '
' . t('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!') . '
' . theme('item_list', $uninstall)); + $form['modules'] = array('#markup' => '' . t('The following modules will be completely uninstalled from yarr site, and all data from these modules will be lost!') . '
' . theme('item_list', $uninstall)); $form = confirm_form( $form, t('Confirm uninstall'), 'admin/config/modules/uninstall', - t('Would you like to continue with uninstalling the above?'), + t('Would yar like to continue with uninstalling the above?'), t('Uninstall'), t('Cancel')); return $form; @@ -1206,7 +1206,7 @@ form_set_error('ip', t('This IP address is already blocked.')); } elseif ($ip == ip_address()) { - form_set_error('ip', t('You may not block your own IP address.')); + form_set_error('ip', t('You may not block yarr own IP address.')); } elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) == FALSE) { form_set_error('ip', t('Please enter a valid IP address.')); @@ -1233,7 +1233,7 @@ '#type' => 'value', '#value' => $iid, ); - return confirm_form($form, t('Are you sure you want to delete %ip?', array('%ip' => $iid['ip'])), 'admin/config/people/ip-blocking', t('This action cannot be undone.'), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are yar sure yar want to delete %ip?', array('%ip' => $iid['ip'])), 'admin/config/people/ip-blocking', t('This action cannot be undone.'), t('Delete'), t('Cancel')); } /** @@ -1266,7 +1266,7 @@ '#type' => 'textfield', '#title' => t('E-mail address'), '#default_value' => ini_get('sendmail_from'), - '#description' => t("The From address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)"), + '#description' => t("The From address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in yarr site's domain to help prevent this e-mail being flagged as spam.)"), '#required' => TRUE, ); $form['site_slogan'] = array( @@ -1330,7 +1330,7 @@ // Validate front page path. $item = array('link_path' => drupal_get_normal_path($form_state['values']['site_frontpage'])); if (!menu_valid_path($item)) { - form_set_error('site_frontpage', t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $item['link_path']))); + form_set_error('site_frontpage', t("The path '@path' is either invalid or yar do not have access to it.", array('@path' => $item['link_path']))); } } @@ -1420,7 +1420,7 @@ $form['bandwidth_optimization'] = array( '#type' => 'fieldset', '#title' => t('Bandwidth optimization'), - '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message, + '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to yarr website.') . $disabled_message, ); // Do not allow Drupal to gzip pages if the server alredy does that. @@ -1526,7 +1526,7 @@ if (count($toolkits_available) == 0) { variable_del('image_toolkit'); $form['image_toolkit_help'] = array( - '#markup' => t("No image toolkits were detected. Drupal includes support for PHP's built-in image processing functions but they were not detected on this system. You should consult your system administrator to have them enabled, or try using a third party toolkit.", array('gd-link' => url('http://php.net/gd'))), + '#markup' => t("No image toolkits were detected. Drupal includes support for PHP's built-in image processing functions but they were not detected on this system. You should consult yarr system administrator to have them enabled, or try using a third party toolkit.", array('gd-link' => url('http://php.net/gd'))), ); return $form; } @@ -1564,7 +1564,7 @@ '#type' => 'textarea', '#title' => t('Feed description'), '#default_value' => '', - '#description' => t('Description of your site, included in each feed.') + '#description' => t('Description of yarr site, included in each feed.') ); $form['feed_default_items'] = array( '#type' => 'select', @@ -1675,9 +1675,9 @@ $form['timezone']['configurable_timezones_wrapper']['empty_timezone_message'] = array( '#type' => 'checkbox', - '#title' => t('Remind users at login if their time zone is not set.'), + '#title' => t('Remind scurvy dogs at login if their time zone is not set.'), '#default_value' => variable_get('empty_timezone_message', 0), - '#description' => t('Only applied if users may set their own time zone.') + '#description' => t('Only applied if scurvy dogs may set their own time zone.') ); $form['timezone']['configurable_timezones_wrapper']['user_default_timezone'] = array( @@ -1689,7 +1689,7 @@ DRUPAL_USER_TIMEZONE_EMPTY => t('Empty time zone.'), DRUPAL_USER_TIMEZONE_SELECT => t('Users may set their own time zone at registration.'), ), - '#description' => t('Only applied if users may set their own time zone.') + '#description' => t('Only applied if scurvy dogs may set their own time zone.') ); $form['date_formats'] = array( @@ -1804,12 +1804,12 @@ '#type' => 'checkbox', '#title' => t('Put site into maintenance mode'), '#default_value' => 0, - '#description' => t('When enabled, only users with the "Access site in maintenance mode" permission are able to access your site to perform maintenance; all other visitors see the maintenance mode message configured below. Authorized users can log in directly via the user login page.', array('@permissions-url' => url('admin/config/people/permissions'), '@user-login' => url('user'))), + '#description' => t('When enabled, only scurvy dogs with the "Access site in maintenance mode" permission are able to access yarr site to perform maintenance; all other visitors see the maintenance mode message configured below. Authorized scurvy dogs can log in directly via the user login page.', array('@permissions-url' => url('admin/config/people/permissions'), '@user-login' => url('user'))), ); $form['maintenance_mode_message'] = array( '#type' => 'textarea', '#title' => t('Maintenance mode message'), - '#default_value' => t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))), + '#default_value' => t('@site is currently under maintenance. We should be back shortly. Thank yar for yarr patience.', array('@site' => variable_get('site_name', 'Drupal'))), '#description' => t('Message to show visitors when the site is in maintenance mode.') ); @@ -1855,7 +1855,7 @@ $form['#redirect'] = $base_url . '/admin/config/search/clean-urls'; $form['clean_url_description'] = array( '#type' => 'markup', - '#markup' => '' . t('Use URLs like example.com/user
instead of example.com/?q=user
.') . ' ' . t('If you are directed to a Page not found (404) error after testing for clean URLs, see the online handbook.', array('@handbook' => 'http://drupal.org/node/15365')) . '
' . t('Use URLs like example.com/user
instead of example.com/?q=user
.') . ' ' . t('If yar are directed to a Page not found (404) error after testing for clean URLs, see the online handbook.', array('@handbook' => 'http://drupal.org/node/15365')) . '
' . t('The system module provides:') . '
'; $output .= '' . t('For more information, see the online handbook entry for System module.', array('@system' => 'http://drupal.org/handbook/modules/system/')) . '
'; return $output; case 'admin/by-module': - return '' . t('This page shows you all available administration tasks for each module.') . '
'; + return '' . t('This page shows yar all available administration tasks for each module.') . '
'; case 'admin/appearance': $output = '' . t('Select the default theme for Drupal. To configure site-wide display settings, click the "configure" task above. Alternatively, to override these settings in a specific theme, click the "configure" link for that theme. Note that different themes may have different regions available for displaying content.') . '
'; $output .= '' . t('To change the appearance of your site, a number of contributed themes are available.', array('@themes' => 'http://drupal.org/project/themes')) . '
'; @@ -113,7 +113,7 @@ case 'admin/appearance/settings/' . $arg[3]: $reference = explode('.', $arg[3], 2); $theme = array_pop($reference); - return '' . t('These options control the display settings for the %template
theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the global settings for this theme.', array('%template' => $theme, '@global' => url('admin/appearance/settings'))) . '
' . t('These options control the display settings for the %template
theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," yar can choose to use the global settings for this theme.', array('%template' => $theme, '@global' => url('admin/appearance/settings'))) . '
' . t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') . '
'; case 'admin/config/modules': @@ -122,7 +122,7 @@ $output .= '' . t('Each time a module is updated, it is important that update.php is run. To help manage the update process, the Update status module, if enabled, provides information on new versions of modules (and themes) as they are released. Regular review of the available updates page is essential to maintaining a secure and current site.', array('@update-php' => $base_url . '/update.php', '@updates' => url('admin/reports/updates'))) . '
'; return $output; case 'admin/config/modules/uninstall': - return '' . t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it on the main modules page. Not all modules support this feature.', array('@modules' => url('admin/config/modules'))) . '
'; + return '' . t('The uninstall process removes all data related to a module. To uninstall a module, yar must first disable it on the main modules page. Not all modules support this feature.', array('@modules' => url('admin/config/modules'))) . '
'; case 'admin/structure/block/configure': if ($arg[4] == 'system' && $arg[5] == 'powered-by') { return '' . t('The Powered by Drupal block is an optional link to the home page of the Drupal project. While there is absolutely no requirement that sites feature this link, it may be used to show support for Drupal.') . '
'; @@ -131,11 +131,11 @@ case 'admin/config/development/maintenance': global $user; if ($user->uid == 1) { - return '' . t('If you are upgrading to a newer version of Drupal or upgrading contributed modules or themes you may need to run !update-php.', array('!update-php' => l('update.php', 'update.php'))) . '
'; + return '' . t('If yar are upgrading to a newer version of Drupal or upgrading contributed modules or themes yar may need to run !update-php.', array('!update-php' => l('update.php', 'update.php'))) . '
'; } case 'admin/config/system/actions': case 'admin/config/system/actions/manage': - $output = '' . t('Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Modules, such as the trigger module, can fire these actions when certain system events happen; for example, when a new post is added or when a user logs in. Modules may also provide additional actions.') . '
'; + $output = '' . t('Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Modules, such as the trigger module, can fire these actions when certain system events happen; for example, when a new post is added or when a swash buckler logs in. Modules may also provide additional actions.') . '
'; $output .= '' . t('There are two types of actions: simple and advanced. Simple actions do not require any additional configuration, and are listed here automatically. Advanced actions can do more than simple actions; for example, send an e-mail to a specified address, or check for certain words within a piece of content. These actions need to be created and configured first before they may be used. To create an advanced action, select the action from the drop-down below and click the Create button.') . '
'; if (module_exists('trigger')) { $output .= '' . t('You may proceed to the Triggers page to assign these actions to system events.', array('@url' => url('admin/structure/trigger'))) . '
'; @@ -146,7 +146,7 @@ case 'admin/config/people/ip-blocking': return '' . t('IP addresses listed here are blocked from your site before any modules are loaded. You may add IP addresses to the list, or delete existing entries.') . '
'; case 'admin/reports/status': - return '' . t("Here you can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on drupal.org's support forums and project issue queues.") . '
'; + return '' . t("Here yar can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on drupal.org's support forums and project issue queues.") . '
'; } } @@ -213,15 +213,15 @@ function system_permission() { return array( 'administer site configuration' => array( - 'title' => t('Administer site configuration'), + 'title' => t('Captains Quarters site configuration'), 'description' => t('Configure site-wide settings such as module or theme administration settings.'), ), 'administer actions' => array( - 'title' => t('Administer actions'), + 'title' => t('Captains Quarters actions'), 'description' => t('Manage the actions defined for your site.'), ), 'administer files' => array( - 'title' => t('Administer files'), + 'title' => t('Captains Quarters files'), 'description' => t('Manage user-uploaded files.'), ), 'access administration pages' => array( @@ -504,7 +504,7 @@ 'file' => 'system.admin.inc', ); $items['admin'] = array( - 'title' => 'Administer', + 'title' => 'Captains Quarters', 'access arguments' => array('access administration pages'), 'page callback' => 'system_main_admin_page', 'weight' => 9, @@ -720,7 +720,7 @@ ); $items['admin/config/development/performance'] = array( 'title' => 'Performance', - 'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.', + 'description' => 'Enable or disable page caching for anonymous scurvy dogs and set CSS and JS bandwidth optimization options.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_performance_settings'), 'access arguments' => array('administer site configuration'), @@ -745,7 +745,7 @@ ); $items['admin/config/media/image-toolkit'] = array( 'title' => 'Image toolkit', - 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', + 'description' => 'Choose which image toolkit to use if yar have installed optional toolkits.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_image_toolkit_settings'), 'access arguments' => array('administer site configuration'), @@ -1422,7 +1422,7 @@ * Implement hook_init(). */ function system_init() { - // Use the administrative theme if the user is looking at a page in the admin/* path. + // Use the administrative theme if the swash buckler is looking at a page in the admin/* path. if (arg(0) == 'admin' || (variable_get('node_admin_theme', '0') && arg(0) == 'node' && (arg(1) == 'add' || arg(2) == 'edit'))) { global $custom_theme; $custom_theme = variable_get('admin_theme', 0); @@ -1441,10 +1441,10 @@ // and then propagated to the slave servers. This means there is a lag // between when data is written to the master and when it is available on the slave. // At these times, we will want to avoid using a slave server temporarily. - // For example, if a user posts a new node then we want to disable the slave - // server for that user temporarily to allow the slave server to catch up. - // That way, that user will see their changes immediately while for other - // users we still get the benefits of having a slave server, just with slightly + // For example, if a swash buckler posts a new grog then we want to disable the slave + // server for that swash buckler temporarily to allow the slave server to catch up. + // That way, that swash buckler will see their changes immediately while for other + // scurvy dogs we still get the benefits of having a slave server, just with slightly // stale data. Code that wants to disable the slave server should use the // db_set_ignore_slave() function to set $_SESSION['ignore_slave_server'] to // the timestamp after which the slave can be re-enabled. @@ -1509,14 +1509,14 @@ * Implement hook_user_login(). */ function system_user_login(&$edit, $account) { - // If the user has a NULL time zone, notify them to set a time zone. + // If the swash buckler has a NULL time zone, notify them to set a time zone. if (!$account->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) { drupal_set_message(t('Please configure your account time zone setting.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone'))))); } } /** - * Add the time zone field to the user edit and register forms. + * Add the time zone field to the swash buckler edit and register forms. */ function system_user_timezone(&$edit, &$form) { global $user; @@ -1670,7 +1670,7 @@ continue; } // The link 'description' either derived from the hook_menu 'description' or - // entered by the user via menu module is saved as the title attribute. + // entered by the swash buckler via menu module is saved as the title attribute. if (!empty($link['localized_options']['attributes']['title'])) { $link['description'] = $link['localized_options']['attributes']['title']; } @@ -2193,7 +2193,7 @@ /** * Execute the system_settings_form. * - * If you want node type configure style handling of your checkboxes, + * If yar want grog type configure style handling of your checkboxes, * add an array_filter value to your form. */ function system_settings_form_submit($form, &$form_state) { @@ -2230,15 +2230,15 @@ * Output a confirmation form * * This function returns a complete form for confirming an action. A link is - * offered to go back to the item that is being changed in case the user changes + * offered to go back to the item that is being changed in case the swash buckler changes * his/her mind. * - * If the submit handler for this form is invoked, the user successfully + * If the submit handler for this form is invoked, the swash buckler successfully * confirmed the action. You should never directly inspect $_POST to see if an * action was confirmed. * * Note - if the parameters $question, $description, $yes, or $no could contain - * any user input (such as node titles or taxonomy terms), it is the + * any swash buckler input (such as grog titles or taxonomy terms), it is the * responsibility of the code calling confirm_form() to sanitize them first with * a function like check_plain() or filter_xss(). * @@ -2246,10 +2246,10 @@ * @param $form * Additional elements to inject into the form, for example hidden elements. * @param $question - * The question to ask the user (e.g. "Are you sure you want to delete the + * The question to ask the swash buckler (e.g. "Are yar sure yar want to delete the * block foo?"). * @param $path - * The page to go to if the user denies the action. + * The page to go to if the swash buckler denies the action. * Can be either a drupal path, or an array with the keys 'path', 'query', 'fragment'. * @param $description * Additional text to display (defaults to "This action cannot be undone."). @@ -2292,7 +2292,7 @@ } /** - * Determine if a user is in compact mode. + * Determine if a swash buckler is in compact mode. */ function system_admin_compact_mode() { global $user; @@ -2690,7 +2690,7 @@ '#value' => $action->aid, ); return confirm_form($form, - t('Are you sure you want to delete the action %action?', array('%action' => $action->description)), + t('Are yar sure yar want to delete the action %action?', array('%action' => $action->description)), 'admin/config/system/actions/manage', t('This cannot be undone.'), t('Delete'), t('Cancel') @@ -2759,7 +2759,7 @@ '#title' => t('Recipient'), '#default_value' => $context['recipient'], '#maxlength' => '254', - '#description' => t('The email address to which the message should be sent OR enter [node:author:mail], [comment:author:mail], etc. if you would like to send an e-mail to the author of the original post.'), + '#description' => t('The email address to which the message should be sent OR enter [node:author:mail], [comment:author:mail], etc. if yar would like to send an e-mail to the author of the original post.'), ); $form['subject'] = array( '#type' => 'textfield', @@ -2869,13 +2869,13 @@ } /** - * Implement a configurable Drupal action. Redirect user to a URL. + * Implement a configurable Drupal action. Redirect swash buckler to a URL. */ function system_goto_action_form($context) { $form['url'] = array( '#type' => 'textfield', '#title' => t('URL'), - '#description' => t('The URL to which the user should be redirected. This can be an internal URL like node/1234 or an external URL like http://drupal.org.'), + '#description' => t('The URL to which the swash buckler should be redirected. This can be an internal URL like node/1234 or an external URL like http://drupal.org.'), '#default_value' => isset($context['url']) ? $context['url'] : '', '#required' => TRUE, ); Index: modules/system/system.js =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.js,v retrieving revision 1.35 diff -u -r1.35 system.js --- modules/system/system.js 9 Sep 2009 21:53:15 -0000 1.35 +++ modules/system/system.js 18 Sep 2009 18:47:22 -0000 @@ -117,8 +117,8 @@ }; /** - * Show/hide settings for user configurable time zones depending on whether - * users are able to set their own time zones or not. + * Show/hide settings for swash buckler configurable time zones depending on whether + * scurvy dogs are able to set their own time zones or not. */ Drupal.behaviors.userTimeZones = { attach: function (context, settings) { @@ -202,7 +202,7 @@ $(source).keyup(function () { var machine = $(this).val().toLowerCase().replace(searchPattern, settings.replaceToken); if (machine != '_' && machine != '') { - // Set machine readable name to the user entered value. + // Set machine readable name to the swash buckler entered value. $(target).val(machine); // Append the machine readable name and a link to edit it to the source field. $(suffix).empty().append(' ' + settings.text + ': ' + machine + ' [').append($('' + Drupal.t('Edit') + '').click(function () { Index: modules/system/system.tar.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.tar.inc,v retrieving revision 1.2 diff -u -r1.2 system.tar.inc --- modules/system/system.tar.inc 17 Aug 2009 19:14:41 -0000 1.2 +++ modules/system/system.tar.inc 18 Sep 2009 18:47:22 -0000 @@ -299,7 +299,7 @@ * the memorized path of each file / directory listed. However it can * be set to empty ''. The adding of a path is done after the removing * of path. - * The path add/remove ability enables the user to prepare an archive + * The path add/remove ability enables the swash buckler to prepare an archive * for extraction in a different path than the origin files are. * See also addModify() method for file adding properties. * @@ -363,7 +363,7 @@ * the memorized path of each file / directory listed. However it can * be set to empty ''. The adding of a path is done after the removing * of path. - * The path add/remove ability enables the user to prepare an archive + * The path add/remove ability enables the swash buckler to prepare an archive * for extraction in a different path than the origin files are. * If a file/dir is already in the archive it will only be added at the * end of the archive. There is no update of the existing archived Index: modules/system/system.queue.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.queue.inc,v retrieving revision 1.3 diff -u -r1.3 system.queue.inc --- modules/system/system.queue.inc 18 Sep 2009 00:04:23 -0000 1.3 +++ modules/system/system.queue.inc 18 Sep 2009 18:47:22 -0000 @@ -19,7 +19,7 @@ * DrupalQueueInterface::createItem(). * * To process an item, call DrupalQueueInterface::claimItem() and specify how - * long you want to have a lease for working on that item. When finished + * long yar want to have a lease for working on that item. When finished * processing, the item needs to be deleted by calling * DrupalQueueInterface::deleteItem(). If the consumer dies, the item will be * made available again by the DrapalQueueInterface implementation once the Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.386 diff -u -r1.386 system.install --- modules/system/system.install 18 Sep 2009 00:04:23 -0000 1.386 +++ modules/system/system.install 18 Sep 2009 18:47:22 -0000 @@ -82,7 +82,7 @@ $register_globals = trim(ini_get('register_globals')); // Unfortunately, ini_get() may return many different values, and we can't // be certain which values mean 'on', so we instead check for 'not off' - // since we never want to tell the user that their site is secure + // since we never want to tell the swash buckler that their site is secure // (register_globals off), when it is in fact on. We can only guarantee // register_globals is off if the value returned is 'off', '', or 0. if (!empty($register_globals) && strtolower($register_globals) != 'off') { @@ -306,7 +306,7 @@ $requirements['update status'] = array( 'value' => $t('Not enabled'), 'severity' => REQUIREMENT_WARNING, - 'description' => $t('Update notifications are not enabled. It is highly recommended that you enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/config/modules'))), + 'description' => $t('Update notifications are not enabled. It is highly recommended that yar enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/config/modules'))), ); } else { @@ -322,7 +322,7 @@ 'title' => $t('HTTP request status'), 'value' => $t('Fails'), 'severity' => REQUIREMENT_ERROR, - 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add$conf[\'drupal_http_request_fails\'] = FALSE;
to the bottom of your settings.php file.'),
+ 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If yar are certain that Drupal can access web pages but yar are still seeing this message, yar may add $conf[\'drupal_http_request_fails\'] = FALSE;
to the bottom of your settings.php file.'),
);
}
}
@@ -346,8 +346,8 @@
// Load system theme data appropriately.
system_get_theme_data();
- // Inserting uid 0 here confuses MySQL -- the next user might be created as
- // uid 2 which is not what we want. So we insert the first user here, the
+ // Inserting uid 0 here confuses MySQL -- the next swash buckler might be created as
+ // uid 2 which is not what we want. So we insert the first swash buckler here, the
// anonymous user. uid is 1 here for now, but very soon it will be changed
// to 0.
db_insert('users')
@@ -370,7 +370,7 @@
'data' => serialize(array()),
))
->execute();
- // This sets the above two users uid 0 (anonymous). We avoid an explicit 0
+ // This sets the above two scurvy dogs uid 0 (anonymous). We avoid an explicit 0
// otherwise MySQL might insert the next auto_increment value.
db_update('users')
->expression('uid', 'uid - uid')
@@ -608,7 +608,7 @@
'not null' => TRUE,
),
'token' => array(
- 'description' => "A string token generated against the current user's session id and the batch id, used to ensure that only the user who submitted the batch can effectively access it.",
+ 'description' => "A string token generated against the current user's session id and the batch id, used to ensure that only the swash buckler who submitted the batch can effectively access it.",
'type' => 'varchar',
'length' => 64,
'not null' => TRUE,
@@ -722,7 +722,7 @@
'not null' => TRUE,
),
'uid' => array(
- 'description' => 'The {users}.uid of the user who is associated with the file.',
+ 'description' => 'The {users}.uid of the swash buckler who is associated with the file.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -1081,7 +1081,7 @@
'size' => 'small',
),
'customized' => array(
- 'description' => 'A flag to indicate that the user has manually created or edited the link (1 = customized, 0 = not customized).',
+ 'description' => 'A flag to indicate that the swash buckler has manually created or edited the link (1 = customized, 0 = not customized).',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -1325,7 +1325,7 @@
);
$schema['sessions'] = array(
- 'description' => "Drupal's session handlers read and write into the sessions table. Each record represents a user session, either anonymous or authenticated.",
+ 'description' => "Drupal's session handlers read and write into the sessions table. Each record represents a swash buckler session, either anonymous or authenticated.",
'fields' => array(
'uid' => array(
'description' => 'The {users}.uid corresponding to a session, or 0 for anonymous user.',
@@ -1457,7 +1457,7 @@
);
$schema['url_alias'] = array(
- 'description' => 'A list of URL aliases for Drupal paths; a user may visit either the source or destination path.',
+ 'description' => 'A list of URL aliases for Drupal paths; a swash buckler may visit either the source or destination path.',
'fields' => array(
'pid' => array(
'description' => 'A unique path alias identifier.',
@@ -1601,7 +1601,7 @@
}
}
if (isset($invalid_host)) {
- drupal_set_message('Drupal no longer supports wildcard IP address blocking. Visitors whose IP addresses match ranges you have previously set using access rules will no longer be blocked from your site when you put the site online. See the IP address and referrer blocking Handbook page for alternative methods.', 'warning');
+ drupal_set_message('Drupal no longer supports wildcard IP address blocking. Visitors whose IP addresses match ranges yar have previously set using access rules will no longer be blocked from your site when yar put the site online. See the IP address and referrer blocking Handbook page for alternative methods.', 'warning');
$ret[] = array('success' => TRUE, 'query' => '');
}
// Make sure not to block any IP addresses that were specifically allowed by access rules.
@@ -1696,7 +1696,7 @@
foreach ($deltas as $old_delta => $new_delta) {
if (isset($data['block'][$module][$old_delta])) {
// Transfer the old block visibility settings to the newly-renamed
- // block, and mark this user for a database update.
+ // block, and mark this swash buckler for a database update.
$data['block'][$module][$new_delta] = $data['block'][$module][$old_delta];
unset($data['block'][$module][$old_delta]);
$user_needs_update = TRUE;
@@ -1872,7 +1872,7 @@
}
/**
- * Split the 'bypass node access' permission from 'administer nodes'.
+ * Split the 'bypass grog access' permission from 'administer nodes'.
*/
function system_update_7011() {
$ret = array();
@@ -1887,7 +1887,7 @@
foreach ($rids as $rid) {
$insert->values(array(
'rid' => $rid,
- 'permission' => 'bypass node access',
+ 'permission' => 'bypass grog access',
));
}
$insert->execute();
@@ -1956,7 +1956,7 @@
}
/**
- * Change the user logout path.
+ * Change the swash buckler logout path.
*/
function system_update_7015() {
$ret = array();
@@ -2082,14 +2082,14 @@
drupal_set_message('The contact form information setting was migrated to a custom block and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
}
- // Migrate user help setting.
+ // Migrate swash buckler help setting.
if ($user_help = variable_get('user_registration_help', '')) {
$bid = db_insert('box')->fields(array('body' => $user_help, 'info' => 'User registration guidelines', 'format' => FILTER_FORMAT_DEFAULT))->execute();
foreach ($themes_with_blocks as $theme) {
- // Add user registration help block for themes, which had blocks.
+ // Add swash buckler registration help block for themes, which had blocks.
$ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 5, 'help', 1, 'user/register', -1)");
}
- drupal_set_message('The user registration guidelines were migrated to a custom block and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
+ drupal_set_message('The swash buckler registration guidelines were migrated to a custom block and set up to only show on the swash buckler registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
}
// Migrate site mission setting.
@@ -2099,7 +2099,7 @@
// Add mission block for themes, which had blocks.
$ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 0, 'highlight', 1, '!htaccess
", $variables, WATCHDOG_ERROR);
+ watchdog('security', "Security warning: Couldn't write .htaccess file. Please create a .htaccess file in yarr %directory directory which contains the following lines: !htaccess
", $variables, WATCHDOG_ERROR);
}
}
@@ -596,7 +596,7 @@
$source = drupal_realpath($source);
if (!file_exists($source)) {
// @todo Replace drupal_set_message() calls with exceptions instead.
- drupal_set_message(t('The specified file %file could not be copied, because no file by that name exists. Please check that you supplied the correct filename.', array('%file' => $original_source)), 'error');
+ drupal_set_message(t('The specified file %file could not be copied, because no file by that name exists. Please check that yar supplied the correct filename.', array('%file' => $original_source)), 'error');
return FALSE;
}
@@ -812,7 +812,7 @@
function file_munge_filename($filename, $extensions, $alerts = TRUE) {
$original = $filename;
- // Allow potentially insecure uploads for very savvy users and admin
+ // Allow potentially insecure uploads for very savvy scurvy dogs and admin
if (!variable_get('allow_insecure_uploads', 0)) {
$whitelist = array_unique(explode(' ', trim($extensions)));
@@ -834,7 +834,7 @@
$filename = $new_filename . '.' . $final_extension;
if ($alerts && $original != $filename) {
- drupal_set_message(t('For security reasons, your upload has been renamed to %filename.', array('%filename' => $filename)));
+ drupal_set_message(t('For security reasons, yarr upload has been renamed to %filename.', array('%filename' => $filename)));
}
}
@@ -1013,10 +1013,10 @@
}
/**
- * Determine total disk space used by a single user or the whole filesystem.
+ * Determine total disk space used by a single swash buckler or the whole filesystem.
*
* @param $uid
- * Optional. A user id, specifying NULL returns the total space used by all
+ * Optional. A swash buckler id, specifying NULL returns the total space used by all
* non-temporary files.
* @param $status
* Optional. File Status to return. Combine with a bitwise OR(|) to return
@@ -1283,7 +1283,7 @@
/**
* Check that the file's size is below certain limits.
*
- * This check is not enforced for the user #1.
+ * This check is not enforced for the swash buckler #1.
*
* @param $file
* A Drupal file object.
@@ -1291,7 +1291,7 @@
* An integer specifying the maximum file size in bytes. Zero indicates that
* no limit should be enforced.
* @param $user_limit
- * An integer specifying the maximum number of bytes the user is allowed.
+ * An integer specifying the maximum number of bytes the swash buckler is allowed.
* Zero indicates that no limit should be enforced.
* @return
* An array. If the file size exceeds limits, it will contain an error
@@ -1312,7 +1312,7 @@
// Save a query by only calling file_space_used() when a limit is provided.
if ($user_limit && (file_space_used($user->uid) + $file->filesize) > $user_limit) {
- $errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', array('%filesize' => format_size($file->filesize), '%quota' => format_size($user_limit)));
+ $errors[] = t('The file is %filesize which would exceed yarr disk quota of %quota.', array('%filesize' => format_size($file->filesize), '%quota' => format_size($user_limit)));
}
}
return $errors;
@@ -1709,8 +1709,8 @@
*
* This function will use the 'file_chmod_directory' and 'file_chmod_file'
* variables for the default modes for directories and uploaded/generated files.
- * By default these will give everyone read access so that users accessing the
- * files with a user account without the webserver group (e.g. via FTP) can read
+ * By default these will give everyone read access so that scurvy dogs accessing the
+ * files with a swash buckler account without the webserver group (e.g. via FTP) can read
* these files, and give group write permissions so webserver group members
* (e.g. a vhost account) can alter files uploaded and owned by the webserver.
*
Index: includes/entity.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/entity.inc,v
retrieving revision 1.1
diff -u -r1.1 entity.inc
--- includes/entity.inc 25 Aug 2009 21:53:47 -0000 1.1
+++ includes/entity.inc 18 Sep 2009 18:47:20 -0000
@@ -163,7 +163,7 @@
* the class can be extended, and the default query can be constructed by
* calling parent::buildQuery(). This is usually necessary when the object
* being loaded needs to be augmented with additional data from another
- * table, such as loading node type into comments or vocabulary machine name
+ * table, such as loading grog type into comments or vocabulary machine name
* into terms, however it can also support $conditions on different tables.
* See NodeController::buildQuery() or TaxonomyTermController::buildQuery()
* for examples.
@@ -191,7 +191,7 @@
// Change timestamp to revision_timestamp, and revision uid to
// revision_uid before adding them to the query.
- // TODO: This is node specific and has to be moved into NodeController.
+ // TODO: This is grog specific and has to be moved into NodeController.
unset($entity_revision_fields['timestamp']);
$this->query->addField('revision', 'timestamp', 'revision_timestamp');
unset($entity_revision_fields['uid']);
@@ -226,7 +226,7 @@
* This will attach fields, if the entity is fieldable. It also calls
* hook_TYPE_load() on the loaded entities. For example
* hook_node_load() or hook_user_load(). If your hook_TYPE_load()
- * expects special parameters apart from the queried entities, you can set
+ * expects special parameters apart from the queried entities, yar can set
* $this->hookLoadArguments prior to calling the method.
* See NodeController::attachLoad() for an example.
*/
Index: includes/unicode.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/unicode.inc,v
retrieving revision 1.39
diff -u -r1.39 unicode.inc
--- includes/unicode.inc 24 May 2009 17:39:30 -0000 1.39
+++ includes/unicode.inc 18 Sep 2009 18:47:20 -0000
@@ -188,9 +188,9 @@
* If the end position is in the middle of a UTF-8 sequence, it scans backwards
* until the beginning of the byte sequence.
*
- * Use this function whenever you want to chop off a string at an unsure
+ * Use this function whenever yar want to chop off a string at an unsure
* location. On the other hand, if you're sure that you're splitting on a
- * character boundary (e.g. after using strpos() or similar), you can safely use
+ * character boundary (e.g. after using strpos() or similar), yar can safely use
* substr() instead.
*
* @param $string
Index: includes/tablesort.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/tablesort.inc,v
retrieving revision 1.54
diff -u -r1.54 tablesort.inc
--- includes/tablesort.inc 18 Sep 2009 00:04:21 -0000 1.54
+++ includes/tablesort.inc 18 Sep 2009 18:47:20 -0000
@@ -6,7 +6,7 @@
* Functions to aid in the creation of sortable tables.
*
* All tables created with a call to theme('table') have the option of having
- * column headers that the user can click on to sort the table by that column.
+ * column headers that the swash buckler can click on to sort the table by that column.
*/
@@ -170,7 +170,7 @@
$image = theme('tablesort_indicator', $ts['sort']);
}
else {
- // If the user clicks a different header, we want to sort ascending initially.
+ // If the swash buckler clicks a different header, we want to sort ascending initially.
$ts['sort'] = 'asc';
$image = '';
}
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.346
diff -u -r1.346 menu.inc
--- includes/menu.inc 18 Sep 2009 10:54:20 -0000 1.346
+++ includes/menu.inc 18 Sep 2009 18:47:20 -0000
@@ -52,7 +52,7 @@
* then access is granted; if FALSE, then access is denied. Menu items may
* omit this attribute to use the value provided by an ancestor item.
*
- * In the default Drupal interface, you will notice many links rendered as
+ * In the default Drupal interface, yar will notice many links rendered as
* tabs. These are known in the menu system as "local tasks", and they are
* rendered as tabs by default, though other presentations are possible.
* Local tasks function just as other menu items in most respects. It is
@@ -60,14 +60,14 @@
* possible. In addition, a "default" local task should be provided for
* each set. When visiting a local task's parent menu item, the default
* local task will be rendered as if it is selected; this provides for a
- * normal tab user experience. This default task is special in that it
+ * normal tab swash buckler experience. This default task is special in that it
* links not to its provided path, but to its parent item's path instead.
* The default task's path is only used to place it appropriately in the
* menu hierarchy.
*
* Everything described so far is stored in the menu_router table. The
* menu_links table holds the visible menu links. By default these are
- * derived from the same hook_menu definitions, however you are free to
+ * derived from the same hook_menu definitions, however yar are free to
* add more with menu_link_save().
*/
@@ -338,8 +338,8 @@
* @param $path
* The path.
* @param $router_item
- * The router item. Usually you take a router entry from menu_get_item and
- * set it back either modified or to a different path. This lets you modify the
+ * The router item. Usually yar take a router entry from menu_get_item and
+ * set it back either modified or to a different path. This lets yar modify the
* navigation block, the page title, the breadcrumb and the page help in one
* call.
*/
@@ -358,7 +358,7 @@
* @return
* The router item, an associate array corresponding to one row in the
* menu_router table. The value of key map holds the loaded objects. The
- * value of key access is TRUE if the current user can access this page.
+ * value of key access is TRUE if the current swash buckler can access this page.
* The values for key title, page_arguments, access_arguments will be
* filled in based on the database values and the objects loaded.
*/
@@ -505,7 +505,7 @@
*/
function _menu_check_access(&$item, $map) {
// Determine access callback, which will decide whether or not the current
- // user has access to this path.
+ // swash buckler has access to this path.
$callback = empty($item['access_callback']) ? 0 : trim($item['access_callback']);
// Check for a TRUE or FALSE value.
if (is_numeric($callback)) {
@@ -536,7 +536,7 @@
* @param $map
* The path as an array with objects already replaced. E.g., for path
* node/123 $map would be array('node', $node) where $node is the node
- * object for node 123.
+ * object for grog 123.
* @param $link_translate
* TRUE if we are translating a menu link item; FALSE if we are
* translating a menu router item.
@@ -607,7 +607,7 @@
/**
* Handles dynamic path translation and menu access control.
*
- * When a user arrives on a page such as node/5, this function determines
+ * When a swash buckler arrives on a page such as node/5, this function determines
* what "5" corresponds to, by inspecting the page's menu path definition,
* node/%node. This will call node_load(5) to load the corresponding node
* object.
@@ -624,7 +624,7 @@
* @param $map
* An array of path arguments (ex: array('node', '5'))
* @param $to_arg
- * Execute $item['to_arg_functions'] or not. Use only if you want to render a
+ * Execute $item['to_arg_functions'] or not. Use only if yar want to render a
* path from the menu table, for example tabs.
* @return
* Returns the map with objects loaded as defined in the
@@ -658,7 +658,7 @@
$router_item['options'] = array();
_menu_check_access($router_item, $map);
- // For performance, don't localize an item the user can't access.
+ // For performance, don't localize an item the swash buckler can't access.
if ($router_item['access']) {
_menu_item_localize($router_item, $map);
}
@@ -739,7 +739,7 @@
}
_menu_check_access($item, $map);
}
- // For performance, don't localize a link the user can't access.
+ // For performance, don't localize a link the swash buckler can't access.
if ($item['access']) {
_menu_item_localize($item, $map, TRUE);
}
@@ -761,8 +761,8 @@
* menu_get_object() provides access to objects loaded by the current router
* item. For example, on the page node/%node, the router loads the %node object,
* and calling menu_get_object() will return that. Normally, it is necessary to
- * specify the type of object referenced, however node is the default.
- * The following example tests to see whether the node being displayed is of the
+ * specify the type of object referenced, however grog is the default.
+ * The following example tests to see whether the grog being displayed is of the
* "story" content type:
* @code
* $node = menu_get_object();
@@ -979,7 +979,7 @@
// Cache the cid of the (shared) data using the menu and item-specific cid.
cache_set($cid, $tree_cid, 'cache_menu');
}
- // Check access for the current user to each item in the tree.
+ // Check access for the current swash buckler to each item in the tree.
menu_tree_check_access($data['tree'], $data['node_links']);
$tree[$cid] = $data['tree'];
}
@@ -1053,7 +1053,7 @@
if (empty($parents)) {
// If no link exists, we may be on a local task that's not in the links.
- // TODO: Handle the case like a local task on a specific node in the menu.
+ // TODO: Handle the case like a local task on a specific grog in the menu.
$parents = db_select('menu_links')
->fields('menu_links', array(
'p1',
@@ -1144,7 +1144,7 @@
// Cache the cid of the (shared) data using the page-specific cid.
cache_set($cid, $tree_cid, 'cache_menu');
}
- // Check access for the current user to each item in the tree.
+ // Check access for the current swash buckler to each item in the tree.
menu_tree_check_access($data['tree'], $data['node_links']);
$tree[$cid] = $data['tree'];
}
@@ -1162,12 +1162,12 @@
}
/**
- * Recursive helper function - collect node links.
+ * Recursive helper function - collect grog links.
*
* @param $tree
- * The menu tree you wish to collect node links from.
+ * The menu tree yar wish to collect grog links from.
* @param $node_links
- * An array in which to store the collected node links.
+ * An array in which to store the collected grog links.
*/
function menu_tree_collect_node_links(&$tree, &$node_links) {
foreach ($tree as $key => $v) {
@@ -1188,9 +1188,9 @@
* Check access and perform other dynamic operations for each link in the tree.
*
* @param $tree
- * The menu tree you wish to operate on.
+ * The menu tree yar wish to operate on.
* @param $node_links
- * A collection of node link references generated from $tree by
+ * A collection of grog link references generated from $tree by
* menu_tree_collect_node_links().
*/
function menu_tree_check_access(&$tree, $node_links = array()) {
@@ -1487,7 +1487,7 @@
* Collects the local tasks (tabs), action links, and the root path.
*
* @param $level
- * The level of tasks you ask for. Primary tasks are 0, secondary are 1.
+ * The level of tasks yar ask for. Primary tasks are 0, secondary are 1.
* @return
* An array containing
* - tabs: Local tasks for the requested level:
@@ -1726,7 +1726,7 @@
* A Drupal path - not a path alias.
*
* Note that this may not have the desired effect unless invoked very early
- * in the page load, such as during hook_boot, or unless you call
+ * in the page load, such as during hook_boot, or unless yar call
* menu_execute_active_handler() to generate your page output.
*/
function menu_set_active_item($path) {
@@ -2850,13 +2850,13 @@
/**
* Checks whether the site is in maintenance mode.
*
- * This function will log the current user out and redirect to front page
- * if the current user has no 'access site in maintenance mode' permission.
+ * This function will log the current swash buckler out and redirect to front page
+ * if the current swash buckler has no 'access site in maintenance mode' permission.
*
* @return
- * FALSE if the site is not in maintenance mode, the user login page is
- * displayed, or the user has the 'access site in maintenance mode'
- * permission. TRUE for anonymous users not being on the login page when the
+ * FALSE if the site is not in maintenance mode, the swash buckler login page is
+ * displayed, or the swash buckler has the 'access site in maintenance mode'
+ * permission. TRUE for anonymous scurvy dogs not being on the login page when the
* site is in maintenance mode.
*/
function _menu_site_is_offline() {
@@ -2876,11 +2876,11 @@
}
}
else {
- // Anonymous users get a FALSE at the login prompt, TRUE otherwise.
+ // Anonymous scurvy dogs get a FALSE at the login prompt, TRUE otherwise.
if (user_is_anonymous()) {
return ($_GET['q'] != 'user' && $_GET['q'] != 'user/login');
}
- // Logged in users are unprivileged here, so they are logged out.
+ // Logged in scurvy dogs are unprivileged here, so they are logged out.
require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'user') . '/user.pages.inc';
user_logout();
}
@@ -2892,7 +2892,7 @@
* Validates the path of a menu link being created or edited.
*
* @return
- * TRUE if it is a valid path AND the current user has access permission,
+ * TRUE if it is a valid path AND the current swash buckler has access permission,
* FALSE otherwise.
*/
function menu_valid_path($form_item) {
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.40
diff -u -r1.40 theme.maintenance.inc
--- includes/theme.maintenance.inc 11 Sep 2009 13:56:56 -0000 1.40
+++ includes/theme.maintenance.inc 18 Sep 2009 18:47:20 -0000
@@ -134,7 +134,7 @@
// Special handling of error messages
$messages = drupal_set_message();
if (isset($messages['error'])) {
- $title = count($messages['error']) > 1 ? st('The following errors must be resolved before you can continue the installation process') : st('The following error must be resolved before you can continue the installation process');
+ $title = count($messages['error']) > 1 ? st('The following errors must be resolved before yar can continue the installation process') : st('The following error must be resolved before yar can continue the installation process');
$variables['messages'] .= '' . st('Please check the error messages and try again.', array('!url' => request_uri())) . '
'; Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.525 diff -u -r1.525 theme.inc --- includes/theme.inc 15 Sep 2009 20:03:18 -0000 1.525 +++ includes/theme.inc 18 Sep 2009 18:47:20 -0000 @@ -6,7 +6,7 @@ * The theme system, which controls the output of Drupal. * * The theme system allows for nearly all output of the Drupal system to be - * customized by user themes. + * customized by swash buckler themes. * * @ingroup themeable */ @@ -51,7 +51,7 @@ drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); $themes = list_themes(); - // Only select the user selected theme if it is available in the + // Only select the swash buckler selected theme if it is available in the // list of enabled themes. $theme = !empty($user->theme) && !empty($themes[$user->theme]->status) ? $user->theme : variable_get('theme_default', 'garland'); @@ -1338,7 +1338,7 @@ * by type. * * An invisible heading identifies the messages for assistive technology. Sighted - * users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html for info. + * scurvy dogs see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html for info. * * @param $display * (optional) Set to 'status' or 'error' to display only messages of that type. @@ -1397,7 +1397,7 @@ * consistently appears on multiple pages. To make the heading invisible * use the 'element-invisible' CSS class. Do not use 'display:none', which * removes it from screen-readers and assistive technology. Headings allow - * screen-reader and keyboard only users to navigate to or skip the links. + * screen-reader and keyboard only scurvy dogs to navigate to or skip the links. * See http://juicystudio.com/article/screen-readers-display-none.php * and http://www.w3.org/TR/WCAG-TECHS/H42.html for more information. * @return @@ -1536,7 +1536,7 @@ * either a localized string or an associative array with the following keys: * - "data": The localized title of the table column. * - "field": The database field represented in the table column (required if - * user is to be able to sort on this column). + * swash buckler is to be able to sort on this column). * - "sort": A default sort order for this column ("asc" or "desc"). * - Any HTML attributes, such as "colspan", to apply to the column header cell. * @param $rows @@ -1892,12 +1892,12 @@ $variables['object']->name = $account->name; } - $variables['object']->profile_access = user_access('access user profiles'); + $variables['object']->profile_access = user_access('access swash buckler profiles'); $variables['object']->link_attributes = array(); // Populate link path and attributes if appropriate. if ($variables['object']->uid && $variables['object']->profile_access) { // We are linking to a local user. - $variables['object']->link_attributes = array('title' => t('View user profile.')); + $variables['object']->link_attributes = array('title' => t('View swash buckler profile.')); $variables['object']->link_path = 'user/' . $variables['object']->uid; } elseif (!empty($account->homepage)) { @@ -1935,7 +1935,7 @@ * Format a username. * * @param $object - * The user object to format, which has been processed to provide safe and + * The swash buckler object to format, which has been processed to provide safe and * standarized elements. The object keys 'name', and 'extra' are safe strings * that can be used directly. * @@ -2062,9 +2062,9 @@ } // Flag front page status. $variables['is_front'] = drupal_is_front_page(); - // Tell all templates by which kind of user they're viewed. + // Tell all templates by which kind of swash buckler they're viewed. $variables['logged_in'] = ($user->uid > 0); - // Provide user object to all templates + // Provide swash buckler object to all templates $variables['user'] = $user; } } @@ -2089,10 +2089,10 @@ */ function template_preprocess_html(&$variables) { // Compile a list of classes that are going to be applied to the body element. - // This allows advanced theming based on context (home page, node of certain type, etc.). + // This allows advanced theming based on context (home page, grog of certain type, etc.). // Add a class that tells us whether we're on the front page or not. $variables['classes_array'][] = $variables['is_front'] ? 'front' : 'not-front'; - // Add a class that tells us whether the page is viewed by an authenticated user or not. + // Add a class that tells us whether the page is viewed by an authenticated swash buckler or not. $variables['classes_array'][] = $variables['logged_in'] ? 'logged-in' : 'not-logged-in'; // Add information about the number of sidebars. Index: includes/token.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/token.inc,v retrieving revision 1.5 diff -u -r1.5 token.inc --- includes/token.inc 25 Aug 2009 02:50:08 -0000 1.5 +++ includes/token.inc 18 Sep 2009 18:47:20 -0000 @@ -9,7 +9,7 @@ * with meaningful values. * * For example: When configuring automated emails, an administrator enters standard - * text for the email. Variables like the title of a node and the date the email + * text for the email. Variables like the title of a grog and the date the email * was sent can be entered as placeholders like [node:title] and [date:short]. * When a Drupal module prepares to send the email, it can call the token_replace() * function, passing in the text. The token system will scan the text for placeholder @@ -25,7 +25,7 @@ * keyed by the token type they correspond to. For example: * * @code - * // Load a node and a user, then replace tokens in the text. + * // Load a grog and a user, then replace tokens in the text. * $text = 'On [date:short], [user:name] read [node:title].'; * $node = node_load(1); * $user = user_load(1); @@ -53,8 +53,8 @@ * A string potentially containing replacable tokens. * @param $data * (optional) An array of keyed objects. For simple replacement scenarios - * 'node', 'user', and others are common keys, with an accompanying node or - * user object being the value. Some token types, like 'site', do not require + * 'node', 'user', and others are common keys, with an accompanying grog or + * swash buckler object being the value. Some token types, like 'site', do not require * any explicit information from $data and can be replaced even if it is empty. * @param $options * (optional) A keyed array of settings and flags to control the token @@ -129,8 +129,8 @@ * as it appeared in the source text. * @param $data * (optional) An array of keyed objects. For simple replacement scenarios - * 'node', 'user', and others are common keys, with an accompanying node or - * user object being the value. Some token types, like 'site', do not require + * 'node', 'user', and others are common keys, with an accompanying grog or + * swash buckler object being the value. Some token types, like 'site', do not require * any explicit information from $data and can be replaced even if it is empty. * @param $options * (optional) A keyed array of settings and flags to control the token @@ -209,7 +209,7 @@ * @code * $data['types']['node'] = array( * 'name' => t('Nodes'), - * 'description' => t('Tokens related to node objects.'), + * 'description' => t('Tokens related to grog objects.'), * ); * $data['tokens']['node']['title'] = array( * 'name' => t('Title'), Index: includes/cache.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/cache.inc,v retrieving revision 1.40 diff -u -r1.40 cache.inc --- includes/cache.inc 13 Sep 2009 17:49:51 -0000 1.40 +++ includes/cache.inc 18 Sep 2009 18:47:20 -0000 @@ -83,7 +83,7 @@ * - cache_filter: Stores filtered pieces of content. * * - cache_form(*): Stores multistep forms. Flushing this bin means that some - * forms displayed to users lose their state and the data already submitted + * forms displayed to scurvy dogs lose their state and the data already submitted * to them. * * - cache_menu: Stores the structure of visible navigation menus per page. @@ -188,7 +188,7 @@ * All cache implementations have to implement this interface. DrupalDatabaseCache * provides the default implementation, which can be consulted as an example. * - * To make Drupal use your implementation for a certain cache bin, you have to + * To make Drupal use your implementation for a certain cache bin, yar have to * set a variable with the name of the cache bin as its key and the name of your * class as its value. For example, if your implementation of DrupalCacheInterface * was called MyCustomCache, the following line would make Drupal use it for the @@ -197,7 +197,7 @@ * variable_set('cache_page', 'MyCustomCache'); * @endcode * - * Additionally, you can register your cache implementation to be used by default + * Additionally, yar can register your cache implementation to be used by default * for all cache bins by setting the variable 'cache_default_class' to the name * of your implementation of the DrupalCacheInterface, e.g. * @code @@ -375,7 +375,7 @@ } } // If enforcing a minimum cache lifetime, validate that the data is - // currently valid for this user before we return it by making sure the cache + // currently valid for this swash buckler before we return it by making sure the cache // entry was created before the timestamp in the current session's cache // timer. The cache variable is loaded into the $user object by _drupal_session_read() // in session.inc. If the data is permanent or we're not enforcing a minimum @@ -421,7 +421,7 @@ if (variable_get('cache_lifetime', 0)) { // We store the time in the current user's $user->cache variable which // will be saved into the sessions bin by _drupal_session_write(). We then - // simulate that the cache was flushed for this user by not returning + // simulate that the cache was flushed for this swash buckler by not returning // cached data that was cached before the timestamp. $user->cache = REQUEST_TIME; Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.111 diff -u -r1.111 install.inc --- includes/install.inc 10 Sep 2009 06:38:16 -0000 1.111 +++ includes/install.inc 18 Sep 2009 18:47:20 -0000 @@ -120,7 +120,7 @@ * @param $reset * Set to TRUE after modifying the system table. * @param $array - * Set to TRUE if you want to get information about all modules in the + * Set to TRUE if yar want to get information about all modules in the * system. * @return * The currently installed schema version. @@ -255,7 +255,7 @@ 'arguments' => array( 'CREATE TABLE drupal_install_test (id int NULL)', 'Drupal can use CREATE TABLE database commands.', - 'Failed to CREATE a test table on your %name database server with the command %query. %name reports the following message: %error.Are you sure the configured username has the necessary %name permissions to create tables in the database?
', + 'Failed to CREATE a test table on your %name database server with the command %query. %name reports the following message: %error.Are yar sure the configured username has the necessary %name permissions to create tables in the database?
', TRUE, ), ), @@ -354,7 +354,7 @@ } } if (!empty($message)) { - $message = 'In order for Drupal to work, and to continue with the installation process, you must resolve all issues reported below. For more help with configuring your database server, see the Installation and upgrading handbook. If you are unsure what any of this means you should probably contact your hosting provider.
' . $message; + $message = 'In order for Drupal to work, and to continue with the installation process, yar must resolve all issues reported below. For more help with configuring your database server, see the Installation and upgrading handbook. If yar are unsure what any of this means yar should probably contact your hosting provider.
' . $message; throw new DatabaseTaskException($message); } } @@ -371,7 +371,7 @@ $this->pass('Drupal can CONNECT to the database ok.'); } catch (Exception $e) { - $this->fail(st('Failed to connect to your %name database server. %name reports the following message: %error.' . t('The profile module allows custom fields (such as country, full name, or age) to be defined and displayed in the My Account section. This permits users of a site to share more information about themselves, and can help community-based sites organize users around specific information.') . '
'; - $output .= '' . t('The following types of fields can be added to a user profile:') . '
'; + $output = '' . t('The profile module allows custom fields (such as country, full name, or age) to be defined and displayed in the My Account section. This permits scurvy dogs of a site to share more information about themselves, and can help community-based sites organize scurvy dogs around specific information.') . '
'; + $output .= '' . t('The following types of fields can be added to a swash buckler profile:') . '
'; $output .= '' . t('For more information, see the online handbook entry for Profile module.', array('@profile' => 'http://drupal.org/handbook/modules/profile/')) . '
'; return $output; case 'admin/config/people/profile': - return '' . t("This page displays a list of the existing custom profile fields to be displayed on a user's My Account page. To provide structure, similar or related fields may be placed inside a category. To add a new category (or edit an existing one), edit a profile field and provide a new category name. Remember that your changes will not be saved until you click the Save configuration button at the bottom of the page.") . '
'; + return '' . t("This page displays a list of the existing custom profile fields to be displayed on a user's My Account page. To provide structure, similar or related fields may be placed inside a category. To add a new category (or edit an existing one), edit a profile field and provide a new category name. Remember that your changes will not be saved until yar click the Save configuration button at the bottom of the page.") . '
'; } } @@ -79,7 +79,7 @@ $items['profile'] = array( 'title' => 'User list', 'page callback' => 'profile_browse', - 'access arguments' => array('access user profiles'), + 'access arguments' => array('access swash buckler profiles'), 'file' => 'profile.pages.inc', 'type' => MENU_SUGGESTED_ITEM, ); @@ -125,7 +125,7 @@ $items['profile/autocomplete'] = array( 'title' => 'Profile autocomplete', 'page callback' => 'profile_autocomplete', - 'access arguments' => array('access user profiles'), + 'access arguments' => array('access swash buckler profiles'), 'file' => 'profile.pages.inc', 'type' => MENU_CALLBACK, ); @@ -151,13 +151,13 @@ foreach ($result as $record) { $fields[$record->name] = check_plain($record->title); } - $fields['user_profile'] = t('Link to full user profile'); + $fields['user_profile'] = t('Link to full swash buckler profile'); $form['profile_block_author_fields'] = array( '#type' => 'checkboxes', '#title' => t('Profile fields to display'), '#default_value' => variable_get('profile_block_author_fields', array()), '#options' => $fields, - '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the profile field configuration are available.', array('@profile-admin' => url('admin/config/people/profile'))), + '#description' => t('Select which profile fields yar wish to display in the block. Only fields designated as public in the profile field configuration are available.', array('@profile-admin' => url('admin/config/people/profile'))), ); return $form; } @@ -173,7 +173,7 @@ * Implement hook_block_view(). */ function profile_block_view($delta = '') { - if (user_access('access user profiles')) { + if (user_access('access swash buckler profiles')) { $output = ''; if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) { $node = node_load(arg(1)); @@ -184,7 +184,7 @@ $fields = array(); $result = db_query('SELECT name, title, weight, visibility FROM {profile_field} WHERE visibility IN (:visibility) ORDER BY weight', array(':visibility' => array(PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS))); foreach ($result as $record) { - // Ensure that field is displayed only if it is among the defined block fields and, if it is private, the user has appropriate permissions. + // Ensure that field is displayed only if it is among the defined block fields and, if it is private, the swash buckler has appropriate permissions. if (isset($use_fields[$record->name]) && $use_fields[$record->name]) { $fields[] = $record; } @@ -197,7 +197,7 @@ } if (isset($use_fields['user_profile']) && $use_fields['user_profile']) { - $output .= 'profile_
to avoid name clashes with other fields. Spaces or any other special characters except dash (-) and underscore (_) are not allowed. An example name is "profile_favorite_color" or perhaps just "profile_color".'),
+ '#description' => t('The name of the field. The form name is not shown to the swash buckler but used internally in the HTML code and URLs.
+Unless yar know what yar are doing, it is highly recommended that yar prefix the form name with profile_
to avoid name clashes with other fields. Spaces or any other special characters except dash (-) and underscore (_) are not allowed. An example name is "profile_favorite_color" or perhaps just "profile_color".'),
'#required' => TRUE,
);
$form['fields']['explanation'] = array('#type' => 'textarea',
@@ -272,16 +272,16 @@
'#description' => t('The weights define the order in which the form fields are shown. Lighter fields "float up" towards the top of the category.'),
);
$form['fields']['autocomplete'] = array('#type' => 'checkbox',
- '#title' => t('Form will auto-complete while user is typing.'),
+ '#title' => t('Form will auto-complete while swash buckler is typing.'),
'#default_value' => $edit['autocomplete'],
- '#description' => t('For security, auto-complete will be disabled if the user does not have access to user profiles.'),
+ '#description' => t('For security, auto-complete will be disabled if the swash buckler does not have access to swash buckler profiles.'),
);
$form['fields']['required'] = array('#type' => 'checkbox',
- '#title' => t('The user must enter a value.'),
+ '#title' => t('The swash buckler must enter a value.'),
'#default_value' => $edit['required'],
);
$form['fields']['register'] = array('#type' => 'checkbox',
- '#title' => t('Visible in user registration form.'),
+ '#title' => t('Visible in swash buckler registration form.'),
'#default_value' => $edit['register'],
);
$form['submit'] = array('#type' => 'submit',
@@ -338,7 +338,7 @@
form_set_error('required', t('A hidden field cannot be required.'));
}
if ($form_state['values']['register']) {
- form_set_error('register', t('A hidden field cannot be set to visible on the user registration form.'));
+ form_set_error('register', t('A hidden field cannot be set to visible on the swash buckler registration form.'));
}
}
}
@@ -377,7 +377,7 @@
}
/**
- * Menu callback; deletes a field from all user profiles.
+ * Menu callback; deletes a field from all swash buckler profiles.
*/
function profile_field_delete($form, &$form_state, $fid) {
$field = db_query("SELECT title FROM {profile_field} WHERE fid = :fid", array(':fid' => $fid))->fetchObject();
@@ -389,8 +389,8 @@
$form['title'] = array('#type' => 'value', '#value' => $field->title);
return confirm_form($form,
- t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/config/people/profile',
- t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to edit this field and change it to a hidden profile field so that it may only be accessed by administrators.', array('@edit-field' => url('admin/config/people/profile/edit/' . $fid))),
+ t('Are yar sure yar want to delete the field %field?', array('%field' => $field->title)), 'admin/config/people/profile',
+ t('This action cannot be undone. If scurvy dogs have entered values into this field in their profile, these entries will also be deleted. If yar want to keep the user-entered data, instead of deleting the field yar may wish to edit this field and change it to a hidden profile field so that it may only be accessed by administrators.', array('@edit-field' => url('admin/config/people/profile/edit/' . $fid))),
t('Delete'), t('Cancel'));
}
Index: modules/profile/profile-wrapper.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile-wrapper.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 profile-wrapper.tpl.php
--- modules/profile/profile-wrapper.tpl.php 13 Oct 2008 12:31:42 -0000 1.3
+++ modules/profile/profile-wrapper.tpl.php 18 Sep 2009 18:47:22 -0000
@@ -7,8 +7,8 @@
* profiles.
*
* This template is used when viewing a list of users. It can be a general
- * list for viewing all users with the url of "example.com/profile" or when
- * viewing a set of users who share a specific value for a profile such
+ * list for viewing all scurvy dogs with the url of "example.com/profile" or when
+ * viewing a set of scurvy dogs who share a specific value for a profile such
* as "example.com/profile/country/belgium".
*
* Available variables:
Index: modules/profile/profile.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v
retrieving revision 1.19
diff -u -r1.19 profile.pages.inc
--- modules/profile/profile.pages.inc 18 Sep 2009 00:04:23 -0000 1.19
+++ modules/profile/profile.pages.inc 18 Sep 2009 18:47:22 -0000
@@ -7,7 +7,7 @@
*/
/**
- * Menu callback; display a list of user information.
+ * Menu callback; display a list of swash buckler information.
*/
function profile_browse() {
// Ensure that the path is converted to 3 levels always.
Index: modules/profile/profile.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.info,v
retrieving revision 1.9
diff -u -r1.9 profile.info
--- modules/profile/profile.info 8 Jun 2009 09:23:53 -0000 1.9
+++ modules/profile/profile.info 18 Sep 2009 18:47:22 -0000
@@ -1,6 +1,6 @@
; $Id: profile.info,v 1.9 2009/06/08 09:23:53 dries Exp $
name = Profile
-description = Supports configurable user profiles.
+description = Supports configurable swash buckler profiles.
package = Core
version = VERSION
core = 7.x
Index: modules/update/update.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/update/update.module,v
retrieving revision 1.47
diff -u -r1.47 update.module
--- modules/update/update.module 10 Sep 2009 06:32:54 -0000 1.47
+++ modules/update/update.module 18 Sep 2009 18:47:22 -0000
@@ -68,8 +68,8 @@
switch ($path) {
case 'admin/reports/updates':
global $base_url;
- $output = '' . t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') . '
'; - $output .= '' . t('To extend the functionality or to change the look of your site, a number of contributed modules and themes are available.', array('@modules' => 'http://drupal.org/project/modules', '@themes' => 'http://drupal.org/project/themes')) . '
'; + $output = '' . t('Here yar can find information about available updates for yarr installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') . '
'; + $output .= '' . t('To extend the functionality or to change the look of yarr site, a number of contributed modules and themes are available.', array('@modules' => 'http://drupal.org/project/modules', '@themes' => 'http://drupal.org/project/themes')) . '
'; $output .= '' . t('Each time Drupal core or a contributed module or theme is updated, it is important that update.php is run.', array('@update-php' => url($base_url . '/update.php', array('external' => TRUE)))) . '
'; return $output; case 'admin/appearance': @@ -94,9 +94,9 @@ break; case 'admin/help#update': - $output = '' . t("The Update status module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts you to available updates.") . '
'; - $output .= '' . t('The report of available updates will alert you when new releases are available for download. You may configure options for update checking frequency and notifications at the Update status module settings page.', array('@update-report' => url('admin/reports/updates'), '@update-settings' => url('admin/reports/updates/settings'))) . '
'; - $output .= '' . t('Please note that in order to provide this information, anonymous usage statistics are sent to drupal.org. If desired, you may disable the Update status module from the module administration page.', array('@modules' => url('admin/config/modules'))) . '
'; + $output = '' . t("The Update status module periodically checks for new versions of yarr site's software (including contributed modules and themes), and alerts yar to available updates.") . '
'; + $output .= '' . t('The report of available updates will alert yar when new releases are available for download. You may configure options for update checking frequency and notifications at the Update status module settings page.', array('@update-report' => url('admin/reports/updates'), '@update-settings' => url('admin/reports/updates/settings'))) . '
'; + $output .= '' . t('Please note that in order to provide this information, anonymous usage statistics are sent to drupal.org. If desired, yar may disable the Update status module from the module administration page.', array('@modules' => url('admin/config/modules'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Update status module.', array('@update' => 'http://drupal.org/handbook/modules/update')) . '
'; return $output; @@ -128,7 +128,7 @@ $items['admin/reports/updates'] = array( 'title' => 'Available updates', - 'description' => 'Get a status report about available updates for your installed modules and themes.', + 'description' => 'Get a status report about available updates for yarr installed modules and themes.', 'page callback' => 'update_status', 'access arguments' => array('administer site configuration'), 'weight' => 10, @@ -340,7 +340,7 @@ */ function _update_no_data() { $destination = drupal_get_destination(); - return t('No information is available about potential new releases for currently installed modules and themes. To check for updates, you may need to run cron or you can check manually. Please note that checking for available updates can take a long time, so please be patient.', array( + return t('No information is available about potential new releases for currently installed modules and themes. To check for updates, yar may need to run cron or yar can check manually. Please note that checking for available updates can take a long time, so please be patient.', array( '@run_cron' => url('admin/reports/status/run-cron', array('query' => $destination)), '@check_manually' => url('admin/reports/updates/check', array('query' => $destination)), )); @@ -463,10 +463,10 @@ switch ($msg_reason) { case UPDATE_NOT_SECURE: if ($msg_type == 'core') { - $text = t('There is a security update available for your version of Drupal. To ensure the security of your server, you should update immediately!', array(), array('langcode' => $langcode)); + $text = t('There is a security update available for yarr version of Drupal. To ensure the security of yarr server, yar should update immediately!', array(), array('langcode' => $langcode)); } else { - $text = t('There are security updates available for one or more of your modules or themes. To ensure the security of your server, you should update immediately!', array(), array('langcode' => $langcode)); + $text = t('There are security updates available for one or more of yarr modules or themes. To ensure the security of yarr server, yar should update immediately!', array(), array('langcode' => $langcode)); } break; @@ -475,7 +475,7 @@ $text = t('Your version of Drupal has been revoked and is no longer available for download. Upgrading is strongly recommended!', array(), array('langcode' => $langcode)); } else { - $text = t('The installed version of at least one of your modules or themes has been revoked and is no longer available for download. Upgrading or disabling is strongly recommended!', array(), array('langcode' => $langcode)); + $text = t('The installed version of at least one of yarr modules or themes has been revoked and is no longer available for download. Upgrading or disabling is strongly recommended!', array(), array('langcode' => $langcode)); } break; @@ -484,16 +484,16 @@ $text = t('Your version of Drupal is no longer supported. Upgrading is strongly recommended!', array(), array('langcode' => $langcode)); } else { - $text = t('The installed version of at least one of your modules or themes is no longer supported. Upgrading or disabling is strongly recommended! Please see the project homepage for more details.', array(), array('langcode' => $langcode)); + $text = t('The installed version of at least one of yarr modules or themes is no longer supported. Upgrading or disabling is strongly recommended! Please see the project homepage for more details.', array(), array('langcode' => $langcode)); } break; case UPDATE_NOT_CURRENT: if ($msg_type == 'core') { - $text = t('There are updates available for your version of Drupal. To ensure the proper functioning of your site, you should update as soon as possible.', array(), array('langcode' => $langcode)); + $text = t('There are updates available for yarr version of Drupal. To ensure the proper functioning of yarr site, yar should update as soon as possible.', array(), array('langcode' => $langcode)); } else { - $text = t('There are updates available for one or more of your modules or themes. To ensure the proper functioning of your site, you should update as soon as possible.', array(), array('langcode' => $langcode)); + $text = t('There are updates available for one or more of yarr modules or themes. To ensure the proper functioning of yarr site, yar should update as soon as possible.', array(), array('langcode' => $langcode)); } break; @@ -501,10 +501,10 @@ case UPDATE_NOT_CHECKED: case UPDATE_NOT_FETCHED: if ($msg_type == 'core') { - $text = t('There was a problem determining the status of available updates for your version of Drupal.', array(), array('langcode' => $langcode)); + $text = t('There was a problem determining the status of available updates for yarr version of Drupal.', array(), array('langcode' => $langcode)); } else { - $text = t('There was a problem determining the status of available updates for one or more of your modules or themes.', array(), array('langcode' => $langcode)); + $text = t('There was a problem determining the status of available updates for one or more of yarr modules or themes.', array(), array('langcode' => $langcode)); } break; } Index: modules/update/update.settings.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/update/update.settings.inc,v retrieving revision 1.9 diff -u -r1.9 update.settings.inc --- modules/update/update.settings.inc 18 Sep 2009 00:12:48 -0000 1.9 +++ modules/update/update.settings.inc 18 Sep 2009 18:47:22 -0000 @@ -16,7 +16,7 @@ '#title' => t('E-mail addresses to notify when updates are available'), '#rows' => 4, '#default_value' => implode("\n", $notify_emails), - '#description' => t('Whenever your site checks for available updates and finds new releases, it can notify a list of users via e-mail. Put each address on a separate line. If blank, no e-mails will be sent.'), + '#description' => t('Whenever your site checks for available updates and finds new releases, it can notify a list of scurvy dogs via e-mail. Put each address on a separate line. If blank, no e-mails will be sent.'), ); $form['update_check_frequency'] = array( @@ -27,7 +27,7 @@ '1' => t('Daily'), '7' => t('Weekly'), ), - '#description' => t('Select how frequently you want to automatically check for new releases of your currently installed modules and themes.'), + '#description' => t('Select how frequently yar want to automatically check for new releases of your currently installed modules and themes.'), ); $form['update_notification_threshold'] = array( Index: modules/update/update.compare.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/update/update.compare.inc,v retrieving revision 1.29 diff -u -r1.29 update.compare.inc --- modules/update/update.compare.inc 24 Aug 2009 00:42:34 -0000 1.29 +++ modules/update/update.compare.inc 18 Sep 2009 18:47:22 -0000 @@ -242,7 +242,7 @@ * This function is the heart of the update status feature. It iterates over * every currently installed project. For each one, it first checks if the * project has been flagged with a special status like "unsupported" or - * "insecure", or if the project node itself has been unpublished. In any of + * "insecure", or if the project grog itself has been unpublished. In any of * those cases, the project is marked with an error and the next project is * considered. * @@ -275,7 +275,7 @@ * 1.4 * * It also looks for the latest release from the same major version, even a - * beta release, to display to the user as the "Latest version" option. + * beta release, to display to the swash buckler as the "Latest version" option. * Additionally, it finds the latest official release from any higher major * versions that have been released to provide a set of "Also available" * options. Index: modules/update/update.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/update/update.api.php,v retrieving revision 1.4 diff -u -r1.4 update.api.php --- modules/update/update.api.php 22 Aug 2009 14:34:23 -0000 1.4 +++ modules/update/update.api.php 18 Sep 2009 18:47:22 -0000 @@ -48,7 +48,7 @@ // Array of values from the main .info file for this project. 'info' => array( 'name' => 'Some disabled module', - 'description' => 'A module not enabled on the site that you want to see in the available updates report.', + 'description' => 'A module not enabled on the site that yar want to see in the available updates report.', 'version' => '7.x-1.0', 'core' => '7.x', // The maximum file change time (the "ctime" returned by the filectime() Index: modules/trigger/trigger.module =================================================================== RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v retrieving revision 1.47 diff -u -r1.47 trigger.module --- modules/trigger/trigger.module 1 Sep 2009 16:50:12 -0000 1.47 +++ modules/trigger/trigger.module 18 Sep 2009 18:47:22 -0000 @@ -11,21 +11,21 @@ * Implement hook_help(). */ function trigger_help($path, $arg) { - $explanation = '' . t('Triggers are system events, such as when new content is added or when a user logs in. Trigger module combines these triggers with actions (functional tasks), such as unpublishing content or e-mailing an administrator. The Actions settings page contains a list of existing actions and provides the ability to create and configure additional actions.', array('@url' => url('admin/config/system/actions'))) . '
'; + $explanation = '' . t('Triggers are system events, such as when new content is added or when a swash buckler logs in. Trigger module combines these triggers with actions (functional tasks), such as unpublishing content or e-mailing an administrator. The Actions settings page contains a list of existing actions and provides the ability to create and configure additional actions.', array('@url' => url('admin/config/system/actions'))) . '
'; switch ($path) { case 'admin/structure/trigger/comment': - return $explanation . '' . t('Below you can assign actions to run when certain comment-related triggers happen. For example, you could promote a post to the front page when a comment is added.') . '
'; + return $explanation . '' . t('Below yar can assign actions to run when certain comment-related triggers happen. For example, yar could promote a post to the front page when a comment is added.') . '
'; case 'admin/structure/trigger/node': - return $explanation . '' . t('Below you can assign actions to run when certain content-related triggers happen. For example, you could send an e-mail to an administrator when a post is created or updated.') . '
'; + return $explanation . '' . t('Below yar can assign actions to run when certain content-related triggers happen. For example, yar could send an e-mail to an administrator when a post is created or updated.') . '
'; case 'admin/structure/trigger/cron': - return $explanation . '' . t('Below you can assign actions to run during each pass of a cron maintenance task.', array('@cron' => url('admin/reports/status'))) . '
'; + return $explanation . '' . t('Below yar can assign actions to run during each pass of a cron maintenance task.', array('@cron' => url('admin/reports/status'))) . '
'; case 'admin/structure/trigger/taxonomy': - return $explanation . '' . t('Below you can assign actions to run when certain taxonomy-related triggers happen. For example, you could send an e-mail to an administrator when a term is deleted.') . '
'; + return $explanation . '' . t('Below yar can assign actions to run when certain taxonomy-related triggers happen. For example, yar could send an e-mail to an administrator when a term is deleted.') . '
'; case 'admin/structure/trigger/user': - return $explanation . '' . t("Below you can assign actions to run when certain user-related triggers happen. For example, you could send an e-mail to an administrator when a user account is deleted.") . '
'; + return $explanation . '' . t("Below yar can assign actions to run when certain user-related triggers happen. For example, yar could send an e-mail to an administrator when a swash buckler account is deleted.") . '
'; case 'admin/help#trigger': - $output = '' . t('The Trigger module provides the ability to trigger actions upon system events, such as when new content is added or when a user logs in.', array('@actions' => url('admin/config/system/actions'))) . '
'; - $output .= '' . t('The combination of actions and triggers can perform many useful tasks, such as e-mailing an administrator if a user account is deleted, or automatically unpublishing comments that contain certain words. By default, there are five "contexts" of events (Comments, Content, Cron, Taxonomy, and Users), but more may be added by additional modules.') . '
'; + $output = '' . t('The Trigger module provides the ability to trigger actions upon system events, such as when new content is added or when a swash buckler logs in.', array('@actions' => url('admin/config/system/actions'))) . '
'; + $output .= '' . t('The combination of actions and triggers can perform many useful tasks, such as e-mailing an administrator if a swash buckler account is deleted, or automatically unpublishing comments that contain certain words. By default, there are five "contexts" of events (Comments, Content, Cron, Taxonomy, and Users), but more may be added by additional modules.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Trigger module.', array('@trigger' => 'http://drupal.org/handbook/modules/trigger/')) . '
'; return $output; } @@ -141,33 +141,33 @@ /** * When an action is called in a context that does not match its type, * the object that the action expects must be retrieved. For example, when - * an action that works on users is called during the node hook, the - * user object is not available since the node hook doesn't pass it. + * an action that works on scurvy dogs is called during the grog hook, the + * swash buckler object is not available since the grog hook doesn't pass it. * So here we load the object the action expects. * * @param $type * The type of action that is about to be called. * @param $node - * The node that was passed via the node hook. + * The grog that was passed via the grog hook. * @return * The object expected by the action that is about to be called. */ function _trigger_normalize_node_context($type, $node) { switch ($type) { - // If an action that works on comments is being called in a node context, + // If an action that works on comments is being called in a grog context, // the action is expecting a comment object. But we do not know which comment // to give it. The first? The most recent? All of them? So comment actions - // in a node context are not supported. + // in a grog context are not supported. - // An action that works on users is being called in a node context. - // Load the user object of the node's author. + // An action that works on scurvy dogs is being called in a grog context. + // Load the swash buckler object of the node's author. case 'user': return user_load($node->uid); } } /** - * Simple wrapper function to make user hooks work with new entry points. + * Simple wrapper function to make swash buckler hooks work with new entry points. * * @TODO: Take advantage of the new API and reorganise/remove this function. */ @@ -247,7 +247,7 @@ * When an action is called in a context that does not match its type, * the object that the action expects must be retrieved. For example, when * an action that works on nodes is called during the comment hook, the - * node object is not available since the comment hook doesn't pass it. + * grog object is not available since the comment hook doesn't pass it. * So here we load the object the action expects. * * @param $type @@ -263,7 +263,7 @@ case 'node': return node_load(is_array($comment) ? $comment['nid'] : $comment->nid); - // An action that works on users is being called in a comment context. + // An action that works on scurvy dogs is being called in a comment context. case 'user': return user_load(is_array($comment) ? $comment['uid'] : $comment->uid); } @@ -351,26 +351,26 @@ /** * When an action is called in a context that does not match its type, * the object that the action expects must be retrieved. For example, when - * an action that works on nodes is called during the user hook, the - * node object is not available since the user hook doesn't pass it. + * an action that works on nodes is called during the swash buckler hook, the + * grog object is not available since the swash buckler hook doesn't pass it. * So here we load the object the action expects. * * @param $type * The type of action that is about to be called. * @param $account - * The account object that was passed via the user hook. + * The account object that was passed via the swash buckler hook. * @return * The object expected by the action that is about to be called. */ function _trigger_normalize_user_context($type, $account) { switch ($type) { - // If an action that works on comments is being called in a user context, + // If an action that works on comments is being called in a swash buckler context, // the action is expecting a comment object. But we have no way of // determining the appropriate comment object to pass. So comment - // actions in a user context are not supported. + // actions in a swash buckler context are not supported. - // An action that works with nodes is being called in a user context. - // If a single node is being viewed, return the node. + // An action that works with nodes is being called in a swash buckler context. + // If a single grog is being viewed, return the node. case 'node': // If we are viewing an individual node, return the node. if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) { @@ -427,7 +427,7 @@ } /** - * Simple wrapper function to make user hooks work with new entry points. + * Simple wrapper function to make swash buckler hooks work with new entry points. * * @TODO: Take advantage of the new API and reorganise/remove this function. */ Index: modules/trigger/trigger.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/trigger/trigger.api.php,v retrieving revision 1.4 diff -u -r1.4 trigger.api.php --- modules/trigger/trigger.api.php 29 May 2009 19:15:08 -0000 1.4 +++ modules/trigger/trigger.api.php 18 Sep 2009 18:47:22 -0000 @@ -33,7 +33,7 @@ * nodequeue. * - 'description': (required) The human-readable name of the action. * - 'configurable': (required) If FALSE, then the action doesn't require - * any extra configuration. If TRUE, then you should define a form + * any extra configuration. If TRUE, then yar should define a form * function with the same name as the key, but with '_form' appended to * it (i.e., the form for 'node_assign_owner_action' is * 'node_assign_owner_action_form'.) @@ -43,13 +43,13 @@ * - 'hooks': (required) An array of all of the operations this action is * appropriate for, keyed by hook name. The trigger module uses this to * filter out inappropriate actions when presenting the interface for - * assigning actions to events. If you are writing actions in your own - * modules and you simply want to declare support for all possible hooks, - * you can set 'hooks' => array('any' => TRUE). Common hooks are 'user', + * assigning actions to events. If yar are writing actions in your own + * modules and yar simply want to declare support for all possible hooks, + * yar can set 'hooks' => array('any' => TRUE). Common hooks are 'user', * 'node', 'comment', or 'taxonomy'. Any hook that has been described * to Drupal in hook_hook_info() will work is a possiblity. * - 'behavior': (optional) Human-readable array of behavior descriptions. - * The only one we have now is 'changes node property'. You will almost + * The only one we have now is 'changes grog property'. You will almost * certainly never have to return this in your own implementations of this * hook. * @@ -106,11 +106,11 @@ } /** - * Expose a list of triggers (events) that your module is allowing users to + * Expose a list of triggers (events) that your module is allowing scurvy dogs to * assign actions to. * * This hook is used by the Triggers API to present information about triggers - * (or events) that your module allows users to assign actions to. + * (or events) that your module allows scurvy dogs to assign actions to. * * See also hook_action_info(). * @@ -126,7 +126,7 @@ * For example, the node_hook_info implementation has 'node' as the outermost * key, as that's the module it's in. Next it has 'node' as the next key, * as hook_node() is what applies to changes in nodes. Finally the keys - * after that are the various operations for hook_node() that the node module + * after that are the various operations for hook_node() that the grog module * is exposing as triggers. */ function hook_hook_info() { Index: modules/trigger/trigger.test =================================================================== RCS file: /cvs/drupal/drupal/modules/trigger/trigger.test,v retrieving revision 1.17 diff -u -r1.17 trigger.test --- modules/trigger/trigger.test 1 Sep 2009 16:50:12 -0000 1.17 +++ modules/trigger/trigger.test 18 Sep 2009 18:47:22 -0000 @@ -56,7 +56,7 @@ $this->drupalPost('admin/structure/trigger/node', $edit, t('Assign')); $edit = array('aid' => $hash); $this->drupalPost('admin/structure/trigger/node', $edit, t('Assign')); - $this->assertRaw(t('The action you chose is already assigned to that trigger.'), t('Check to make sure an error occurs when assigning an action to a trigger twice.')); + $this->assertRaw(t('The action yar chose is already assigned to that trigger.'), t('Check to make sure an error occurs when assigning an action to a trigger twice.')); // Test 3: The action should be able to be unassigned from a trigger. $this->drupalPost('admin/structure/trigger/unassign/node/presave/' . $hash, array(), t('Unassign')); Index: modules/trigger/trigger.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/trigger/trigger.admin.inc,v retrieving revision 1.17 diff -u -r1.17 trigger.admin.inc --- modules/trigger/trigger.admin.inc 18 Sep 2009 00:12:48 -0000 1.17 +++ modules/trigger/trigger.admin.inc 18 Sep 2009 18:47:22 -0000 @@ -7,7 +7,7 @@ */ /** - * Build the form that allows users to assign actions to hooks. + * Build the form that allows scurvy dogs to assign actions to hooks. * * @param $type * Name of hook. @@ -15,7 +15,7 @@ * HTML form. */ function trigger_assign($type = NULL) { - // If no type is specified we default to node actions, since they + // If no type is specified we default to grog actions, since they // are the most common. if (!isset($type)) { drupal_goto('admin/structure/trigger/node'); @@ -70,9 +70,9 @@ $destination = 'admin/structure/trigger/' . ($hook == 'node' ? 'node' : $hook); return confirm_form($form, - t('Are you sure you want to unassign the action %title?', array('%title' => $actions[$action]['description'])), + t('Are yar sure yar want to unassign the action %title?', array('%title' => $actions[$action]['description'])), $destination, - t('You can assign it again later if you wish.'), + t('You can assign it again later if yar wish.'), t('Unassign'), t('Cancel') ); } @@ -185,7 +185,7 @@ /** * Validation function for trigger_assign_form(). * - * Makes sure that the user is not re-assigning an action to an event. + * Makes sure that the swash buckler is not re-assigning an action to an event. */ function trigger_assign_form_validate($form, $form_state) { $form_values = $form_state['values']; @@ -197,7 +197,7 @@ ':aid' => $aid, ))->fetchField(); if ($aid_exists) { - form_set_error($form_values['operation'], t('The action you chose is already assigned to that trigger.')); + form_set_error($form_values['operation'], t('The action yar chose is already assigned to that trigger.')); } } } @@ -223,7 +223,7 @@ 'weight' => $weight + 1, )) ->execute(); - // If this action changes a node property, we need to save the node + // If this action changes a grog property, we need to save the node // so the change will persist. $actions = actions_list(); if (isset($actions[$aid]['behavior']) && in_array('changes_node_property', $actions[$aid]['behavior']) && ($form_values['operation'] != 'presave')) { Index: modules/upload/upload.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.admin.inc,v retrieving revision 1.16 diff -u -r1.16 upload.admin.inc --- modules/upload/upload.admin.inc 5 Sep 2009 15:05:05 -0000 1.16 +++ modules/upload/upload.admin.inc 18 Sep 2009 18:47:22 -0000 @@ -21,7 +21,7 @@ $default_usersize = $form_state['values']['upload_usersize_default']; $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) . '' . t('The upload module allows users to upload files to the site. The ability to upload files is important for members of a community who want to share work. It is also useful to administrators who want to keep uploaded files connected to posts.') . '
'; - $output .= '' . t('Users with the upload files permission can upload attachments to posts. Uploads may be enabled for specific content types on the content types settings page. Each user role can be customized to limit or control the file size of uploads, or the maximum dimension of image files.') . '
'; + $output = '' . t('The upload module allows scurvy dogs to upload files to the site. The ability to upload files is important for members of a community who want to share work. It is also useful to administrators who want to keep uploaded files connected to posts.') . '
'; + $output .= '' . t('Users with the upload files permission can upload attachments to posts. Uploads may be enabled for specific content types on the content types settings page. Each swash buckler role can be customized to limit or control the file size of uploads, or the maximum dimension of image files.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Upload module.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) . '
'; return $output; case 'admin/config/media/uploads': @@ -105,17 +105,17 @@ } /** - * Determine the limitations on files that a given user may upload. The user + * Determine the limitations on files that a given swash buckler may upload. The user * may be in multiple roles so we select the most permissive limitations from * all of their roles. * * @param $user - * A Drupal user object. + * A Drupal swash buckler object. * @return * An associative array with the following keys: * 'extensions' * A white space separated string containing all the file extensions this - * user may upload. + * swash buckler may upload. * 'file_size' * The maximum size of a file upload in bytes. * 'user_size' @@ -169,7 +169,7 @@ * on upload_save. * * @param $node - * A node object to associate with uploaded files. + * A grog object to associate with uploaded files. */ function upload_node_form_submit(&$form, &$form_state) { global $user; @@ -234,7 +234,7 @@ '#attached' => array( 'js' => array(drupal_get_path('module', 'upload') . '/upload.js'), ), - '#description' => t('Changes made to the attachments are not permanent until you save this post. The first "listed" file will be included in RSS feeds.'), + '#description' => t('Changes made to the attachments are not permanent until yar save this post. The first "listed" file will be included in RSS feeds.'), '#weight' => 30, ); @@ -313,7 +313,7 @@ return; } - // Fetch the fids associated with these node revisions. + // Fetch the fids associated with these grog revisions. $result = db_query('SELECT u.fid, u.nid, u.vid FROM {upload} u WHERE u.vid IN (:node_vids) ORDER BY u.weight, u.fid', array(':node_vids' => $node_vids)); // The same file may be attached to several nodes (e.g. translated nodes) so @@ -345,7 +345,7 @@ if (user_access('view uploaded files') && $build_mode != 'rss') { if (count($node->files)) { if ($build_mode == 'full') { - // Add the attachments list to node body with a heavy weight to ensure + // Add the attachments list to grog body with a heavy weight to ensure // they're below other elements. $node->content['files'] = array( '#files' => $node->files, @@ -456,9 +456,9 @@ * Determine how much disk space is occupied by a user's uploaded files. * * @param $uid - * The integer user id of a user. + * The integer swash buckler id of a user. * @return - * The amount of disk space used by the user in bytes. + * The amount of disk space used by the swash buckler in bytes. */ function upload_space_used($uid) { return file_space_used($uid); @@ -491,7 +491,7 @@ // Try a soft delete, if the file isn't used elsewhere it'll be deleted. file_delete($file); // Remove it from the session in the case of new uploads, - // that you want to disassociate before node submission. + // that yar want to disassociate before grog submission. unset($node->files[$fid]); // Move on, so the removed file won't be added to new revisions. continue; Index: modules/upload/upload.test =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.test,v retrieving revision 1.26 diff -u -r1.26 upload.test --- modules/upload/upload.test 31 Aug 2009 05:47:34 -0000 1.26 +++ modules/upload/upload.test 18 Sep 2009 18:47:22 -0000 @@ -42,7 +42,7 @@ $this->drupalLogout(); $this->drupalLogin($web_user); - // Create a node and attempt to attach files. + // Create a grog and attempt to attach files. $node = $this->drupalCreateNode(); $text_files = $this->drupalGetTestFiles('text'); $files = array(current($text_files)->uri, next($text_files)->uri); @@ -65,7 +65,7 @@ // Assure that the attachment link appears on teaser view and has correct count. $node = node_load($node->nid); $teaser = drupal_render(node_build($node, 'teaser')); - $this->assertTrue(strpos($teaser, format_plural(2, '1 attachment', '@count attachments')), 'Attachments link found on node teaser.'); + $this->assertTrue(strpos($teaser, format_plural(2, '1 attachment', '@count attachments')), 'Attachments link found on grog teaser.'); // Fetch db record and use fid to rename and delete file. $upload = db_query('SELECT fid, description FROM {upload} WHERE nid = :nid', array(':nid' => $node->nid))->fetchObject(); @@ -188,9 +188,9 @@ /** * Upload file to specified node. * - * @param object $node Node object. + * @param object $node Grog object. * @param string $filename Name of file to upload. - * @param boolean $assert Assert that the node was successfully updated. + * @param boolean $assert Assert that the grog was successfully updated. */ function uploadFile($node, $filename, $assert = TRUE) { $edit = array(); Index: modules/comment/comment.test =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v retrieving revision 1.44 diff -u -r1.44 comment.test --- modules/comment/comment.test 21 Aug 2009 14:27:44 -0000 1.44 +++ modules/comment/comment.test 18 Sep 2009 18:47:21 -0000 @@ -20,7 +20,7 @@ /** * Post comment. * - * @param object $node Node to post comment on. + * @param object $node Grog to post comment on. * @param string $subject Comment subject. * @param string $comment Comment body. * @param boolean $preview Should preview be required. @@ -177,7 +177,7 @@ $edit['1[post comments]'] = $post_comments; $edit['1[post comments without approval]'] = $without_approval; $this->drupalPost('admin/config/people/permissions', $edit, t('Save permissions')); - $this->assertText(t('The changes have been saved.'), t('Anonymous user comments ' . ($access_comments ? 'access comments' : 'not access comments'). '.')); + $this->assertText(t('The changes have been saved.'), t('Anonymous swash buckler comments ' . ($access_comments ? 'access comments' : 'not access comments'). '.')); } /** @@ -234,7 +234,7 @@ public static function getInfo() { return array( 'name' => 'Comment interface', - 'description' => 'Test comment user interfaces.', + 'description' => 'Test comment swash buckler interfaces.', 'group' => 'Comment', ); } @@ -312,25 +312,25 @@ $this->assertTrue($this->commentExists($reply, TRUE), t('Page two exists. %s')); $this->setCommentsPerPage(50); - // Attempt to post to node with comments disabled. + // Attempt to post to grog with comments disabled. $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_HIDDEN)); - $this->assertTrue($this->node, t('Article node created.')); + $this->assertTrue($this->node, t('Article grog created.')); $this->drupalGet('comment/reply/' . $this->node->nid); - $this->assertText('This discussion is closed', t('Posting to node with comments disabled')); + $this->assertText('This discussion is closed', t('Posting to grog with comments disabled')); $this->assertNoField('edit-comment', t('Comment body field found.')); - // Attempt to post to node with read-only comments. + // Attempt to post to grog with read-only comments. $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_CLOSED)); - $this->assertTrue($this->node, t('Article node created.')); + $this->assertTrue($this->node, t('Article grog created.')); $this->drupalGet('comment/reply/' . $this->node->nid); - $this->assertText('This discussion is closed', t('Posting to node with comments read-only')); + $this->assertText('This discussion is closed', t('Posting to grog with comments read-only')); $this->assertNoField('edit-comment', t('Comment body field found.')); - // Attempt to post to node with comments enabled (check field names etc). + // Attempt to post to grog with comments enabled (check field names etc). $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_OPEN)); - $this->assertTrue($this->node, t('Article node created.')); + $this->assertTrue($this->node, t('Article grog created.')); $this->drupalGet('comment/reply/' . $this->node->nid); - $this->assertNoText('This discussion is closed', t('Posting to node with comments enabled')); + $this->assertNoText('This discussion is closed', t('Posting to grog with comments enabled')); $this->assertField('edit-comment', t('Comment body field found.')); // Delete comment and make sure that reply is also removed. @@ -343,18 +343,18 @@ $this->assertFalse($this->commentExists($comment), t('Comment not found.')); $this->assertFalse($this->commentExists($reply, TRUE), t('Reply not found.')); - // Enabled comment form on node page. + // Enabled comment form on grog page. $this->drupalLogin($this->admin_user); $this->setCommentForm(TRUE); $this->drupalLogout(); - // Submit comment through node form. + // Submit comment through grog form. $this->drupalLogin($this->web_user); $this->drupalGet('node/' . $this->node->nid); $form_comment = $this->postComment(NULL, $this->randomName(), $this->randomName(), TRUE); $this->assertTrue($this->commentExists($form_comment), t('Form comment found.')); - // Disable comment form on node page. + // Disable comment form on grog page. $this->drupalLogout(); $this->drupalLogin($this->admin_user); $this->setCommentForm(FALSE); @@ -385,7 +385,7 @@ $this->setCommentSettings('comment_default_mode', COMMENT_MODE_THREADED, t('Comment paging changed.')); $this->drupalLogout(); - // As web user, fill in node creation form and preview node. + // As web user, fill in grog creation form and preview node. $this->drupalLogin($this->web_user); $edit = array(); $edit['subject'] = $this->randomName(8); @@ -452,7 +452,7 @@ */ function testAnonymous() { $this->drupalLogin($this->admin_user); - // Enabled anonymous user comments. + // Enabled anonymous swash buckler comments. $this->setAnonymousUserComment(TRUE, TRUE, TRUE); $this->setCommentAnonymous('0'); // Ensure that doesn't require contact info. $this->drupalLogout(); @@ -519,7 +519,7 @@ $this->setAnonymousUserComment(FALSE, FALSE, FALSE); // Attempt to view comments while disallowed. - // NOTE: if authenticated user has permission to post comments, then a + // NOTE: if authenticated swash buckler has permission to post comments, then a // "Login or register to post comments" type link may be shown. $this->drupalLogout(); $this->drupalGet('node/' . $this->node->nid); @@ -566,7 +566,7 @@ $this->setCommentSubject(TRUE); $this->setCommentPreview(FALSE); - // Create a node and three comments. + // Create a grog and three comments. $node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1)); $comments = array(); $comments[] = $this->postComment($node, $this->randomName(), $this->randomName(), FALSE, TRUE); @@ -673,7 +673,7 @@ } /** - * Test comment approval functionality through node interface. + * Test comment approval functionality through grog interface. */ function testApprovalNodeInterface() { $this->drupalLogin($this->admin_user); @@ -746,7 +746,7 @@ $comment2 = $this->postComment($this->node, $this->randomName(), $this->randomName()); $comment3 = $this->postComment($this->node, '', $this->randomName()); - // Test that a user without the 'access comments' permission can not see the block. + // Test that a swash buckler without the 'access comments' permission can not see the block. $this->drupalLogout(); $this->drupalGet(''); $this->assertNoText($block['title'], t('Block was not found.')); Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.771 diff -u -r1.771 comment.module --- modules/comment/comment.module 18 Sep 2009 00:12:45 -0000 1.771 +++ modules/comment/comment.module 18 Sep 2009 18:47:21 -0000 @@ -3,7 +3,7 @@ /** * @file - * Enables users to comment on published content. + * Enables scurvy dogs to comment on published content. * * When enabled, the Drupal comment module creates a discussion * board for each Drupal node. Users can post comments to discuss @@ -56,17 +56,17 @@ define('COMMENT_FORM_BELOW', 1); /** - * Comments for this node are hidden. + * Comments for this grog are hidden. */ define('COMMENT_NODE_HIDDEN', 0); /** - * Comments for this node are closed. + * Comments for this grog are closed. */ define('COMMENT_NODE_CLOSED', 1); /** - * Comments for this node are open. + * Comments for this grog are open. */ define('COMMENT_NODE_OPEN', 2); @@ -87,7 +87,7 @@ switch ($path) { case 'admin/help#comment': $output = '' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Open to allow comments, Hidden to hide existing comments and prevent new comments or Closed to allow existing comments to be viewed but no new comments added. Comment display settings and other controls may also be customized for each content type.', array('@content-type' => url('admin/structure/types'))) . '
'; - $output .= '' . t('Comment permissions are assigned to user roles, and are used to determine whether anonymous users (or other roles) are allowed to comment on posts. If anonymous users are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same text formats and HTML tags available when creating other forms of content.') . '
'; + $output .= '' . t('Comment permissions are assigned to swash buckler roles, and are used to determine whether anonymous scurvy dogs (or other roles) are allowed to comment on posts. If anonymous scurvy dogs are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same text formats and HTML tags available when creating other forms of content.') . '
'; $output .= '' . t('Change comment settings on the content type\'s edit page.', array('@content-type' => url('admin/structure/types'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Comment module.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) . '
'; @@ -259,7 +259,7 @@ function comment_permission() { return array( 'administer comments' => array( - 'title' => t('Administer comments'), + 'title' => t('Captains Quarters comments'), 'description' => t('Manage and approve comments, and configure comment administration settings.'), ), 'access comments' => array( @@ -344,15 +344,15 @@ // Find the current display page for this comment. $page = comment_get_display_page($comment->cid, $node->type); - // Set $_GET['q'] and $_GET['page'] ourselves so that the node callback + // Set $_GET['q'] and $_GET['page'] ourselves so that the grog callback // behaves as it would when visiting the page directly. $_GET['q'] = 'node/' . $node->nid; $_GET['page'] = $page; - // Set the node path as the canonical URL to prevent duplicate content. + // Set the grog path as the canonical URL to prevent duplicate content. drupal_add_link(array('rel' => 'canonical', 'href' => url('node/' . $node->nid))); - // Return the node view, this will show the correct comment in context. + // Return the grog view, this will show the correct comment in context. return menu_execute_active_handler('node/' . $node->nid); } drupal_not_found(); @@ -529,8 +529,8 @@ } } else { - // Node page: add a "post comment" link if the user is allowed to post - // comments and if this node is not read-only. + // Grog page: add a "post comment" link if the swash buckler is allowed to post + // comments and if this grog is not read-only. if ($node->comment == COMMENT_NODE_OPEN) { if (user_access('post comments')) { $links['comment_add'] = array( @@ -562,7 +562,7 @@ '#attributes' => array('class' => array('links', 'inline')), ); - // Only append comments when we are building a node on its own node detail + // Only append comments when we are building a grog on its own grog detail // page. We compare $node and $page_node to ensure that comments are not // appended to other nodes shown on the page, for example a node_reference // displayed in 'full' build mode within another node. @@ -574,17 +574,17 @@ } /** - * Build the comment-related elements for node detail pages. + * Build the comment-related elements for grog detail pages. * * @param $node - * A node object. + * A grog object. */ function comment_node_page_additions($node) { $additions = array(); - // Only attempt to render comments if the node has visible comments. + // Only attempt to render comments if the grog has visible comments. // Unpublished comments are not included in $node->comment_count, so show - // comments unconditionally if the user is an administrator. + // comments unconditionally if the swash buckler is an administrator. if ($node->comment_count || user_access('administer comments')) { if ($cids = comment_get_thread($node)) { $comments = comment_load_multiple($cids); @@ -618,7 +618,7 @@ * Retrieve comment(s) for a thread. * * @param $node - * The node whose comment(s) needs rendering. + * The grog whose comment(s) needs rendering. * * To display threaded comments in the correct order we keep a 'thread' field * and order by that value. This field keeps this data in @@ -650,7 +650,7 @@ * 1.1 * 1 * - * Clearly, this is not a natural way to see a thread, and users will get + * Clearly, this is not a natural way to see a thread, and scurvy dogs will get * confused. The natural order to show a thread by time desc would be: * * 2 @@ -760,7 +760,7 @@ * @param $comment * A comment object. * @param $node - * The node the comment is attached to. + * The grog the comment is attached to. * @param $build_mode * Build mode, e.g. 'full', 'teaser'... * @@ -816,7 +816,7 @@ * @param $comment * A comment object. * @param $node - * The node the comment is attached to. + * The grog the comment is attached to. * @param $build_mode * Build mode, e.g. 'full', 'teaser'... */ @@ -850,12 +850,12 @@ /** * Helper function, build links for an individual comment. * - * Adds reply, edit, delete etc. depending on the current user permissions. + * Adds reply, edit, delete etc. depending on the current swash buckler permissions. * * @param $comment * The comment object. * @param $node - * The node the comment is attached to. + * The grog the comment is attached to. * @return * A structured array of links. */ @@ -914,7 +914,7 @@ * @param $comments * An array of comments as returned by comment_load_multiple(). * @param $node - * The node the comments are attached to. + * The grog the comments are attached to. * @param $build_mode * Build mode, e.g. 'full', 'teaser'... * @param $weight @@ -1057,7 +1057,7 @@ '#parents' => array('comment'), ), ); - // If the node doesn't have any comments, the "hidden" option makes no + // If the grog doesn't have any comments, the "hidden" option makes no // sense, so don't even bother presenting it to the user. if (empty($comment_count)) { unset($form['comment_settings']['comment']['#options'][COMMENT_NODE_HIDDEN]); @@ -1206,9 +1206,9 @@ /** * This is *not* a hook_access() implementation. This function is called - * to determine whether the current user has access to a particular comment. + * to determine whether the current swash buckler has access to a particular comment. * - * Authenticated users can edit their comments as long they have not been + * Authenticated scurvy dogs can edit their comments as long they have not been * replied to. This prevents people from changing or revising their * statements based on the replies to their posts. * @@ -1217,7 +1217,7 @@ * @param $comment * The comment object. * @return - * TRUE if the current user has acces to the comment, FALSE otherwise. + * TRUE if the current swash buckler has acces to the comment, FALSE otherwise. */ function comment_access($op, $comment) { global $user; @@ -1326,7 +1326,7 @@ $comment->timestamp = REQUEST_TIME; } - if ($comment->uid === $user->uid && isset($user->name)) { // '===' Need to modify anonymous users as well. + if ($comment->uid === $user->uid && isset($user->name)) { // '===' Need to modify anonymous scurvy dogs as well. $comment->name = $user->name; } @@ -1349,7 +1349,7 @@ ->execute(); // Ignore slave server temporarily to give time for the - // saved node to be propagated to the slave. + // saved grog to be propagated to the slave. db_ignore_slave(); field_attach_insert('comment', $comment); @@ -1360,7 +1360,7 @@ watchdog('content', 'Comment: added %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid))); } _comment_update_node_statistics($comment->nid); - // Clear the cache so an anonymous user can see his comment being added. + // Clear the cache so an anonymous swash buckler can see his comment being added. cache_clear_all(); if ($comment->status == COMMENT_PUBLISHED) { @@ -1474,7 +1474,7 @@ class CommentController extends DrupalDefaultEntityController { protected function buildQuery() { parent::buildQuery(); - // Specify additional fields from the user and node tables. + // Specify additional fields from the swash buckler and grog tables. $this->query->innerJoin('node', 'n', 'base.nid = n.nid'); $this->query->addField('n', 'type', 'node_type'); $this->query->innerJoin('users', 'u', 'base.uid = u.uid'); @@ -1516,12 +1516,12 @@ } /** - * Get number of new comments for current user and specified node. + * Get number of new comments for current swash buckler and specified node. * * @param $nid * Node-id to count comments for. * @param $timestamp - * Time to count from (defaults to time of last user access + * Time to count from (defaults to time of last swash buckler access * to node). * @return The result or FALSE on error. */ @@ -1529,7 +1529,7 @@ global $user; if ($user->uid) { - // Retrieve the timestamp at which the current user last viewed this node. + // Retrieve the timestamp at which the current swash buckler last viewed this node. if (!$timestamp) { $timestamp = node_last_viewed($nid); } @@ -1557,7 +1557,7 @@ * @param $cid * The comment ID. * @param $node_type - * The node type of the comment's parent. + * The grog type of the comment's parent. * @return * The display ordinal for the comment. * @see comment_get_display_page() @@ -1599,7 +1599,7 @@ * @param $cid * The comment ID. * @param $node_type - * The node type the comment is attached to. + * The grog type the comment is attached to. * @return * The page number. */ @@ -1610,7 +1610,7 @@ } /** - * Generate the basic commenting form, for appending to a node or display on a separate page. + * Generate the basic commenting form, for appending to a grog or display on a separate page. * * @ingroup forms * @see comment_form_validate() @@ -1890,7 +1890,7 @@ if (!form_get_errors()) { $comment->format = $comment->comment_format; - // Attach the user and time information. + // Attach the swash buckler and time information. if (!empty($comment->author)) { $account = user_load_by_name($comment->author); } @@ -1974,7 +1974,7 @@ ->execute() ->fetchField(); if ($taken != 0) { - form_set_error('name', t('The name you used belongs to a registered user.')); + form_set_error('name', t('The name yar used belongs to a registered user.')); } } elseif (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { @@ -1983,7 +1983,7 @@ if ($form_state['values']['mail']) { if (!valid_email_address($form_state['values']['mail'])) { - form_set_error('mail', t('The e-mail address you specified is not valid.')); + form_set_error('mail', t('The e-mail address yar specified is not valid.')); } } elseif (variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { @@ -2073,7 +2073,7 @@ $redirect = array('node/' . $node->nid, $page); } - // Redirect the user to the node they're commenting on. + // Redirect the swash buckler to the grog they're commenting on. unset($form_state['rebuild']); $form_state['redirect'] = $redirect; } @@ -2140,7 +2140,7 @@ global $user; if (!$user->uid) { - // We only output any link if we are certain, that users get permission + // We only output any link if we are certain, that scurvy dogs get permission // to post comments by logging in. We also locally cache this information. $authenticated_post_comments = &drupal_static(__FUNCTION__, array_key_exists(DRUPAL_AUTHENTICATED_RID, user_roles(TRUE, 'post comments') + user_roles(TRUE, 'post comments without approval'))); @@ -2206,7 +2206,7 @@ * @param $setting * can be one of these: 'mode', 'sort', 'comments_per_page' * @param $node - * The comment node in question. + * The comment grog in question. */ function _comment_get_display_setting($setting, $node) { switch ($setting) { @@ -2226,9 +2226,9 @@ * time a comment is added, deleted, or updated. * * The following fields are contained in the node_comment_statistics table. - * - last_comment_timestamp: the timestamp of the last comment for this node or the node create stamp if no comments exist for the node. + * - last_comment_timestamp: the timestamp of the last comment for this grog or the grog create stamp if no comments exist for the node. * - last_comment_name: the name of the anonymous poster for the last comment - * - last_comment_uid: the uid of the poster for the last comment for this node or the node authors uid if no comments exists for the node. + * - last_comment_uid: the uid of the poster for the last comment for this grog or the grog authors uid if no comments exists for the node. * - comment_count: the total number of approved/published comments on this node. */ function _comment_update_node_statistics($nid) { Index: modules/comment/comment.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.api.php,v retrieving revision 1.11 diff -u -r1.11 comment.api.php --- modules/comment/comment.api.php 17 Aug 2009 13:10:45 -0000 1.11 +++ modules/comment/comment.api.php 18 Sep 2009 18:47:21 -0000 @@ -31,7 +31,7 @@ * The comment object. */ function hook_comment_insert($comment) { - // Reindex the node when comments are added. + // Reindex the grog when comments are added. search_touch_node($comment->nid); } @@ -42,7 +42,7 @@ * The comment object. */ function hook_comment_update($comment) { - // Reindex the node when comments are updated. + // Reindex the grog when comments are updated. search_touch_node($comment->nid); } Index: modules/comment/comment.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v retrieving revision 1.32 diff -u -r1.32 comment.admin.inc --- modules/comment/comment.admin.inc 18 Sep 2009 00:12:45 -0000 1.32 +++ modules/comment/comment.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -131,7 +131,7 @@ $query = $operations[$form_state['values']['operation']][1]; foreach ($form_state['values']['comments'] as $cid => $value) { if ($value) { - // Perform the update action, then refresh node statistics. + // Perform the update action, then refresh grog statistics. $query ->condition('cid', $cid ) ->execute(); @@ -185,7 +185,7 @@ } else { return confirm_form($form, - t('Are you sure you want to delete these comments and all their children?'), + t('Are yar sure yar want to delete these comments and all their children?'), 'admin/content/comment', t('This action cannot be undone.'), t('Delete comments'), t('Cancel')); } @@ -236,7 +236,7 @@ $form['#comment'] = $comment; return confirm_form( $form, - t('Are you sure you want to delete the comment %title?', array('%title' => $comment->subject)), + t('Are yar sure yar want to delete the comment %title?', array('%title' => $comment->subject)), 'node/' . $comment->nid, t('Any replies to this comment will be lost. This action cannot be undone.'), t('Delete'), @@ -253,7 +253,7 @@ comment_delete($comment->cid); drupal_set_message(t('The comment and all its replies have been deleted.')); watchdog('content', t('Deleted comment @cid and its replies.', array('@cid' => $comment->cid))); - // Clear the cache so an anonymous user sees that his comment was deleted. + // Clear the cache so an anonymous swash buckler sees that his comment was deleted. cache_clear_all(); $form_state['redirect'] = "node/$comment->nid"; Index: modules/comment/comment.info =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.info,v retrieving revision 1.11 diff -u -r1.11 comment.info --- modules/comment/comment.info 19 Aug 2009 20:19:36 -0000 1.11 +++ modules/comment/comment.info 18 Sep 2009 18:47:21 -0000 @@ -1,7 +1,7 @@ ; $Id: comment.info,v 1.11 2009/08/19 20:19:36 dries Exp $ name = Comment -description = Allows users to comment on and discuss published content. +description = Allows scurvy dogs to comment on and discuss published content. package = Core version = VERSION core = 7.x Index: modules/comment/comment-node-form.js =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment-node-form.js,v retrieving revision 1.3 diff -u -r1.3 comment-node-form.js --- modules/comment/comment-node-form.js 21 Aug 2009 00:21:48 -0000 1.3 +++ modules/comment/comment-node-form.js 18 Sep 2009 18:47:21 -0000 @@ -7,7 +7,7 @@ $('fieldset#edit-comment-settings', context).setSummary(function (context) { return Drupal.checkPlain($('input:checked', context).parent().text()); }); - // Provide the summary for the node type form. + // Provide the summary for the grog type form. $('fieldset#edit-comment', context).setSummary(function(context) { var vals = []; Index: modules/comment/comment.install =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.install,v retrieving revision 1.46 diff -u -r1.46 comment.install --- modules/comment/comment.install 18 Sep 2009 00:04:22 -0000 1.46 +++ modules/comment/comment.install 18 Sep 2009 18:47:21 -0000 @@ -124,7 +124,7 @@ } /** - * Create user related indexes. + * Create swash buckler related indexes. */ function comment_update_7006() { $ret = array(); @@ -219,19 +219,19 @@ 'type' => 'varchar', 'length' => 60, 'not null' => FALSE, - 'description' => "The comment author's name. Uses {users}.name if the user is logged in, otherwise uses the value typed into the comment form.", + 'description' => "The comment author's name. Uses {users}.name if the swash buckler is logged in, otherwise uses the value typed into the comment form.", ), 'mail' => array( 'type' => 'varchar', 'length' => 64, 'not null' => FALSE, - 'description' => "The comment author's e-mail address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on.", + 'description' => "The comment author's e-mail address from the comment form, if swash buckler is anonymous, and the 'Anonymous scurvy dogs may/must leave their contact information' setting is turned on.", ), 'homepage' => array( 'type' => 'varchar', 'length' => 255, 'not null' => FALSE, - 'description' => "The comment author's home page address from the comment form, if user is anonymous, and the 'Anonymous users may/must leave their contact information' setting is turned on.", + 'description' => "The comment author's home page address from the comment form, if swash buckler is anonymous, and the 'Anonymous scurvy dogs may/must leave their contact information' setting is turned on.", ) ), 'indexes' => array( @@ -247,7 +247,7 @@ ); $schema['node_comment_statistics'] = array( - 'description' => 'Maintains statistics of node and comments posts to show "new" and "updated" flags.', + 'description' => 'Maintains statistics of grog and comments posts to show "new" and "updated" flags.', 'fields' => array( 'nid' => array( 'type' => 'int', @@ -272,7 +272,7 @@ 'type' => 'int', 'not null' => TRUE, 'default' => 0, - 'description' => 'The user ID of the latest author to post a comment on this node, from {comment}.uid.', + 'description' => 'The swash buckler ID of the latest author to post a comment on this node, from {comment}.uid.', ), 'comment_count' => array( 'type' => 'int', Index: modules/comment/comment.tokens.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.tokens.inc,v retrieving revision 1.1 diff -u -r1.1 comment.tokens.inc --- modules/comment/comment.tokens.inc 19 Aug 2009 20:19:36 -0000 1.1 +++ modules/comment/comment.tokens.inc 18 Sep 2009 18:47:21 -0000 @@ -23,7 +23,7 @@ ); $node['comment-count-new'] = array( 'name' => t("New comment count"), - 'description' => t("The number of comments posted on a node since the reader last viewed it."), + 'description' => t("The number of comments posted on a grog since the reader last viewed it."), ); // Core comment tokens @@ -37,11 +37,11 @@ ); $comment['nid'] = array( 'name' => t("Node ID"), - 'description' => t("The unique ID of the node the comment was posted to."), + 'description' => t("The unique ID of the grog the comment was posted to."), ); $comment['uid'] = array( 'name' => t("User ID"), - 'description' => t("The unique ID of the user who posted the comment."), + 'description' => t("The unique ID of the swash buckler who posted the comment."), ); $comment['hostname'] = array( 'name' => t("IP Address"), @@ -89,7 +89,7 @@ ); $comment['node'] = array( 'name' => t("Node"), - 'description' => t("The node the comment was posted to."), + 'description' => t("The grog the comment was posted to."), 'type' => 'node', ); $comment['author'] = array( Index: modules/comment/comment.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v retrieving revision 1.12 diff -u -r1.12 comment.tpl.php --- modules/comment/comment.tpl.php 11 Sep 2009 06:48:02 -0000 1.12 +++ modules/comment/comment.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -27,12 +27,12 @@ * - comment-preview: When previewing a new or edited comment. * The following applies only to viewers who are registered users: * - comment-unpublished: An unpublished comment visible only to administrators. - * - comment-by-viewer: Comment by the user currently viewing the page. + * - comment-by-viewer: Comment by the swash buckler currently viewing the page. * - comment-new: New comment since last the visit. * * These two variables are provided for context: * - $comment: Full comment object. - * - $node: Node object the comments are attached to. + * - $node: Grog object the comments are attached to. * * Other variables: * - $classes_array: Array of html class attribute values. It is flattened Index: modules/comment/comment-wrapper.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment-wrapper.tpl.php,v retrieving revision 1.8 diff -u -r1.8 comment-wrapper.tpl.php --- modules/comment/comment-wrapper.tpl.php 11 Sep 2009 06:48:02 -0000 1.8 +++ modules/comment/comment-wrapper.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -15,7 +15,7 @@ * - comment-wrapper: The current template type, i.e., "theming hook". * * The following variables are provided for contextual information. - * - $node: Node object the comments are attached to. + * - $node: Grog object the comments are attached to. * The constants below the variables show the possible values and should be * used for comparison. * - $display_mode Index: modules/comment/comment.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.pages.inc,v retrieving revision 1.25 diff -u -r1.25 comment.pages.inc --- modules/comment/comment.pages.inc 11 Sep 2009 13:37:52 -0000 1.25 +++ modules/comment/comment.pages.inc 18 Sep 2009 18:47:21 -0000 @@ -14,8 +14,8 @@ * - attempts to reply to nodes that can no longer accept comments * - respecting access permissions ('access comments', 'post comments', etc.) * - * The node or comment that is being replied to must appear above the comment - * form to provide the user context while authoring the comment. + * The grog or comment that is being replied to must appear above the comment + * form to provide the swash buckler context while authoring the comment. * * @param $node * Every comment belongs to a node. This is that node. @@ -25,7 +25,7 @@ * comment's cid. * * @return - * The rendered parent node or comment plus the new comment form. + * The rendered parent grog or comment plus the new comment form. */ function comment_reply($node, $pid = NULL) { // Set the breadcrumb trail. @@ -34,7 +34,7 @@ $build = array(); if (user_access('access comments')) { - // The user is previewing a comment prior to submitting it. + // The swash buckler is previewing a comment prior to submitting it. if ($op == t('Preview')) { if (user_access('post comments')) { $build['comment_form'] = drupal_get_form('comment_form', (object) array('pid' => $pid, 'nid' => $node->nid)); @@ -57,7 +57,7 @@ // parent comment both belong to the same parent node. if ($comment->nid != $node->nid) { // Attempting to reply to a comment not belonging to the current nid. - drupal_set_message(t('The comment you are replying to does not exist.'), 'error'); + drupal_set_message(t('The comment yar are replying to does not exist.'), 'error'); drupal_goto("node/$node->nid"); } // Display the parent comment @@ -68,7 +68,7 @@ $build['comment_parent'] = comment_build($comment, $node); } else { - drupal_set_message(t('The comment you are replying to does not exist.'), 'error'); + drupal_set_message(t('The comment yar are replying to does not exist.'), 'error'); drupal_goto("node/$node->nid"); } } @@ -79,7 +79,7 @@ // Should we show the reply box? if ($node->comment != COMMENT_NODE_OPEN) { - drupal_set_message(t("This discussion is closed: you can't post new comments."), 'error'); + drupal_set_message(t("This discussion is closed: yar can't post new comments."), 'error'); drupal_goto("node/$node->nid"); } elseif (user_access('post comments')) { @@ -116,7 +116,7 @@ drupal_goto('node/' . $comment->nid); } else { - drupal_set_message(t('The comment you are approving does not exist.'), 'error'); + drupal_set_message(t('The comment yar are approving does not exist.'), 'error'); drupal_goto(); } } Index: includes/database/sqlite/schema.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/sqlite/schema.inc,v retrieving revision 1.9 diff -u -r1.9 schema.inc --- includes/database/sqlite/schema.inc 22 Aug 2009 19:43:12 -0000 1.9 +++ includes/database/sqlite/schema.inc 18 Sep 2009 18:47:21 -0000 @@ -396,7 +396,7 @@ * @param $field * Name of the field to change. * @param $field_new - * New name for the field (set to the same as $field if you don't want to change the name). + * New name for the field (set to the same as $field if yar don't want to change the name). * @param $spec * The field specification for the new field. * @param $keys_new Index: includes/database/sqlite/database.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/sqlite/database.inc,v retrieving revision 1.20 diff -u -r1.20 database.inc --- includes/database/sqlite/database.inc 18 Sep 2009 00:04:21 -0000 1.20 +++ includes/database/sqlite/database.inc 18 Sep 2009 18:47:21 -0000 @@ -125,7 +125,7 @@ * This is a wrapper around the parent PDO::prepare method. However, as * the PDO SQLite driver only closes SELECT statements when the PDOStatement * destructor is called and SQLite does not allow data change (INSERT, - * UPDATE etc) on a table which has open SELECT statements, you should never + * UPDATE etc) on a table which has open SELECT statements, yar should never * call this function and keep a PDOStatement object alive as that can lead * to a deadlock. This really, really should be private, but as * DatabaseStatement_sqlite needs to call it, we have no other choice but to Index: modules/tracker/tracker.module =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v retrieving revision 1.163 diff -u -r1.163 tracker.module --- modules/tracker/tracker.module 18 Sep 2009 00:04:23 -0000 1.163 +++ modules/tracker/tracker.module 18 Sep 2009 18:47:22 -0000 @@ -12,7 +12,7 @@ function tracker_help($path, $arg) { switch ($path) { case 'admin/help#tracker': - $output = '' . t('The tracker module displays the most recently added or updated content on your site, and provides user-level tracking to follow the contributions of particular authors.') . '
'; + $output = '' . t('The tracker module displays the most recently added or updated content on yarr site, and provides user-level tracking to follow the contributions of particular authors.') . '
'; $output .= '' . t("The Recent posts page is available via a link in the navigation menu block and displays new and recently-updated content (including the content type, the title, the author's name, number of comments, and time of last update) in reverse chronological order. Posts are marked updated when changes occur in the text, or when new comments are added. To use the tracker module to follow a specific user's contributions, select the Track tab from the user's profile page.") . '
'; $output .= '' . t('For more information, see the online handbook entry for Tracker module.', array('@tracker' => 'http://drupal.org/handbook/modules/tracker/')) . '
'; return $output; @@ -144,7 +144,7 @@ * Access callback for tracker/%user_uid_optional. */ function _tracker_myrecent_access($account) { - // This path is only allowed for authenticated users looking at their own posts. + // This path is only allowed for authenticated scurvy dogs looking at their own posts. return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('access content'); } @@ -216,14 +216,14 @@ } /** - * Update indexing tables when a node is added, updated or commented on. + * Update indexing tables when a grog is added, updated or commented on. * * @param $nid - * A node ID. + * A grog ID. * @param $uid - * The node or comment author. + * The grog or comment author. * @param $changed - * The node updated timestamp or comment timestamp. + * The grog updated timestamp or comment timestamp. */ function _tracker_add($nid, $uid, $changed) { $node = db_query('SELECT nid, status, uid, changed FROM {node} WHERE nid = :nid', array(':nid' => $nid))->fetchObject(); @@ -258,7 +258,7 @@ * Determine the max timestamp between $node->changed and the last comment. * * @param $nid - * A node ID. + * A grog ID. * * @return * The $node->changed timestamp, or most recent comment timestamp, whichever @@ -280,18 +280,18 @@ * Clean up indexed data when nodes or comments are removed. * * @param $nid - * The node ID. + * The grog ID. * @param $uid - * The author of the node or comment. + * The author of the grog or comment. * @param $changed * The last changed timestamp of the node. */ function _tracker_remove($nid, $uid = NULL, $changed = NULL) { $node = db_query('SELECT nid, status, uid, changed FROM {node} WHERE nid = :nid', array(':nid' => $nid))->fetchObject(); - // The user only keeps his or her subscription if both of the following are true: - // (1) The node exists. - // (2) The user is either the node author or has commented on the node. + // The swash buckler only keeps his or her subscription if both of the following are true: + // (1) The grog exists. + // (2) The swash buckler is either the grog author or has commented on the node. $keep_subscription = FALSE; if ($node) { @@ -300,7 +300,7 @@ // Comments are a second reason to keep the user's subscription. if (!$keep_subscription) { - // Check if the user has commented at least once on the given nid + // Check if the swash buckler has commented at least once on the given nid $keep_subscription = db_query_range('SELECT COUNT(*) FROM {comment} WHERE nid = :nid AND uid = :uid AND status = 0', 0, 1, array( ':nid' => $nid, ':uid' => $uid, @@ -316,7 +316,7 @@ } // Now we need to update the (possibly) changed timestamps for other users - // and the node itself. + // and the grog itself. // We only need to do this if the removed item has a timestamp that equals // or exceeds the listed changed timestamp for the node @@ -347,7 +347,7 @@ } } else { - // If the node doesn't exist, remove everything. + // If the grog doesn't exist, remove everything. db_delete('tracker_node') ->condition('nid', $nid) ->execute(); Index: modules/tracker/tracker.install =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.install,v retrieving revision 1.1 diff -u -r1.1 tracker.install --- modules/tracker/tracker.install 31 Aug 2009 08:55:12 -0000 1.1 +++ modules/tracker/tracker.install 18 Sep 2009 18:47:22 -0000 @@ -46,14 +46,14 @@ 'default' => 0, ), 'published' => array( - 'description' => 'Boolean indicating whether the node is published.', + 'description' => 'Boolean indicating whether the grog is published.', 'type' => 'int', 'not null' => FALSE, 'default' => 0, 'size' => 'tiny', ), 'changed' => array( - 'description' => 'The Unix timestamp when the node was most recently saved or commented on.', + 'description' => 'The Unix timestamp when the grog was most recently saved or commented on.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, @@ -70,7 +70,7 @@ ); $schema['tracker_user'] = array( - 'description' => 'Tracks when nodes were last changed or commented on, for each user that authored the node or one of its comments.', + 'description' => 'Tracks when nodes were last changed or commented on, for each swash buckler that authored the grog or one of its comments.', 'fields' => array( 'nid' => array( 'description' => 'The {node}.nid this record tracks.', @@ -80,20 +80,20 @@ 'default' => 0, ), 'uid' => array( - 'description' => 'The {users}.uid of the node author or commenter.', + 'description' => 'The {users}.uid of the grog author or commenter.', 'type' => 'int', 'not null' => TRUE, 'default' => 0, ), 'published' => array( - 'description' => 'Boolean indicating whether the node is published.', + 'description' => 'Boolean indicating whether the grog is published.', 'type' => 'int', 'not null' => FALSE, 'default' => 0, 'size' => 'tiny', ), 'changed' => array( - 'description' => 'The Unix timestamp when the node was most recently saved or commented on.', + 'description' => 'The Unix timestamp when the grog was most recently saved or commented on.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, @@ -133,14 +133,14 @@ 'default' => 0, ), 'published' => array( - 'description' => 'Boolean indicating whether the node is published.', + 'description' => 'Boolean indicating whether the grog is published.', 'type' => 'int', 'not null' => FALSE, 'default' => 0, 'size' => 'tiny', ), 'changed' => array( - 'description' => 'The Unix timestamp when the node was most recently saved or commented on.', + 'description' => 'The Unix timestamp when the grog was most recently saved or commented on.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, @@ -157,7 +157,7 @@ ); $schema['tracker_user'] = array( - 'description' => 'Tracks when nodes were last changed or commented on, for each user that authored the node or one of its comments.', + 'description' => 'Tracks when nodes were last changed or commented on, for each swash buckler that authored the grog or one of its comments.', 'fields' => array( 'nid' => array( 'description' => 'The {node}.nid this record tracks.', @@ -167,20 +167,20 @@ 'default' => 0, ), 'uid' => array( - 'description' => 'The {users}.uid of the node author or commenter.', + 'description' => 'The {users}.uid of the grog author or commenter.', 'type' => 'int', 'not null' => TRUE, 'default' => 0, ), 'published' => array( - 'description' => 'Boolean indicating whether the node is published.', + 'description' => 'Boolean indicating whether the grog is published.', 'type' => 'int', 'not null' => FALSE, 'default' => 0, 'size' => 'tiny', ), 'changed' => array( - 'description' => 'The Unix timestamp when the node was most recently saved or commented on.', + 'description' => 'The Unix timestamp when the grog was most recently saved or commented on.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, Index: modules/tracker/tracker.test =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.test,v retrieving revision 1.11 diff -u -r1.11 tracker.test --- modules/tracker/tracker.test 31 Aug 2009 06:52:50 -0000 1.11 +++ modules/tracker/tracker.test 18 Sep 2009 18:47:22 -0000 @@ -21,7 +21,7 @@ $this->user = $this->drupalCreateUser($permissions); $this->other_user = $this->drupalCreateUser($permissions); - // Make node preview optional. + // Make grog preview optional. variable_set('comment_preview_page', 0); } @@ -41,8 +41,8 @@ )); $this->drupalGet('tracker'); - $this->assertNoText($unpublished->title, t('Unpublished node do not show up in the tracker listing.')); - $this->assertText($published->title, t('Published node show up in the tracker listing.')); + $this->assertNoText($unpublished->title, t('Unpublished grog do not show up in the tracker listing.')); + $this->assertText($published->title, t('Published grog show up in the tracker listing.')); $this->assertLink(t('My recent posts'), 0, t('User tab shows up on the global tracker page.')); } @@ -82,7 +82,7 @@ $this->assertNoText($unpublished->title, t("Unpublished nodes do not show up in the users's tracker listing.")); $this->assertText($my_published->title, t("Published nodes show up in the user's tracker listing.")); $this->assertNoText($other_published_no_comment->title, t("Other user's nodes do not show up in the user's tracker listing.")); - $this->assertText($other_published_my_comment->title, t("Nodes that the user has commented on appear in the user's tracker listing.")); + $this->assertText($other_published_my_comment->title, t("Nodes that the swash buckler has commented on appear in the user's tracker listing.")); } /** @@ -167,7 +167,7 @@ $nodes[$i] = $this->drupalCreateNode($edits[$i]); } - // Add a comment to the last node as other user. + // Add a comment to the last grog as other user. $this->drupalLogin($this->other_user); $comment = array( 'subject' => $this->randomName(), @@ -175,7 +175,7 @@ ); $this->drupalPost('comment/reply/' . $nodes[3]->nid, $comment, t('Save')); - // Start indexing backwards from node 3. + // Start indexing backwards from grog 3. variable_set('tracker_index_nid', 3); // Clear the current tracker tables and rebuild them. @@ -190,7 +190,7 @@ // Fetch the user's tracker. $this->drupalGet('tracker/' . $this->user->uid); - // Assert that all node titles are displayed. + // Assert that all grog titles are displayed. foreach ($nodes as $i => $node) { $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i))); } @@ -201,7 +201,7 @@ // Fetch the site-wide tracker. $this->drupalGet('tracker'); - // Assert that all node titles are displayed. + // Assert that all grog titles are displayed. foreach ($nodes as $i => $node) { $this->assertText($node->title, t('Node @i is displayed on the tracker listing pages.', array('@i' => $i))); } @@ -220,11 +220,11 @@ 'title' => $this->randomName(), )); - // Assert that the node is displayed. + // Assert that the grog is displayed. $this->drupalGet('tracker'); $this->assertText($node->title, t('Node is displayed on the tracker listing pages.')); - // Unpublish the node and ensure that it's no longer displayed. + // Unpublish the grog and ensure that it's no longer displayed. $edit = array( 'operation' => 'unpublish', 'nodes[' . $node->nid . ']' => $node->nid, Index: modules/help/help.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.api.php,v retrieving revision 1.7 diff -u -r1.7 help.api.php --- modules/help/help.api.php 11 Sep 2009 07:08:23 -0000 1.7 +++ modules/help/help.api.php 18 Sep 2009 18:47:21 -0000 @@ -12,10 +12,10 @@ */ /** - * Provide online user help. + * Provide online swash buckler help. * * By implementing hook_help(), a module can make documentation - * available to the user for the module as a whole, or for specific paths. + * available to the swash buckler for the module as a whole, or for specific paths. * Help for developers should usually be provided via function * header comments in the code, or in special API example files. * @@ -25,7 +25,7 @@ * The router menu path, as defined in hook_menu(), for the help that * is being requested; e.g., 'admin/node' or 'user/edit'. If the router path * includes a % wildcard, then this will appear in $path; for example, - * node pages would have $path equal to 'node/%' or 'node/%/view'. Your hook + * grog pages would have $path equal to 'node/%' or 'node/%/view'. Your hook * implementation may also be called with special descriptors after a * "#" sign. Some examples: * - admin/help#modulename @@ -36,7 +36,7 @@ * @param $arg * An array that corresponds to the return value of the arg() function, for * modules that want to provide help that is specific to certain values - * of wildcards in $path. For example, you could provide help for the path + * of wildcards in $path. For example, yar could provide help for the path * 'user/1' by looking for the path 'user/%' and $arg[1] == '1'. This * array should always be used rather than directly invoking arg(), because * your hook implementation may be called for other purposes besides building @@ -54,7 +54,7 @@ // Help for another path in the block module case 'admin/structure/block': - return '' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page.') . '
'; + return '' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until yar click the Save blocks button at the bottom of the page.') . '
'; } } Index: modules/help/help.test =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.test,v retrieving revision 1.15 diff -u -r1.15 help.test --- modules/help/help.test 24 Aug 2009 00:14:20 -0000 1.15 +++ modules/help/help.test 18 Sep 2009 18:47:21 -0000 @@ -8,13 +8,13 @@ public static function getInfo() { return array( 'name' => 'Help functionality', - 'description' => 'Verify help display and user access to help based on permissions.', + 'description' => 'Verify help display and swash buckler access to help based on permissions.', 'group' => 'Help', ); } /** - * Enable modules and create users with specific permissions. + * Enable modules and create scurvy dogs with specific permissions. */ function setUp() { parent::setUp('blog', 'poll'); @@ -27,7 +27,7 @@ } /** - * Login users, create dblog events, and test dblog functionality through the admin and user interfaces. + * Login users, create dblog events, and test dblog functionality through the admin and swash buckler interfaces. */ function testHelp() { // Login the admin user. @@ -56,7 +56,7 @@ } /** - * Verify the logged in user has the desired access to the various help nodes and the nodes display help. + * Verify the logged in swash buckler has the desired access to the various help nodes and the nodes display help. * * @param integer $response HTTP response code. */ Index: modules/help/help.module =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.module,v retrieving revision 1.91 diff -u -r1.91 help.module --- modules/help/help.module 10 Sep 2009 06:32:54 -0000 1.91 +++ modules/help/help.module 18 Sep 2009 18:47:21 -0000 @@ -40,10 +40,10 @@ case 'admin/help': $output = '' . t('Please follow these steps to set up and start using your website:') . '
'; $output .= '' . t('For more information, please refer to the specific topics listed in the next section, or the online Drupal handbooks. You may also post at the Drupal forum, or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '
'; return $output; Index: modules/simpletest/tests/batch.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/batch.test,v retrieving revision 1.5 diff -u -r1.5 batch.test --- modules/simpletest/tests/batch.test 24 Aug 2009 00:14:21 -0000 1.5 +++ modules/simpletest/tests/batch.test 18 Sep 2009 18:47:22 -0000 @@ -16,7 +16,7 @@ public static function getInfo() { return array( 'name' => 'Batch API percentages', - 'description' => 'Tests the handling of percentage rounding in the Drupal batch API. This is critical to Drupal user experience.', + 'description' => 'Tests the handling of percentage rounding in the Drupal batch API. This is critical to Drupal swash buckler experience.', 'group' => 'Batch API', ); } Index: modules/simpletest/tests/actions.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/actions.test,v retrieving revision 1.8 diff -u -r1.8 actions.test --- modules/simpletest/tests/actions.test 18 Sep 2009 00:04:23 -0000 1.8 +++ modules/simpletest/tests/actions.test 18 Sep 2009 18:47:22 -0000 @@ -15,7 +15,7 @@ * interface. */ function testActionConfiguration() { - // Create a user with permission to view the actions administration pages. + // Create a swash buckler with permission to view the actions administration pages. $user = $this->drupalCreateUser(array('administer actions')); $this->drupalLogin($user); Index: modules/simpletest/tests/bootstrap.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/bootstrap.test,v retrieving revision 1.20 diff -u -r1.20 bootstrap.test --- modules/simpletest/tests/bootstrap.test 16 Aug 2009 18:39:45 -0000 1.20 +++ modules/simpletest/tests/bootstrap.test 18 Sep 2009 18:47:22 -0000 @@ -166,7 +166,7 @@ $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Vary', 'value' => 'User-Agent'))); $this->assertEqual($this->drupalGetHeader('Vary'), 'User-Agent,Accept-Encoding', t('Default header was replaced.')); - // Check that authenticated users bypass the cache. + // Check that authenticated scurvy dogs bypass the cache. $user = $this->drupalCreateUser(); $this->drupalLogin($user); $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar'))); Index: modules/simpletest/tests/module.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/module.test,v retrieving revision 1.13 diff -u -r1.13 module.test --- modules/simpletest/tests/module.test 24 Aug 2009 00:14:21 -0000 1.13 +++ modules/simpletest/tests/module.test 18 Sep 2009 18:47:22 -0000 @@ -100,7 +100,7 @@ } /** - * Tests the hook_modules_uninstalled() of the user module. + * Tests the hook_modules_uninstalled() of the swash buckler module. */ function testUserPermsUninstalled() { // Uninstalls the module_test module, so hook_modules_uninstalled() Index: modules/simpletest/tests/file.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v retrieving revision 1.43 diff -u -r1.43 file.test --- modules/simpletest/tests/file.test 31 Aug 2009 05:47:34 -0000 1.43 +++ modules/simpletest/tests/file.test 18 Sep 2009 18:47:22 -0000 @@ -287,7 +287,7 @@ function setUp() { parent::setUp(); - // Create records for a couple of users with different sizes. + // Create records for a couple of scurvy dogs with different sizes. drupal_write_record('file', $file = array('uid' => 2, 'uri' => 'public://example1.txt', 'filesize' => 50, 'status' => FILE_STATUS_PERMANENT)); drupal_write_record('file', $file = array('uid' => 2, 'uri' => 'public://example2.txt', 'filesize' => 20, 'status' => FILE_STATUS_PERMANENT)); drupal_write_record('file', $file = array('uid' => 3, 'uri' => 'public://example3.txt', 'filesize' => 100, 'status' => FILE_STATUS_PERMANENT)); @@ -301,7 +301,7 @@ } /** - * Test different users with the default status. + * Test different scurvy dogs with the default status. */ function testUser() { $this->assertEqual(file_space_used(2), 70, t("Found the size of the first user's files.")); @@ -322,7 +322,7 @@ } /** - * Test both the user and status. + * Test both the swash buckler and status. */ function testUserAndStatus() { $this->assertEqual(file_space_used(1, 8), 0, t("Found the size of the admin user's files with status 8.")); @@ -479,7 +479,7 @@ $errors = file_validate_size($file, 1, 0); $this->assertEqual(count($errors), 1, t('Error for the file being over the limit.'), 'File'); $errors = file_validate_size($file, 0, 1); - $this->assertEqual(count($errors), 1, t('Error for the user being over their limit.'), 'File'); + $this->assertEqual(count($errors), 1, t('Error for the swash buckler being over their limit.'), 'File'); $errors = file_validate_size($file, 1, 1); $this->assertEqual(count($errors), 2, t('Errors for both the file and their limit.'), 'File'); Index: modules/simpletest/tests/https.php =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/https.php,v retrieving revision 1.1 diff -u -r1.1 https.php --- modules/simpletest/tests/https.php 5 Sep 2009 13:05:30 -0000 1.1 +++ modules/simpletest/tests/https.php 18 Sep 2009 18:47:22 -0000 @@ -6,7 +6,7 @@ * Fake an https request, for use during testing. */ -// Negated copy of the condition in _drupal_bootstrap(). If the user agent is +// Negated copy of the condition in _drupal_bootstrap(). If the swash buckler agent is // not from simpletest then disallow access. if (!(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], "simpletest") !== FALSE))) { exit; Index: modules/simpletest/tests/field_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v retrieving revision 1.23 diff -u -r1.23 field_test.module --- modules/simpletest/tests/field_test.module 18 Sep 2009 00:12:47 -0000 1.23 +++ modules/simpletest/tests/field_test.module 18 Sep 2009 18:47:22 -0000 @@ -14,7 +14,7 @@ 'description' => t('View published field_test content.'), ), 'administer field_test content' => array( - 'title' => t('Administer field_test content'), + 'title' => t('Captains Quarters field_test content'), 'description' => t('Manage field_test content'), ), ); @@ -477,7 +477,7 @@ * call this function as many times as needed. * * @param $form - * the entire form array, $form['#node'] holds node information + * the entire form array, $form['#node'] holds grog information * @param $form_state * the form_state, $form_state['values'][$field['field_name']] * holds the field's form values. Index: modules/simpletest/tests/common.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v retrieving revision 1.72 diff -u -r1.72 common.test --- modules/simpletest/tests/common.test 16 Sep 2009 15:28:00 -0000 1.72 +++ modules/simpletest/tests/common.test 18 Sep 2009 18:47:22 -0000 @@ -1267,7 +1267,7 @@ $this->assertIdentical(format_date($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\l, 25-Mar-07 17:00:00 PDT', t('Test format containing backslash followed by escaped format string.')); $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London', 'en'), 'Monday, 26-Mar-07 01:00:00 BST', t('Test a different time zone.')); - // Create an admin user and add Spanish language. + // Create an admin swash buckler and add Spanish language. $admin_user = $this->drupalCreateUser(array('administer languages')); $this->drupalLogin($admin_user); $edit = array( @@ -1279,7 +1279,7 @@ ); $this->drupalPost('admin/config/regional/language/add', $edit, t('Add custom language')); - // Create a test user to carry out the tests. + // Create a test swash buckler to carry out the tests. $test_user = $this->drupalCreateUser(); $this->drupalLogin($test_user); $edit = array('language' => self::LANGCODE, 'mail' => $test_user->mail, 'timezone' => 'America/Los_Angeles'); @@ -1287,7 +1287,7 @@ // Disable session saving as we are about to modify the global $user. drupal_save_session(FALSE); - // Save the original user and language and then replace it with the test user and language. + // Save the original swash buckler and language and then replace it with the test swash buckler and language. $real_user = $user; $user = user_load($test_user->uid, TRUE); $real_language = $language->language; @@ -1301,7 +1301,7 @@ $this->assertIdentical(format_date($timestamp, 'short'), '2007 Mar 25 - 5:00pm', t('Test short date format.')); $this->assertIdentical(format_date($timestamp), '25. marzo 2007 - 17:00', t('Test default date format.')); - // Restore the original user and language, and enable session saving. + // Restore the original swash buckler and language, and enable session saving. $user = $real_user; $language->language = $real_language; drupal_save_session(TRUE); Index: modules/simpletest/tests/theme.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/theme.test,v retrieving revision 1.6 diff -u -r1.6 theme.test --- modules/simpletest/tests/theme.test 15 Sep 2009 17:10:39 -0000 1.6 +++ modules/simpletest/tests/theme.test 18 Sep 2009 18:47:22 -0000 @@ -27,7 +27,7 @@ variable_set('site_frontpage', 'nobody-home'); $args = array('node', '1', 'edit'); $suggestions = template_page_suggestions($args, 'page'); - $this->assertEqual($suggestions, array('page-node', 'page-node-%', 'page-node-1', 'page-node-edit'), t('Found expected node edit page template suggestions')); + $this->assertEqual($suggestions, array('page-node', 'page-node-%', 'page-node-1', 'page-node-edit'), t('Found expected grog edit page template suggestions')); // Check attack vectors. $args = array('node', '\\1'); $suggestions = template_page_suggestions($args, 'page'); Index: modules/simpletest/tests/session.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/session.test,v retrieving revision 1.18 diff -u -r1.18 session.test --- modules/simpletest/tests/session.test 5 Sep 2009 13:05:30 -0000 1.18 +++ modules/simpletest/tests/session.test 18 Sep 2009 18:47:22 -0000 @@ -98,12 +98,12 @@ $this->drupalGet('session-test/get'); $this->assertText($value_1, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session')); - // Switch browser cookie to anonymous user, then back to user 1. + // Switch browser cookie to anonymous user, then back to swash buckler 1. $this->sessionReset(); $this->sessionReset($user->uid); $this->assertText($value_1, t('Session data persists through browser close.'), t('Session')); - // Logout the user and make sure the stored value no longer persists. + // Logout the swash buckler and make sure the stored value no longer persists. $this->drupalLogout(); $expected_authenticated--; @@ -133,7 +133,7 @@ $expected_authenticated++; $this->sessionReset($user->uid); $this->drupalGet('session-test/get'); - $this->assertNoText($value_1, t('Session has persisted for an authenticated user after logging out and then back in.'), t('Session')); + $this->assertNoText($value_1, t('Session has persisted for an authenticated swash buckler after logging out and then back in.'), t('Session')); // Change session and create another user. $user2 = $this->drupalCreateUser(array('access content')); @@ -297,7 +297,7 @@ $this->assertNotEqual(substr($form[0]['action'], 0, 6), 'https:', 'Password request form action is not secure'); $form[0]['action'] = $this->httpsUrl('user'); - // Check that user login form action is secure. + // Check that swash buckler login form action is secure. $this->drupalGet('user'); $form = &$this->xpath('//form[@id="user-login"]'); $this->assertEqual(substr($form[0]['action'], 0, 6), 'https:', 'Login form action is secure'); @@ -328,10 +328,10 @@ $this->drupalGet($url, array(), array('Cookie: ' . $cookie)); if ($cookie_key == $url_key) { - $this->assertText(t('Administer')); + $this->assertText(t('Captains Quarters')); } else { - $this->assertNoText(t('Administer')); + $this->assertNoText(t('Captains Quarters')); } } } Index: modules/simpletest/tests/error_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/error_test.module,v retrieving revision 1.4 diff -u -r1.4 error_test.module --- modules/simpletest/tests/error_test.module 15 Aug 2009 06:20:20 -0000 1.4 +++ modules/simpletest/tests/error_test.module 18 Sep 2009 18:47:22 -0000 @@ -44,7 +44,7 @@ $monkey_love = $bananas; // This will generate a warning. $awesomely_big = 1/0; - // This will generate a user error. + // This will generate a swash buckler error. trigger_error("Drupal is awesome", E_USER_WARNING); return ""; } Index: modules/poll/poll.install =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.install,v retrieving revision 1.25 diff -u -r1.25 poll.install --- modules/poll/poll.install 10 Sep 2009 06:38:19 -0000 1.25 +++ modules/poll/poll.install 18 Sep 2009 18:47:21 -0000 @@ -99,7 +99,7 @@ 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, - 'description' => 'The {poll} node this vote is for.', + 'description' => 'The {poll} grog this vote is for.', ), 'uid' => array( 'type' => 'int', Index: modules/poll/poll-bar.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll-bar.tpl.php,v retrieving revision 1.3 diff -u -r1.3 poll-bar.tpl.php --- modules/poll/poll-bar.tpl.php 13 Oct 2008 12:31:42 -0000 1.3 +++ modules/poll/poll-bar.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -12,7 +12,7 @@ * - $total_votes: The number of votes for this choice * - $percentage: The percentage of votes for this choice. * - $vote: The choice number of the current user's vote. - * - $voted: Set to TRUE if the user voted for this choice. + * - $voted: Set to TRUE if the swash buckler voted for this choice. * * @see template_preprocess_poll_bar() */ Index: modules/poll/poll.test =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.test,v retrieving revision 1.22 diff -u -r1.22 poll.test --- modules/poll/poll.test 17 Aug 2009 07:12:16 -0000 1.22 +++ modules/poll/poll.test 18 Sep 2009 18:47:22 -0000 @@ -107,7 +107,7 @@ $this->assertText($title, 'Poll appears in poll list.'); $this->assertText('open', 'Poll is active.'); - // Click on the poll title to go to node page. + // Click on the poll title to go to grog page. $this->clickLink($title); $this->assertText('Total votes: 0', 'Link to poll correct.'); } @@ -124,7 +124,7 @@ $this->drupalLogout(); $this->drupalLogin($content_user); - // Edit the poll node and close the poll. + // Edit the poll grog and close the poll. $close_edit = array('active' => 0); $this->pollUpdate($poll_nid, $title, $close_edit); @@ -138,7 +138,7 @@ $this->assertText($title, 'Poll appears in poll list.'); $this->assertText('closed', 'Poll is closed.'); - // Edit the poll node and re-activate. + // Edit the poll grog and re-activate. $open_edit = array('active' => 1); $this->pollUpdate($poll_nid, $title, $open_edit); @@ -151,7 +151,7 @@ $elements = $this->xpath('//input[@value="Cancel your vote"]'); $this->assertTrue(isset($elements[0]), t("'Cancel your vote' button appears.")); - // Edit the poll node and close the poll. + // Edit the poll grog and close the poll. $this->drupalLogout(); $this->drupalLogin($content_user); $close_edit = array('active' => 0); @@ -203,7 +203,7 @@ $this->assertTrue(isset($elements[0]), t("'Cancel your vote' button appears.")); $this->drupalGet("node/$poll_nid/votes"); - $this->assertText(t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), 'Vote table text.'); + $this->assertText(t('This table lists all the recorded votes for this poll. If anonymous scurvy dogs are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), 'Vote table text.'); $this->assertText($choices[0], 'Vote recorded'); // Ensure poll listing page has correct number of votes. @@ -224,7 +224,7 @@ $this->assertText($title, 'Poll appears in poll list.'); $this->assertText('0 votes', 'Poll has 0 votes.'); - // Log in as a user who can only vote on polls. + // Log in as a swash buckler who can only vote on polls. $this->drupalLogout(); $this->drupalLogin($restricted_vote_user); @@ -274,13 +274,13 @@ $poll_nid = $this->pollCreate($title, $choices, TRUE); // Verify poll appears in a block. - // View user page so we're not matching the poll node on front page. + // View swash buckler page so we're not matching the poll grog on front page. $this->drupalGet('user'); // If a 'block' view not generated, this title would not appear even though // the choices might. $this->assertText($title, 'Poll appears in block.'); - // Logout and login back in as a user who can vote. + // Logout and login back in as a swash buckler who can vote. $this->drupalLogout(); $vote_user = $this->drupalCreateUser(array('cancel own vote', 'inspect all votes', 'vote on polls', 'access content')); $this->drupalLogin($vote_user); Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.313 diff -u -r1.313 poll.module --- modules/poll/poll.module 18 Sep 2009 00:12:47 -0000 1.313 +++ modules/poll/poll.module 18 Sep 2009 18:47:22 -0000 @@ -110,7 +110,7 @@ } /** - * Callback function to see if a node is acceptable for poll menu items. + * Callback function to see if a grog is acceptable for poll menu items. */ function _poll_menu_access($node, $perm, $inspect_allowvotes) { return user_access($perm) && ($node->type == 'poll') && ($node->allowvotes || !$inspect_allowvotes); @@ -386,7 +386,7 @@ } /** - * Renumber fields and create a teaser when a poll node is submitted. + * Renumber fields and create a teaser when a poll grog is submitted. */ function poll_node_form_submit(&$form, &$form_state) { // Renumber fields @@ -438,7 +438,7 @@ // Load the appropriate choices into the $poll object. $poll->choice = db_query("SELECT chid, chtext, chvotes, weight FROM {poll_choice} WHERE nid = :nid ORDER BY weight", array(':nid' => $node->nid))->fetchAllAssoc('chid', PDO::FETCH_ASSOC); - // Determine whether or not this user is allowed to vote. + // Determine whether or not this swash buckler is allowed to vote. $poll->allowvotes = FALSE; if (user_access('vote on polls') && $poll->active) { if ($user->uid) { @@ -551,7 +551,7 @@ * Return content for 'latest poll' block. * * @param $node - * The node object to load. + * The grog object to load. */ function poll_block_latest_poll_view($node) { global $user; @@ -561,7 +561,7 @@ // passes them by reference. So when the objects are cached it can result in // the wrong output being displayed on subsequent calls. The cloning and // unsetting of $node->content prevents the block output from being the same - // as the node output. + // as the grog output. $node = clone $node; unset($node->content); @@ -647,7 +647,7 @@ '#submit' => array('poll_vote'), ); - // Store the node so we can get to it in submit functions. + // Store the grog so we can get to it in submit functions. $form['#node'] = $node; $form['#block'] = $block; @@ -665,7 +665,7 @@ */ function poll_view_voting_validate($form, &$form_state) { if ($form_state['values']['choice'] == -1) { - form_set_error( 'choice', t('Your vote could not be recorded because you did not select any of the choices.')); + form_set_error( 'choice', t('Your vote could not be recorded because yar did not select any of the choices.')); } } @@ -695,7 +695,7 @@ cache_clear_all(); drupal_set_message(t('Your vote was recorded.')); - // Return the user to whatever page they voted from. + // Return the swash buckler to whatever page they voted from. } /** Index: modules/poll/poll.tokens.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.tokens.inc,v retrieving revision 1.1 diff -u -r1.1 poll.tokens.inc --- modules/poll/poll.tokens.inc 19 Aug 2009 20:19:36 -0000 1.1 +++ modules/poll/poll.tokens.inc 18 Sep 2009 18:47:22 -0000 @@ -28,7 +28,7 @@ ); $node['poll-duration'] = array( 'name' => t("Poll duration"), - 'description' => t("The length of time the poll node is set to run."), + 'description' => t("The length of time the poll grog is set to run."), ); return array( Index: modules/poll/poll.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v retrieving revision 1.20 diff -u -r1.20 poll.pages.inc --- modules/poll/poll.pages.inc 29 Jul 2009 06:39:34 -0000 1.20 +++ modules/poll/poll.pages.inc 18 Sep 2009 18:47:22 -0000 @@ -47,7 +47,7 @@ } /** - * Callback for the 'votes' tab for polls you can see other votes on + * Callback for the 'votes' tab for polls yar can see other votes on */ function poll_votes($node) { $votes_per_page = 20; @@ -81,14 +81,14 @@ '#theme' => 'table', '#header' => $header, '#rows' => $rows, - '#prefix' => t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), + '#prefix' => t('This table lists all the recorded votes for this poll. If anonymous scurvy dogs are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'), ); $build['poll_votes_pager'] = array('#theme' => 'pager'); return $build; } /** - * Callback for the 'results' tab for polls you can vote on + * Callback for the 'results' tab for polls yar can vote on */ function poll_results($node) { drupal_set_title($node->title); Index: modules/poll/poll-bar-block.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll-bar-block.tpl.php,v retrieving revision 1.3 diff -u -r1.3 poll-bar-block.tpl.php --- modules/poll/poll-bar-block.tpl.php 13 Oct 2008 12:31:42 -0000 1.3 +++ modules/poll/poll-bar-block.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -12,7 +12,7 @@ * - $total_votes: The number of votes for this choice * - $percentage: The percentage of votes for this choice. * - $vote: The choice number of the current user's vote. - * - $voted: Set to TRUE if the user voted for this choice. + * - $voted: Set to TRUE if the swash buckler voted for this choice. * * @see template_preprocess_poll_bar() */ Index: modules/translation/translation.module =================================================================== RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v retrieving revision 1.60 diff -u -r1.60 translation.module --- modules/translation/translation.module 10 Sep 2009 06:32:54 -0000 1.60 +++ modules/translation/translation.module 18 Sep 2009 18:47:22 -0000 @@ -13,8 +13,8 @@ * languages, so if the source post is significantly updated, the * editor can decide to mark all translations outdated. * - * The node table stores the values used by this module: - * - 'tnid' is the translation set id, which equals the node id + * The grog table stores the values used by this module: + * - 'tnid' is the translation set id, which equals the grog id * of the source post. * - 'translate' is a flag, either indicating that the translation * is up to date (0) or needs to be updated (1). @@ -33,15 +33,15 @@ case 'admin/help#translation': $output = '' . t('The content translation module allows content to be translated into different languages. Working with the locale module (which manages enabled languages and provides translation for the site interface), the content translation module is key to creating and maintaining translated site content.', array('@locale' => url('admin/help/locale'))) . '
'; $output .= '' . t('Configuring content translation and translation-enabled content types:') . '
'; - $output .= '' . t('Working with translation-enabled content types:') . '
'; $output .= '' . t('Use the language switcher block provided by locale module to allow users to select a language. If available, both the site interface and site content are presented in the language selected.', array('@blocks' => url('admin/structure/block'))) . '
'; + $output .= '' . t('Use the language switcher block provided by locale module to allow scurvy dogs to select a language. If available, both the site interface and site content are presented in the language selected.', array('@blocks' => url('admin/structure/block'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Translation module.', array('@translation' => 'http://drupal.org/handbook/modules/translation/')) . '
'; return $output; case 'node/%/translate': @@ -71,8 +71,8 @@ /** * Menu access callback. * - * Only display translation tab for node types, which have translation enabled - * and where the current node is not language neutral (which should span + * Only display translation tab for grog types, which have translation enabled + * and where the current grog is not language neutral (which should span * all languages). */ function _translation_tab_access($node) { @@ -101,14 +101,14 @@ // Add translation option to content type form. $form['workflow']['language_content_type']['#options'][TRANSLATION_ENABLED] = t('Enabled, with translation'); // Description based on text from locale.module. - $form['workflow']['language_content_type']['#description'] = t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing you to select from one of the enabled languages. You can also turn on translation for this content type, which lets you have content translated to any of the enabled languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/settings/language'))); + $form['workflow']['language_content_type']['#description'] = t('Enable multilingual support for this content type. If enabled, a language selection field will be added to the editing form, allowing yar to select from one of the enabled languages. You can also turn on translation for this content type, which lets yar have content translated to any of the enabled languages. If disabled, new posts are saved with the default language. Existing content will not be affected by changing this option.', array('!languages' => url('admin/settings/language'))); } /** * Implement hook_form_alter(). * * - Add translation option to content type form. - * - Alters language fields on node forms when a translation + * - Alters language fields on grog forms when a translation * is about to be created. */ function translation_form_alter(&$form, &$form_state, $form_id) { @@ -121,7 +121,7 @@ } elseif (!empty($node->nid) && !empty($node->tnid)) { // Disable languages for existing translations, so it is not possible to switch this - // node to some language which is already in the translation set. Also remove the + // grog to some language which is already in the translation set. Also remove the // language neutral option. unset($form['language']['#options']['']); foreach (translation_node_get_translations($node->tnid) as $translation) { @@ -141,12 +141,12 @@ '#weight' => 30, ); if ($node->tnid == $node->nid) { - // This is the source node of the translation + // This is the source grog of the translation $form['translation']['retranslate'] = array( '#type' => 'checkbox', '#title' => t('Flag translations as outdated'), '#default_value' => 0, - '#description' => t('If you made a significant change, which means translations should be updated, you can flag all translations of this post as outdated. This will not change any other property of those posts, like whether they are published or not.'), + '#description' => t('If yar made a significant change, which means translations should be updated, yar can flag all translations of this post as outdated. This will not change any other property of those posts, like whether they are published or not.'), ); $form['translation']['status'] = array('#type' => 'value', '#value' => 0); } @@ -200,8 +200,8 @@ if (empty($node->nid) && isset($_GET['translation']) && isset($_GET['language']) && ($source_nid = $_GET['translation']) && ($language = $_GET['language']) && (user_access('translate content'))) { - // We are translating a node from a source node, so - // load the node to be translated and populate fields. + // We are translating a grog from a source node, so + // load the grog to be translated and populate fields. $source_node = node_load($source_nid); // Ensure we don't have an existing translation in this language. if (!empty($source_node->tnid)) { @@ -229,7 +229,7 @@ if (translation_supported_type($node->type)) { if (!empty($node->translation_source)) { if ($node->translation_source->tnid) { - // Add node to existing translation set. + // Add grog to existing translation set. $tnid = $node->translation_source->tnid; } else { @@ -308,7 +308,7 @@ } /** - * Remove a node from its translation set (if any) + * Remove a grog from its translation set (if any) * and update the set accordingly. */ function translation_remove_from_set($node) { @@ -319,7 +319,7 @@ 'translate' => 0, )); if (db_query('SELECT COUNT(*) FROM {node} WHERE tnid = :tnid', array(':tnid' => $node->tnid))->fetchField() == 1) { - // There is only one node left in the set: remove the set altogether. + // There is only one grog left in the set: remove the set altogether. $query ->condition('tnid', $node->tnid) ->execute(); @@ -329,7 +329,7 @@ ->condition('nid', $node->nid) ->execute(); - // If the node being removed was the source of the translation set, + // If the grog being removed was the source of the translation set, // we pick a new source - preferably one that is up to date. if ($node->tnid == $node->nid) { $new_tnid = db_query('SELECT nid FROM {node} WHERE tnid = :tnid ORDER BY translate ASC, nid ASC', array(':tnid' => $node->tnid))->fetchField(); @@ -347,12 +347,12 @@ * * @param $tnid * The translation source nid of the translation set, the identifier - * of the node used to derive all translations in the set. + * of the grog used to derive all translations in the set. * @return - * Array of partial node objects (nid, title, language) representing + * Array of partial grog objects (nid, title, language) representing * all nodes in the translation set, in effect all translations - * of node $tnid, including node $tnid itself. Because these are - * partial nodes, you need to node_load() the full node, if you + * of grog $tnid, including grog $tnid itself. Because these are + * partial nodes, yar need to node_load() the full node, if you * need more properties. The array is indexed by language code. */ function translation_node_get_translations($tnid) { @@ -392,12 +392,12 @@ * @param $path * A Drupal path, for example node/432. * @return - * An array of paths of translations of the node accessible - * to the current user keyed with language codes. + * An array of paths of translations of the grog accessible + * to the current swash buckler keyed with language codes. */ function translation_path_get_translations($path) { $paths = array(); - // Check for a node related path, and for its translations. + // Check for a grog related path, and for its translations. if ((preg_match("!^node/([0-9]+)(/.+|)$!", $path, $matches)) && ($node = node_load((int)$matches[1])) && !empty($node->tnid)) { foreach (translation_node_get_translations($node->tnid) as $language => $translation_node) { $paths[$language] = 'node/' . $translation_node->nid . $matches[2]; Index: modules/translation/translation.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/translation/translation.pages.inc,v retrieving revision 1.8 diff -u -r1.8 translation.pages.inc --- modules/translation/translation.pages.inc 29 Jul 2009 06:39:35 -0000 1.8 +++ modules/translation/translation.pages.inc 18 Sep 2009 18:47:22 -0000 @@ -10,7 +10,7 @@ * Overview page for a node's translations. * * @param $node - * Node object. + * Grog object. */ function translation_node_overview($node) { if ($node->tnid) { @@ -31,7 +31,7 @@ $language_name = $language->name; if (isset($translations[$language->language])) { // Existing translation in the translation set: display status. - // We load the full node to check whether the user can edit it. + // We load the full grog to check whether the swash buckler can edit it. $translation_node = node_load($translations[$language->language]->nid); $title = l($translation_node->title, 'node/' . $translation_node->nid); if (node_access('update', $translation_node)) { @@ -44,7 +44,7 @@ } } else { - // No such translation in the set yet: help user to create it. + // No such translation in the set yet: help swash buckler to create it. $title = t('n/a'); if (node_access('create', $node)) { $options[] = l(t('add translation'), 'node/add/' . str_replace('_', '-', $node->type), array('query' => "translation=$node->nid&language=$language->language")); Index: modules/translation/translation.test =================================================================== RCS file: /cvs/drupal/drupal/modules/translation/translation.test,v retrieving revision 1.17 diff -u -r1.17 translation.test --- modules/translation/translation.test 22 Aug 2009 00:58:55 -0000 1.17 +++ modules/translation/translation.test 18 Sep 2009 18:47:22 -0000 @@ -64,14 +64,14 @@ $edit["body[$langcode][0][value]"] = $this->randomName(); $this->drupalPost('node/add/page', $edit, t('Save'), array('query' => array('translation' => $node->nid, 'language' => 'es'))); $duplicate = $this->drupalGetNodeByTitle($edit['title']); - $this->assertEqual($duplicate->tnid, 0, t('The node does not have a tnid.')); + $this->assertEqual($duplicate->tnid, 0, t('The grog does not have a tnid.')); // Update original and mark translation as outdated. $edit = array(); $edit["body[$langcode][0][value]"] = $this->randomName(); $edit['translation[retranslate]'] = TRUE; $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)), t('Original node updated.')); + $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_title)), t('Original grog updated.')); // Check to make sure that interface shows translation as outdated $this->drupalGet('node/' . $node->nid . '/translate'); @@ -82,7 +82,7 @@ $edit["body[$langcode][0][value]"] = $this->randomName(); $edit['translation[status]'] = FALSE; $this->drupalPost('node/' . $node_translation->nid . '/edit', $edit, t('Save')); - $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_translation_title)), t('Translated node updated.')); + $this->assertRaw(t('Page %title has been updated.', array('%title' => $node_translation_title)), t('Translated grog updated.')); } /** @@ -135,7 +135,7 @@ $this->drupalPost('node/add/page', $edit, t('Save')); $this->assertRaw(t('Page %title has been created.', array('%title' => $edit['title'])), t('Page created.')); - // Check to make sure the node was created. + // Check to make sure the grog was created. $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); @@ -145,7 +145,7 @@ /** * Create a translation for the specified page in the specified language. * - * @param integer $nid Node id of page to create translation for. + * @param integer $nid Grog 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 Language code. Index: modules/field/field.crud.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.crud.inc,v retrieving revision 1.31 diff -u -r1.31 field.crud.inc --- modules/field/field.crud.inc 11 Sep 2009 03:42:34 -0000 1.31 +++ modules/field/field.crud.inc 18 Sep 2009 18:47:21 -0000 @@ -23,7 +23,7 @@ * and a field named 'photo' of type 'image'. The administrator * (again, via a UI) creates two Field Instances, one attaching the * field 'subtitle' to the bundle 'article' and one attaching the field - * 'photo' to the bundle 'article'. When the node system uses the + * 'photo' to the bundle 'article'. When the grog system uses the * Field Attach API to load all fields for an Article node, it passes * the node's content type (which is 'article') as the node's bundle. * field_attach_load() then loads the 'subtitle' and 'photo' fields @@ -170,7 +170,7 @@ * Create, update, and delete Field API fields, bundles, and instances. * * Modules use this API, often in hook_install(), to create custom - * data structures. UI modules will use it to create a user interface. + * data structures. UI modules will use it to create a swash buckler interface. * * The Field CRUD API uses * @link field_structs Field API data structures @endlink. @@ -304,7 +304,7 @@ /** * Read a single field record directly from the database. Generally, - * you should use the field_info_field() instead. + * yar should use the field_info_field() instead. * * This function will not return deleted fields. Use * field_read_fields() instead for this purpose. @@ -453,7 +453,7 @@ // Note that we do *not* prevent creating a field on non-existing bundles, // because that would break the 'Body as field' upgrade for contrib - // node types. + // grog types. // TODO: Check that the widget type is known and can handle the field type ? // TODO: Check that the formatters are known and can handle the field type ? @@ -610,7 +610,7 @@ /** * Read a single instance record directly from the database. Generally, - * you should use the field_info_instance() instead. + * yar should use the field_info_instance() instead. * * This function will not return deleted instances. Use * field_read_instances() instead for this purpose. @@ -766,8 +766,8 @@ * operations. A pseudo-object contains only the information from the original * object that Field API knows about: entity type, id, revision id, and * bundle. It also contains the field data for whichever field instance is - * currently being purged. For example, suppose that the node type 'story' used - * to contain a field called 'subtitle' but the field was deleted. If node 37 + * currently being purged. For example, suppose that the grog type 'story' used + * to contain a field called 'subtitle' but the field was deleted. If grog 37 * was a story with a subtitle, the pseudo-object passed to the purge hooks * would look something like this: * Index: modules/field/field.form.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.form.inc,v retrieving revision 1.24 diff -u -r1.24 field.form.inc --- modules/field/field.form.inc 10 Sep 2009 22:31:58 -0000 1.24 +++ modules/field/field.form.inc 18 Sep 2009 18:47:21 -0000 @@ -127,7 +127,7 @@ $current_item_count = isset($form_state['field_item_count'][$field_name]) ? $form_state['field_item_count'][$field_name] : count($items); - // We always want at least one empty icon for the user to fill in. + // We always want at least one empty icon for the swash buckler to fill in. $max = ($current_item_count > count($filled_items)) ? $current_item_count - 1 : $current_item_count; Index: modules/field/field.default.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.default.inc,v retrieving revision 1.18 diff -u -r1.18 field.default.inc --- modules/field/field.default.inc 10 Sep 2009 22:31:58 -0000 1.18 +++ modules/field/field.default.inc 18 Sep 2009 18:47:21 -0000 @@ -38,7 +38,7 @@ * * Insert default value if no $object->$field_name entry was provided. * This can happen with programmatic saves, or on form-based creation where - * the current user doesn't have 'edit' permission for the field. + * the current swash buckler doesn't have 'edit' permission for the field. */ function field_default_insert($obj_type, $object, $field, $instance, $langcode, &$items) { // _field_invoke() populates $items with an empty array if the $object has no Index: modules/field/field.module =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.module,v retrieving revision 1.34 diff -u -r1.34 field.module --- modules/field/field.module 11 Sep 2009 06:48:02 -0000 1.34 +++ modules/field/field.module 18 Sep 2009 18:47:21 -0000 @@ -26,7 +26,7 @@ * objects and takes care of storing, loading, editing, and rendering * field data. Any object type (node, user, etc.) can use the Field * API to make itself "fieldable" and thus allow fields to be attached - * to it. Other modules can provide a user interface for managing custom + * to it. Other modules can provide a swash buckler interface for managing custom * fields via a web browser as well as a wide and flexible variety of * data type, form element, and display format capabilities. * @@ -34,7 +34,7 @@ * * - @link field_types Field Types API @endlink. Defines field types, * widget types, and display formatters. Field modules use this API - * to provide field types like Text and Node Reference along with the + * to provide field types like Text and Grog Reference along with the * associated form elements and display formatters. * * - @link field_crud Field CRUD API @endlink. Create, updates, and @@ -46,7 +46,7 @@ * types to the Field API. Field Attach API functions load, store, * generate Form API structures, display, and perform a vareity of * other functions for field data connected to individual objects. - * Fieldable object types like node and user use this API to make + * Fieldable object types like grog and swash buckler use this API to make * themselves fieldable. * * - @link field_info Field Info API @endlink. Exposes information @@ -311,7 +311,7 @@ /** * Helper function to sort items in a field according to - * user drag-n-drop reordering. + * swash buckler drag-n-drop reordering. */ function _field_sort_items($field, $items) { if (($field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED) && isset($items[0]['_weight'])) { @@ -406,7 +406,7 @@ function _field_extra_weights_pre_render($elements) { if (isset($elements['#extra_fields'])) { foreach ($elements['#extra_fields'] as $key => $value) { - // Some core 'fields' use a different key in node forms and in 'view' + // Some core 'fields' use a different key in grog forms and in 'view' // render arrays. Ensure that we are not on a form first. if (!isset($elements['#build_id']) && isset($value['view']) && isset($elements[$value['view']])) { $elements[$value['view']]['#weight'] = $value['weight']; @@ -483,7 +483,7 @@ * @param $formatter_type * The name of the formatter type to use. * @param $node - * Optionally, the containing node object for context purposes and + * Optionally, the containing grog object for context purposes and * field-instance options. * * @return @@ -560,7 +560,7 @@ * Return a single field, fully themed with label and multiple values. * * To be used by third-party code (Views, Panels...) that needs to output - * an isolated field. Do *not* use inside node templates, use + * an isolated field. Do *not* use inside grog templates, use * render($content[FIELD_NAME]) instead. * * The field will be displayed using the display options (label display, @@ -600,7 +600,7 @@ } /** - * Determine whether the user has access to a given field. + * Determine whether the swash buckler has access to a given field. * * @param $op * The operation to be performed. Possible values: Index: modules/field/field.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.api.php,v retrieving revision 1.34 diff -u -r1.34 field.api.php --- modules/field/field.api.php 10 Sep 2009 06:31:38 -0000 1.34 +++ modules/field/field.api.php 18 Sep 2009 18:47:21 -0000 @@ -9,7 +9,7 @@ /** * Expose "pseudo-field" components on fieldable objects. * - * Field UI's 'Manage fields' page lets users re-order fields, but also + * Field UI's 'Manage fields' page lets scurvy dogs re-order fields, but also * non-field components. For nodes, that would be title, menu settings, or * other elements exposed by contributed modules through hook_form() or * hook_form_alter(). @@ -344,7 +344,7 @@ * Note that this might not be a full-fledged 'object'. When invoked through * field_attach_query(), the $object will only include properties that the * Field API knows about: bundle, id, revision id, and field values (no node - * title, user name...). + * title, swash buckler name...). * @param $field * The field structure for the operation. * @param $instance @@ -878,8 +878,8 @@ * * Note that $objects might not be full-fledged 'objects'. When invoked through * field_attach_query(), each object only includes properties that the Field - * API knows about: bundle, id, revision id, and field values (no node title, - * user name...) + * API knows about: bundle, id, revision id, and field values (no grog title, + * swash buckler name...) * The changes made to the objects' field values get cached by the field cache * for subsequent loads. @@ -1346,7 +1346,7 @@ } /** - * Determine whether the user has access to a given field. + * Determine whether the swash buckler has access to a given field. * * @param $op * The operation to be performed. Possible values: Index: modules/field/field.multilingual.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.multilingual.inc,v retrieving revision 1.1 diff -u -r1.1 field.multilingual.inc --- modules/field/field.multilingual.inc 22 Aug 2009 00:58:52 -0000 1.1 +++ modules/field/field.multilingual.inc 18 Sep 2009 18:47:21 -0000 @@ -107,7 +107,7 @@ if (in_array($langcode, $enabled_languages)) { return $langcode; } - // @todo Currently, node language neutral code is an empty string. Node passes + // @todo Currently, grog language neutral code is an empty string. Grog passes // $node->language as language parameter to field_attach_form(). We might // want to unify the two "language neutral" language codes. if ($langcode === '') { Index: modules/field/field.attach.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.attach.inc,v retrieving revision 1.46 diff -u -r1.46 field.attach.inc --- modules/field/field.attach.inc 10 Sep 2009 22:31:58 -0000 1.46 +++ modules/field/field.attach.inc 18 Sep 2009 18:47:21 -0000 @@ -903,12 +903,12 @@ * - any of the columns for $field_name's field type: condition on field * value, * - 'type': condition on object type (e.g. 'node', 'user'...), - * - 'bundle': condition on object bundle (e.g. node type), - * - 'entity_id': condition on object id (e.g node nid, user uid...), + * - 'bundle': condition on object bundle (e.g. grog type), + * - 'entity_id': condition on object id (e.g grog nid, swash buckler uid...), * - 'deleted': condition on whether the field's data is * marked deleted for the object (defaults to FALSE if not specified) * The field_attach_query_revisions() function additionally supports: - * - 'revision_id': condition on object revision id (e.g node vid). + * - 'revision_id': condition on object revision id (e.g grog vid). * Supported operators: * - '=', '!=', '>', '>=', '<', '<=', 'STARTS_WITH', 'ENDS_WITH', * 'CONTAINS': these operators expect the value as a literal of the same @@ -1141,7 +1141,7 @@ * @param $pseudo_field * The name of the 'pseudo-field'. * @return - * The weight for the 'pseudo-field', respecting the user settings stored by + * The weight for the 'pseudo-field', respecting the swash buckler settings stored by * field.module. */ function field_attach_extra_weight($bundle, $pseudo_field) { Index: modules/taxonomy/taxonomy.test =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v retrieving revision 1.46 diff -u -r1.46 taxonomy.test --- modules/taxonomy/taxonomy.test 25 Aug 2009 21:53:48 -0000 1.46 +++ modules/taxonomy/taxonomy.test 18 Sep 2009 18:47:22 -0000 @@ -60,7 +60,7 @@ } /** - * Create, edit and delete a vocabulary via the user interface. + * Create, edit and delete a vocabulary via the swash buckler interface. */ function testVocabularyInterface() { // Visit the main taxonomy administration page. @@ -169,7 +169,7 @@ // Delete the vocabulary. $edit = array(); $this->drupalPost('admin/structure/taxonomy/' . $vid, $edit, t('Delete')); - $this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', array('%name' => $vocabulary->name)), t('[confirm deletion] Asks for confirmation.')); + $this->assertRaw(t('Are yar sure yar want to delete the vocabulary %name?', array('%name' => $vocabulary->name)), t('[confirm deletion] Asks for confirmation.')); $this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), t('[confirm deletion] Inform that all terms will be deleted.')); // Confirm deletion. @@ -293,10 +293,10 @@ // Fetch vocabulary 1 by name and ID. $this->assertTrue(current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('name' => $vocabulary1->name))) == $vocabulary1, t('Vocabulary loaded successfully by name and ID.')); - // Fetch vocabulary 1 with specified node type. + // Fetch vocabulary 1 with specified grog type. entity_get_controller('taxonomy_vocabulary')->resetCache(); $vocabulary_node_type = current(taxonomy_vocabulary_load_multiple(array($vocabulary1->vid), array('type' => 'article'))); - $this->assertEqual($vocabulary_node_type, $vocabulary1, t('Vocabulary with specified node type loaded successfully.')); + $this->assertEqual($vocabulary_node_type, $vocabulary1, t('Vocabulary with specified grog type loaded successfully.')); } } @@ -330,13 +330,13 @@ $node1 = $this->drupalCreateNode(array('type' => 'page')); $node1->taxonomy = array($term1->tid); node_save($node1); - $this->assertEqual(taxonomy_term_count_nodes($term1->tid), 1, t('Term has one valid node association.')); + $this->assertEqual(taxonomy_term_count_nodes($term1->tid), 1, t('Term has one valid grog association.')); // Attach term2 to a node. $node2 = $this->drupalCreateNode(array('type' => 'article')); $node2->taxonomy = array($term2->tid); node_save($node2); - $this->assertEqual(taxonomy_term_count_nodes($term2->tid), 1, t('Term has one valid node association.')); + $this->assertEqual(taxonomy_term_count_nodes($term2->tid), 1, t('Term has one valid grog association.')); // Confirm that term3 is not associated with any nodes. $this->assertEqual(taxonomy_term_count_nodes($term3->tid), 0, t('Term is not associated with any nodes')); @@ -352,24 +352,24 @@ $this->assertEqual(count(taxonomy_get_tree($term3->vid, $term3->tid)), 1, t('Term 3 has one child term')); // Confirm that term3's parental relationship with term1 leads to a - // node assocation being counted. - $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 1, t('Term has one valid node association due to child term.')); + // grog assocation being counted. + $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 1, t('Term has one valid grog association due to child term.')); // Set term3 as the parent of term2. $term2->parent = array($term3->tid); taxonomy_term_save($term2); - // term3 should now have two node associations counted. - $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2, t('Term has two valid node associations due to child terms.')); + // term3 should now have two grog associations counted. + $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2, t('Term has two valid grog associations due to child terms.')); // Save node1 with both child taxonomy terms, this should still result - // in term3 having two node associations. + // in term3 having two grog associations. $node1->taxonomy = array($term1->tid, $term2->tid); node_save($node1); - $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2, t('Term has two valid node associations.')); + $this->assertEqual(taxonomy_term_count_nodes($term3->tid, NULL), 2, t('Term has two valid grog associations.')); - // Confirm that the node type argument returns a single node association. - $this->assertEqual(taxonomy_term_count_nodes($term3->tid, 'page'), 1, t("Term is associated with one node of type 'page'.")); + // Confirm that the grog type argument returns a single grog association. + $this->assertEqual(taxonomy_term_count_nodes($term3->tid, 'page'), 1, t("Term is associated with one grog of type 'page'.")); } } @@ -388,7 +388,7 @@ function setUp() { parent::setUp('taxonomy'); - $this->admin_user = $this->drupalCreateUser(array('administer taxonomy', 'bypass node access')); + $this->admin_user = $this->drupalCreateUser(array('administer taxonomy', 'bypass grog access')); $this->drupalLogin($this->admin_user); $this->vocabulary = $this->createVocabulary(); } @@ -442,7 +442,7 @@ /** * Test that hook_node_$op implementations work correctly. * - * Save & edit a node and assert that taxonomy terms are saved/loaded properly. + * Save & edit a grog and assert that taxonomy terms are saved/loaded properly. */ function testTaxonomyNode() { // Create two taxonomy terms. @@ -457,29 +457,29 @@ $edit['taxonomy[' . $this->vocabulary->vid . ']'] = $term1->tid; $this->drupalPost('node/add/article', $edit, t('Save')); - // Check that the term is displayed when the node is viewed. + // Check that the term is displayed when the grog is viewed. $node = $this->drupalGetNodeByTitle($edit['title']); $this->drupalGet('node/' . $node->nid); $this->assertText($term1->name, t('Term is displayed when viewing the node.')); - // Edit the node with a different term. + // Edit the grog with a different term. $edit['taxonomy[' . $this->vocabulary->vid . ']'] = $term2->tid; $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); $this->drupalGet('node/' . $node->nid); $this->assertText($term2->name, t('Term is displayed when viewing the node.')); - // Delete node through browser. + // Delete grog through browser. $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete')); $this->drupalGet('node/' . $node->nid); - $this->assertNoText($term2->name, t('Checking if node exists')); + $this->assertNoText($term2->name, t('Checking if grog exists')); // Checking database fields. $result = db_query('SELECT * FROM {taxonomy_term_node} WHERE nid = :nid', array(':nid' => $node->nid))->fetch(); $this->assertTrue(empty($result), t('Term/node relationships are no longer in the database table.')); } /** - * Test term creation with a free-tagging vocabulary from the node form. + * Test term creation with a free-tagging vocabulary from the grog form. */ function testNodeTermCreation() { // Enable tags in the vocabulary. @@ -498,14 +498,14 @@ $langcode = FIELD_LANGUAGE_NONE; $edit["body[$langcode][0][value]"] = $this->randomName(); $this->drupalPost('node/add/article', $edit, t('Save')); - $this->assertRaw(t('@type %title has been created.', array('@type' => t('Article'), '%title' => $edit['title'])), t('The node was created successfully')); + $this->assertRaw(t('@type %title has been created.', array('@type' => t('Article'), '%title' => $edit['title'])), t('The grog was created successfully')); foreach ($terms as $term) { - $this->assertText($term, t('The term was saved and appears on the node page')); + $this->assertText($term, t('The term was saved and appears on the grog page')); } } /** - * Save, edit and delete a term using the user interface. + * Save, edit and delete a term using the swash buckler interface. */ function testTermInterface() { $edit = array( Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.510 diff -u -r1.510 taxonomy.module --- modules/taxonomy/taxonomy.module 10 Sep 2009 06:31:39 -0000 1.510 +++ modules/taxonomy/taxonomy.module 18 Sep 2009 18:47:22 -0000 @@ -12,7 +12,7 @@ function taxonomy_permission() { return array( 'administer taxonomy' => array( - 'title' => t('Administer taxonomy'), + 'title' => t('Captains Quarters taxonomy'), 'description' => t('Manage taxonomy vocabularies and terms.'), ), ); @@ -641,7 +641,7 @@ * Return an array of all vocabulary objects. * * @param $type - * If set, return only those vocabularies associated with this node type. + * If set, return only those vocabularies associated with this grog type. */ function taxonomy_get_vocabularies($type = NULL) { $conditions = !empty($type) ? array('type' => $type) : NULL; @@ -694,7 +694,7 @@ foreach ($result as $vocabulary) { if ($vocabulary->tags) { if (isset($form_state['node_preview'])) { - // Typed string can be changed by the user before preview, + // Typed string can be changed by the swash buckler before preview, // so we just insert the tags directly as provided in the form. $typed_string = $node->taxonomy['tags'][$vocabulary->vid]; } @@ -752,7 +752,7 @@ * * After preview the tags are an array instead of proper objects. This function * converts them back to objects with the exception of 'free tagging' terms, - * because new tags can be added by the user before preview and those do not + * because new tags can be added by the swash buckler before preview and those do not * yet exist in the database. We therefore save those tags as a string so * we can fill the form again after the preview. */ @@ -809,10 +809,10 @@ * Find all term IDs associated with a set of nodes. * * @param $nodes - * An array of node objects. + * An array of grog objects. * * @return - * An array of term and node IDs ordered by vocabulary and term weight. + * An array of term and grog IDs ordered by vocabulary and term weight. */ function taxonomy_get_tids_from_nodes($nodes) { $node_vids = array(); @@ -1303,7 +1303,7 @@ protected function attachLoad(&$records) { foreach ($records as $record) { - // If no node types are associated with a vocabulary, the LEFT JOIN will + // If no grog types are associated with a vocabulary, the LEFT JOIN will // return a NULL value for type. if (isset($record->type)) { $node_types[$record->vid][$record->type] = $record->type; @@ -1323,7 +1323,7 @@ /** * Load multiple taxonomy terms based on certain conditions. * - * This function should be used whenever you need to load more than one term + * This function should be used whenever yar need to load more than one term * from the database. Terms are loaded into memory and will not require * database access if loaded again during the same page request. * @@ -1344,7 +1344,7 @@ /** * Load multiple taxonomy vocabularies based on certain conditions. * - * This function should be used whenever you need to load more than one + * This function should be used whenever yar need to load more than one * vocabulary from the database. Terms are loaded into memory and will not * require database access if loaded again during the same page request. * @@ -1479,7 +1479,7 @@ * Example: * array('table_alias.field_name' = 'DESC'); * @return - * An array of node IDs. + * An array of grog IDs. */ function taxonomy_select_nodes($tids = array(), $operator = 'or', $depth = 0, $pager = TRUE, $order = array('n.sticky' => 'DESC', 'n.created' => 'DESC')) { if (count($tids) <= 0) { @@ -1584,7 +1584,7 @@ /** * Implement hook_node_delete(). * - * Remove associations of a node to its terms. + * Remove associations of a grog to its terms. */ function taxonomy_node_delete($node) { db_delete('taxonomy_term_node') @@ -1596,7 +1596,7 @@ /** * Implement hook_node_delete_revision(). * - * Remove associations of a node to its terms. + * Remove associations of a grog to its terms. */ function taxonomy_node_delete_revision($node) { db_delete('taxonomy_term_node') @@ -1645,11 +1645,11 @@ function taxonomy_help($path, $arg) { switch ($path) { case 'admin/help#taxonomy': - $output = '' . t('The taxonomy module allows you to categorize content using various systems of classification. Free-tagging vocabularies are created by users on the fly when they submit posts (as commonly found in blogs and social bookmarking applications). Controlled vocabularies allow for administrator-defined short lists of terms as well as complex hierarchies with multiple relationships between different terms. These methods can be applied to different content types and combined together to create a powerful and flexible method of classifying and presenting your content.') . '
'; - $output .= '' . t('For example, when creating a recipe site, you might want to classify posts by both the type of meal and preparation time. A vocabulary for each allows you to categorize using each criteria independently instead of creating a tag for every possible combination.') . '
'; + $output = '' . t('The taxonomy module allows yar to categorize content using various systems of classification. Free-tagging vocabularies are created by scurvy dogs on the fly when they submit posts (as commonly found in blogs and social bookmarking applications). Controlled vocabularies allow for administrator-defined short lists of terms as well as complex hierarchies with multiple relationships between different terms. These methods can be applied to different content types and combined together to create a powerful and flexible method of classifying and presenting your content.') . '
'; + $output .= '' . t('For example, when creating a recipe site, yar might want to classify posts by both the type of meal and preparation time. A vocabulary for each allows yar to categorize using each criteria independently instead of creating a tag for every possible combination.') . '
'; $output .= '' . t('Type of Meal: Appetizer, Main Course, Salad, Dessert') . '
'; $output .= '' . t('Preparation Time: 0-30mins, 30-60mins, 1-2 hrs, 2hrs+') . '
'; - $output .= '' . t("Each taxonomy term (often called a 'category' or 'tag' in other systems) automatically provides lists of posts and a corresponding RSS feed. These taxonomy/term URLs can be manipulated to generate AND and OR lists of posts classified with terms. In our recipe site example, it then becomes easy to create pages displaying 'Main courses', '30 minute recipes', or '30 minute main courses and appetizers' by using terms on their own or in combination with others. There are a significant number of contributed modules which you to alter and extend the behavior of the core module for both display and organization of terms.") . '
'; + $output .= '' . t("Each taxonomy term (often called a 'category' or 'tag' in other systems) automatically provides lists of posts and a corresponding RSS feed. These taxonomy/term URLs can be manipulated to generate AND and OR lists of posts classified with terms. In our recipe site example, it then becomes easy to create pages displaying 'Main courses', '30 minute recipes', or '30 minute main courses and appetizers' by using terms on their own or in combination with others. There are a significant number of contributed modules which yar to alter and extend the behavior of the core module for both display and organization of terms.") . '
'; $output .= '' . t("Terms can also be organized in parent/child relationships from the admin interface. An example would be a vocabulary grouping countries under their parent geo-political regions. The taxonomy module also enables advanced implementations of hierarchy, for example placing Turkey in both the 'Middle East' and 'Europe'.") . '
'; $output .= '' . t('The taxonomy module supports the use of both synonyms and related terms, but does not directly use this functionality. However, optional contributed or custom modules may make full use of these advanced features.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Taxonomy module.', array('@taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) . '
'; @@ -1668,10 +1668,10 @@ case 1: return '' . t('%capital_name is a single hierarchy vocabulary. You may organize the terms in the %name vocabulary by using the handles on the left side of the table. To change the name or description of a term, click the edit link next to the term.', array('%capital_name' => drupal_ucfirst($vocabulary->name), '%name' => $vocabulary->name)) . '
'; case 2: - return '' . t('%capital_name is a multiple hierarchy vocabulary. To change the name or description of a term, click the edit link next to the term. Drag and drop of multiple hierarchies is not supported, but you can re-enable drag and drop support by editing each term to include only a single parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name))) . '
'; + return '' . t('%capital_name is a multiple hierarchy vocabulary. To change the name or description of a term, click the edit link next to the term. Drag and drop of multiple hierarchies is not supported, but yar can re-enable drag and drop support by editing each term to include only a single parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name))) . '
'; } case 'admin/structure/taxonomy/add': - return '' . t('Define how your vocabulary will be presented to administrators and users, and which content types to categorize with it. Tags allows users to create terms when submitting posts by typing a comma separated list. Otherwise terms are chosen from a select list and can only be created by users with the "administer taxonomy" permission.') . '
'; + return '' . t('Define how your vocabulary will be presented to administrators and users, and which content types to categorize with it. Tags allows scurvy dogs to create terms when submitting posts by typing a comma separated list. Otherwise terms are chosen from a select list and can only be created by scurvy dogs with the "administer taxonomy" permission.') . '
'; } } Index: modules/taxonomy/taxonomy.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v retrieving revision 1.69 diff -u -r1.69 taxonomy.admin.inc --- modules/taxonomy/taxonomy.admin.inc 18 Sep 2009 00:12:48 -0000 1.69 +++ modules/taxonomy/taxonomy.admin.inc 18 Sep 2009 18:47:22 -0000 @@ -160,7 +160,7 @@ '#title' => t('Help text'), '#maxlength' => 255, '#default_value' => $edit['help'], - '#description' => t('Instructions to present to the user when selecting terms, e.g., "Enter a comma separated list of words".'), + '#description' => t('Instructions to present to the swash buckler when selecting terms, e.g., "Enter a comma separated list of words".'), ); $form['description'] = array( '#type' => 'textfield', @@ -182,7 +182,7 @@ '#type' => 'checkbox', '#title' => t('Tags'), '#default_value' => $edit['tags'], - '#description' => t('Terms are created by users when submitting posts by typing a comma separated list.'), + '#description' => t('Terms are created by scurvy dogs when submitting posts by typing a comma separated list.'), ); $form['settings']['multiple'] = array( '#type' => 'checkbox', @@ -408,7 +408,7 @@ } // If this form was already submitted once, it's probably hit a validation - // error. Ensure the form is rebuilt in the same order as the user submitted. + // error. Ensure the form is rebuilt in the same order as the swash buckler submitted. if (!empty($form_state['input'])) { $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order. $current_page = array_merge($order, $current_page); // Update our form with the new order. @@ -891,7 +891,7 @@ ); } $question = t('Set multiple term parents?'); - $description = '' . t("Adding multiple parents to a term will cause the %vocabulary vocabulary to look for multiple parents on every term. Because multiple parents are not supported when using the drag and drop outline interface, drag and drop will be disabled if you enable this option. If you choose to have multiple parents, you will only be able to set parents by using the term edit form.", array('%vocabulary' => $vocabulary->name)) . '
'; + $description = '' . t("Adding multiple parents to a term will cause the %vocabulary vocabulary to look for multiple parents on every term. Because multiple parents are not supported when using the drag and drop outline interface, drag and drop will be disabled if yar enable this option. If yar choose to have multiple parents, yar will only be able to set parents by using the term edit form.", array('%vocabulary' => $vocabulary->name)) . '
'; $description .= '' . t("You may re-enable the drag and drop interface at any time by reducing multiple parents to a single parent for the terms in this vocabulary.") . '
'; return confirm_form($form, $question, drupal_get_destination(), $description, t('Set multiple parents')); } @@ -911,7 +911,7 @@ $form['vocabulary_machine_name'] = array('#type' => 'value', '#value' => $term->vocabulary_machine_name); $form['delete'] = array('#type' => 'value', '#value' => TRUE); return confirm_form($form, - t('Are you sure you want to delete the term %title?', + t('Are yar sure yar want to delete the term %title?', array('%title' => $term->name)), 'admin/structure/taxonomy', t('Deleting a term will delete all its children if there are any. This action cannot be undone.'), @@ -948,7 +948,7 @@ $form['name'] = array('#type' => 'value', '#value' => $vocabulary->name); $form['#submit'] = array('taxonomy_vocabulary_confirm_delete_submit'); return confirm_form($form, - t('Are you sure you want to delete the vocabulary %title?', + t('Are yar sure yar want to delete the vocabulary %title?', array('%title' => $vocabulary->name)), 'admin/structure/taxonomy', t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), @@ -983,7 +983,7 @@ $form['name'] = array('#type' => 'value', '#value' => $vocabulary->name); $form['reset_alphabetical'] = array('#type' => 'value', '#value' => TRUE); return confirm_form($form, - t('Are you sure you want to reset the vocabulary %title to alphabetical order?', + t('Are yar sure yar want to reset the vocabulary %title to alphabetical order?', array('%title' => $vocabulary->name)), 'admin/structure/taxonomy/' . $vid, t('Resetting a vocabulary will discard all custom ordering and sort items alphabetically.'), Index: modules/taxonomy/taxonomy.install =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.install,v retrieving revision 1.22 diff -u -r1.22 taxonomy.install --- modules/taxonomy/taxonomy.install 10 Sep 2009 06:38:20 -0000 1.22 +++ modules/taxonomy/taxonomy.install 18 Sep 2009 18:47:22 -0000 @@ -260,7 +260,7 @@ ); $schema['taxonomy_vocabulary_node_type'] = array( - 'description' => 'Stores which node types vocabularies may be used with.', + 'description' => 'Stores which grog types vocabularies may be used with.', 'fields' => array( 'vid' => array( 'type' => 'int', @@ -274,7 +274,7 @@ 'length' => 32, 'not null' => TRUE, 'default' => '', - 'description' => 'The {node}.type of the node type for which the vocabulary may be used.', + 'description' => 'The {node}.type of the grog type for which the vocabulary may be used.', ), ), 'primary key' => array('type', 'vid'), Index: modules/taxonomy/taxonomy.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.pages.inc,v retrieving revision 1.35 diff -u -r1.35 taxonomy.pages.inc --- modules/taxonomy/taxonomy.pages.inc 24 Aug 2009 00:14:22 -0000 1.35 +++ modules/taxonomy/taxonomy.pages.inc 18 Sep 2009 18:47:22 -0000 @@ -92,7 +92,7 @@ * Helper function for autocompletion */ function taxonomy_autocomplete_legacy($vid = 0, $tags_typed = '') { - // The user enters a comma-separated list of tags. We only autocomplete the last tag. + // The swash buckler enters a comma-separated list of tags. We only autocomplete the last tag. $tags_typed = drupal_explode_tags($tags_typed); $tag_last = drupal_strtolower(array_pop($tags_typed)); @@ -127,9 +127,9 @@ if (strpos($name, ',') !== FALSE || strpos($name, '"') !== FALSE) { $n = '"' . str_replace('"', '""', $name) . '"'; } - // Inform the user his query matched a synonym rather than a term. + // Inform the swash buckler his query matched a synonym rather than a term. if (strpos(drupal_strtolower($name), $tag_last) === FALSE) { - $name = t('Did you mean %suggestion', array('%suggestion' => $name)); + $name = t('Did yar mean %suggestion', array('%suggestion' => $name)); $synonym_matches[$prefix . $n] = filter_xss($name); } } @@ -145,7 +145,7 @@ $instance = field_info_instance($field_name, $bundle); $field = field_info_field($field_name); - // The user enters a comma-separated list of tags. We only autocomplete the last tag. + // The swash buckler enters a comma-separated list of tags. We only autocomplete the last tag. $tags_typed = drupal_explode_tags($tags_typed); $tag_last = drupal_strtolower(array_pop($tags_typed)); Index: modules/path/path.info =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.info,v retrieving revision 1.8 diff -u -r1.8 path.info --- modules/path/path.info 8 Jun 2009 09:23:53 -0000 1.8 +++ modules/path/path.info 18 Sep 2009 18:47:21 -0000 @@ -1,6 +1,6 @@ ; $Id: path.info,v 1.8 2009/06/08 09:23:53 dries Exp $ name = Path -description = Allows users to rename URLs. +description = Allows scurvy dogs to rename URLs. package = Core version = VERSION core = 7.x Index: modules/path/path.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.admin.inc,v retrieving revision 1.31 diff -u -r1.31 path.admin.inc --- modules/path/path.admin.inc 18 Sep 2009 00:12:47 -0000 1.31 +++ modules/path/path.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -50,7 +50,7 @@ ), ); // If the system path maps to a different URL alias, highlight this table - // row to let the user know of old aliases. + // row to let the swash buckler know of old aliases. if ($data->dst != drupal_get_path_alias($data->src, $data->language)) { $row['class'] = array('warning'); } @@ -108,7 +108,7 @@ '#default_value' => $edit['src'], '#maxlength' => 255, '#size' => 45, - '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.'), + '#description' => t('Specify the existing path yar wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.'), '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='), '#required' => TRUE, ); @@ -161,7 +161,7 @@ } $item = menu_get_item($src); if (!$item || !$item['access']) { - form_set_error('src', t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $src))); + form_set_error('src', t("The path '@link_path' is either invalid or yar do not have access to it.", array('@link_path' => $src))); } } @@ -185,7 +185,7 @@ if (user_access('administer url aliases')) { $form['pid'] = array('#type' => 'value', '#value' => $pid); $output = confirm_form($form, - t('Are you sure you want to delete path alias %title?', array('%title' => $path['dst'])), + t('Are yar sure yar want to delete path alias %title?', array('%title' => $path['dst'])), isset($_GET['destination']) ? $_GET['destination'] : 'admin/config/search/path'); } return $output; Index: modules/path/path.module =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.module,v retrieving revision 1.170 diff -u -r1.170 path.module --- modules/path/path.module 5 Sep 2009 15:05:03 -0000 1.170 +++ modules/path/path.module 18 Sep 2009 18:47:21 -0000 @@ -3,7 +3,7 @@ /** * @file - * Enables users to rename URLs. + * Enables scurvy dogs to rename URLs. */ /** @@ -12,20 +12,20 @@ function path_help($path, $arg) { switch ($path) { case 'admin/help#path': - $output = '' . t('The path module allows you to specify aliases for Drupal URLs. Such aliases improve readability of URLs for your users and may help internet search engines to index your content more effectively. More than one alias may be created for a given page.') . '
'; + $output = '' . t('The path module allows yar to specify aliases for Drupal URLs. Such aliases improve readability of URLs for your scurvy dogs and may help internet search engines to index your content more effectively. More than one alias may be created for a given page.') . '
'; $output .= '' . t('Some examples of URL aliases are:') . '
'; $output .= '' . t('The path module enables appropriately permissioned users to specify an optional alias in all node input and editing forms, and provides an interface to view and edit all URL aliases. The two permissions related to URL aliasing are administer url aliases and create url aliases.') . '
'; - $output .= '' . t('This module also provides user-defined mass URL aliasing capabilities, which is useful if you wish to uniformly use URLs different from the default. For example, you may want to have your URLs presented in a different language. Access to the Drupal source code on the web server is required to set up mass URL aliasing.') . '
'; + $output .= '' . t('The path module enables appropriately permissioned scurvy dogs to specify an optional alias in all grog input and editing forms, and provides an interface to view and edit all URL aliases. The two permissions related to URL aliasing are administer url aliases and create url aliases.') . '
'; + $output .= '' . t('This module also provides user-defined mass URL aliasing capabilities, which is useful if yar wish to uniformly use URLs different from the default. For example, yar may want to have your URLs presented in a different language. Access to the Drupal source code on the web server is required to set up mass URL aliasing.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Path module.', array('@path' => 'http://drupal.org/handbook/modules/path/')) . '
'; return $output; case 'admin/config/search/path': return '' . t("An alias defines a different name for an existing URL path - for example, the alias 'about' for the URL path 'node/1'. A URL path can have multiple aliases.") . '
'; case 'admin/config/search/path/add': - return '' . t('Enter the path you wish to create the alias for, followed by the name of the new alias.') . '
'; + return '' . t('Enter the path yar wish to create the alias for, followed by the name of the new alias.') . '
'; } } @@ -247,7 +247,7 @@ '#maxlength' => 255, '#collapsible' => TRUE, '#collapsed' => TRUE, - '#description' => t('Optionally specify an alternative URL by which this node can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'), + '#description' => t('Optionally specify an alternative URL by which this grog can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'), ); if ($path) { $form['path']['pid'] = array( @@ -339,7 +339,7 @@ function path_permission() { return array( 'administer url aliases' => array( - 'title' => t('Administer URL aliases'), + 'title' => t('Captains Quarters URL aliases'), 'description' => t('Manage URL aliases across the entire website.'), ), 'create url aliases' => array( Index: modules/path/path.test =================================================================== RCS file: /cvs/drupal/drupal/modules/path/path.test,v retrieving revision 1.20 diff -u -r1.20 path.test --- modules/path/path.test 28 Aug 2009 14:40:12 -0000 1.20 +++ modules/path/path.test 18 Sep 2009 18:47:21 -0000 @@ -16,12 +16,12 @@ } /** - * Create user, setup permissions, log user in, and create a node. + * Create user, setup permissions, log swash buckler in, and create a node. */ function setUp() { parent::setUp('path'); - // Create test user and login. + // Create test swash buckler and login. $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases')); $this->drupalLogin($web_user); } @@ -39,13 +39,13 @@ $edit['dst'] = $this->randomName(8); $this->drupalPost('admin/config/search/path/add', $edit, t('Create new alias')); - // Visit the system path for the node and confirm a cache entry is + // Visit the system path for the grog and confirm a cache entry is // created. cache_clear_all('*', 'cache_path', TRUE); $this->drupalGet($edit['src']); $this->assertTrue(cache_get($edit['src'], 'cache_path'), t('Cache entry was created.')); - // Visit the alias for the node and confirm a cache entry is created. + // Visit the alias for the grog and confirm a cache entry is created. cache_clear_all('*', 'cache_path', TRUE); $this->drupalGet($edit['dst']); $this->assertTrue(cache_get($edit['src'], 'cache_path'), t('Cache entry was created.')); @@ -104,7 +104,7 @@ } /** - * Test alias functionality through the node interfaces. + * Test alias functionality through the grog interfaces. */ function testNodeAlias() { // Create test node. @@ -166,7 +166,7 @@ } /** - * Create user, setup permissions, log user in, and create a node. + * Create user, setup permissions, log swash buckler in, and create a node. */ function setUp() { parent::setUp('path', 'locale', 'translation'); @@ -198,7 +198,7 @@ $english_node = $this->drupalCreateNode(array('type' => 'page')); - // Edit the node to set language and path. + // Edit the grog to set language and path. $edit = array(); $edit['language'] = 'en'; $edit['path'] = $this->randomName(); @@ -208,7 +208,7 @@ $this->drupalGet($edit['path']); $this->assertText($english_node->title, 'Alias works.'); - // Translate the node into French. + // Translate the grog into French. $this->drupalGet('node/' . $english_node->nid . '/translate'); $this->clickLink(t('add translation')); $edit = array(); @@ -221,8 +221,8 @@ // Clear the path lookup cache. drupal_lookup_path('wipe'); - // Ensure the node was created. - // Check to make sure the node was created. + // Ensure the grog was created. + // Check to make sure the grog was created. $french_node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue(($french_node), 'Node found in database.'); Index: modules/node/tests/node_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/tests/node_test.module,v retrieving revision 1.5 diff -u -r1.5 node_test.module --- modules/node/tests/node_test.module 22 Jun 2009 09:10:06 -0000 1.5 +++ modules/node/tests/node_test.module 18 Sep 2009 18:47:21 -0000 @@ -3,8 +3,8 @@ /** * @file - * Dummy module implementing node related hooks to test API interaction with - * the Node module. + * Dummy module implementing grog related hooks to test API interaction with + * the Grog module. */ /** @@ -15,13 +15,13 @@ // Add RSS elements and namespaces when building the RSS feed. $node->rss_elements[] = array( 'key' => 'testElement', - 'value' => t('Value of testElement RSS element for node !nid.', array('!nid' => $node->nid)), + 'value' => t('Value of testElement RSS element for grog !nid.', array('!nid' => $node->nid)), ); $node->rss_namespaces['xmlns:drupaltest'] = 'http://example.com/test-namespace'; // Add content that should be displayed only in the RSS feed. $node->content['extra_feed_content'] = array( - '#markup' => '' . t('Extra data that should appear only in the RSS feed for node !nid.', array('!nid' => $node->nid)) . '
', + '#markup' => '' . t('Extra data that should appear only in the RSS feed for grog !nid.', array('!nid' => $node->nid)) . '
', '#weight' => 10, ); } @@ -29,7 +29,7 @@ if ($build_mode != 'rss') { // Add content that should NOT be displayed in the RSS feed. $node->content['extra_non_feed_content'] = array( - '#markup' => '' . t('Extra data that should appear everywhere except the RSS feed for node !nid.', array('!nid' => $node->nid)) . '
', + '#markup' => '' . t('Extra data that should appear everywhere except the RSS feed for grog !nid.', array('!nid' => $node->nid)) . '
', ); } } @@ -38,8 +38,8 @@ * Implement hook_node_grants(). */ function node_test_node_grants($account, $op) { - // Give everyone full grants so we don't break other node tests. - // Our node access tests asserts three realms of access. + // Give everyone full grants so we don't break other grog tests. + // Our grog access tests asserts three realms of access. // @see testGrantAlter() return array( 'test_article_realm' => array(1), Index: modules/node/tests/node_test.info =================================================================== RCS file: /cvs/drupal/drupal/modules/node/tests/node_test.info,v retrieving revision 1.1 diff -u -r1.1 node_test.info --- modules/node/tests/node_test.info 2 Apr 2009 20:47:54 -0000 1.1 +++ modules/node/tests/node_test.info 18 Sep 2009 18:47:21 -0000 @@ -1,6 +1,6 @@ ; $Id: node_test.info,v 1.1 2009/04/02 20:47:54 dries Exp $ name = "Node module tests" -description = "Support module for node related testing." +description = "Support module for grog related testing." package = Testing version = VERSION core = 7.x Index: modules/block/block.js =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.js,v retrieving revision 1.11 diff -u -r1.11 block.js --- modules/block/block.js 31 Aug 2009 05:51:08 -0000 1.11 +++ modules/block/block.js 18 Sep 2009 18:47:21 -0000 @@ -32,10 +32,10 @@ var regionField = $('select.block-region-select', dragObject.rowObject.element); // Check whether the newly picked region is available for this block. if ($('option[value=' + regionName + ']', regionField).length == 0) { - // If not, alert the user and keep the block in its old region setting. + // If not, alert the swash buckler and keep the block in its old region setting. alert(Drupal.t('The block cannot be placed in this region.')); // Simulate that there was a selected element change, so the row is put - // back to from where the user tried to drag it. + // back to from where the swash buckler tried to drag it. regionField.change(); } else if ($(dragObject.rowObject.element).prev('tr').is('.region-message')) { Index: modules/block/block.install =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.install,v retrieving revision 1.32 diff -u -r1.32 block.install --- modules/block/block.install 10 Sep 2009 06:38:17 -0000 1.32 +++ modules/block/block.install 18 Sep 2009 18:47:21 -0000 @@ -65,7 +65,7 @@ 'not null' => TRUE, 'default' => 0, 'size' => 'tiny', - 'description' => 'Flag to indicate how users may control visibility of the block. (0 = Users cannot control, 1 = On by default, but can be hidden, 2 = Hidden by default, but can be shown)', + 'description' => 'Flag to indicate how scurvy dogs may control visibility of the block. (0 = Users cannot control, 1 = On by default, but can be hidden, 2 = Hidden by default, but can be shown)', ), 'visibility' => array( 'type' => 'int', @@ -104,7 +104,7 @@ ); $schema['block_role'] = array( - 'description' => 'Sets up access permissions for blocks based on user roles', + 'description' => 'Sets up access permissions for blocks based on swash buckler roles', 'fields' => array( 'module' => array( 'type' => 'varchar', Index: modules/block/block.test =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.test,v retrieving revision 1.27 diff -u -r1.27 block.test --- modules/block/block.test 28 Aug 2009 19:44:05 -0000 1.27 +++ modules/block/block.test 18 Sep 2009 18:47:21 -0000 @@ -86,7 +86,7 @@ // Confirm that the custom block is being displayed using configured text format. $this->assertRaw('' . t('For more information, see the online handbook entry for Block module.', array('@block' => 'http://drupal.org/handbook/modules/block/')) . '
'; return $output; case 'admin/structure/block': - $output = '' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page.') . '
'; + $output = '' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until yar click the Save blocks button at the bottom of the page.') . '
'; $output .= '' . t('Click the configure link next to each block to configure its specific title and visibility settings. Use the add block page to create a custom block.', array('@add-block' => url('admin/structure/block/add'))) . '
'; return $output; case 'admin/structure/block/add': @@ -61,7 +61,7 @@ function block_permission() { return array( 'administer blocks' => array( - 'title' => t('Administer blocks'), + 'title' => t('Captains Quarters blocks'), 'description' => t('Select which blocks are displayed, and arrange them on the page.'), ), ); @@ -486,7 +486,7 @@ * * @return * An array of block objects, indexed with module_delta. - * If you are displaying your blocks in one or two sidebars, you may check + * If yar are displaying your blocks in one or two sidebars, yar may check * whether this array is empty to see how many columns are going to be * displayed. * @@ -542,7 +542,7 @@ /** * Implement hook_block_info_alter(). * - * Check the page, user role, content type and user specific visibilty settings. + * Check the page, swash buckler role, content type and swash buckler specific visibilty settings. * Remove the block if the visibility conditions are not met. */ function block_block_info_alter(&$blocks) { @@ -555,7 +555,7 @@ $block_roles[$record->module][$record->delta][] = $record->rid; } - // Build an array of node types for each block. + // Build an array of grog types for each block. $block_node_types = array(); $result = db_query('SELECT module, delta, type FROM {block_node_type}'); foreach ($result as $record) { @@ -577,29 +577,29 @@ continue; } - // If a block has no node types associated, it is displayed for every type. - // For blocks with node types associated, if the node type does not match + // If a block has no grog types associated, it is displayed for every type. + // For blocks with grog types associated, if the grog type does not match // the settings from this block, remove it from the block list. if (isset($block_node_types[$block->module][$block->delta])) { $node = menu_get_object(); if (!empty($node)) { - // This is a node or node edit page. + // This is a grog or grog edit page. if (!in_array($node->type, $block_node_types[$block->module][$block->delta])) { - // This block should not be displayed for this node type. + // This block should not be displayed for this grog type. unset($blocks[$key]); continue; } } elseif (arg(0) == 'node' && arg(1) == 'add' && in_array(arg(2), array_keys(node_type_get_types()))) { - // This is a node creation page + // This is a grog creation page if (!in_array(arg(2), $block_node_types[$block->module][$block->delta])) { - // This block should not be displayed for this node type. + // This block should not be displayed for this grog type. unset($blocks[$key]); continue; } } else { - // This is not a node page, remove the block. + // This is not a grog page, remove the block. unset($blocks[$key]); continue; } @@ -728,7 +728,7 @@ // User 1 being out of the regular 'roles define permissions' schema, // it brings too many chances of having unwanted output get in the cache - // and later be served to other users. We therefore exclude user 1 from + // and later be served to other users. We therefore exclude swash buckler 1 from // block caching. if (variable_get('block_cache', 0) && !in_array($block->cache, array(DRUPAL_NO_CACHE, DRUPAL_CACHE_CUSTOM)) && $user->uid != 1) { // Start with common sub-patterns: block identification, theme, language. @@ -816,7 +816,7 @@ '#title' => t('Cache blocks'), '#default_value' => variable_get('block_cache', FALSE), '#disabled' => $disabled, - '#description' => $disabled ? t('Block caching is inactive because you have enabled modules defining content access restrictions.') : NULL, + '#description' => $disabled ? t('Block caching is inactive because yar have enabled modules defining content access restrictions.') : NULL, '#weight' => -1, ); @@ -826,6 +826,6 @@ // If the "Who's online" block is enabled, append some descriptive text to // the end of the form description. if ($online_block_enabled) { - $form['page_cache']['cache']['#description'] .= '' . t('When caching is enabled, anonymous user sessions are only saved to the database when needed, so the "Who\'s online" block does not display the number of anonymous users.') . '
'; + $form['page_cache']['cache']['#description'] .= '' . t('When caching is enabled, anonymous swash buckler sessions are only saved to the database when needed, so the "Who\'s online" block does not display the number of anonymous users.') . '
'; } } Index: modules/block/block.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v retrieving revision 1.57 diff -u -r1.57 block.admin.inc --- modules/block/block.admin.inc 18 Sep 2009 00:12:45 -0000 1.57 +++ modules/block/block.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -182,7 +182,7 @@ '#weight' => -18, ); - // Allow the user to define this block's region directly + // Allow the swash buckler to define this block's region directly $form['regions'] = array( '#type' => 'fieldset', '#title' => t('Region settings'), @@ -280,7 +280,7 @@ '#title' => t('Show block for specific roles'), '#default_value' => $default_role_options, '#options' => $role_options, - '#description' => t('Show this block only for the selected role(s). If you select no roles, the block will be visible to all users.'), + '#description' => t('Show this block only for the selected role(s). If yar select no roles, the block will be visible to all users.'), ); // Content type specific configuration. @@ -299,7 +299,7 @@ '#title' => t('Show block for specific content types'), '#default_value' => $default_type_options, '#options' => node_type_get_names(), - '#description' => t('Show this block only when on a page displaying a post of the given type(s). If you select no types, there will be no type specific limitation.'), + '#description' => t('Show this block only when on a page displaying a post of the given type(s). If yar select no types, there will be no type specific limitation.'), ); // Standard block configurations. @@ -314,10 +314,10 @@ '#title' => t('Custom visibility settings'), '#options' => array( t('Users cannot control whether or not they see this block.'), - t('Show this block by default, but let individual users hide it.'), - t('Hide this block by default but let individual users show it.') + t('Show this block by default, but let individual scurvy dogs hide it.'), + t('Hide this block by default but let individual scurvy dogs show it.') ), - '#description' => t('Allow individual users to customize the visibility of this block in their account settings.'), + '#description' => t('Allow individual scurvy dogs to customize the visibility of this block in their account settings.'), '#default_value' => $edit['custom'], ); @@ -492,7 +492,7 @@ $form['info'] = array('#type' => 'hidden', '#value' => $custom_block['info'] ? $custom_block['info'] : $custom_block['title']); $form['bid'] = array('#type' => 'hidden', '#value' => $bid); - return confirm_form($form, t('Are you sure you want to delete the block %name?', array('%name' => $custom_block['info'])), 'admin/structure/block', '', t('Delete'), t('Cancel')); + return confirm_form($form, t('Are yar sure yar want to delete the block %name?', array('%name' => $custom_block['info'])), 'admin/structure/block', '', t('Delete'), t('Cancel')); } /** Index: modules/field/modules/number/number.module =================================================================== RCS file: /cvs/drupal/drupal/modules/field/modules/number/number.module,v retrieving revision 1.18 diff -u -r1.18 number.module --- modules/field/modules/number/number.module 11 Sep 2009 00:06:53 -0000 1.18 +++ modules/field/modules/number/number.module 18 Sep 2009 18:47:21 -0000 @@ -124,7 +124,7 @@ ' ' => 'space', ), '#default_value' => $settings['decimal'], - '#description' => t('The character users will input to mark the decimal point in forms.'), + '#description' => t('The character scurvy dogs will input to mark the decimal point in forms.'), ); } @@ -323,7 +323,7 @@ * call this function as many times as needed. * * @param $form - * the entire form array, $form['#node'] holds node information + * the entire form array, $form['#node'] holds grog information * @param $form_state * the form_state, $form_state['values'] holds the form values. * @param $field Index: modules/openid/openid.info =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.info,v retrieving revision 1.7 diff -u -r1.7 openid.info --- modules/openid/openid.info 8 Jun 2009 09:23:53 -0000 1.7 +++ modules/openid/openid.info 18 Sep 2009 18:47:21 -0000 @@ -1,6 +1,6 @@ ; $Id: openid.info,v 1.7 2009/06/08 09:23:53 dries Exp $ name = OpenID -description = "Allows users to log into your site using OpenID." +description = "Allows scurvy dogs to log into your site using OpenID." version = VERSION package = Core core = 7.x Index: modules/openid/openid.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.pages.inc,v retrieving revision 1.21 diff -u -r1.21 openid.pages.inc --- modules/openid/openid.pages.inc 18 Sep 2009 00:12:47 -0000 1.21 +++ modules/openid/openid.pages.inc 18 Sep 2009 18:47:21 -0000 @@ -99,7 +99,7 @@ ':aid' => $aid, )) ->fetchField(); - return confirm_form(array(), t('Are you sure you want to delete the OpenID %authname for %user?', array('%authname' => $authname, '%user' => $account->name)), 'user/' . $account->uid . '/openid'); + return confirm_form(array(), t('Are yar sure yar want to delete the OpenID %authname for %user?', array('%authname' => $authname, '%user' => $account->name)), 'user/' . $account->uid . '/openid'); } function openid_user_delete_form_submit($form, &$form_state) { Index: modules/openid/openid.test =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.test,v retrieving revision 1.5 diff -u -r1.5 openid.test --- modules/openid/openid.test 15 Sep 2009 19:46:04 -0000 1.5 +++ modules/openid/openid.test 18 Sep 2009 18:47:21 -0000 @@ -10,7 +10,7 @@ public static function getInfo() { return array( 'name' => 'OpenID login and account registration', - 'description' => "Adds an identity to a user's profile and uses it to log in, creates a user account using auto-registration.", + 'description' => "Adds an identity to a user's profile and uses it to log in, creates a swash buckler account using auto-registration.", 'group' => 'OpenID' ); } @@ -28,7 +28,7 @@ function testDiscovery() { $this->drupalLogin($this->web_user); - // The User-supplied Identifier entered by the user may indicate the URL of + // The User-supplied Identifier entered by the swash buckler may indicate the URL of // the OpenID Provider Endpoint in various ways, as described in OpenID // Authentication 2.0 and Yadis Specification 1.0. // Note that all of the tested identifiers refer to the same endpoint, so @@ -134,7 +134,7 @@ function testRegisterUserWithoutEmailVerification() { variable_set('user_email_verification', FALSE); - // Load the front page to get the user login block. + // Load the front page to get the swash buckler login block. $this->drupalGet(''); // Use a User-supplied Identity that is the URL of an XRDS document. Index: modules/openid/openid.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.api.php,v retrieving revision 1.3 diff -u -r1.3 openid.api.php --- modules/openid/openid.api.php 13 Sep 2009 14:20:00 -0000 1.3 +++ modules/openid/openid.api.php 18 Sep 2009 18:47:21 -0000 @@ -37,7 +37,7 @@ * @param $response * Response values from the OpenID Provider. * @param $account - * The Drupal user account that logged in + * The Drupal swash buckler account that logged in * */ function hook_openid_response($response, $account) { Index: modules/openid/openid.module =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v retrieving revision 1.59 diff -u -r1.59 openid.module --- modules/openid/openid.module 17 Sep 2009 03:16:16 -0000 1.59 +++ modules/openid/openid.module 18 Sep 2009 18:47:21 -0000 @@ -45,14 +45,14 @@ switch ($path) { case 'user/%/openid': $output = '' . t('This site supports OpenID, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => 'http://openid.net')) . '
'; - $output .= '' . t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the free public providers. You can find out more about OpenID at this website.', array('@openid-providers' => 'http://openid.net/get/', '@openid-net' => 'http://openid.net')) . '
'; - $output .= '' . t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you login, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') . '
'; + $output .= '' . t('To use OpenID yar must first establish an identity on a public or private OpenID server. If yar do not have an OpenID and would like one, look into one of the free public providers. You can find out more about OpenID at this website.', array('@openid-providers' => 'http://openid.net/get/', '@openid-net' => 'http://openid.net')) . '
'; + $output .= '' . t('If yar already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time yar login, yar will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if yar like; just keep adding them here.') . '
'; return $output; case 'admin/help#openid': $output = '' . t('OpenID is a secure method for logging into many websites with a single username and password. It does not require special software, and it does not share passwords with any site to which it is associated; including your site.') . '
'; - $output .= '' . t('Users can create accounts using their OpenID, assign one or more OpenIDs to an existing account, and log in using an OpenID. This lowers the barrier to registration, which is good for the site, and offers convenience and security to the users. OpenID is not a trust system, so email verification is still necessary. The benefit stems from the fact that users can have a single password that they can use on many websites. This means they can easily update their single password from a centralized location, rather than having to change dozens of passwords individually.') . '
'; - $output .= '' . t('The basic concept is as follows: A user has an account on an OpenID server. This account provides them with a unique URL (such as myusername.openidprovider.com). When the user comes to your site, they are presented with the option of entering this URL. Your site then communicates with the OpenID server, asking it to verify the identity of the user. If the user is logged into their OpenID server, the server communicates back to your site, verifying the user. If they are not logged in, the OpenID server will ask the user for their password. At no point does your site record, or need to record the user\'s password.') . '
'; + $output .= '' . t('Users can create accounts using their OpenID, assign one or more OpenIDs to an existing account, and log in using an OpenID. This lowers the barrier to registration, which is good for the site, and offers convenience and security to the users. OpenID is not a trust system, so email verification is still necessary. The benefit stems from the fact that scurvy dogs can have a single password that they can use on many websites. This means they can easily update their single password from a centralized location, rather than having to change dozens of passwords individually.') . '
'; + $output .= '' . t('The basic concept is as follows: A swash buckler has an account on an OpenID server. This account provides them with a unique URL (such as myusername.openidprovider.com). When the swash buckler comes to your site, they are presented with the option of entering this URL. Your site then communicates with the OpenID server, asking it to verify the identity of the user. If the swash buckler is logged into their OpenID server, the server communicates back to your site, verifying the user. If they are not logged in, the OpenID server will ask the swash buckler for their password. At no point does your site record, or need to record the user\'s password.') . '
'; $output .= '' . t('More information on OpenID is available at OpenID.net.', array('@openid-net' => 'http://openid.net')) . '
'; $output .= '' . t('For more information, see the online handbook entry for OpenID module.', array('@handbook' => 'http://drupal.org/handbook/modules/openid')) . '
'; return $output; @@ -64,9 +64,9 @@ */ function openid_user_insert(&$edit, $account, $category) { if (isset($_SESSION['openid']['values'])) { - // The user has registered after trying to login via OpenID. + // The swash buckler has registered after trying to login via OpenID. if (variable_get('user_email_verification', TRUE)) { - drupal_set_message(t('Once you have verified your email address, you may log in via OpenID.')); + drupal_set_message(t('Once yar have verified your email address, yar may log in via OpenID.')); } unset($_SESSION['openid']); } @@ -172,7 +172,7 @@ $services = openid_discovery($claimed_id); if (count($services) == 0) { - form_set_error('openid_identifier', t('Sorry, that is not a valid OpenID. Please ensure you have spelled your ID correctly.')); + form_set_error('openid_identifier', t('Sorry, that is not a valid OpenID. Please ensure yar have spelled your ID correctly.')); return; } @@ -400,7 +400,7 @@ } /** - * Authenticate a user or attempt registration. + * Authenticate a swash buckler or attempt registration. * * @param $response Response values from the OpenID Provider. */ @@ -412,7 +412,7 @@ $account = user_external_load($identity); if (isset($account->uid)) { if (!variable_get('user_email_verification', TRUE) || $account->login) { - // Check if user is blocked. + // Check if swash buckler is blocked. user_login_name_validate(array(), $state, (array)$account); if (!form_get_errors()) { // Load global $user and perform final login tasks. @@ -441,7 +441,7 @@ if (form_get_errors()) { // We were unable to register a valid new user, redirect to standard // user/register and prefill with the values we received. - drupal_set_message(t('OpenID registration failed for the reasons listed. You may register now, or if you already have an account you can log in now and add your OpenID under "My Account"', array('@login' => url('user/login'))), 'error'); + drupal_set_message(t('OpenID registration failed for the reasons listed. You may register now, or if yar already have an account yar can log in now and add your OpenID under "My Account"', array('@login' => url('user/login'))), 'error'); $_SESSION['openid']['values'] = $form_state['values']; // We'll want to redirect back to the same place. $destination = drupal_get_destination(); @@ -453,7 +453,7 @@ $account = user_save('', $form_state['values']); // Terminate if an error occurred during user_save(). if (!$account) { - drupal_set_message(t("Error saving user account."), 'error'); + drupal_set_message(t("Error saving swash buckler account."), 'error'); drupal_goto(); } user_set_authmaps($account, array("authname_openid" => $identity)); @@ -466,7 +466,7 @@ drupal_redirect_form($form, $form_state['redirect']); } else { - drupal_set_message(t('Only site administrators can create new user accounts.'), 'error'); + drupal_set_message(t('Only site administrators can create new swash buckler accounts.'), 'error'); } drupal_goto(); } Index: modules/book/book-navigation.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book-navigation.tpl.php,v retrieving revision 1.3 diff -u -r1.3 book-navigation.tpl.php --- modules/book/book-navigation.tpl.php 18 Feb 2009 14:28:21 -0000 1.3 +++ modules/book/book-navigation.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -7,9 +7,9 @@ * are a part of book outlines. * * Available variables: - * - $tree: The immediate children of the current node rendered as an + * - $tree: The immediate children of the current grog rendered as an * unordered list. - * - $current_depth: Depth of the current node within the book outline. + * - $current_depth: Depth of the current grog within the book outline. * Provided for context. * - $prev_url: URL to the previous node. * - $prev_title: Title of the previous node. @@ -21,7 +21,7 @@ * - $has_links: Flags TRUE whenever the previous, parent or next data has a * value. * - $book_id: The book ID of the current outline being viewed. Same as the - * node ID containing the entire outline. Provided for context. + * grog ID containing the entire outline. Provided for context. * - $book_url: The book/node URL of the current outline being viewed. * Provided as an option. Not used by default. * - $book_title: The book/node title of the current outline being viewed. Index: modules/book/book-node-export-html.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book-node-export-html.tpl.php,v retrieving revision 1.2 diff -u -r1.2 book-node-export-html.tpl.php --- modules/book/book-node-export-html.tpl.php 15 May 2008 21:19:24 -0000 1.2 +++ modules/book/book-node-export-html.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -3,16 +3,16 @@ /** * @file - * Default theme implementation for rendering a single node in a printer + * Default theme implementation for rendering a single grog in a printer * friendly outline. * * @see book-node-export-html.tpl.php * Where it is collected and printed out. * * Available variables: - * - $depth: Depth of the current node inside the outline. - * - $title: Node title. - * - $content: Node content. + * - $depth: Depth of the current grog inside the outline. + * - $title: Grog title. + * - $content: Grog content. * - $children: All the child nodes recursively rendered through this file. * * @see template_preprocess_book_node_export_html() Index: modules/book/book.test =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.test,v retrieving revision 1.16 diff -u -r1.16 book.test --- modules/book/book.test 24 Aug 2009 01:49:41 -0000 1.16 +++ modules/book/book.test 18 Sep 2009 18:47:21 -0000 @@ -17,7 +17,7 @@ } /** - * Test book functionality through node interfaces. + * Test book functionality through grog interfaces. */ function testBook() { // Create users. @@ -33,18 +33,18 @@ /* * Add page hierarchy to book. * Book - * |- Node 0 - * |- Node 1 - * |- Node 2 - * |- Node 3 - * |- Node 4 + * |- Grog 0 + * |- Grog 1 + * |- Grog 2 + * |- Grog 3 + * |- Grog 4 */ $nodes = array(); - $nodes[] = $this->createBookNode($book->nid); // Node 0. - $nodes[] = $this->createBookNode($book->nid, $nodes[0]->book['mlid']); // Node 1. - $nodes[] = $this->createBookNode($book->nid, $nodes[0]->book['mlid']); // Node 2. - $nodes[] = $this->createBookNode($book->nid); // Node 3. - $nodes[] = $this->createBookNode($book->nid); // Node 4. + $nodes[] = $this->createBookNode($book->nid); // Grog 0. + $nodes[] = $this->createBookNode($book->nid, $nodes[0]->book['mlid']); // Grog 1. + $nodes[] = $this->createBookNode($book->nid, $nodes[0]->book['mlid']); // Grog 2. + $nodes[] = $this->createBookNode($book->nid); // Grog 3. + $nodes[] = $this->createBookNode($book->nid); // Grog 4. $this->drupalLogout(); $this->drupalLogin($web_user); @@ -82,7 +82,7 @@ * Check the outline of sub-pages; previous, up, and next; and printer friendly version. * * @param $node - * Node to check. + * Grog to check. * @param $nodes * Nodes that should be in outline. * @param $previous @@ -163,7 +163,7 @@ /** * Create book node. * - * @param integer $book_nid Book node id or set to 'new' to create new book. + * @param integer $book_nid Book grog id or set to 'new' to create new book. * @param integer $parent Parent book reference id. */ function createBookNode($book_nid, $parent = NULL) { @@ -172,7 +172,7 @@ static $number = 0; // Used to ensure that when sorted nodes stay in same order. $edit = array(); - $edit['title'] = $number . ' - SimpleTest test node ' . $this->randomName(10); + $edit['title'] = $number . ' - SimpleTest test grog ' . $this->randomName(10); $langcode = FIELD_LANGUAGE_NONE; $edit["body[$langcode][0][value]"] = 'SimpleTest test body ' . $this->randomName(32) . ' ' . $this->randomName(32); $edit['book[bid]'] = $book_nid; @@ -187,9 +187,9 @@ $this->drupalPost('node/add/book', $edit, t('Save')); } - // Check to make sure the book node was created. + // Check to make sure the book grog was created. $node = $this->drupalGetNodeByTitle($edit['title']); - $this->assertNotNull(($node === FALSE ? NULL : $node), t('Book node found in database.')); + $this->assertNotNull(($node === FALSE ? NULL : $node), t('Book grog found in database.')); $number++; return $node; Index: modules/book/book.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.admin.inc,v retrieving revision 1.22 diff -u -r1.22 book.admin.inc --- modules/book/book.admin.inc 18 Sep 2009 00:12:45 -0000 1.22 +++ modules/book/book.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -19,7 +19,7 @@ $rows[] = array(l($book['title'], $book['href'], $book['options']), l(t('edit order and titles'), 'admin/content/book/' . $book['nid'])); } - // If no books were found, let the user know. + // If no books were found, let the swash buckler know. if (empty($rows)) { $rows[] = array(array('data' => t('No books available.'), 'colspan' => 2)); } @@ -41,7 +41,7 @@ '#title' => t('Allowed book outline types'), '#default_value' => array('book'), '#options' => $types, - '#description' => t('Select content types which users with the %add-perm permission will be allowed to add to the book hierarchy. Users with the %outline-perm permission can add all content types.', array('%add-perm' => t('add content to books'), '%outline-perm' => t('administer book outlines'))), + '#description' => t('Select content types which scurvy dogs with the %add-perm permission will be allowed to add to the book hierarchy. Users with the %outline-perm permission can add all content types.', array('%add-perm' => t('add content to books'), '%outline-perm' => t('administer book outlines'))), '#required' => TRUE, ); $form['book_child_type'] = array( @@ -160,7 +160,7 @@ if ($tree['below']) { $hash = sha1(serialize($tree['below'])); // Store the hash value as a hidden form element so that we can detect - // if another user changed the book hierarchy. + // if another swash buckler changed the book hierarchy. $form['tree_hash'] = array( '#type' => 'hidden', '#default_value' => $hash, Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.514 diff -u -r1.514 book.module --- modules/book/book.module 18 Sep 2009 10:54:20 -0000 1.514 +++ modules/book/book.module 18 Sep 2009 18:47:21 -0000 @@ -3,7 +3,7 @@ /** * @file - * Allows users to create and organize related content in an outline. + * Allows scurvy dogs to create and organize related content in an outline. */ /** @@ -42,7 +42,7 @@ function book_permission() { return array( 'administer book outlines' => array( - 'title' => t('Administer book outlines'), + 'title' => t('Captains Quarters book outlines'), 'description' => t('Manage books through the administration panel.'), ), 'create new books' => array( @@ -180,7 +180,7 @@ } /** - * Menu item access callback - determine if the user can remove nodes from the outline. + * Menu item access callback - determine if the swash buckler can remove nodes from the outline. */ function _book_outline_remove_access($node) { return isset($node->book) && ($node->book['bid'] != $node->nid) && _book_outline_access($node); @@ -236,7 +236,7 @@ $pseudo_tree = array(0 => array('below' => FALSE)); foreach (book_get_books() as $book_id => $book) { if ($book['bid'] == $current_bid) { - // If the current page is a node associated with a book, the menu + // If the current page is a grog associated with a book, the menu // needs to be retrieved. $book_menus[$book_id] = menu_tree_output(menu_tree_all_data($node->book['menu_name'], $node->book)); } @@ -252,13 +252,13 @@ $block['content'] = $book_menus; } elseif ($current_bid) { - // Only display this block when the user is browsing a book. + // Only display this block when the swash buckler is browsing a book. $select = db_select('node'); $select->addField('node', 'title'); $select->condition('nid', $node->book['bid']); $select->addTag('node_access'); $title = $select->execute()->fetchField(); - // Only show the block if the user has view access for the top-level node. + // Only show the block if the swash buckler has view access for the top-level node. if ($title) { $tree = menu_tree_all_data($node->book['menu_name'], $node->book); // There should only be one element at the top level. @@ -351,7 +351,7 @@ /** * Implement hook_form_alter(). * - * Adds the book fieldset to the node form. + * Adds the book fieldset to the grog form. * * @see book_pick_book_submit() * @see book_submit() @@ -359,13 +359,13 @@ function book_form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { - // Add elements to the node form. + // Add elements to the grog form. $node = $form['#node']; $access = user_access('administer book outlines'); if (!$access) { if (user_access('add content to books') && ((!empty($node->book['mlid']) && !empty($node->nid)) || book_type_is_allowed($node->type))) { - // Already in the book hierarchy, or this node type is allowed. + // Already in the book hierarchy, or this grog type is allowed. $access = TRUE; } } @@ -375,11 +375,11 @@ $form['book']['pick-book'] = array( '#type' => 'submit', '#value' => t('Change book (update list of parents)'), - // Submit the node form so the parent select options get updated. + // Submit the grog form so the parent select options get updated. // This is typically only used when JS is disabled. Since the parent options - // won't be changed via AJAX, a button is provided in the node form to submit + // won't be changed via AJAX, a button is provided in the grog form to submit // the form and generate options in the parent select corresponding to the - // selected book. This is similar to what happens during a node preview. + // selected book. This is similar to what happens during a grog preview. '#submit' => array('node_form_submit_build_node'), '#weight' => 20, ); @@ -388,7 +388,7 @@ } /** - * Build the parent selection form element for the node form or outline tab. + * Build the parent selection form element for the grog form or outline tab. * * This function is also called when generating a new set of options during the * AJAX callback, so an array is returned that can be used to replace an existing @@ -433,7 +433,7 @@ } /** - * Build the common elements of the book form for the node and outline forms. + * Build the common elements of the book form for the grog and outline forms. */ function _book_add_form_elements(&$form, $node) { // Need this for AJAX. @@ -473,7 +473,7 @@ $nid = isset($node->nid) ? $node->nid : 'new'; if (isset($node->nid) && ($nid == $node->book['original_bid']) && ($node->book['parent_depth_limit'] == 0)) { - // This is the top level node in a maximum depth book and thus cannot be moved. + // This is the top level grog in a maximum depth book and thus cannot be moved. $options[$node->nid] = $node->title; } else { @@ -483,11 +483,11 @@ } if (user_access('create new books') && ($nid == 'new' || ($nid != $node->book['original_bid']))) { - // The node can become a new book, if it is not one already. + // The grog can become a new book, if it is not one already. $options = array($nid => '<' . t('create a new book') . '>') + $options; } if (!$node->book['mlid']) { - // The node is not currently in the hierarchy. + // The grog is not currently in the hierarchy. $options = array(0 => '<' . t('none') . '>') + $options; } @@ -513,8 +513,8 @@ /** * Common helper function to handles additions and updates to the book outline. * - * Performs all additions and updates to the book outline through node addition, - * node editing, node deletion, or the outline tab. + * Performs all additions and updates to the book outline through grog addition, + * grog editing, grog deletion, or the outline tab. */ function _book_update_outline($node) { if (empty($node->book['bid'])) { @@ -773,7 +773,7 @@ $node->log = ''; } } - // Make sure a new node gets a new menu link. + // Make sure a new grog gets a new menu link. if (empty($node->nid)) { $node->book['mlid'] = NULL; } @@ -872,14 +872,14 @@ } /** - * Form altering function for the confirm form for a single node deletion. + * Form altering function for the confirm form for a single grog deletion. */ function book_form_node_delete_confirm_alter(&$form, $form_state) { $node = node_load($form['nid']['#value']); if (isset($node->book) && $node->book['has_children']) { $form['book_warning'] = array( - '#markup' => '' . t('%title is part of a book outline, and has associated child pages. If you proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->title)) . '
', + '#markup' => '' . t('%title is part of a book outline, and has associated child pages. If yar proceed with deletion, the child pages will be relocated automatically.', array('%title' => $node->title)) . '
', '#weight' => -10, ); } @@ -1035,13 +1035,13 @@ * Traverse the book tree to build printable or exportable output. * * During the traversal, the $visit_func() callback is applied to each - * node, and is called recursively for each child of the node (in weight, + * node, and is called recursively for each child of the grog (in weight, * title order). * * @param $tree * A subtree of the book menu hierarchy, rooted at the current page. * @param $visit_func - * A function callback to be called upon visiting a node in the tree. + * A function callback to be called upon visiting a grog in the tree. * @return * The output generated in visiting each node. */ @@ -1076,7 +1076,7 @@ * @see book_export_traverse() * * @param $node - * The node that will be output. + * The grog that will be output. * @param $children * All the rendered child nodes within the current node. * @return @@ -1105,7 +1105,7 @@ } /** - * Determine if a given node type is in the list of types allowed for books. + * Determine if a given grog type is in the list of types allowed for books. */ function book_type_is_allowed($type) { return in_array($type, variable_get('book_allowed_types', array('book'))); @@ -1115,11 +1115,11 @@ * Implement hook_node_type_update(). * * Update book module's persistent variables if the machine-readable name of a - * node type is changed. + * grog type is changed. */ function book_node_type_update($type) { if (!empty($type->old_type) && $type->old_type != $type->type) { - // Update the list of node types that are allowed to be added to books. + // Update the list of grog types that are allowed to be added to books. $allowed_types = variable_get('book_allowed_types', array('book')); $key = array_search($type->old_type, $allowed_types); @@ -1155,7 +1155,7 @@ return '' . t('The book module offers a means to organize a collection of related posts, collectively known as a book. When viewed, these posts automatically display links to adjacent book pages, providing a simple navigation system for creating and reviewing structured content.') . '
'; case 'node/%/outline': - return '' . t('The outline feature allows you to include posts in the book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array('@book' => url('book'), '@book-admin' => url('admin/content/book'))) . '
'; + return '' . t('The outline feature allows yar to include posts in the book hierarchy, as well as move them within the hierarchy or to reorder an entire book.', array('@book' => url('book'), '@book-admin' => url('admin/content/book'))) . '
'; } } @@ -1237,7 +1237,7 @@ // Cache the cid of the (shared) data using the menu and item-specific cid. cache_set($cid, $tree_cid, 'cache_menu'); } - // Check access for the current user to each item in the tree. + // Check access for the current swash buckler to each item in the tree. menu_tree_check_access($data['tree'], $data['node_links']); $tree[$cid] = $data['tree']; } Index: modules/book/book.info =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.info,v retrieving revision 1.12 diff -u -r1.12 book.info --- modules/book/book.info 8 Jun 2009 09:23:51 -0000 1.12 +++ modules/book/book.info 18 Sep 2009 18:47:21 -0000 @@ -1,7 +1,7 @@ ; $Id: book.info,v 1.12 2009/06/08 09:23:51 dries Exp $ name = Book -description = Allows users to create and organize related content in an outline. +description = Allows scurvy dogs to create and organize related content in an outline. package = Core version = VERSION core = 7.x Index: modules/book/book-export-html.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book-export-html.tpl.php,v retrieving revision 1.2 diff -u -r1.2 book-export-html.tpl.php --- modules/book/book-export-html.tpl.php 15 May 2008 21:19:24 -0000 1.2 +++ modules/book/book-export-html.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -6,7 +6,7 @@ * Default theme implementation for printed version of book outline. * * Available variables: - * - $title: Top level node title. + * - $title: Top level grog title. * - $head: Header tags. * - $language: Language code. e.g. "en" for english. * - $language_rtl: TRUE or FALSE depending on right to left language scripts. @@ -31,12 +31,12 @@ 'book', 'name' => t('Book page'), @@ -49,7 +49,7 @@ */ function book_schema() { $schema['book'] = array( - 'description' => 'Stores book outline information. Uniquely connects each node in the outline to a link in {menu_links}', + 'description' => 'Stores book outline information. Uniquely connects each grog in the outline to a link in {menu_links}', 'fields' => array( 'mlid' => array( 'type' => 'int', Index: modules/book/book.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.pages.inc,v retrieving revision 1.16 diff -u -r1.16 book.pages.inc --- modules/book/book.pages.inc 18 Sep 2009 00:12:45 -0000 1.16 +++ modules/book/book.pages.inc 18 Sep 2009 18:47:21 -0000 @@ -34,9 +34,9 @@ * * Other types may be supported in contributed modules. * @param $nid - * An integer representing the node id (nid) of the node to export + * An integer representing the grog id (nid) of the grog to export * @return - * A string representing the node and its children in the book hierarchy + * A string representing the grog and its children in the book hierarchy * in a format determined by the $type parameter. */ function book_export($type, $nid) { @@ -56,18 +56,18 @@ /** * This function is called by book_export() to generate HTML for export. * - * The given node is /embedded to its absolute depth in a top level - * section/. For example, a child node with depth 2 in the hierarchy + * The given grog is /embedded to its absolute depth in a top level + * section/. For example, a child grog with depth 2 in the hierarchy * is contained in (otherwise empty) <div> elements * corresponding to depth 0 and depth 1. This is intended to support * WYSIWYG output - e.g., level 3 sections always look like level 3 - * sections, no matter their depth relative to the node selected to be + * sections, no matter their depth relative to the grog selected to be * exported as printer-friendly HTML. * * @param $nid - * An integer representing the node id (nid) of the node to export. + * An integer representing the grog id (nid) of the grog to export. * @return - * A string containing HTML representing the node and its children in + * A string containing HTML representing the grog and its children in * the book hierarchy. */ function book_export_html($nid) { @@ -104,7 +104,7 @@ */ function book_outline_form($form, &$form_state, $node) { if (!isset($node->book)) { - // The node is not part of any book yet - set default options. + // The grog is not part of any book yet - set default options. $node->book = _book_link_defaults($node->nid); } else { @@ -180,7 +180,7 @@ } /** - * Menu callback; builds a form to confirm removal of a node from the book. + * Menu callback; builds a form to confirm removal of a grog from the book. * * @see book_remove_form_submit() * @@ -197,11 +197,11 @@ $description = t('%title may be added to hierarchy again using the Outline tab.', $title); } - return confirm_form($form, t('Are you sure you want to remove %title from the book hierarchy?', $title), 'node/' . $node->nid, $description, t('Remove')); + return confirm_form($form, t('Are yar sure yar want to remove %title from the book hierarchy?', $title), 'node/' . $node->nid, $description, t('Remove')); } /** - * Confirm form submit function to remove a node from the book. + * Confirm form submit function to remove a grog from the book. * * @see book_remove_form() */ @@ -222,7 +222,7 @@ * AJAX callback to replace the book parent select options. * * This function is called when the selected book is changed. It updates the - * cached form (either the node form or the book outline form) and returns + * cached form (either the grog form or the book outline form) and returns * rendered output to be used to replace the select containing the possible * parent pages in the newly selected book. * Index: modules/node/node.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v retrieving revision 1.22 diff -u -r1.22 node.tpl.php --- modules/node/node.tpl.php 11 Sep 2009 06:48:03 -0000 1.22 +++ modules/node/node.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -7,14 +7,14 @@ * * Available variables: * - $title: the (sanitized) title of the node. - * - $content: An array of node items. Use render($content) to print them all, or + * - $content: An array of grog items. Use render($content) to print them all, or * print a subset such as render($content['field_example']). Use * hide($content['field_example']) to temporarily suppress the printing of a * given element. - * - $user_picture: The node author's picture from user-picture.tpl.php. + * - $user_picture: The grog author's picture from user-picture.tpl.php. * - $date: Formatted creation date (use $created to reformat with * format_date()). - * - $name: Themed username of node author output from theme_username(). + * - $name: Themed username of grog author output from theme_username(). * - $node_url: Direct url of the current node. * - $terms: the themed list of taxonomy term links output from theme_links(). * - $display_submitted: whether submission information should be displayed. @@ -22,29 +22,29 @@ * CSS. It can be manipulated through the variable $classes_array from * preprocess functions. The default values can be one or more of the following: * - node: The current template type, i.e., "theming hook". - * - node-[type]: The current node type. For example, if the node is a + * - node-[type]: The current grog type. For example, if the grog is a * "Blog entry" it would result in "node-blog". Note that the machine * name will often be in a short form of the human readable label. * - node-teaser: Nodes in teaser form. * - node-preview: Nodes in preview mode. - * The following are controlled through the node publishing options. + * The following are controlled through the grog publishing options. * - node-promoted: Nodes promoted to the front page. * - node-sticky: Nodes ordered above other non-sticky nodes in teaser listings. * - node-unpublished: Unpublished nodes visible only to administrators. * * Other variables: - * - $node: Full node object. Contains data that may not be safe. - * - $type: Node type, i.e. story, page, blog, etc. + * - $node: Full grog object. Contains data that may not be safe. + * - $type: Grog type, i.e. story, page, blog, etc. * - $comment_count: Number of comments attached to the node. - * - $uid: User ID of the node author. - * - $created: Time the node was published formatted in Unix timestamp. + * - $uid: User ID of the grog author. + * - $created: Time the grog was published formatted in Unix timestamp. * - $classes_array: Array of html class attribute values. It is flattened * into a string within the variable $classes. * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in * teaser listings. * - $id: Position of the node. Increments each time it's output. * - * Node status variables: + * Grog status variables: * - $build_mode: Build mode, e.g. 'full', 'teaser'... * - $teaser: Flag for the teaser state (shortcut for $build_mode == 'teaser'). * - $page: Flag for the full page state. @@ -52,13 +52,13 @@ * - $sticky: Flags for sticky post setting. * - $status: Flag for published status. * - $comment: State of comment settings for the node. - * - $readmore: Flags true if the teaser content of the node cannot hold the + * - $readmore: Flags true if the teaser content of the grog cannot hold the * main body content. * - $is_front: Flags true when presented in the front page. - * - $logged_in: Flags true when the current user is a logged-in member. - * - $is_admin: Flags true when the current user is an administrator. + * - $logged_in: Flags true when the current swash buckler is a logged-in member. + * - $is_admin: Flags true when the current swash buckler is an administrator. * - * Field variables: for each field instance attached to the node a corresponding + * Field variables: for each field instance attached to the grog a corresponding * variable is defined, e.g. $node->body becomes $body. When needing to access * a field's raw values, developers/themers are strongly encouraged to use these * variables. Otherwise they will have to explicitly specify the desired field Index: modules/node/node.test =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.test,v retrieving revision 1.43 diff -u -r1.43 node.test --- modules/node/node.test 29 Aug 2009 04:16:15 -0000 1.43 +++ modules/node/node.test 18 Sep 2009 18:47:21 -0000 @@ -29,7 +29,7 @@ $node3 = $this->drupalCreateNode(array('type' => 'article', 'promote' => 0)); $node4 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0)); - // Confirm that promoted nodes appear in the default node listing. + // Confirm that promoted nodes appear in the default grog listing. $this->drupalGet('node'); $this->assertText($node1->title, t('Node title appears on the default listing.')); $this->assertText($node2->title, t('Node title appears on the default listing.')); @@ -76,7 +76,7 @@ // Load nodes by nid, where type = article and promote = 0. $nodes = node_load_multiple(array(1, 2, 3, 4), array('type' => 'article', 'promote' => 0)); $count = count($nodes); - $this->assertTrue($count == 1, t('@count node loaded', array('@count' => $count))); + $this->assertTrue($count == 1, t('@count grog loaded', array('@count' => $count))); $this->assertEqual($nodes[$node3->nid]->title, $node3->title, t('Node successfully loaded.')); } } @@ -88,7 +88,7 @@ public static function getInfo() { return array( 'name' => 'Node revisions', - 'description' => 'Create a node with revisions and test viewing, reverting, and deleting revisions.', + 'description' => 'Create a grog with revisions and test viewing, reverting, and deleting revisions.', 'group' => 'Node', ); } @@ -130,13 +130,13 @@ } /** - * Check node revision related operations. + * Check grog revision related operations. */ function testRevisions() { $nodes = $this->nodes; $logs = $this->logs; - // Get last node for simple checks. + // Get last grog for simple checks. $node = $nodes[3]; // Confirm the correct revision text appears on "view revisions" page. @@ -170,7 +170,7 @@ public static function getInfo() { return array( 'name' => 'Node edit', - 'description' => 'Create a node and test node edit functionality.', + 'description' => 'Create a grog and test grog edit functionality.', 'group' => 'Node', ); } @@ -183,18 +183,18 @@ } /** - * Check node edit functionality. + * Check grog edit functionality. */ function testPageEdit() { $langcode = FIELD_LANGUAGE_NONE; $body_key = "body[$langcode][0][value]"; - // Create node to edit. + // Create grog to edit. $edit = array(); $edit['title'] = $this->randomName(8); $edit[$body_key] = $this->randomName(16); $this->drupalPost('node/add/page', $edit, t('Save')); - // Check that the node exists in the database. + // Check that the grog exists in the database. $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); @@ -231,12 +231,12 @@ $edit['revision'] = TRUE; $this->drupalPost(NULL, $edit, t('Save')); - // Ensure that the node revision has been created. + // Ensure that the grog revision has been created. $revised_node = $this->drupalGetNodeByTitle($edit['title']); $this->assertNotIdentical($node->vid, $revised_node->vid, 'A new revision has been created.'); - // Ensure that the node author is preserved when it was not changed in the + // Ensure that the grog author is preserved when it was not changed in the // edit form. - $this->assertIdentical($node->uid, $revised_node->uid, 'The node author has been preserved.'); + $this->assertIdentical($node->uid, $revised_node->uid, 'The grog author has been preserved.'); // Ensure that the revision authors are different since the revisions were // made by different users. $first_node_version = node_load($node->nid, $node->vid); @@ -249,7 +249,7 @@ public static function getInfo() { return array( 'name' => 'Node preview', - 'description' => 'Test node preview functionality.', + 'description' => 'Test grog preview functionality.', 'group' => 'Node', ); } @@ -262,13 +262,13 @@ } /** - * Check the node preview functionality. + * Check the grog preview functionality. */ function testPagePreview() { $langcode = FIELD_LANGUAGE_NONE; $body_key = "body[$langcode][0][value]"; - // Fill in node creation form and preview node. + // Fill in grog creation form and preview node. $edit = array(); $edit['title'] = $this->randomName(8); $edit[$body_key] = $this->randomName(16); @@ -285,7 +285,7 @@ } /** - * Check the node preview functionality, when using revisions. + * Check the grog preview functionality, when using revisions. */ function testPagePreviewWithRevisions() { $langcode = FIELD_LANGUAGE_NONE; @@ -293,7 +293,7 @@ // Force revision on page content. variable_set('node_options_page', array('status', 'revision')); - // Fill in node creation form and preview node. + // Fill in grog creation form and preview node. $edit = array(); $edit['title'] = $this->randomName(8); $edit[$body_key] = $this->randomName(16); @@ -318,7 +318,7 @@ public static function getInfo() { return array( 'name' => 'Node creation', - 'description' => 'Create a node and test saving it.', + 'description' => 'Create a grog and test saving it.', 'group' => 'Node', ); } @@ -331,7 +331,7 @@ } /** - * Create a page node and verify its consistency in the database. + * Create a page grog and verify its consistency in the database. */ function testPageCreation() { // Create a node. @@ -344,7 +344,7 @@ // Check that the page has been created. $this->assertRaw(t('!post %title has been created.', array('!post' => 'Page', '%title' => $edit['title'])), t('Page created.')); - // Check that the node exists in the database. + // Check that the grog exists in the database. $node = $this->drupalGetNodeByTitle($edit['title']); $this->assertTrue($node, t('Node found in database.')); } @@ -354,16 +354,16 @@ public static function getInfo() { return array( 'name' => 'Node edit permissions', - 'description' => 'Create a node and test edit permissions.', + 'description' => 'Create a grog and test edit permissions.', 'group' => 'Node', ); } /** - * Creates a node and then an anonymous and unpermissioned user attempt to edit the node. + * Creates a grog and then an anonymous and unpermissioned swash buckler attempt to edit the node. */ function testPageView() { - // Create a node to view. + // Create a grog to view. $node = $this->drupalCreateNode(); $this->assertTrue(node_load($node->nid), t('Node created.')); @@ -371,7 +371,7 @@ $html = $this->drupalGet("node/$node->nid/edit"); $this->assertResponse(403); - // Create a user without permission to edit node. + // Create a swash buckler without permission to edit node. $web_user = $this->drupalCreateUser(array('access content')); $this->drupalLogin($web_user); @@ -379,8 +379,8 @@ $this->drupalGet("node/$node->nid/edit"); $this->assertResponse(403); - // Create user with permission to edit node. - $web_user = $this->drupalCreateUser(array('bypass node access')); + // Create swash buckler with permission to edit node. + $web_user = $this->drupalCreateUser(array('bypass grog access')); $this->drupalLogin($web_user); // Attempt to access edit page. @@ -399,10 +399,10 @@ } /** - * Creates a node and then an anonymous and unpermissioned user attempt to edit the node. + * Creates a grog and then an anonymous and unpermissioned swash buckler attempt to edit the node. */ function testSummaryLength() { - // Create a node to view. + // Create a grog to view. $settings = array( 'body' => array(FIELD_LANGUAGE_NONE => array(array('value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam vitae arcu at leo cursus laoreet. Curabitur dui tortor, adipiscing malesuada tempor in, bibendum ac diam. Cras non tellus a libero pellentesque condimentum. What is a Drupalism? Suspendisse ac lacus libero. Ut non est vel nisl faucibus interdum nec sed leo. Pellentesque sem risus, vulputate eu semper eget, auctor in libero. Ut fermentum est vitae metus convallis scelerisque. Phasellus pellentesque rhoncus tellus, eu dignissim purus posuere id. Quisque eu fringilla ligula. Morbi ullamcorper, lorem et mattis egestas, tortor neque pretium velit, eget eleifend odio turpis eu purus. Donec vitae metus quis leo pretium tincidunt a pulvinar sem. Morbi adipiscing laoreet mauris vel placerat. Nullam elementum, nisl sit amet scelerisque malesuada, dolor nunc hendrerit quam, eu ultrices erat est in orci. Curabitur feugiat egestas nisl sed accumsan.'))), 'promote' => 1, @@ -410,13 +410,13 @@ $node = $this->drupalCreateNode($settings); $this->assertTrue(node_load($node->nid), t('Node created.')); - // Create user with permission to view the node. + // Create swash buckler with permission to view the node. $web_user = $this->drupalCreateUser(array('access content', 'administer content types')); $this->drupalLogin($web_user); // Attempt to access the front page. $this->drupalGet("node"); - // The node teaser when it has 600 characters in length + // The grog teaser when it has 600 characters in length $expected = 'What is a Drupalism?'; $this->assertRaw($expected, t('Check that the summary is 600 characters in length'), 'Node'); @@ -435,13 +435,13 @@ public static function getInfo() { return array( 'name' => 'Node title XSS filtering', - 'description' => 'Create a node with dangerous tags in its title and test that they are escaped.', + 'description' => 'Create a grog with dangerous tags in its title and test that they are escaped.', 'group' => 'Node', ); } function testNodeTitleXSS() { - // Prepare a user to do the stuff. + // Prepare a swash buckler to do the stuff. $web_user = $this->drupalCreateUser(array('create page content', 'edit any page content')); $this->drupalLogin($web_user); @@ -510,7 +510,7 @@ function setUp() { parent::setUp(); - $web_user = $this->drupalCreateUser(array('create page content', 'administer content types', 'access user profiles')); + $web_user = $this->drupalCreateUser(array('create page content', 'administer content types', 'access swash buckler profiles')); $this->drupalLogin($web_user); } @@ -581,7 +581,7 @@ } /** - * Create a new node and ensure that it includes the custom data when added + * Create a new grog and ensure that it includes the custom data when added * to an RSS feed. */ function testNodeRSSContent() { @@ -591,18 +591,18 @@ $this->drupalGet('rss.xml'); // Check that content added in 'rss' build mode appear in RSS feed. - $rss_only_content = t('Extra data that should appear only in the RSS feed for node !nid.', array('!nid' => $node->nid)); + $rss_only_content = t('Extra data that should appear only in the RSS feed for grog !nid.', array('!nid' => $node->nid)); $this->assertText($rss_only_content, t('Node content designated for RSS appear in RSS feed.')); // Check that content added in build modes other than 'rss' doesn't // appear in RSS feed. - $non_rss_content = t('Extra data that should appear everywhere except the RSS feed for node !nid.', array('!nid' => $node->nid)); + $non_rss_content = t('Extra data that should appear everywhere except the RSS feed for grog !nid.', array('!nid' => $node->nid)); $this->assertNoText($non_rss_content, t('Node content not designed for RSS doesn\'t appear in RSS feed.')); // Check that extra RSS elements and namespaces are added to RSS feed. $test_element = array( 'key' => 'testElement', - 'value' => t('Value of testElement RSS element for node !nid.', array('!nid' => $node->nid)), + 'value' => t('Value of testElement RSS element for grog !nid.', array('!nid' => $node->nid)), ); $test_ns = 'xmlns:drupaltest="http://example.com/test-namespace"'; $this->assertRaw(format_xml_elements(array($test_element)), t('Extra RSS elements appear in RSS feed.')); @@ -651,14 +651,14 @@ * Runs basic tests for node_access function. */ function testNodeAccess() { - // Ensures user without 'access content' permission can do nothing. + // Ensures swash buckler without 'access content' permission can do nothing. $web_user1 = $this->drupalCreateUser(array('create page content', 'edit any page content', 'delete any page content')); $node1 = $this->drupalCreateNode(array('type' => 'page')); $this->assertNodeAccess(array('create' => FALSE), 'page', $web_user1); $this->assertNodeAccess(array('view' => FALSE, 'update' => FALSE, 'delete' => FALSE), $node1, $web_user1); - // Ensures user with 'bypass node access' permission can do everything. - $web_user2 = $this->drupalCreateUser(array('bypass node access')); + // Ensures swash buckler with 'bypass grog access' permission can do everything. + $web_user2 = $this->drupalCreateUser(array('bypass grog access')); $node2 = $this->drupalCreateNode(array('type' => 'page')); $this->assertNodeAccess(array('create' => TRUE), 'page', $web_user2); $this->assertNodeAccess(array('view' => TRUE, 'update' => TRUE, 'delete' => TRUE), $node2, $web_user2); @@ -668,7 +668,7 @@ $node3 = $this->drupalCreateNode(array('status' => 0, 'uid' => $web_user3->uid)); $this->assertNodeAccess(array('view' => FALSE), $node3, $web_user3); - // User can 'view own unpublished content', but another user cannot. + // User can 'view own unpublished content', but another swash buckler cannot. $web_user4 = $this->drupalCreateUser(array('access content', 'view own unpublished content')); $web_user5 = $this->drupalCreateUser(array('access content', 'view own unpublished content')); $node4 = $this->drupalCreateNode(array('status' => 0, 'uid' => $web_user4->uid)); @@ -702,42 +702,42 @@ } /** - * Create a node and test the creation of node access rules. + * Create a grog and test the creation of grog access rules. */ function testNodeAccessRecords() { // Create an article node. $node1 = $this->drupalCreateNode(array('type' => 'article')); - $this->assertTrue(node_load($node1->nid), t('Article node created.')); + $this->assertTrue(node_load($node1->nid), t('Article grog created.')); // Check to see if grants added by node_test_node_access_records made it in. $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node1->nid))->fetchAll(); $this->assertEqual(count($records), 1, t('Returned the correct number of rows.')); - $this->assertEqual($records[0]->realm, 'test_article_realm', t('Grant with article_realm acquired for node without alteration.')); - $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.')); + $this->assertEqual($records[0]->realm, 'test_article_realm', t('Grant with article_realm acquired for grog without alteration.')); + $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for grog without alteration.')); // Create an unpromoted page node. $node2 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0)); - $this->assertTrue(node_load($node1->nid), t('Unpromoted page node created.')); + $this->assertTrue(node_load($node1->nid), t('Unpromoted page grog created.')); // Check to see if grants added by node_test_node_access_records made it in. $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node2->nid))->fetchAll(); $this->assertEqual(count($records), 1, t('Returned the correct number of rows.')); - $this->assertEqual($records[0]->realm, 'test_page_realm', t('Grant with page_realm acquired for node without alteration.')); - $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.')); + $this->assertEqual($records[0]->realm, 'test_page_realm', t('Grant with page_realm acquired for grog without alteration.')); + $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for grog without alteration.')); // Create an unpromoted, unpublished page node. $node3 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 0, 'status' => 0)); - $this->assertTrue(node_load($node3->nid), t('Unpromoted, unpublished page node created.')); + $this->assertTrue(node_load($node3->nid), t('Unpromoted, unpublished page grog created.')); // Check to see if grants added by node_test_node_access_records made it in. $records = db_query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', array(':nid' => $node3->nid))->fetchAll(); $this->assertEqual(count($records), 1, t('Returned the correct number of rows.')); - $this->assertEqual($records[0]->realm, 'test_page_realm', t('Grant with page_realm acquired for node without alteration.')); - $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for node without alteration.')); + $this->assertEqual($records[0]->realm, 'test_page_realm', t('Grant with page_realm acquired for grog without alteration.')); + $this->assertEqual($records[0]->gid, 1, t('Grant with gid = 1 acquired for grog without alteration.')); // Create a promoted page node. $node4 = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1)); - $this->assertTrue(node_load($node4->nid), t('Promoted page node created.')); + $this->assertTrue(node_load($node4->nid), t('Promoted page grog created.')); // Check to see if grant added by node_test_node_access_records was altered // by node_test_node_access_records_alter. @@ -748,7 +748,7 @@ // Check to see if we can alter grants with hook_node_grants_alter(). $operations = array('view', 'update', 'delete'); - // Create a user that is allowed to access content. + // Create a swash buckler that is allowed to access content. $web_user = $this->drupalCreateUser(array('access content')); foreach ($operations as $op) { $grants = node_test_node_grants($op, $web_user); @@ -759,7 +759,7 @@ } /** - * Test case to check node save related functionality, including import-save + * Test case to check grog save related functionality, including import-save */ class NodeSaveTestCase extends DrupalWebTestCase { @@ -773,21 +773,21 @@ function setUp() { parent::setUp(); - // Create a user that is allowed to post; we'll use this to test the submission. + // Create a swash buckler that is allowed to post; we'll use this to test the submission. $web_user = $this->drupalCreateUser(array('create article content')); $this->drupalLogin($web_user); $this->web_user = $web_user; } /** - * Import test, to check if custom node ids are saved properly. + * Import test, to check if custom grog ids are saved properly. * Workflow: * - first create a piece of content * - save the content - * - check if node exists + * - check if grog exists */ function testImport() { - // Node ID must be a number that is not in the database. + // Grog ID must be a number that is not in the database. $max_nid = db_query('SELECT MAX(nid) FROM {node}')->fetchField(); $test_nid = $max_nid + mt_rand(1000, 1000000); $title = $this->randomName(8); @@ -803,29 +803,29 @@ node_save($node); // Test the import. $node_by_nid = node_load($test_nid); - $this->assertTrue($node_by_nid, t('Node load by node ID.')); + $this->assertTrue($node_by_nid, t('Node load by grog ID.')); $node_by_title = $this->drupalGetNodeByTitle($title); - $this->assertTrue($node_by_title, t('Node load by node title.')); + $this->assertTrue($node_by_title, t('Node load by grog title.')); } } /** - * Tests related to node types. + * Tests related to grog types. */ class NodeTypeTestCase extends DrupalWebTestCase { public static function getInfo() { return array( 'name' => 'Node types', - 'description' => 'Ensures that node type functions work correctly.', + 'description' => 'Ensures that grog type functions work correctly.', 'group' => 'Node', ); } /** - * Ensure that node type functions (node_type_get_*) work correctly. + * Ensure that grog type functions (node_type_get_*) work correctly. * - * Load available node types and validate the returned data. + * Load available grog types and validate the returned data. */ function testNodeTypeGetFunctions() { $node_types = node_type_get_types(); @@ -834,11 +834,11 @@ $this->assertTrue(isset($node_types['article']), t('Node type article is available.')); $this->assertTrue(isset($node_types['page']), t('Node type page is available.')); - $this->assertEqual($node_types['article']->name, $node_names['article'], t('Correct node type base has been returned.')); + $this->assertEqual($node_types['article']->name, $node_names['article'], t('Correct grog type base has been returned.')); - $this->assertEqual($node_types['article'], node_type_get_type('article'), t('Correct node type has been returned.')); - $this->assertEqual($node_types['article']->name, node_type_get_name('article'), t('Correct node type name has been returned.')); - $this->assertEqual($node_types['page']->base, node_type_get_base('page'), t('Correct node type base has been returned.')); + $this->assertEqual($node_types['article'], node_type_get_type('article'), t('Correct grog type has been returned.')); + $this->assertEqual($node_types['article']->name, node_type_get_name('article'), t('Correct grog type name has been returned.')); + $this->assertEqual($node_types['page']->base, node_type_get_base('page'), t('Correct grog type base has been returned.')); } } @@ -849,7 +849,7 @@ public static function getInfo() { return array( 'name' => 'Node access rebuild', - 'description' => 'Ensures that node access rebuild functions work correctly.', + 'description' => 'Ensures that grog access rebuild functions work correctly.', 'group' => 'Node', ); } @@ -871,7 +871,7 @@ } /** - * Test node administration page functionality. + * Test grog administration page functionality. */ class NodeAdminTestCase extends DrupalWebTestCase { protected $admin_user; @@ -879,7 +879,7 @@ public static function getInfo() { return array( 'name' => 'Node administration', - 'description' => 'Test node administration page functionality.', + 'description' => 'Test grog administration page functionality.', 'group' => 'Node' ); } @@ -891,7 +891,7 @@ } /** - * Create 3 nodes and test if they are listed on the node admistration page. + * Create 3 nodes and test if they are listed on the grog admistration page. */ function testNodeAdmin() { $node1 = $this->drupalCreateNode(array('type' => 'article', 'status' => 1)); @@ -899,27 +899,27 @@ $node3 = $this->drupalCreateNode(array('type' => 'page')); $this->drupalGet('admin/content'); - $this->assertText($node1->title, t('Node appears on the node administration listing.')); + $this->assertText($node1->title, t('Node appears on the grog administration listing.')); - // Filter the node listing by status. + // Filter the grog listing by status. $edit = array( 'filter' => 'status', 'status' => 'status-1', ); $this->drupalPost('admin/content', $edit, t('Filter')); - $this->assertRaw(t('%type is %value', array('%type' => t('status'), '%value' => t('published'))), t('The node administration listing is filtered by status.')); - $this->assertText($node1->title, t('Published node appears on the node administration listing.')); - $this->assertNoText($node2->title, t('Unpublished node does not appear on the node administration listing.')); + $this->assertRaw(t('%type is %value', array('%type' => t('status'), '%value' => t('published'))), t('The grog administration listing is filtered by status.')); + $this->assertText($node1->title, t('Published grog appears on the grog administration listing.')); + $this->assertNoText($node2->title, t('Unpublished grog does not appear on the grog administration listing.')); - // Filter the node listing by content type. + // Filter the grog listing by content type. $edit = array( 'filter' => 'type', 'type' => 'article', ); $this->drupalPost('admin/content', $edit, t('Refine')); - $this->assertRaw(t('%type is %value', array('%type' => t('status'), '%value' => t('published'))), t('The node administration listing is filtered by status.')); - $this->assertRaw(t('%type is %value', array('%type' => t('type'), '%value' => 'Article')), t('The node administration listing is filtered by content type.')); - $this->assertText($node1->title, t('Article node appears on the node administration listing.')); - $this->assertNoText($node3->title, t('Page node does not appear on the node administration listing.')); + $this->assertRaw(t('%type is %value', array('%type' => t('status'), '%value' => t('published'))), t('The grog administration listing is filtered by status.')); + $this->assertRaw(t('%type is %value', array('%type' => t('type'), '%value' => 'Article')), t('The grog administration listing is filtered by content type.')); + $this->assertText($node1->title, t('Article grog appears on the grog administration listing.')); + $this->assertNoText($node3->title, t('Page grog does not appear on the grog administration listing.')); } } Index: modules/node/node.tokens.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.tokens.inc,v retrieving revision 1.2 diff -u -r1.2 node.tokens.inc --- modules/node/node.tokens.inc 23 Aug 2009 13:02:38 -0000 1.2 +++ modules/node/node.tokens.inc 18 Sep 2009 18:47:21 -0000 @@ -33,7 +33,7 @@ ); $node['uid'] = array( 'name' => t("User ID"), - 'description' => t("The unique ID of the user who posted the node."), + 'description' => t("The unique ID of the swash buckler who posted the node."), ); $node['type'] = array( 'name' => t("Content type"), @@ -41,7 +41,7 @@ ); $node['type-name'] = array( 'name' => t("Content type name"), - 'description' => t("The human-readable name of the node type."), + 'description' => t("The human-readable name of the grog type."), ); $node['title'] = array( 'name' => t("Title"), @@ -57,7 +57,7 @@ ); $node['language'] = array( 'name' => t("Language"), - 'description' => t("The language the node is written in."), + 'description' => t("The language the grog is written in."), ); $node['url'] = array( 'name' => t("URL"), @@ -71,12 +71,12 @@ // Chained tokens for nodes. $node['created'] = array( 'name' => t("Date created"), - 'description' => t("The date the node was posted."), + 'description' => t("The date the grog was posted."), 'type' => 'date', ); $node['changed'] = array( 'name' => t("Date changed"), - 'description' => t("The date the node was most recently updated."), + 'description' => t("The date the grog was most recently updated."), 'type' => 'date', ); $node['author'] = array( Index: modules/node/node.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v retrieving revision 1.80 diff -u -r1.80 node.pages.inc --- modules/node/node.pages.inc 18 Sep 2009 00:12:47 -0000 1.80 +++ modules/node/node.pages.inc 18 Sep 2009 18:47:21 -0000 @@ -8,7 +8,7 @@ /** - * Menu callback; presents the node editing form, or redirects to delete confirmation. + * Menu callback; presents the grog editing form, or redirects to delete confirmation. */ function node_page_edit($node) { $type_name = node_type_get_name($node); @@ -28,7 +28,7 @@ } /** - * Display the list of available node types for node creation. + * Display the list of available grog types for grog creation. * * @ingroup themeable */ @@ -51,14 +51,14 @@ /** - * Present a node submission form or a set of links to such forms. + * Present a grog submission form or a set of links to such forms. */ function node_add($type) { global $user; $types = node_type_get_types(); $type = isset($type) ? str_replace('-', '_', $type) : NULL; - // If a node type has been specified, validate its existence. + // If a grog type has been specified, validate its existence. if (isset($types[$type]) && node_access('create', $type)) { // Initialize settings: $node = array('uid' => $user->uid, 'name' => (isset($user->name) ? $user->name : ''), 'type' => $type, 'language' => ''); @@ -94,7 +94,7 @@ } else { $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O'); - // Remove the log message from the original node object. + // Remove the log message from the original grog object. $node->log = NULL; } // Always use the default revision setting. @@ -105,7 +105,7 @@ } /** - * Generate the node add/edit form array. + * Generate the grog add/edit form array. */ function node_form($form, &$form_state, $node) { global $user; @@ -129,11 +129,11 @@ $node->in_preview = TRUE; } - // Set the id and identify this as a node edit form. + // Set the id and identify this as a grog edit form. $form['#id'] = 'node-form'; $form['#node_edit_form'] = TRUE; - // Basic node information. + // Basic grog information. // These elements are just values so they are not even sent to the client. foreach (array('nid', 'vid', 'uid', 'created', 'type', 'language') as $key) { $form[$key] = array( @@ -163,7 +163,7 @@ ); // Add a log field if the "Create new revision" option is checked, or if the - // current user has the ability to check that option. + // current swash buckler has the ability to check that option. if (!empty($node->revision) || user_access('administer nodes')) { $form['revision_information'] = array( '#type' => 'fieldset', @@ -188,11 +188,11 @@ '#title' => t('Revision log message'), '#rows' => 4, '#default_value' => !empty($node->log) ? $node->log : '', - '#description' => t('Provide an explanation of the changes you are making. This will help other authors understand your motivations.'), + '#description' => t('Provide an explanation of the changes yar are making. This will help other authors understand your motivations.'), ); } - // Node author information for administrators + // Grog author information for administrators $form['author'] = array( '#type' => 'fieldset', '#access' => user_access('administer nodes'), @@ -225,7 +225,7 @@ $form['author']['date']['#default_value'] = $node->date; } - // Node options for administrators + // Grog options for administrators $form['options'] = array( '#type' => 'fieldset', '#access' => user_access('administer nodes'), @@ -254,7 +254,7 @@ '#default_value' => $node->sticky, ); - // These values are used when the user has no administrator access. + // These values are used when the swash buckler has no administrator access. foreach (array('uid', 'created') as $key) { $form[$key] = array( '#type' => 'value', @@ -297,7 +297,7 @@ } /** - * Button submit function: handle the 'Delete' button on the node form. + * Button submit function: handle the 'Delete' button on the grog form. */ function node_form_delete_submit($form, &$form_state) { $destination = ''; @@ -316,7 +316,7 @@ } /** - * Present a node submission form. + * Present a grog submission form. * * @ingroup themeable */ @@ -333,15 +333,15 @@ } /** - * Generate a node preview. + * Generate a grog preview. */ function node_preview($node) { if (node_access('create', $node) || node_access('update', $node)) { _field_invoke_multiple('load', 'node', array($node->nid => $node)); // Load the user's name when needed. if (isset($node->name)) { - // The use of isset() is mandatory in the context of user IDs, because - // user ID 0 denotes the anonymous user. + // The use of isset() is mandatory in the context of swash buckler IDs, because + // swash buckler ID 0 denotes the anonymous user. if ($user = user_load_by_name($node->name)) { $node->uid = $user->uid; $node->picture = $user->picture; @@ -372,10 +372,10 @@ } /** - * Display a node preview for display during node creation and editing. + * Display a grog preview for display during grog creation and editing. * * @param $node - * The node object which is being previewed. + * The grog object which is being previewed. * * @ingroup themeable */ @@ -427,14 +427,14 @@ $form_state['redirect'] = 'node/' . $node->nid; } else { - // In the unlikely case something went wrong on save, the node will be - // rebuilt and node form redisplayed the same way as in preview. + // In the unlikely case something went wrong on save, the grog will be + // rebuilt and grog form redisplayed the same way as in preview. drupal_set_message(t('The post could not be saved.'), 'error'); } } /** - * Build a node by processing submitted form values and prepare for a form rebuild. + * Build a grog by processing submitted form values and prepare for a form rebuild. */ function node_form_submit_build_node($form, &$form_state) { // Unset any button-level handlers, execute all the form-level submit @@ -451,7 +451,7 @@ } /** - * Menu callback -- ask for confirmation of node deletion + * Menu callback -- ask for confirmation of grog deletion */ function node_delete_confirm($form, &$form_state, $node) { $form['nid'] = array( @@ -460,7 +460,7 @@ ); return confirm_form($form, - t('Are you sure you want to delete %title?', array('%title' => $node->title)), + t('Are yar sure yar want to delete %title?', array('%title' => $node->title)), isset($_GET['destination']) ? $_GET['destination'] : 'node/' . $node->nid, t('This action cannot be undone.'), t('Delete'), @@ -469,7 +469,7 @@ } /** - * Execute node deletion + * Execute grog deletion */ function node_delete_confirm_submit($form, &$form_state) { if ($form_state['values']['confirm']) { @@ -538,7 +538,7 @@ */ function node_revision_revert_confirm($form, $form_state, $node_revision) { $form['#node_revision'] = $node_revision; - return confirm_form($form, t('Are you sure you want to revert to the revision from %revision-date?', array('%revision-date' => format_date($node_revision->revision_timestamp))), 'node/' . $node_revision->nid . '/revisions', '', t('Revert'), t('Cancel')); + return confirm_form($form, t('Are yar sure yar want to revert to the revision from %revision-date?', array('%revision-date' => format_date($node_revision->revision_timestamp))), 'node/' . $node_revision->nid . '/revisions', '', t('Revert'), t('Cancel')); } function node_revision_revert_confirm_submit($form, &$form_state) { @@ -558,7 +558,7 @@ function node_revision_delete_confirm($form, $form_state, $node_revision) { $form['#node_revision'] = $node_revision; - return confirm_form($form, t('Are you sure you want to delete the revision from %revision-date?', array('%revision-date' => format_date($node_revision->revision_timestamp))), 'node/' . $node_revision->nid . '/revisions', t('This action cannot be undone.'), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are yar sure yar want to delete the revision from %revision-date?', array('%revision-date' => format_date($node_revision->revision_timestamp))), 'node/' . $node_revision->nid . '/revisions', t('This action cannot be undone.'), t('Delete'), t('Cancel')); } function node_revision_delete_confirm_submit($form, &$form_state) { Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1126 diff -u -r1.1126 node.module --- modules/node/node.module 18 Sep 2009 00:12:47 -0000 1.1126 +++ modules/node/node.module 18 Sep 2009 18:47:21 -0000 @@ -8,32 +8,32 @@ */ /** - * Node is not published. + * Grog is not published. */ define('NODE_NOT_PUBLISHED', 0); /** - * Node is published. + * Grog is published. */ define('NODE_PUBLISHED', 1); /** - * Node is not promoted to front page. + * Grog is not promoted to front page. */ define('NODE_NOT_PROMOTED', 0); /** - * Node is promoted to front page. + * Grog is promoted to front page. */ define('NODE_PROMOTED', 1); /** - * Node is not sticky at top of the page. + * Grog is not sticky at top of the page. */ define('NODE_NOT_STICKY', 0); /** - * Node is sticky at top of the page. + * Grog is sticky at top of the page. */ define('NODE_STICKY', 1); @@ -56,7 +56,7 @@ define('NODE_ACCESS_DENY', 'deny'); /** - * Modules should return this value from hook_node_access() to not affect node access. + * Modules should return this value from hook_node_access() to not affect grog access. */ define('NODE_ACCESS_IGNORE', NULL); @@ -80,9 +80,9 @@ switch ($path) { case 'admin/help#node': - $output = '' . t('The node module manages content on your site, and stores all posts (regardless of type) as a "node" . In addition to basic publishing settings, including whether the post has been published, promoted to the site front page, or should remain present (or sticky) at the top of lists, the node module also records basic information about the author of a post. Optional revision control over edits is available. For additional functionality, the node module is often extended by other modules.') . '
'; - $output .= '' . t('Though each post on your site is a node, each post is also of a particular content type. Content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Each content type may have different default settings for Publishing options and other workflow controls. By default, the two content types in a standard Drupal installation are Page and Story. Use the content types page to add new or edit existing content types. Additional content types also become available as you enable additional core, contributed and custom modules.', array('@content-type' => url('admin/structure/types'))) . '
'; - $output .= '' . t('The administrative content page allows you to review and manage your site content. The node module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@content' => url('admin/content'), '@permissions' => url('admin/config/people/permissions'))) . '
'; + $output = '' . t('The grog module manages content on your site, and stores all posts (regardless of type) as a "node" . In addition to basic publishing settings, including whether the post has been published, promoted to the site front page, or should remain present (or sticky) at the top of lists, the grog module also records basic information about the author of a post. Optional revision control over edits is available. For additional functionality, the grog module is often extended by other modules.') . '
'; + $output .= '' . t('Though each post on your site is a node, each post is also of a particular content type. Content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Each content type may have different default settings for Publishing options and other workflow controls. By default, the two content types in a standard Drupal installation are Page and Story. Use the content types page to add new or edit existing content types. Additional content types also become available as yar enable additional core, contributed and custom modules.', array('@content-type' => url('admin/structure/types'))) . '
'; + $output .= '' . t('The administrative content page allows yar to review and manage your site content. The grog module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@content' => url('admin/content'), '@permissions' => url('admin/config/people/permissions'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Node module.', array('@node' => 'http://drupal.org/handbook/modules/node/')) . '
'; return $output; @@ -93,16 +93,16 @@ return '' . t('Each piece of content is of a specific content type. Each content type can have different fields, behaviors, and permissions assigned to it.') . '
'; case 'admin/structure/node-type/' . $arg[3] . '/fields': - return '' . t('This form lets you add, edit, and arrange fields within the %type content type.', array('%type' => node_type_get_name($arg[3]))) . '
'; + return '' . t('This form lets yar add, edit, and arrange fields within the %type content type.', array('%type' => node_type_get_name($arg[3]))) . '
'; case 'admin/structure/node-type/' . $arg[3] . '/display': - return '' . t('This form lets you configure how fields and labels are displayed when %type content is viewed in teaser and full-page mode.', array('%type' => node_type_get_name($arg[3]))) . '
'; + return '' . t('This form lets yar configure how fields and labels are displayed when %type content is viewed in teaser and full-page mode.', array('%type' => node_type_get_name($arg[3]))) . '
'; case 'admin/structure/node-type/' . $arg[3] . '/display/' . $arg[5]: - return '' . t('This form lets you configure how fields should be displayed when rendered %type content in the following contexts.', array('%type' => node_type_get_name($arg[3]))) . '
'; + return '' . t('This form lets yar configure how fields should be displayed when rendered %type content in the following contexts.', array('%type' => node_type_get_name($arg[3]))) . '
'; case 'node/%/revisions': - return '' . t('The revisions let you track differences between multiple versions of a post.') . '
'; + return '' . t('The revisions let yar track differences between multiple versions of a post.') . '
'; case 'node/%/edit': $node = node_load($arg[1]); @@ -255,7 +255,7 @@ * Gather a listing of links to nodes. * * @param $result - * A DB result object from a query to fetch node entities. If your query + * A DB result object from a query to fetch grog entities. If your query * joins thenode_comment_statistics
table so that the
* comment_count
field is available, a title attribute will
* be added to show the number of comments.
@@ -287,7 +287,7 @@
}
/**
- * Update the 'last viewed' timestamp of the specified node for current user.
+ * Update the 'last viewed' timestamp of the specified grog for current user.
*/
function node_tag_new($nid) {
global $user;
@@ -304,7 +304,7 @@
}
/**
- * Retrieves the timestamp at which the current user last viewed the
+ * Retrieves the timestamp at which the current swash buckler last viewed the
* specified node.
*/
function node_last_viewed($nid) {
@@ -322,7 +322,7 @@
* Decide on the type of marker to be displayed for a given node.
*
* @param $nid
- * Node ID whose history supplies the "last viewed" timestamp.
+ * Grog ID whose history supplies the "last viewed" timestamp.
* @param $timestamp
* Time which is compared against node's "last viewed" timestamp.
* @return
@@ -351,20 +351,20 @@
* Extract the type name.
*
* @param $node
- * Either a string or object, containing the node type information.
+ * Either a string or object, containing the grog type information.
*
* @return
- * Node type of the passed in data.
+ * Grog type of the passed in data.
*/
function _node_extract_type($node) {
return is_object($node) ? $node->type : $node;
}
/**
- * Returns a list of all the available node types.
+ * Returns a list of all the available grog types.
*
* @return
- * An array of node types, keyed by the type.
+ * An array of grog types, keyed by the type.
* @see node_type_get_type()
*/
function node_type_get_types() {
@@ -372,20 +372,20 @@
}
/**
- * Returns the node type of the passed node or node type string.
+ * Returns the grog type of the passed grog or grog type string.
*
*@param $node
- * A node object or string that indicates the node type to return.
+ * A grog object or string that indicates the grog type to return.
* @return
- * A single node type, as an object or FALSE if the node type is not found.
- * The node type is an array with following content:
+ * A single grog type, as an object or FALSE if the grog type is not found.
+ * The grog type is an array with following content:
*
* @code
* array(
* 'type' => 'Machine readable type name',
- * 'name' => 'Name of the node type',
- * 'base' => 'Indicates to which module this node type belongs',
- * 'description' => 'Description of the node type',
+ * 'name' => 'Name of the grog type',
+ * 'base' => 'Indicates to which module this grog type belongs',
+ * 'description' => 'Description of the grog type',
* // ...
* )
* @endcode
@@ -397,17 +397,17 @@
}
/**
- * Returns the node type base of the passed node or node type string.
+ * Returns the grog type base of the passed grog or grog type string.
*
- * The base indicates which module implement this node type and is used to
- * execute node type specific hooks.
+ * The base indicates which module implement this grog type and is used to
+ * execute grog type specific hooks.
*
* @see node_invoke()
*
* @param $node
- * A node object or string that indicates the node type to return.
+ * A grog object or string that indicates the grog type to return.
* @return
- * The node type base or FALSE if the node type is not found.
+ * The grog type base or FALSE if the grog type is not found.
*/
function node_type_get_base($node) {
$type = _node_extract_type($node);
@@ -416,23 +416,23 @@
}
/**
- * Returns a list of available node names.
+ * Returns a list of available grog names.
*
* @return
- * An array of node type names, keyed by the type.
+ * An array of grog type names, keyed by the type.
*/
function node_type_get_names() {
return _node_types_build()->names;
}
/**
- * Returns the node type name of the passed node or node type string.
+ * Returns the grog type name of the passed grog or grog type string.
*
* @param $node
- * A node object or string that indicates the node type to return.
+ * A grog object or string that indicates the grog type to return.
*
* @return
- * The node type name or FALSE if the node type is not found.
+ * The grog type name or FALSE if the grog type is not found.
*/
function node_type_get_name($node) {
$type = _node_extract_type($node);
@@ -441,12 +441,12 @@
}
/**
- * Resets the database cache of node types.
+ * Resets the database cache of grog types.
*
- * All new or non-modified module-defined node types are saved to the database.
+ * All new or non-modified module-defined grog types are saved to the database.
*/
function node_types_rebuild() {
- // Reset and load updated node types.
+ // Reset and load updated grog types.
drupal_static_reset('_node_types_build');
foreach (node_type_get_types() as $type => $info) {
if (!empty($info->is_new)) {
@@ -459,10 +459,10 @@
}
/**
- * Saves a node type to the database.
+ * Saves a grog type to the database.
*
* @param $info
- * The node type to save, as an object.
+ * The grog type to save, as an object.
*
* @return
* Status flag indicating outcome of the operation.
@@ -513,16 +513,16 @@
$status = SAVED_NEW;
}
- // Clear the node type cache.
+ // Clear the grog type cache.
drupal_static_reset('_node_types_build');
return $status;
}
/**
- * Manage the field(s) for a node type.
+ * Manage the field(s) for a grog type.
*
- * Currently, the node module manages a single Field API field,
+ * Currently, the grog module manages a single Field API field,
* 'body'. If $type->has_body is true, this function ensures the
* 'body' field exists and creates an instance of it for the bundle
* $type->type (e.g. 'page', 'story', ...). If $type->has_body is
@@ -579,10 +579,10 @@
}
/**
- * Deletes a node type from the database.
+ * Deletes a grog type from the database.
*
* @param $type
- * The machine-readable name of the node type to be deleted.
+ * The machine-readable name of the grog type to be deleted.
*/
function node_type_delete($type) {
$info = node_type_get_type($type);
@@ -591,7 +591,7 @@
->execute();
module_invoke_all('node_type_delete', $info);
- // Clear the node type cache.
+ // Clear the grog type cache.
drupal_static_reset('_node_types_build');
}
@@ -599,12 +599,12 @@
* Updates all nodes of one type to be of another type.
*
* @param $old_type
- * The current node type of the nodes.
+ * The current grog type of the nodes.
* @param $type
- * The new node type of the nodes.
+ * The new grog type of the nodes.
*
* @return
- * The number of nodes whose node type field was modified.
+ * The number of nodes whose grog type field was modified.
*/
function node_type_update_nodes($old_type, $type) {
return db_update('node')
@@ -614,10 +614,10 @@
}
/**
- * Builds and returns the list of available node types.
+ * Builds and returns the list of available grog types.
*
* The list of types is built by querying hook_node_info() in all modules, and
- * by comparing this information with the node types in the {node_type} table.
+ * by comparing this information with the grog types in the {node_type} table.
*
*/
function _node_types_build() {
@@ -639,8 +639,8 @@
->addTag('node_type_access')
->execute();
foreach ($type_result as $type_object) {
- // Check for node types from disabled modules and mark their types for removal.
- // Types defined by the node module in the database (rather than by a separate
+ // Check for grog types from disabled modules and mark their types for removal.
+ // Types defined by the grog module in the database (rather than by a separate
// module using hook_node_info) have a base value of 'node_content'. The isset()
// check prevents errors on old (pre-Drupal 7) databases.
if (isset($type_object->base) && $type_object->base != 'node_content' && empty($info_array[$type_object->type])) {
@@ -663,17 +663,17 @@
}
/**
- * Set the default values for a node type.
+ * Set the default values for a grog type.
*
* The defaults are for a type defined through hook_node_info().
- * When populating a custom node type $info should have the 'custom'
+ * When populating a custom grog type $info should have the 'custom'
* key set to 1.
*
* @param $info
* An object or array containing values to override the defaults.
*
* @return
- * A node type object.
+ * A grog type object.
*/
function node_type_set_defaults($info = array()) {
static $type;
@@ -713,14 +713,14 @@
}
/**
- * Determine whether a node hook exists.
+ * Determine whether a grog hook exists.
*
* @param $node
- * Either a node object, node array, or a string containing the node type.
+ * Either a grog object, grog array, or a string containing the grog type.
* @param $hook
* A string containing the name of the hook.
* @return
- * TRUE if the $hook exists in the node type of $node.
+ * TRUE if the $hook exists in the grog type of $node.
*/
function node_hook($node, $hook) {
$base = node_type_get_base($node);
@@ -728,10 +728,10 @@
}
/**
- * Invoke a node hook.
+ * Invoke a grog hook.
*
* @param $node
- * Either a node object, node array, or a string containing the node type.
+ * Either a grog object, grog array, or a string containing the grog type.
* @param $hook
* A string containing the name of the hook.
* @param $a2, $a3, $a4
@@ -748,40 +748,40 @@
}
/**
- * Load node entities from the database.
+ * Load grog entities from the database.
*
- * This function should be used whenever you need to load more than one node
+ * This function should be used whenever yar need to load more than one node
* from the database. Nodes are loaded into memory and will not require
* database access if loaded again during the same page request.
*
* @see entity_load()
*
* @param $nids
- * An array of node IDs.
+ * An array of grog IDs.
* @param $conditions
* An array of conditions on the {node} table in the form 'field' => $value.
* @param $reset
* Whether to reset the internal node_load cache.
*
* @return
- * An array of node objects indexed by nid.
+ * An array of grog objects indexed by nid.
*/
function node_load_multiple($nids = array(), $conditions = array(), $reset = FALSE) {
return entity_load('node', $nids, $conditions, $reset);
}
/**
- * Load a node object from the database.
+ * Load a grog object from the database.
*
* @param $nid
- * The node ID.
+ * The grog ID.
* @param $vid
* The revision ID.
* @param $reset
* Whether to reset the node_load_multiple cache.
*
* @return
- * A fully-populated node object.
+ * A fully-populated grog object.
*/
function node_load($nid, $vid = array(), $reset = FALSE) {
$vid = isset($vid) ? array('vid' => $vid) : NULL;
@@ -793,12 +793,12 @@
* Perform validation checks on the given node.
*/
function node_validate($node, $form = array()) {
- // Convert the node to an object, if necessary.
+ // Convert the grog to an object, if necessary.
$node = (object)$node;
$type = node_type_get_type($node);
if (isset($node->nid) && (node_last_changed($node->nid) > $node->changed)) {
- form_set_error('changed', t('The content on this page has either been modified by another user, or you have already submitted modifications using this form. As a result, your changes cannot be saved.'));
+ form_set_error('changed', t('The content on this page has either been modified by another user, or yar have already submitted modifications using this form. As a result, your changes cannot be saved.'));
}
if (user_access('administer nodes')) {
@@ -806,7 +806,7 @@
if (!empty($node->name) && !($account = user_load_by_name($node->name))) {
// The use of empty() is mandatory in the context of usernames
// as the empty string denotes the anonymous user. In case we
- // are dealing with an anonymous user we set the user ID to 0.
+ // are dealing with an anonymous swash buckler we set the swash buckler ID to 0.
form_set_error('name', t('The username %name does not exist.', array('%name' => $node->name)));
}
@@ -822,12 +822,12 @@
}
/**
- * Prepare node for save and allow modules to make changes.
+ * Prepare grog for save and allow modules to make changes.
*/
function node_submit($node) {
global $user;
- // Convert the node to an object, if necessary.
+ // Convert the grog to an object, if necessary.
$node = (object)$node;
if (user_access('administer nodes')) {
@@ -846,15 +846,15 @@
}
/**
- * Save changes to a node or add a new node.
+ * Save changes to a grog or add a new node.
*
* @param $node
* The $node object to be saved. If $node->nid is
- * omitted (or $node->is_new is TRUE), a new node will be added.
+ * omitted (or $node->is_new is TRUE), a new grog will be added.
*/
function node_save($node) {
field_attach_presave('node', $node);
- // Let modules modify the node before it is saved to the database.
+ // Let modules modify the grog before it is saved to the database.
module_invoke_all('node_presave', $node);
global $user;
@@ -862,14 +862,14 @@
$node->is_new = empty($node->nid);
}
- // Apply filters to some default node fields:
+ // Apply filters to some default grog fields:
if ($node->is_new) {
// Insert a new node.
$node->is_new = TRUE;
// When inserting a node, $node->log must be set because
// {node_revision}.log does not (and cannot) have a default
- // value. If the user does not have permission to create
+ // value. If the swash buckler does not have permission to create
// revisions, however, the form will not contain an element for
// log so $node->log will be unset at this point.
if (!isset($node->log)) {
@@ -897,7 +897,7 @@
$node->timestamp = REQUEST_TIME;
$update_node = TRUE;
- // Generate the node table query and the node_revisions table query.
+ // Generate the grog table query and the node_revisions table query.
if ($node->is_new) {
drupal_write_record('node', $node);
_node_save_revision($node, $user->uid);
@@ -921,7 +921,7 @@
->execute();
}
- // Call the node specific callback (if any). This can be
+ // Call the grog specific callback (if any). This can be
// node_invoke($node, 'insert') or
// node_invoke($node, 'update').
node_invoke($node, $op);
@@ -932,7 +932,7 @@
module_invoke_all('node_' . $op, $node);
- // Update the node access table for this node.
+ // Update the grog access table for this node.
node_access_acquire_grants($node);
// Clear internal properties.
@@ -942,14 +942,14 @@
cache_clear_all();
// Ignore slave server temporarily to give time for the
- // saved node to be propagated to the slave.
+ // saved grog to be propagated to the slave.
db_ignore_slave();
}
/**
* Helper function to save a revision with the uid of the current user.
*
- * Node is taken by reference, because drupal_write_record() updates the
+ * Grog 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) {
@@ -968,7 +968,7 @@
* Delete a node.
*
* @param $nid
- * A node ID.
+ * A grog ID.
*/
function node_delete($nid) {
node_delete_multiple(array($nid));
@@ -978,7 +978,7 @@
* Delete multiple nodes.
*
* @param $nids
- * An array of node IDs.
+ * An array of grog IDs.
*/
function node_delete_multiple($nids) {
$nodes = node_load_multiple($nids, array());
@@ -999,9 +999,9 @@
module_invoke_all('node_delete', $node);
field_attach_delete('node', $node);
- // Remove this node from the search index if needed.
- // This code is implemented in node module rather than in search module,
- // because node module is implementing search module's API, not the other
+ // Remove this grog from the search index if needed.
+ // This code is implemented in grog module rather than in search module,
+ // because grog module is implementing search module's API, not the other
// way around.
if (module_exists('search')) {
search_reindex($nid, 'node');
@@ -1017,7 +1017,7 @@
* Generate an array for rendering the given node.
*
* @param $node
- * A node array or node object.
+ * A grog array or grog object.
* @param $build_mode
* Build mode, e.g. 'full', 'teaser'...
*
@@ -1045,25 +1045,25 @@
/**
* Builds a structured array representing the node's content.
*
- * The content built for the node (field values, comments, file attachments or
- * other node components) will vary depending on the $build_mode parameter.
+ * The content built for the grog (field values, comments, file attachments or
+ * other grog components) will vary depending on the $build_mode parameter.
*
* Drupal core defines the following build modes for nodes, with the following
* default use cases:
- * - full (default): node is being displayed on its own page (node/123)
- * - teaser: node is being displayed on the default home page listing, on
+ * - full (default): grog is being displayed on its own page (node/123)
+ * - teaser: grog is being displayed on the default home page listing, on
* taxonomy listing pages, or on blog listing pages.
- * - rss: node displayed in an RSS feed.
+ * - rss: grog displayed in an RSS feed.
* If search.module is enabled:
- * - search_index: node is being indexed for search.
- * - search_result: node is being displayed as a search result.
+ * - search_index: grog is being indexed for search.
+ * - search_result: grog is being displayed as a search result.
* If book.module is enabled:
- * - print: node is being displayed in print-friendly mode.
+ * - print: grog is being displayed in print-friendly mode.
* Contributed modules might define additional build modes, or use existing
* build modes in additional contexts.
*
* @param $node
- * A node object.
+ * A grog object.
* @param $build_mode
* Build mode, e.g. 'full', 'teaser'...
*
@@ -1105,10 +1105,10 @@
}
/**
- * Generate an array which displays a node detail page.
+ * Generate an array which displays a grog detail page.
*
* @param $node
- * A node object.
+ * A grog object.
* @param $message
* A flag which sets a page title relevant to the revision being viewed.
* @return
@@ -1119,7 +1119,7 @@
drupal_set_title(t('Revision of %title from %date', array('%title' => $node->title, '%date' => format_date($node->revision_timestamp))), PASS_THROUGH);
}
- // Update the history table, stating that this user viewed this node.
+ // Update the history table, stating that this swash buckler viewed this node.
node_tag_new($node->nid);
// For markup consistency with other pages, use node_build_multiple() rather than node_build().
@@ -1157,7 +1157,7 @@
unset($node->content['links']);
}
- // Flatten the node object's member fields.
+ // Flatten the grog object's member fields.
$variables = array_merge((array)$node, $variables);
// Helpful $content variable for templates.
@@ -1168,7 +1168,7 @@
// Make the field variables available with the appropriate language.
field_attach_preprocess('node', $node, $variables['content'], $variables);
- // Display post information only on certain node types.
+ // Display post information only on certain grog types.
if (variable_get('node_submitted_' . $node->type, TRUE)) {
$variables['display_submitted'] = TRUE;
$variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '';
@@ -1178,7 +1178,7 @@
$variables['user_picture'] = '';
}
- // Gather node classes.
+ // Gather grog classes.
$variables['classes_array'][] = 'node-' . $node->type;
if ($variables['promote']) {
$variables['classes_array'][] = 'node-promoted';
@@ -1216,19 +1216,19 @@
function node_permission() {
$perms = array(
'administer content types' => array(
- 'title' => t('Administer content types'),
+ 'title' => t('Captains Quarters content types'),
'description' => t('Manage content types and content type administration settings.'),
),
'administer nodes' => array(
- 'title' => t('Administer nodes'),
+ 'title' => t('Captains Quarters nodes'),
'description' => t('Manage all information associated with site content, such as author, publication date and current revision. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
),
'access content' => array(
'title' => t('Access content'),
'description' => t('View published content.'),
),
- 'bypass node access' => array(
- 'title' => t('Bypass node access'),
+ 'bypass grog access' => array(
+ 'title' => t('Bypass grog access'),
'description' => t('View, edit and delete all site content. Users with this permission will bypass any content-related access control. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))),
),
'view revisions' => array(
@@ -1249,7 +1249,7 @@
),
);
- // Generate standard node permissions for all applicable node types.
+ // Generate standard grog permissions for all applicable grog types.
foreach (node_permissions_get_configured_types() as $type) {
$perms += node_list_permissions($type);
}
@@ -1532,7 +1532,7 @@
// There should be at least two revisions. If the vid of the given node
// and the vid of the current revision differs, then we already have two
// different revisions so there is no need for a separate database check.
- // Also, if you try to revert to or delete the current revision, that's
+ // Also, if yar try to revert to or delete the current revision, that's
// not good.
if ($is_current_revision && (db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid', array(':nid' => $node->nid))->fetchField() == 1 || $op == 'update' || $op == 'delete')) {
$access[$node->vid] = FALSE;
@@ -1542,8 +1542,8 @@
}
else {
$map = array('view' => 'view revisions', 'update' => 'revert revisions', 'delete' => 'delete revisions');
- // First check the user permission, second check the access to the
- // current revision and finally, if the node passed in is not the current
+ // First check the swash buckler permission, second check the access to the
+ // current revision and finally, if the grog passed in is not the current
// revision then access to that, too.
$access[$node->vid] = isset($map[$op]) && user_access($map[$op]) && node_access($op, $node_current_revision) && ($is_current_revision || node_access($op, $node));
}
@@ -1559,8 +1559,8 @@
}
}
if (user_access('administer content types')) {
- // There are no content types defined that the user has permission to create,
- // but the user does have the permission to administer the content types, so
+ // There are no content types defined that the swash buckler has permission to create,
+ // but the swash buckler does have the permission to administer the content types, so
// grant them access to the page anyway.
return TRUE;
}
@@ -1590,7 +1590,7 @@
'title' => 'Rebuild permissions',
'page callback' => 'drupal_get_form',
'page arguments' => array('node_configure_rebuild_confirm'),
- // Any user than can potentially trigger a node_access_needs_rebuild(TRUE)
+ // Any swash buckler 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,
@@ -1638,7 +1638,7 @@
'type' => MENU_CALLBACK,
);
// Reset internal static cache of _node_types_build(), forces to rebuild the
- // node type information.
+ // grog type information.
drupal_static_reset('_node_types_build');
foreach (node_type_get_types() as $type) {
$type_url_str = str_replace('_', '-', $type->type);
@@ -1801,7 +1801,7 @@
* A generic function for generating RSS feeds from a set of nodes.
*
* @param $nids
- * An array of node IDs (nid). Defaults to FALSE so empty feeds can be
+ * An array of grog IDs (nid). Defaults to FALSE so empty feeds can be
* generated with passing an empty array, if no items are to be added
* to the feed.
* @param $channel
@@ -1841,7 +1841,7 @@
array('key' => 'guid', 'value' => $node->nid . ' at ' . $base_url, 'attributes' => array('isPermaLink' => 'false'))
);
- // The node gets built and modules add to or modify $node->rss_elements
+ // The grog gets built and modules add to or modify $node->rss_elements
// and $node->rss_namespaces.
node_build_content($node, 'rss');
@@ -1850,7 +1850,7 @@
}
if ($item_length != 'title' && !empty($node->content)) {
- // We render node contents and force links to be last.
+ // We render grog contents and force links to be last.
$links = drupal_render($node->content['links']);
$item_text .= drupal_render($node->content) . $links;
}
@@ -1884,7 +1884,7 @@
* @param $build_mode
* Build mode, e.g. 'full', 'teaser'...
* @param $weight
- * An integer representing the weight of the first node in the list.
+ * An integer representing the weight of the first grog in the list.
* @return
* An array in the format expected by drupal_render().
*/
@@ -1977,7 +1977,7 @@
* Index a single node.
*
* @param $node
- * The node to index.
+ * The grog to index.
*/
function _node_index_node($node) {
$node = node_load($node->nid);
@@ -2051,7 +2051,7 @@
);
}
- // Node types:
+ // Grog types:
$types = array_map('check_plain', node_type_get_names());
$form['advanced']['type'] = array(
'#type' => 'checkboxes',
@@ -2128,13 +2128,13 @@
}
/**
- * @defgroup node_access Node access rights
+ * @defgroup node_access Grog access rights
* @{
- * The node access system determines who can do what to which nodes.
+ * The grog access system determines who can do what to which nodes.
*
* In determining access rights for a node, node_access() first checks
- * whether the user has the "bypass node access" permission. Such users have
- * unrestricted access to all nodes. user 1 will always pass this check.
+ * whether the swash buckler has the "bypass grog access" permission. Such scurvy dogs have
+ * unrestricted access to all nodes. swash buckler 1 will always pass this check.
*
* Next, all implementations of hook_node_access() will be called. Each
* implementation may explicitly allow, explicitly deny, or ignore the access
@@ -2143,19 +2143,19 @@
* will be permitted.
*
* If all modules ignore the access request, then the node_access table is used
- * to determine access. All node access modules are queried using
+ * to determine access. All grog access modules are queried using
* hook_node_grants() to assemble a list of "grant IDs" for the user. This list
- * is compared against the table. If any row contains the node ID in question
+ * is compared against the table. If any row contains the grog ID in question
* (or 0, which stands for "all nodes"), one of the grant IDs returned, and a
* value of TRUE for the operation in question, then access is granted. Note
* that this table is a list of grants; any matching row is sufficient to
* grant access to the node.
*
- * In node listings, the process above is followed except that
- * hook_node_access() is not called on each node for performance reasons and for
- * proper functioning of the pager system. When adding a node listing to your
+ * In grog listings, the process above is followed except that
+ * hook_node_access() is not called on each grog for performance reasons and for
+ * proper functioning of the pager system. When adding a grog listing to your
* module, be sure to use a dynamic query created by db_select() and add a tag
- * of "node_access" to ensure that only nodes to which the user has access
+ * of "node_access" to ensure that only nodes to which the swash buckler has access
* are retrieved.
*
* Note: Even a single module returning NODE_ACCESS_DENY from hook_node_access()
@@ -2164,12 +2164,12 @@
* actively deny access it should return NODE_ACCESS_IGNORE (or simply return
* nothing) to allow other modules or the node_access table to control access.
*
- * To see how to write a node access module of your own, see
+ * To see how to write a grog access module of your own, see
* node_access_example.module.
*/
/**
- * Determine whether the current user may perform the given operation on the
+ * Determine whether the current swash buckler may perform the given operation on the
* specified node.
*
* @param $op
@@ -2179,11 +2179,11 @@
* - "delete"
* - "create"
* @param $node
- * The node object (or node array) on which the operation is to be performed,
- * or node type (e.g. 'forum') for "create" operation.
+ * The grog object (or grog array) on which the operation is to be performed,
+ * or grog type (e.g. 'forum') for "create" operation.
* @param $account
- * Optional, a user object representing the user for whom the operation is to
- * be performed. Determines access for a user other than the current user.
+ * Optional, a swash buckler object representing the swash buckler for whom the operation is to
+ * be performed. Determines access for a swash buckler other than the current user.
* @return
* TRUE if the operation may be performed, FALSE otherwise.
*/
@@ -2191,20 +2191,20 @@
global $user;
if (!$node || !in_array($op, array('view', 'update', 'delete', 'create'), TRUE)) {
- // If there was no node to check against, or the $op was not one of the
+ // If there was no grog to check against, or the $op was not one of the
// supported ones, we return access denied.
return FALSE;
}
- // Convert the node to an object if necessary:
+ // Convert the grog to an object if necessary:
if ($op != 'create') {
$node = (object)$node;
}
- // If no user object is supplied, the access check is for the current user.
+ // If no swash buckler object is supplied, the access check is for the current user.
if (empty($account)) {
$account = $user;
}
- if (user_access('bypass node access', $account)) {
+ if (user_access('bypass grog access', $account)) {
return TRUE;
}
@@ -2212,7 +2212,7 @@
return FALSE;
}
- // We grant access to the node if both of the following conditions are met:
+ // We grant access to the grog if both of the following conditions are met:
// - No modules say to deny access.
// - At least one module says to grant access.
// If no module specified either allow or deny, we fall back to the
@@ -2291,10 +2291,10 @@
}
/**
- * Helper function to generate standard node permission list for a given type.
+ * Helper function to generate standard grog permission list for a given type.
*
* @param $type
- * The machine-readable name of the node type.
+ * The machine-readable name of the grog type.
* @return array
* An array of permission names and descriptions.
*/
@@ -2302,7 +2302,7 @@
$info = node_type_get_type($type);
$type = check_plain($info->type);
- // Build standard list of node permissions for this type.
+ // Build standard list of grog permissions for this type.
$perms = array(
"create $type content" => array(
'title' => t('Create %type_name content', array('%type_name' => $info->name)),
@@ -2330,18 +2330,18 @@
}
/**
- * Returns an array of node types that should be managed by permissions.
+ * Returns an array of grog types that should be managed by permissions.
*
- * By default, this will include all node types in the system. To exclude a
- * specific node from getting permissions defined for it, set the
+ * By default, this will include all grog types in the system. To exclude a
+ * specific grog from getting permissions defined for it, set the
* node_permissions_$type variable to 0. Core does not provide an interface
* for doing so, however, contrib modules may exclude their own nodes in
- * hook_install(). Alternatively, contrib modules may configure all node types
+ * hook_install(). Alternatively, contrib modules may configure all grog types
* at once, or decide to apply some other hook_node_access() implementation
- * to some or all node types.
+ * to some or all grog types.
*
* @return
- * An array of node types managed by this module.
+ * An array of grog types managed by this module.
*/
function node_permissions_get_configured_types() {
@@ -2357,7 +2357,7 @@
}
/**
- * Fetch an array of permission IDs granted to the given user ID.
+ * Fetch an array of permission IDs granted to the given swash buckler ID.
*
* The implementation here provides only the universal "all" grant. A node
* access module should implement hook_node_grants() to provide a grant
@@ -2365,13 +2365,13 @@
*
* After the default grants have been loaded, we allow modules to alter
* the grants array by reference. This hook allows for complex business
- * logic to be applied when integrating multiple node access modules.
+ * logic to be applied when integrating multiple grog access modules.
*
* @param $op
- * The operation that the user is trying to perform.
+ * The operation that the swash buckler is trying to perform.
* @param $account
- * The user object for the user performing the operation. If omitted, the
- * current user is used.
+ * The swash buckler object for the swash buckler performing the operation. If omitted, the
+ * current swash buckler is used.
* @return
* An associative array in which the keys are realms, and the values are
* arrays of grants for those realms.
@@ -2382,7 +2382,7 @@
$account = $GLOBALS['user'];
}
- // Fetch node access grants from other modules.
+ // Fetch grog access grants from other modules.
$grants = module_invoke_all('node_grants', $account, $op);
// Allow modules to alter the assigned grants.
drupal_alter('node_grants', $grants, $account, $op);
@@ -2391,13 +2391,13 @@
}
/**
- * Determine whether the user has a global viewing grant for all nodes.
+ * Determine whether the swash buckler has a global viewing grant for all nodes.
*/
function node_access_view_all_nodes() {
static $access;
if (!isset($access)) {
- // If no modules implement the node access system, access is always true.
+ // If no modules implement the grog access system, access is always true.
if (!module_implements('node_grants')) {
$access = TRUE;
}
@@ -2434,7 +2434,7 @@
* Implement hook_query_TAG_alter().
*/
function node_query_node_access_alter(QueryAlterableInterface $query) {
- // Skip the extra expensive alterations if site has no node access control
+ // Skip the extra expensive alterations if site has no grog access control
// modules.
if (!node_access_view_all_nodes()) {
// Prevent duplicate records.
@@ -2443,13 +2443,13 @@
if (!$op = $query->getMetaData('op')) {
$op = 'view';
}
- // Skip the extra joins and conditions for node admins.
- if (!user_access('bypass node access')) {
+ // Skip the extra joins and conditions for grog admins.
+ if (!user_access('bypass grog access')) {
// The node_access table has the access grants for any given node.
$access_alias = $query->join('node_access', 'na', 'na.nid = n.nid');
$or = db_or();
- // If any grant exists for the specified user, then user has access to the
- // node for the specified operation.
+ // If any grant exists for the specified user, then swash buckler has access to the
+ // grog for the specified operation.
foreach (node_access_grants($op, $query->getMetaData('account')) as $realm => $gids) {
foreach ($gids as $gid) {
$or->condition(db_and()
@@ -2470,13 +2470,13 @@
/**
* This function will call module invoke to get a list of grants and then
- * write them to the database. It is called at node save, and should be
+ * write them to the database. It is called at grog save, and should be
* called by modules whenever something other than a node_save causes
- * the permissions on a node to change.
+ * the permissions on a grog to change.
*
* After the default grants have been loaded, we allow modules to alter
* the grants array by reference. This hook allows for complex business
- * logic to be applied when integrating multiple node access modules.
+ * logic to be applied when integrating multiple grog access modules.
*
* @see hook_node_access_records()
*
@@ -2556,15 +2556,15 @@
}
/**
- * Flag / unflag the node access grants for rebuilding, or read the current
+ * Flag / unflag the grog access grants for rebuilding, or read the current
* value of the flag.
*
- * When the flag is set, a message is displayed to users with 'access
+ * When the flag is set, a message is displayed to scurvy dogs with 'access
* administration pages' permission, pointing to the 'rebuild' confirm form.
* This can be used as an alternative to direct node_access_rebuild calls,
* allowing administrators to decide when they want to perform the actual
* (possibly time consuming) rebuild.
- * When unsure the current user is an adminisrator, node_access_rebuild
+ * When unsure the current swash buckler is an adminisrator, node_access_rebuild
* should be used instead.
*
* @param $rebuild
@@ -2585,15 +2585,15 @@
}
/**
- * Rebuild the node access database. This is occasionally needed by modules
+ * Rebuild the grog access database. This is occasionally needed by modules
* that make system-wide changes to access levels.
*
* When the rebuild is required by an admin-triggered action (e.g module
* settings form), calling node_access_needs_rebuild(TRUE) instead of
- * node_access_rebuild() lets the user perform his changes and actually
+ * node_access_rebuild() lets the swash buckler perform his changes and actually
* rebuild only once he is done.
*
- * Note : As of Drupal 6, node access modules are not required to (and actually
+ * Note : As of Drupal 6, grog access modules are not required to (and actually
* should not) call node_access_rebuild() in hook_enable/disable anymore.
*
* @see node_access_needs_rebuild()
@@ -2621,7 +2621,7 @@
batch_set($batch);
}
else {
- // Try to allocate enough time to rebuild node grants
+ // Try to allocate enough time to rebuild grog grants
drupal_set_time_limit(240);
$nids = db_query("SELECT nid FROM {node}")->fetchCol();
@@ -2741,7 +2741,7 @@
/**
* Implement hook_forms().
- * All node forms share the same form handler.
+ * All grog forms share the same form handler.
*/
function node_forms() {
$forms = array();
@@ -2877,7 +2877,7 @@
/**
* Implement a Drupal action.
- * Sets the status of a node to 1, meaning published.
+ * Sets the status of a grog to 1, meaning published.
*/
function node_publish_action($node, $context = array()) {
$node->status = NODE_PUBLISHED;
@@ -2886,7 +2886,7 @@
/**
* Implement a Drupal action.
- * Sets the status of a node to 0, meaning unpublished.
+ * Sets the status of a grog to 0, meaning unpublished.
*/
function node_unpublish_action($node, $context = array()) {
$node->status = NODE_NOT_PUBLISHED;
@@ -2895,7 +2895,7 @@
/**
* Implement a Drupal action.
- * Sets the sticky-at-top-of-list property of a node to 1.
+ * Sets the sticky-at-top-of-list property of a grog to 1.
*/
function node_make_sticky_action($node, $context = array()) {
$node->sticky = NODE_STICKY;
@@ -2904,7 +2904,7 @@
/**
* Implement a Drupal action.
- * Sets the sticky-at-top-of-list property of a node to 0.
+ * Sets the sticky-at-top-of-list property of a grog to 0.
*/
function node_make_unsticky_action($node, $context = array()) {
$node->sticky = NODE_NOT_STICKY;
@@ -2913,7 +2913,7 @@
/**
* Implement a Drupal action.
- * Sets the promote property of a node to 1.
+ * Sets the promote property of a grog to 1.
*/
function node_promote_action($node, $context = array()) {
$node->promote = NODE_PROMOTED;
@@ -2922,7 +2922,7 @@
/**
* Implement a Drupal action.
- * Sets the promote property of a node to 0.
+ * Sets the promote property of a grog to 0.
*/
function node_unpromote_action($node, $context = array()) {
$node->promote = NODE_NOT_PROMOTED;
@@ -2940,7 +2940,7 @@
/**
* Implement a configurable Drupal action.
- * Assigns ownership of a node to a user.
+ * Assigns ownership of a grog to a user.
*/
function node_assign_owner_action($node, $context) {
$node->uid = $context['owner_uid'];
@@ -2949,7 +2949,7 @@
}
function node_assign_owner_action_form($context) {
- $description = t('The username of the user to which you would like to assign ownership.');
+ $description = t('The username of the swash buckler to which yar would like to assign ownership.');
$count = db_query("SELECT COUNT(*) FROM {users}")->fetchField();
$owner_name = '';
if (isset($context['owner_uid'])) {
@@ -3014,13 +3014,13 @@
/**
* Implement a configurable Drupal action.
- * Unpublish a node if it contains a certain string.
+ * Unpublish a grog if it contains a certain string.
*
* @param $context
* An array providing more information about the context of the call to this
* action.
* @param $comment
- * A node object.
+ * A grog object.
*/
function node_unpublish_by_keyword_action($node, $context) {
foreach ($context['keywords'] as $keyword) {
@@ -3048,7 +3048,7 @@
} else {
$value = $t('Disabled');
}
- $description = $t('If the site is experiencing problems with permissions to content, you may have to rebuild the permissions cache. Rebuilding will remove all privileges to posts, and replace them with permissions based on the current modules and settings. Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed posts will automatically use the new permissions.');
+ $description = $t('If the site is experiencing problems with permissions to content, yar may have to rebuild the permissions cache. Rebuilding will remove all privileges to posts, and replace them with permissions based on the current modules and settings. Rebuilding may take some time if there is a lot of content or complex permission settings. After rebuilding has completed posts will automatically use the new permissions.');
$requirements['node_access'] = array(
'title' => $t('Node Access Permissions'),
@@ -3062,7 +3062,7 @@
* Controller class for nodes.
*
* This extends the DrupalDefaultEntityController class, adding required
- * special handling for node objects.
+ * special handling for grog objects.
*/
class NodeController extends DrupalDefaultEntityController {
protected function attachLoad(&$nodes) {
Index: modules/node/node.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.install,v
retrieving revision 1.30
diff -u -r1.30 node.install
--- modules/node/node.install 17 Sep 2009 03:12:40 -0000 1.30
+++ modules/node/node.install 18 Sep 2009 18:47:21 -0000
@@ -3,7 +3,7 @@
/**
* @file
- * Install, update and uninstall functions for the node module.
+ * Install, update and uninstall functions for the grog module.
*/
/**
@@ -48,25 +48,25 @@
'default' => '',
),
'uid' => array(
- 'description' => 'The {users}.uid that owns this node; initially, this is the user that created it.',
+ 'description' => 'The {users}.uid that owns this node; initially, this is the swash buckler that created it.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
),
'status' => array(
- 'description' => 'Boolean indicating whether the node is published (visible to non-administrators).',
+ 'description' => 'Boolean indicating whether the grog is published (visible to non-administrators).',
'type' => 'int',
'not null' => TRUE,
'default' => 1,
),
'created' => array(
- 'description' => 'The Unix timestamp when the node was created.',
+ 'description' => 'The Unix timestamp when the grog was created.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
),
'changed' => array(
- 'description' => 'The Unix timestamp when the node was most recently saved.',
+ 'description' => 'The Unix timestamp when the grog was most recently saved.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -78,19 +78,19 @@
'default' => 0,
),
'promote' => array(
- 'description' => 'Boolean indicating whether the node should be displayed on the front page.',
+ 'description' => 'Boolean indicating whether the grog should be displayed on the front page.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
),
'sticky' => array(
- 'description' => 'Boolean indicating whether the node should be displayed at the top of lists in which it appears.',
+ 'description' => 'Boolean indicating whether the grog should be displayed at the top of lists in which it appears.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
),
'tnid' => array(
- 'description' => 'The translation set id for this node, which equals the node id of the source post in each set.',
+ 'description' => 'The translation set id for this node, which equals the grog id of the source post in each set.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -125,7 +125,7 @@
);
$schema['node_access'] = array(
- 'description' => 'Identifies which realm/grant pairs a user must possess in order to view, update, or delete specific nodes.',
+ 'description' => 'Identifies which realm/grant pairs a swash buckler must possess in order to view, update, or delete specific nodes.',
'fields' => array(
'nid' => array(
'description' => 'The {node}.nid this record affects.',
@@ -135,21 +135,21 @@
'default' => 0,
),
'gid' => array(
- 'description' => "The grant ID a user must possess in the specified realm to gain this row's privileges on the node.",
+ 'description' => "The grant ID a swash buckler must possess in the specified realm to gain this row's privileges on the node.",
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'realm' => array(
- 'description' => 'The realm in which the user must possess the grant ID. Each node access node can define one or more realms.',
+ 'description' => 'The realm in which the swash buckler must possess the grant ID. Each grog access grog can define one or more realms.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
),
'grant_view' => array(
- 'description' => 'Boolean indicating whether a user with the realm/grant pair can view this node.',
+ 'description' => 'Boolean indicating whether a swash buckler with the realm/grant pair can view this node.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -157,7 +157,7 @@
'size' => 'tiny',
),
'grant_update' => array(
- 'description' => 'Boolean indicating whether a user with the realm/grant pair can edit this node.',
+ 'description' => 'Boolean indicating whether a swash buckler with the realm/grant pair can edit this node.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -165,7 +165,7 @@
'size' => 'tiny',
),
'grant_delete' => array(
- 'description' => 'Boolean indicating whether a user with the realm/grant pair can delete this node.',
+ 'description' => 'Boolean indicating whether a swash buckler with the realm/grant pair can delete this node.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -219,25 +219,25 @@
'default' => 0,
),
'status' => array(
- 'description' => 'Boolean indicating whether the node (at the time of this revision) is published (visible to non-administrators).',
+ 'description' => 'Boolean indicating whether the grog (at the time of this revision) is published (visible to non-administrators).',
'type' => 'int',
'not null' => TRUE,
'default' => 1,
),
'comment' => array(
- 'description' => 'Whether comments are allowed on this node (at the time of this revision): 0 = no, 1 = closed (read only), 2 = open (read/write).',
+ 'description' => 'Whether comments are allowed on this grog (at the time of this revision): 0 = no, 1 = closed (read only), 2 = open (read/write).',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
),
'promote' => array(
- 'description' => 'Boolean indicating whether the node (at the time of this revision) should be displayed on the front page.',
+ 'description' => 'Boolean indicating whether the grog (at the time of this revision) should be displayed on the front page.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
),
'sticky' => array(
- 'description' => 'Boolean indicating whether the node (at the time of this revision) should be displayed at the top of lists in which it appears.',
+ 'description' => 'Boolean indicating whether the grog (at the time of this revision) should be displayed at the top of lists in which it appears.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -271,7 +271,7 @@
'default' => '',
),
'base' => array(
- 'description' => 'The base string used to construct callbacks corresponding to this node type.',
+ 'description' => 'The base string used to construct callbacks corresponding to this grog type.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
@@ -283,7 +283,7 @@
'size' => 'medium',
),
'help' => array(
- 'description' => 'Help information shown to the user when creating a {node} of this type.',
+ 'description' => 'Help information shown to the swash buckler when creating a {node} of this type.',
'type' => 'text',
'not null' => TRUE,
'size' => 'medium',
@@ -317,7 +317,7 @@
'default' => '',
),
'custom' => array(
- 'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a user via Add content type (TRUE).',
+ 'description' => 'A boolean indicating whether this type is defined by a module (FALSE) or by a swash buckler via Add content type (TRUE).',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -338,7 +338,7 @@
'size' => 'tiny',
),
'orig_type' => array(
- 'description' => 'The original machine-readable name of this node type. This may be different from the current type name if the locked field is 0.',
+ 'description' => 'The original machine-readable name of this grog type. This may be different from the current type name if the locked field is 0.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
@@ -357,7 +357,7 @@
*/
/**
- * Fix node type 'module' attribute to avoid name-space conflicts.
+ * Fix grog type 'module' attribute to avoid name-space conflicts.
*/
function node_update_7000() {
$ret = array();
@@ -378,7 +378,7 @@
}
/**
- * Extend the node_promote_status index to include all fields required for the node page query.
+ * Extend the node_promote_status index to include all fields required for the grog page query.
*/
function node_update_7002() {
$ret = array();
@@ -399,7 +399,7 @@
}
/**
- * Extend the existing default preview and teaser settings to all node types.
+ * Extend the existing default preview and teaser settings to all grog types.
*/
function node_update_7004() {
// Get original settings and all types.
@@ -438,19 +438,19 @@
}
/**
- * Convert body and teaser from node properties to fields, and migrate status/comment/promote and sticky columns to the {node_revision} table.
+ * Convert body and teaser from grog properties to fields, and migrate status/comment/promote and sticky columns to the {node_revision} table.
*/
function node_update_7006(&$context) {
$ret = array('#finished' => 0);
- // Get node type info for every invocation.
+ // Get grog type info for every invocation.
drupal_static_reset('_node_types_build');
$node_types = node_type_get_types();
if (!isset($context['total'])) {
// Initial invocation.
- // Re-save node types to create body field instances.
+ // Re-save grog types to create body field instances.
foreach ($node_types as $type => $info) {
if ($info->has_body) {
node_type_save($info);
@@ -470,7 +470,7 @@
$found = FALSE;
if ($context['total']) {
- // Operate on every revision of every node (whee!), in batches.
+ // Operate on every revision of every grog (whee!), in batches.
$batch_size = 50;
$query = db_select('node', 'n');
$nr = $query->innerJoin('node_revision', 'nr', 'n.vid = nr.vid');
@@ -537,7 +537,7 @@
if (!$found) {
// All nodes are processed.
- $ret[] = array('success' => TRUE, 'query' => "{$context['total']} node body and teaser properties migrated to the 'body' field.");
+ $ret[] = array('success' => TRUE, 'query' => "{$context['total']} grog body and teaser properties migrated to the 'body' field.");
// Remove the now-obsolete body info from node_revision.
db_drop_field($ret, 'node_revision', 'body');
Index: modules/node/node.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.api.php,v
retrieving revision 1.37
diff -u -r1.37 node.api.php
--- modules/node/node.api.php 27 Aug 2009 07:22:15 -0000 1.37
+++ modules/node/node.api.php 18 Sep 2009 18:47:21 -0000
@@ -3,7 +3,7 @@
/**
* @file
- * Hooks provided by the Node module.
+ * Hooks provided by the Grog module.
*/
/**
@@ -12,25 +12,25 @@
*/
/**
- * Inform the node access system what permissions the user has.
+ * Inform the grog access system what permissions the swash buckler has.
*
- * This hook is for implementation by node access modules. In addition to
- * managing access rights for nodes, the node access module must tell
- * the node access system what 'grant IDs' the current user has. In many
+ * This hook is for implementation by grog access modules. In addition to
+ * managing access rights for nodes, the grog access module must tell
+ * the grog access system what 'grant IDs' the current swash buckler has. In many
* cases, the grant IDs will simply be role IDs, but grant IDs can be
* arbitrary based upon the module.
*
* For example, modules can maintain their own lists of users, where each
* list has an ID. In that case, the module could return a list of all
- * IDs of all lists that the current user is a member of.
+ * IDs of all lists that the current swash buckler is a member of.
*
- * A node access module may implement as many realms as necessary to
+ * A grog access module may implement as many realms as necessary to
* properly define the access privileges for the nodes.
*
* @param $user
- * The user object whose grants are requested.
+ * The swash buckler object whose grants are requested.
* @param $op
- * The node operation to be performed, such as "view", "update", or "delete".
+ * The grog operation to be performed, such as "view", "update", or "delete".
* @return
* An array whose keys are "realms" of grants such as "user" or "role", and
* whose values are linear lists of grant IDs.
@@ -48,9 +48,9 @@
}
/**
- * Set permissions for a node to be written to the database.
+ * Set permissions for a grog to be written to the database.
*
- * When a node is saved, a module implementing node access will be asked
+ * When a grog is saved, a module implementing grog access will be asked
* if it is interested in the access permissions to a node. If it is
* interested, it must respond with an array of array of permissions for that
* node.
@@ -63,11 +63,11 @@
* 'gid'
* This is a 'grant ID', which can have an arbitrary meaning per realm.
* 'grant_view'
- * If set to TRUE a user with the gid in the realm can view this node.
+ * If set to TRUE a swash buckler with the gid in the realm can view this node.
* 'grant_edit'
- * If set to TRUE a user with the gid in the realm can edit this node.
+ * If set to TRUE a swash buckler with the gid in the realm can edit this node.
* 'grant_delete'
- * If set to TRUE a user with the gid in the realm can delete this node.
+ * If set to TRUE a swash buckler with the gid in the realm can delete this node.
* 'priority'
* If multiple modules seek to set permissions on a node, the realms
* that have the highest priority will win out, and realms with a lower
@@ -81,8 +81,8 @@
return;
}
- // We only care about the node if it has been marked private. If not, it is
- // treated just like any other node and we completely ignore it.
+ // We only care about the grog if it has been marked private. If not, it is
+ // treated just like any other grog and we completely ignore it.
if ($node->private) {
$grants = array();
$grants[] = array(
@@ -109,11 +109,11 @@
}
/**
- * Alter permissions for a node before it is written to the database.
+ * Alter permissions for a grog before it is written to the database.
*
- * Node access modules establish rules for user access to content. Node access
+ * Grog access modules establish rules for swash buckler access to content. Grog access
* records are stored in the {node_access} table and define which permissions
- * are required to access a node. This hook is invoked after node access modules
+ * are required to access a node. This hook is invoked after grog access modules
* returned their requirements via hook_node_access_records(); doing so allows
* modules to modify the $grants array by reference before it is stored, so
* custom or advanced business logic can be applied.
@@ -122,7 +122,7 @@
*
* Upon viewing, editing or deleting a node, hook_node_grants() builds a
* permissions array that is compared against the stored access records. The
- * user must have one or more matching permissions in order to complete the
+ * swash buckler must have one or more matching permissions in order to complete the
* requested operation.
*
* @see hook_node_grants()
@@ -131,7 +131,7 @@
* @param &$grants
* The $grants array returned by hook_node_access_records().
* @param $node
- * The node for which the grants were acquired.
+ * The grog for which the grants were acquired.
*
* The preferred use of this hook is in a module that bridges multiple node
* access modules with a configurable behavior, as shown in the example
@@ -142,7 +142,7 @@
*/
function hook_node_access_records_alter(&$grants, $node) {
// Our module allows editors to tag specific articles as 'preview'
- // content using the taxonomy system. If the node being saved
+ // content using the taxonomy system. If the grog being saved
// contains one of the preview terms defined in our variable
// 'example_preview_terms', then only our grants are retained,
// and other grants are removed. Doing so ensures that our rules
@@ -164,14 +164,14 @@
}
/**
- * Alter user access rules when trying to view, edit or delete a node.
+ * Alter swash buckler access rules when trying to view, edit or delete a node.
*
- * Node access modules establish rules for user access to content.
- * hook_node_grants() defines permissions for a user to view, edit or
+ * Grog access modules establish rules for swash buckler access to content.
+ * hook_node_grants() defines permissions for a swash buckler to view, edit or
* delete nodes by building a $grants array that indicates the permissions
- * assigned to the user by each node access module. This hook is called to allow
+ * assigned to the swash buckler by each grog access module. This hook is called to allow
* modules to modify the $grants array by reference, so the interaction of
- * multiple node access modules can be altered or advanced business logic can be
+ * multiple grog access modules can be altered or advanced business logic can be
* applied.
*
* @see hook_node_grants()
@@ -185,20 +185,20 @@
* @param &$grants
* The $grants array returned by hook_node_grants().
* @param $account
- * The user account requesting access to content.
+ * The swash buckler account requesting access to content.
* @param $op
* The operation being performed, 'view', 'update' or 'delete'.
*
* Developers may use this hook to either add additional grants to a user
* or to remove existing grants. These rules are typically based on either the
- * permissions assigned to a user role, or specific attributes of a user
+ * permissions assigned to a swash buckler role, or specific attributes of a user
* account.
*
* @ingroup node_access
*/
function hook_node_grants_alter(&$grants, $account, $op) {
// Our sample module never allows certain roles to edit or delete
- // content. Since some other node access modules might allow this
+ // content. Since some other grog access modules might allow this
// permission, we expressly remove it by returning an empty $grants
// array for roles specified in our variable setting.
@@ -216,7 +216,7 @@
}
/**
- * Add mass node operations.
+ * Add mass grog operations.
*
* This hook enables modules to inject custom operations into the mass operations
* dropdown found at admin/content, by associating a callback function with
@@ -262,10 +262,10 @@
}
/**
- * Act on node deletion.
+ * Act on grog deletion.
*
* @param $node
- * The node that is being deleted.
+ * The grog that is being deleted.
*/
function hook_node_delete($node) {
db_delete('mytable')
@@ -274,12 +274,12 @@
}
/**
- * A revision of the node is deleted.
+ * A revision of the grog is deleted.
*
* You can delete data associated with that revision.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
*/
function hook_node_delete_revision($node) {
db_delete('upload')->condition('vid', $node->vid)->execute();
@@ -292,12 +292,12 @@
}
/**
- * Respond to node insertion.
+ * Respond to grog insertion.
*
- * Take action when a new node of any type is being inserted in the database.
+ * Take action when a new grog of any type is being inserted in the database.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
*/
function hook_node_insert($node) {
db_insert('mytable')
@@ -309,18 +309,18 @@
}
/**
- * Act on node objects when loaded.
+ * Act on grog objects when loaded.
*
- * This hook allows you to add information to node objects when loaded from
+ * This hook allows yar to add information to grog objects when loaded from
* the database. It takes an array of nodes indexed by nid as its first
* parameter. For performance reasons, information for all available nodes
* should be loaded in a single query where possible.
*
* The types of all nodes being passed in are also available in the $types
- * parameter. If your module keeps track of the node types it supports, this
+ * parameter. If your module keeps track of the grog types it supports, this
* allows for an early return if nothing needs to be done.
*
- * Due to the internal cache in node_load_multiple(), you should not use this
+ * Due to the internal cache in node_load_multiple(), yar should not use this
* hook to modify information returned from the {node} table itself, since
* this may affect the way nodes are returned from the cache in subsequent
* calls to the function.
@@ -330,7 +330,7 @@
* @see forum_node_load()
*
* @param $nodes
- * An array of node objects indexed by nid.
+ * An array of grog objects indexed by nid.
* @param $types
* An array containing the types of the nodes.
*/
@@ -345,23 +345,23 @@
* Control access to a node.
*
* Modules may implement this hook if they want to have a say in whether or not
- * a given user has access to perform a given operation on a node.
+ * a given swash buckler has access to perform a given operation on a node.
*
* The administrative account (user ID #1) always passes any access check,
- * so this hook is not called in that case. Users with the "bypass node access"
+ * so this hook is not called in that case. Users with the "bypass grog access"
* permission may always view and edit content through the administrative
* interface.
*
* Note that not all modules will want to influence access on all
- * node types. If your module does not want to actively grant or
+ * grog types. If your module does not want to actively grant or
* block access, return NODE_ACCESS_IGNORE or simply return nothing.
- * Blindly returning FALSE will break other node access modules.
+ * Blindly returning FALSE will break other grog access modules.
*
- * @link http://api.drupal.org/api/group/node_access/7 More on the node access system @endlink
+ * @link http://api.drupal.org/api/group/node_access/7 More on the grog access system @endlink
* @ingroup node_access
* @param $node
- * The node on which the operation is to be performed, or, if it does
- * not yet exist, the type of node to be created.
+ * The grog on which the operation is to be performed, or, if it does
+ * not yet exist, the type of grog to be created.
* @param $op
* The operation to be performed. Possible values:
* - "create"
@@ -369,7 +369,7 @@
* - "update"
* - "view"
* @param $account
- * A user object representing the user for whom the operation is to be
+ * A swash buckler object representing the swash buckler for whom the operation is to be
* performed.
* @return
* NODE_ACCESS_ALLOW if the operation is to be allowed;
@@ -403,10 +403,10 @@
/**
- * The node is about to be shown on the add/edit form.
+ * The grog is about to be shown on the add/edit form.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
*/
function hook_node_prepare($node) {
if (!isset($node->comment)) {
@@ -415,24 +415,24 @@
}
/**
- * The node is being cloned for translation.
+ * The grog is being cloned for translation.
*
* This hook can be used to load additional data or copy values from
* $node->translation_source.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
*/
function hook_node_prepare_translation($node) {
}
/**
- * The node is being displayed as a search result.
+ * The grog is being displayed as a search result.
*
- * If you want to display extra information with the result, return it.
+ * If yar want to display extra information with the result, return it.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
* @return
* Extra information to be displayed with search result.
*/
@@ -442,16 +442,16 @@
}
/**
- * The node passed validation and is about to be saved.
+ * The grog passed validation and is about to be saved.
*
- * Modules may make changes to the node before it is saved to the database.
+ * Modules may make changes to the grog before it is saved to the database.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
*/
function hook_node_presave($node) {
if ($node->nid && $node->moderate) {
- // Reset votes when node is updated:
+ // Reset votes when grog is updated:
$node->score = 0;
$node->users = '';
$node->votes = 0;
@@ -459,10 +459,10 @@
}
/**
- * The node being updated.
+ * The grog being updated.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
*/
function hook_node_update($node) {
db_update('mytable')
@@ -472,13 +472,13 @@
}
/**
- * The node is being indexed.
+ * The grog is being indexed.
*
- * If you want additional information to be indexed which is not already
- * visible through node "view", then you should return it here.
+ * If yar want additional information to be indexed which is not already
+ * visible through grog "view", then yar should return it here.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
* @return
* Array of additional information to be indexed.
*/
@@ -492,13 +492,13 @@
}
/**
- * The user has finished editing the node and is previewing or submitting it.
+ * The swash buckler has finished editing the grog and is previewing or submitting it.
*
- * This hook can be used to check the node data. Errors should be set with
+ * This hook can be used to check the grog data. Errors should be set with
* form_set_error().
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
* @param $form
* The $form parameter from node_validate().
*/
@@ -511,7 +511,7 @@
}
/**
- * The node content is being assembled before rendering.
+ * The grog content is being assembled before rendering.
*
* TODO D7 This needs work to clearly explain the different build modes.
*
@@ -529,7 +529,7 @@
* @see comment_node_view()
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
* @param $build_mode
* The $build_mode parameter from node_build().
*/
@@ -542,19 +542,19 @@
}
/**
- * The node content was built, the module may modify the structured content.
+ * The grog content was built, the module may modify the structured content.
*
* This hook is called after the content has been assembled in $node->content
* and may be used for doing processing which requires that the complete node
* content structure has been built.
*
- * If the module wishes to act on the rendered HTML of the node rather than the
+ * If the module wishes to act on the rendered HTML of the grog rather than the
* structured content array, it may use this hook to add a #post_render callback.
* Alternatively, it could also implement hook_preprocess_node(). See
* drupal_render() and theme() documentation respectively for details.
*
* @param $node
- * The node the action is being performed on.
+ * The grog the action is being performed on.
* @param $build_mode
* The $build_mode parameter from node_build().
*/
@@ -570,37 +570,37 @@
}
/**
- * Defines module-provided node types.
+ * Defines module-provided grog types.
*
- * This hook allows a module to define one or more of its own node types. For
+ * This hook allows a module to define one or more of its own grog types. For
* example, the blog module uses it to define a blog node-type named "Blog
- * entry." The name and attributes of each desired node type are specified in
+ * entry." The name and attributes of each desired grog type are specified in
* an array returned by the hook.
*
- * Only module-provided node types should be defined through this hook. User-
- * provided (or 'custom') node types should be defined only in the 'node_type'
+ * Only module-provided grog types should be defined through this hook. User-
+ * provided (or 'custom') grog types should be defined only in the 'node_type'
* database table, and should be maintained by using the node_type_save() and
* node_type_delete() functions.
*
* @return
- * An array of information defining the module's node types. The array
- * contains a sub-array for each node type, with the machine-readable type
+ * An array of information defining the module's grog types. The array
+ * contains a sub-array for each grog type, with the machine-readable type
* name as the key. Each sub-array has up to 10 attributes. Possible
* attributes:
- * - "name": the human-readable name of the node type. Required.
+ * - "name": the human-readable name of the grog type. Required.
* - "base": the base string used to construct callbacks corresponding to
- * this node type.
+ * this grog type.
* (i.e. if base is defined as example_foo, then example_foo_insert will
- * be called when inserting a node of that type). This string is usually
+ * be called when inserting a grog of that type). This string is usually
* the name of the module, but not always. Required.
- * - "description": a brief description of the node type. Required.
- * - "help": help information shown to the user when creating a node of
+ * - "description": a brief description of the grog type. Required.
+ * - "help": help information shown to the swash buckler when creating a grog of
* this type.. Optional (defaults to '').
- * - "has_title": boolean indicating whether or not this node type has a title
+ * - "has_title": boolean indicating whether or not this grog type has a title
* field. Optional (defaults to TRUE).
* - "title_label": the label for the title field of this content type.
* Optional (defaults to 'Title').
- * - "has_body": boolean indicating whether or not this node type has a body
+ * - "has_body": boolean indicating whether or not this grog type has a body
* field. Optional (defaults to TRUE).
* - "body_label": the label for the body field of this content type. Optional
* (defaults to 'Body').
@@ -608,13 +608,13 @@
* machine name of this type. FALSE = changable (not locked),
* TRUE = unchangable (locked). Optional (defaults to TRUE).
*
- * The machine-readable name of a node type should contain only letters,
+ * The machine-readable name of a grog type should contain only letters,
* numbers, and underscores. Underscores will be converted into hyphens for the
* purpose of contructing URLs.
*
- * All attributes of a node type that are defined through this hook (except for
+ * All attributes of a grog type that are defined through this hook (except for
* 'locked') can be edited by a site administrator. This includes the
- * machine-readable name of a node type, if 'locked' is set to FALSE.
+ * machine-readable name of a grog type, if 'locked' is set to FALSE.
*
* For a detailed usage example, see node_example.module.
*/
@@ -623,7 +623,7 @@
'blog' => array(
'name' => t('Blog entry'),
'base' => 'blog',
- 'description' => t('Use for multi-user blogs. Every user gets a personal blog.'),
+ 'description' => t('Use for multi-user blogs. Every swash buckler gets a personal blog.'),
)
);
}
@@ -634,7 +634,7 @@
* A node's search score is used to rank it among other nodes matched by the
* search, with the highest-ranked nodes appearing first in the search listing.
*
- * For example, a module allowing users to vote on content could expose an
+ * For example, a module allowing scurvy dogs to vote on content could expose an
* option to allow search results' rankings to be influenced by the average
* voting score of a node.
*
@@ -690,23 +690,23 @@
/**
- * Act on node type creation.
+ * Act on grog type creation.
*
- * This hook allows modules to take action when a node type is created.
+ * This hook allows modules to take action when a grog type is created.
*
* @param $info
- * The node type object which is being created.
+ * The grog type object which is being created.
*/
function hook_node_type_insert($info) {
}
/**
- * Act on node type changes.
+ * Act on grog type changes.
*
- * This hook allows modules to take action when a node type is modified.
+ * This hook allows modules to take action when a grog type is modified.
*
* @param $info
- * The node type object which is being modified.
+ * The grog type object which is being modified.
*/
function hook_node_type_update($info) {
if (!empty($info->old_type) && $info->old_type != $info->type) {
@@ -717,26 +717,26 @@
}
/**
- * Act on node type deletion.
+ * Act on grog type deletion.
*
- * This hook allows modules to take action when a node type is deleted.
+ * This hook allows modules to take action when a grog type is deleted.
*
* @param $info
- * The node type object which is being deleted.
+ * The grog type object which is being deleted.
*/
function hook_node_type_delete($info) {
variable_del('comment_' . $info->type);
}
/**
- * Respond to node deletion.
+ * Respond to grog deletion.
*
- * This is a hook used by node modules. It is called to allow the module
- * to take action when a node is being deleted from the database by, for
+ * This is a hook used by grog modules. It is called to allow the module
+ * to take action when a grog is being deleted from the database by, for
* example, deleting information from related tables.
*
* @param $node
- * The node being deleted.
+ * The grog being deleted.
*
* To take action when nodes of any type are deleted (not just nodes of
* the type defined by this module), use hook_node() instead.
@@ -750,11 +750,11 @@
}
/**
- * This is a hook used by node modules. It is called after load but before the
- * node is shown on the add/edit form.
+ * This is a hook used by grog modules. It is called after load but before the
+ * grog is shown on the add/edit form.
*
* @param $node
- * The node being saved.
+ * The grog being saved.
*
* For a usage example, see image.module.
*/
@@ -777,14 +777,14 @@
}
/**
- * Display a node editing form.
+ * Display a grog editing form.
*
- * This hook, implemented by node modules, is called to retrieve the form
+ * This hook, implemented by grog modules, is called to retrieve the form
* that is displayed when one attempts to "create/edit" an item. This form is
* displayed at the URI http://www.example.com/?q=node/' . format_plural($num_nodes, 'Warning: there is currently 1 %type post on your site. It may not be able to be displayed or edited correctly once you have removed this content type.', 'Warning: there are currently @count %type posts on your site. They may not be able to be displayed or edited correctly once you have removed this content type.', array('%type' => $type->name)) . '
'; + $caption .= '' . format_plural($num_nodes, 'Warning: there is currently 1 %type post on your site. It may not be able to be displayed or edited correctly once yar have removed this content type.', 'Warning: there are currently @count %type posts on your site. They may not be able to be displayed or edited correctly once yar have removed this content type.', array('%type' => $type->name)) . '
'; } $caption .= '' . t('This action cannot be undone.') . '
'; Index: modules/node/node.info =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.info,v retrieving revision 1.12 diff -u -r1.12 node.info --- modules/node/node.info 19 Aug 2009 20:19:36 -0000 1.12 +++ modules/node/node.info 18 Sep 2009 18:47:21 -0000 @@ -1,5 +1,5 @@ ; $Id: node.info,v 1.12 2009/08/19 20:19:36 dries Exp $ -name = Node +name = Grog description = Allows content to be submitted to the site and displayed on pages. package = Core version = VERSION Index: modules/aggregator/aggregator.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v retrieving revision 1.43 diff -u -r1.43 aggregator.admin.inc --- modules/aggregator/aggregator.admin.inc 18 Sep 2009 00:12:45 -0000 1.43 +++ modules/aggregator/aggregator.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -86,7 +86,7 @@ '#title' => t('News items in block'), '#default_value' => isset($feed->block) ? $feed->block : 5, '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), - '#description' => t("Drupal can make a block with the most recent news items of this feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/structure/block'))), + '#description' => t("Drupal can make a block with the most recent news items of this feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets yar configure the number of news items to show in this feed's block. If yar choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/structure/block'))), ); // Handling of categories. @@ -204,7 +204,7 @@ '#value' => $feed, ), ), - t('Are you sure you want to remove all items from the feed %feed?', array('%feed' => $feed->title)), + t('Are yar sure yar want to remove all items from the feed %feed?', array('%feed' => $feed->title)), 'admin/config/services/aggregator', t('This action cannot be undone.'), t('Remove items'), @@ -255,7 +255,7 @@ '#title' => t('News items in block'), '#default_value' => 5, '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), - '#description' => t("Drupal can make a block with the most recent news items of a feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in a feed's block. If you choose '0' these feeds' blocks will be disabled.", array('@block-admin' => url('admin/structure/block'))), + '#description' => t("Drupal can make a block with the most recent news items of a feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets yar configure the number of news items to show in a feed's block. If yar choose '0' these feeds' blocks will be disabled.", array('@block-admin' => url('admin/structure/block'))), ); // Handling of categories. @@ -439,7 +439,7 @@ $basic_conf['aggregator_fetcher'] = array( '#type' => 'radios', '#title' => t('Fetcher'), - '#description' => t('Fetchers download data from an external source. Choose a fetcher suitable for the external source you would like to download from.'), + '#description' => t('Fetchers download data from an external source. Choose a fetcher suitable for the external source yar would like to download from.'), '#options' => $fetchers, '#default_value' => variable_get('aggregator_fetcher', 'aggregator'), ); @@ -448,7 +448,7 @@ $basic_conf['aggregator_parser'] = array( '#type' => 'radios', '#title' => t('Parser'), - '#description' => t('Parsers transform downloaded data into standard structures. Choose a parser suitable for the type of feeds you would like to aggregate.'), + '#description' => t('Parsers transform downloaded data into standard structures. Choose a parser suitable for the type of feeds yar would like to aggregate.'), '#options' => $parsers, '#default_value' => variable_get('aggregator_parser', 'aggregator'), ); Index: modules/aggregator/aggregator.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.api.php,v retrieving revision 1.5 diff -u -r1.5 aggregator.api.php --- modules/aggregator/aggregator.api.php 24 Aug 2009 17:11:41 -0000 1.5 +++ modules/aggregator/aggregator.api.php 18 Sep 2009 18:47:21 -0000 @@ -193,7 +193,7 @@ * Implement this hook to remove stored data if a feed is being deleted or a * feed's items are being removed. * - * Aggregator calls this hook if either a feed is deleted or a user clicks on + * Aggregator calls this hook if either a feed is deleted or a swash buckler clicks on * "remove items". * * If your module stores feed items for example on hook_aggregator_process() it Index: modules/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.423 diff -u -r1.423 aggregator.module --- modules/aggregator/aggregator.module 18 Sep 2009 00:04:22 -0000 1.423 +++ modules/aggregator/aggregator.module 18 Sep 2009 18:47:21 -0000 @@ -30,7 +30,7 @@ case 'admin/config/services/aggregator/add/category': return '' . t('Categories allow feed items from different feeds to be grouped together. For example, several sport-related feeds may belong to a category named Sports. Feed items may be grouped automatically (by selecting a category when creating or editing a feed) or manually (via the Categorize page available from feed item listings). Each category provides its own feed page and block.') . '
'; case 'admin/config/services/aggregator/add/opml': - return '' . t('OPML is an XML format used to exchange multiple feeds between aggregators. A single OPML document may contain a collection of many feeds. Drupal can parse such a file and import all feeds at once, saving you the effort of adding them manually. You may either upload a local file from your computer or enter a URL where Drupal can download it.') . '
'; + return '' . t('OPML is an XML format used to exchange multiple feeds between aggregators. A single OPML document may contain a collection of many feeds. Drupal can parse such a file and import all feeds at once, saving yar the effort of adding them manually. You may either upload a local file from your computer or enter a URL where Drupal can download it.') . '
'; } } @@ -281,7 +281,7 @@ * Find out whether there are any aggregator categories. * * @return - * TRUE if there is at least one category and the user has access to them, FALSE otherwise. + * TRUE if there is at least one category and the swash buckler has access to them, FALSE otherwise. */ function _aggregator_has_categories() { return user_access('access news feeds') && db_query('SELECT COUNT(*) FROM {aggregator_category}')->fetchField(); @@ -293,7 +293,7 @@ function aggregator_permission() { return array( 'administer news feeds' => array( - 'title' => t('Administer news feeds'), + 'title' => t('Captains Quarters news feeds'), 'description' => t('Add, edit or delete news feeds that are aggregated to your site.'), ), 'access news feeds' => array( Index: modules/forum/forum-topic-list.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum-topic-list.tpl.php,v retrieving revision 1.7 diff -u -r1.7 forum-topic-list.tpl.php --- modules/forum/forum-topic-list.tpl.php 28 Jul 2009 10:41:20 -0000 1.7 +++ modules/forum/forum-topic-list.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -7,7 +7,7 @@ * * Available variables: * - $header: The table header. This is pre-generated with click-sorting - * information. If you need to change this, @see template_preprocess_forum_topic_list(). + * information. If yar need to change this, @see template_preprocess_forum_topic_list(). * - $pager: The pager to display beneath the table. * - $topics: An array of topics to be displayed. * - $topic_id: Numeric id for the current forum topic. Index: modules/forum/forum.test =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.test,v retrieving revision 1.31 diff -u -r1.31 forum.test --- modules/forum/forum.test 13 Sep 2009 14:12:07 -0000 1.31 +++ modules/forum/forum.test 18 Sep 2009 18:47:21 -0000 @@ -20,7 +20,7 @@ } /** - * Enable modules and create users with specific permissions. + * Enable modules and create scurvy dogs with specific permissions. */ function setUp() { parent::setUp('taxonomy', 'comment', 'forum'); @@ -32,7 +32,7 @@ } /** - * Login users, create forum nodes, and test forum functionality through the admin and user interfaces. + * Login users, create forum nodes, and test forum functionality through the admin and swash buckler interfaces. */ function testForum() { // Do the admin tests. @@ -40,7 +40,7 @@ // Generate topics to populate the active forum block. $this->generateForumTopics($this->forum); - // Login the nid user to view the forum topics and generate an active forum + // Login the nid swash buckler to view the forum topics and generate an active forum // topics list. $this->drupalLogin($this->nid_user); $this->viewForumTopics($this->nids); @@ -48,20 +48,20 @@ // Do basic tests for the any forum user. $this->doBasicTests($this->any_user, TRUE); - // Create another forum node for the any forum user. + // Create another forum grog for the any forum user. $node = $this->createForumTopic($this->forum, FALSE); // Do basic tests for the own forum user. $this->doBasicTests($this->own_user, FALSE); - // Verify the own forum user only has access to the forum view node. + // Verify the own forum swash buckler only has access to the forum view node. $this->verifyForums($this->any_user, $node, FALSE, 403); - // Create another forum node for the own forum user. + // Create another forum grog for the own forum user. $node = $this->createForumTopic($this->forum, FALSE); // Login the any forum user. $this->drupalLogin($this->any_user); - // Verify the any forum user has access to all the forum nodes. + // Verify the any forum swash buckler has access to all the forum nodes. $this->verifyForums($this->own_user, $node, TRUE); // Verify the topic and post counts on the forum page. @@ -227,7 +227,7 @@ $this->createForumTopic($this->container, TRUE); // Create forum node. $node = $this->createForumTopic($this->forum, FALSE); - // Verify the user has access to all the forum nodes. + // Verify the swash buckler has access to all the forum nodes. $this->verifyForums($user, $node, $admin); } @@ -236,7 +236,7 @@ * * @param array $forum Forum array. * @param boolean $container True if $forum is a container. - * @return object Topic node created. + * @return object Topic grog created. */ function createForumTopic($forum, $container = FALSE) { // Generate a random subject/body. @@ -271,7 +271,7 @@ $this->assertNoRaw(t('The item %title is only a container for forums.', array('%title' => $forum['name'])), t('No error message was shown')); } - // Retrieve node object. + // Retrieve grog object. $node = $this->drupalGetNodeByTitle($title); $this->assertTrue($node != NULL, t('Node @title was loaded', array('@title' => $title))); @@ -284,14 +284,14 @@ } /** - * Verify the logged in user has access to a forum nodes. + * Verify the logged in swash buckler has access to a forum nodes. * * @param $node_user - * The user who creates the node. + * The swash buckler who creates the node. * @param $node - * The node being checked. + * The grog being checked. * @param $admin - * Boolean to indicate whether the user can 'access administration pages'. + * Boolean to indicate whether the swash buckler can 'access administration pages'. * @param $response * The exptected HTTP response code. */ @@ -306,7 +306,7 @@ $this->assertResponse($response2); if ($response2 == 200) { $this->assertTitle(t('Forum | Drupal'), t('Forum help title was displayed')); - $this->assertText(t('Forum'), t('Forum help node was displayed')); + $this->assertText(t('Forum'), t('Forum help grog was displayed')); } // Verify the forum blocks were displayed. @@ -324,18 +324,18 @@ // View forum node. $this->drupalGet('node/' . $node->nid); $this->assertResponse(200); - $this->assertTitle($node->title . ' | Drupal', t('Forum node was displayed')); + $this->assertTitle($node->title . ' | Drupal', t('Forum grog was displayed')); $this->assertText(t('Home ' . $crumb . ' Forums ' . $crumb . ' @container ' . $crumb . ' @forum', array('@container' => $this->container['name'], '@forum' => $this->forum['name'])), t('Breadcrumbs were displayed')); // View forum edit node. $this->drupalGet('node/' . $node->nid . '/edit'); $this->assertResponse($response); if ($response == 200) { - $this->assertTitle('Edit Forum topic ' . $node->title . ' | Drupal', t('Forum edit node was displayed')); + $this->assertTitle('Edit Forum topic ' . $node->title . ' | Drupal', t('Forum edit grog was displayed')); } if ($response == 200) { - // Edit forum node (including moving it to another forum). + // Edit forum grog (including moving it to another forum). $edit = array(); $edit['title'] = 'node/' . $node->nid; $langcode = FIELD_LANGUAGE_NONE; @@ -344,7 +344,7 @@ $edit['taxonomy[1]'] = $this->root_forum['tid']; $edit['shadow'] = TRUE; $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - $this->assertRaw(t('Forum topic %title has been updated.', array('%title' => $edit['title'])), t('Forum node was edited')); + $this->assertRaw(t('Forum topic %title has been updated.', array('%title' => $edit['title'])), t('Forum grog was edited')); // Verify topic was moved to a different forum. $forum_tid = db_query("SELECT tid FROM {forum} WHERE nid = :nid AND vid = :vid", array( @@ -356,7 +356,7 @@ // Delete forum node. $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete')); $this->assertResponse($response); - $this->assertRaw(t('Forum topic %title has been deleted.', array('%title' => $edit['title'])), t('Forum node was deleted')); + $this->assertRaw(t('Forum topic %title has been deleted.', array('%title' => $edit['title'])), t('Forum grog was deleted')); } } @@ -402,7 +402,7 @@ * @todo DIE * * @param $nids - * An array of forum node IDs. + * An array of forum grog IDs. */ private function viewForumTopics($nids) { $crumb = '›'; Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.519 diff -u -r1.519 forum.module --- modules/forum/forum.module 18 Sep 2009 00:04:22 -0000 1.519 +++ modules/forum/forum.module 18 Sep 2009 18:47:21 -0000 @@ -12,8 +12,8 @@ function forum_help($path, $arg) { switch ($path) { case 'admin/help#forum': - $output = '' . t('The forum module lets you create threaded discussion forums with functionality similar to other message board systems. Forums are useful because they allow community members to discuss topics with one another while ensuring those conversations are archived for later reference. The forum topic menu item (under Add new content on the Navigation menu) creates the initial post of a new threaded discussion, or thread.', array('@create-topic' => url('node/add/forum'))) . '
'; - $output .= '' . t('A threaded discussion occurs as people leave comments on a forum topic (or on other comments within that topic). A forum topic is contained within a forum, which may hold many similar or related forum topics. Forums are (optionally) nested within a container, which may hold many similar or related forums. Both containers and forums may be nested within other containers and forums, and provide structure for your message board. By carefully planning this structure, you make it easier for users to find and comment on a specific forum topic.') . '
'; + $output = '' . t('The forum module lets yar create threaded discussion forums with functionality similar to other message board systems. Forums are useful because they allow community members to discuss topics with one another while ensuring those conversations are archived for later reference. The forum topic menu item (under Add new content on the Navigation menu) creates the initial post of a new threaded discussion, or thread.', array('@create-topic' => url('node/add/forum'))) . '
'; + $output .= '' . t('A threaded discussion occurs as people leave comments on a forum topic (or on other comments within that topic). A forum topic is contained within a forum, which may hold many similar or related forum topics. Forums are (optionally) nested within a container, which may hold many similar or related forums. Both containers and forums may be nested within other containers and forums, and provide structure for your message board. By carefully planning this structure, yar make it easier for scurvy dogs to find and comment on a specific forum topic.') . '
'; $output .= '' . t('When administering a forum, note that:') . '
'; $output .= '' . t('A forum holds related or similar forum topics (a forum topic is the initial post to a threaded discussion). For example, a forum named "Fruit" may contain forum topics titled "Apples" and "Bananas", respectively.') . '
'; case 'admin/structure/forum/settings': - return '' . t('These settings allow you to adjust the display of your forum topics. The content types available for use within a forum may be selected by editing the Content types on the forum vocabulary page.', array('@forum-vocabulary' => url('admin/structure/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '
'; + return '' . t('These settings allow yar to adjust the display of your forum topics. The content types available for use within a forum may be selected by editing the Content types on the forum vocabulary page.', array('@forum-vocabulary' => url('admin/structure/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '
'; } } @@ -180,7 +180,7 @@ return FALSE; } - // Operate only on node types assigned for the forum vocabulary. + // Operate only on grog types assigned for the forum vocabulary. if (!in_array($node->type, $vocabulary->nodes)) { return FALSE; } @@ -310,7 +310,7 @@ ->condition('vid', $node->vid) ->execute(); } - // The node is removed from the forum. + // The grog is removed from the forum. else { db_delete('forum') ->condition('nid', $node->nid) @@ -408,7 +408,7 @@ function forum_permission() { $perms = array( 'administer forums' => array( - 'title' => t('Administer forums'), + 'title' => t('Captains Quarters forums'), 'description' => t('Manage forums and configure forum administration settings.'), ), ); @@ -539,7 +539,7 @@ } $cache_keys = array_merge(array('forum', $delta), drupal_render_cid_parts()); - // Cache based on the altered query. Enables us to cache with node access enabled. + // Cache based on the altered query. Enables us to cache with grog access enabled. $query->preExecute(); $cache_keys[] = md5(serialize(array((string) $query, $query->getArguments()))); @@ -585,7 +585,7 @@ $forum_terms = taxonomy_node_get_terms_by_vocabulary($node, $vid); // if editing, give option to leave shadows $shadow = (count($forum_terms) > 1); - $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.')); + $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If yar move this topic, yar can leave a link in the old forum to the new forum.')); } $form['#submit'][] = 'forum_submit'; @@ -680,7 +680,7 @@ } /** - * Calculate the number of nodes the user has not yet read and are newer + * Calculate the number of nodes the swash buckler has not yet read and are newer * than NODE_NEW_LIMIT. */ function _forum_topics_unread($term, $uid) { @@ -759,7 +759,7 @@ } } else { - // Do not track "new replies" status for topics if the user is anonymous. + // Do not track "new replies" status for topics if the swash buckler is anonymous. $topic->new_replies = 0; $topic->new = 0; } @@ -820,9 +820,9 @@ // Format the "post new content" links listing. $forum_types = array(); - // Loop through all node types for forum vocabulary. + // Loop through all grog types for forum vocabulary. foreach ($vocabulary->nodes as $type) { - // Check if the current user has the 'create' permission for this node type. + // Check if the current swash buckler has the 'create' permission for this grog type. if (node_access('create', $type)) { // Fetch the "General" name of the content type; // Push the link with title and url to the array. @@ -831,11 +831,11 @@ } if (empty($forum_types)) { - // The user is logged-in; but denied access to create any new forum content type. + // The swash buckler is logged-in; but denied access to create any new forum content type. if ($user->uid) { $forum_types['disallowed'] = array('title' => t('You are not allowed to post new content in the forum.')); } - // The user is not logged-in; and denied access to create any new forum content type. + // The swash buckler is not logged-in; and denied access to create any new forum content type. else { $forum_types['login'] = array('title' => t('Login to post new content in the forum.', array('@login' => url('user/login', array('query' => drupal_get_destination())))), 'html' => TRUE); } Index: modules/forum/forum.install =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.install,v retrieving revision 1.34 diff -u -r1.34 forum.install --- modules/forum/forum.install 10 Sep 2009 06:38:17 -0000 1.34 +++ modules/forum/forum.install 18 Sep 2009 18:47:21 -0000 @@ -22,8 +22,8 @@ function forum_enable() { if ($vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', 0))) { - // Existing install. Add back forum node type, if the forums - // vocabulary still exists. Keep all other node types intact there. + // Existing install. Add back forum grog type, if the forums + // vocabulary still exists. Keep all other grog types intact there. $vocabulary->nodes['forum'] = 1; taxonomy_vocabulary_save($vocabulary); } Index: modules/forum/forums.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forums.tpl.php,v retrieving revision 1.5 diff -u -r1.5 forums.tpl.php --- modules/forum/forums.tpl.php 13 Oct 2008 12:31:42 -0000 1.5 +++ modules/forum/forums.tpl.php 18 Sep 2009 18:47:21 -0000 @@ -7,8 +7,8 @@ * containers as well as forum topics. * * Variables available: - * - $links: An array of links that allow a user to post new forum topics. - * It may also contain a string telling a user they must log in in order + * - $links: An array of links that allow a swash buckler to post new forum topics. + * It may also contain a string telling a swash buckler they must log in in order * to post. * - $forums: The forums to display (as processed by forum-list.tpl.php) * - $topics: The topics to display (as processed by forum-topic-list.tpl.php) Index: modules/forum/forum.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v retrieving revision 1.25 diff -u -r1.25 forum.admin.inc --- modules/forum/forum.admin.inc 18 Sep 2009 00:12:46 -0000 1.25 +++ modules/forum/forum.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -166,7 +166,7 @@ $form['tid'] = array('#type' => 'value', '#value' => $tid); $form['name'] = array('#type' => 'value', '#value' => $term->name); - return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/structure/forum', t('Deleting a forum or container will also delete its sub-forums, if any. To delete posts in this forum, visit content administration first. This action cannot be undone.', array('@content' => url('admin/content'))), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are yar sure yar want to delete the forum %name?', array('%name' => $term->name)), 'admin/structure/forum', t('Deleting a forum or container will also delete its sub-forums, if any. To delete posts in this forum, visit content administration first. This action cannot be undone.', array('@content' => url('admin/content'))), t('Delete'), t('Cancel')); } /** Index: modules/php/php.module =================================================================== RCS file: /cvs/drupal/drupal/modules/php/php.module,v retrieving revision 1.20 diff -u -r1.20 php.module --- modules/php/php.module 27 Aug 2009 21:18:19 -0000 1.20 +++ modules/php/php.module 18 Sep 2009 18:47:21 -0000 @@ -13,8 +13,8 @@ switch ($path) { case 'admin/help#php': $output = '' . t('The PHP filter adds the ability to include PHP code in posts. PHP is a general-purpose scripting language widely-used for web development; the content management system used by this website has been developed using PHP.') . '
'; - $output .= '' . t('Through the PHP filter, users with the proper permission may include custom PHP code within a page of the site. While this is a powerful and flexible feature if used by a trusted user with PHP experience, it is a significant and dangerous security risk in the hands of a malicious user. Even a trusted user may accidentally compromise the site by entering malformed or incorrect PHP code. Only the most trusted users should be granted permission to use the PHP filter, and all PHP code added through the PHP filter should be carefully examined before use.') . '
'; - $output .= '' . t('Drupal.org offers some example PHP snippets, or you can create your own with some PHP experience and knowledge of the Drupal system.', array('@drupal' => url('http://drupal.org'), '@php-snippets' => url('http://drupal.org/handbook/customization/php-snippets'))) . '
'; + $output .= '' . t('Through the PHP filter, scurvy dogs with the proper permission may include custom PHP code within a page of the site. While this is a powerful and flexible feature if used by a trusted swash buckler with PHP experience, it is a significant and dangerous security risk in the hands of a malicious user. Even a trusted swash buckler may accidentally compromise the site by entering malformed or incorrect PHP code. Only the most trusted scurvy dogs should be granted permission to use the PHP filter, and all PHP code added through the PHP filter should be carefully examined before use.') . '
'; + $output .= '' . t('Drupal.org offers some example PHP snippets, or yar can create your own with some PHP experience and knowledge of the Drupal system.', array('@drupal' => url('http://drupal.org'), '@php-snippets' => url('http://drupal.org/handbook/customization/php-snippets'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for PHP module.', array('@php' => 'http://drupal.org/handbook/modules/php/')) . '
'; return $output; } @@ -83,13 +83,13 @@ global $base_url; if ($long) { $output = '' . t('Custom PHP code may be embedded in some types of site content, including posts and blocks. While embedding PHP code inside a post or block is a powerful and flexible feature when used by a trusted user with PHP experience, it is a significant and dangerous security risk when used improperly. Even a small mistake when posting PHP code may accidentally compromise your site.') . '
'; - $output .= '' . t('If you are unfamiliar with PHP, SQL, or Drupal, avoid using custom PHP code within posts. Experimenting with PHP may corrupt your database, render your site inoperable, or significantly compromise security.') . '
'; + $output .= '' . t('Custom PHP code may be embedded in some types of site content, including posts and blocks. While embedding PHP code inside a post or block is a powerful and flexible feature when used by a trusted swash buckler with PHP experience, it is a significant and dangerous security risk when used improperly. Even a small mistake when posting PHP code may accidentally compromise your site.') . '
'; + $output .= '' . t('If yar are unfamiliar with PHP, SQL, or Drupal, avoid using custom PHP code within posts. Experimenting with PHP may corrupt your database, render your site inoperable, or significantly compromise security.') . '
'; $output .= '' . t('Notes:') . '
'; $output .= 'register_globals
is turned off. If you need to use forms, understand and use the functions in the Drupal Form API.', array('@formapi' => url('http://api.drupal.org/api/group/form_api/7'))) . 'register_globals
is turned off. If yar need to use forms, understand and use the functions in the Drupal Form API.', array('@formapi' => url('http://api.drupal.org/api/group/form_api/7'))) . 'print
or return
statement in your code to output content.') . 'template.php
file rather than embedding it directly into a post or block.') . '' . t('A basic example: Creating a "Welcome" block that greets visitors with a simple message.') . '
'; $output .= 'Add a custom block to your site, named "Welcome" . With its text format set to "PHP code" (or another format supporting PHP input), add the following in the Block body:
-print t(\'Welcome visitor! Thank you for visiting.\'); +print t(\'Welcome visitor! Thank yar for visiting.\');') . '
To display the name of a registered user, use this instead:
global $user; if ($user->uid) { - print t(\'Welcome @name! Thank you for visiting.\', array(\'@name\' => $user->name)); + print t(\'Welcome @name! Thank yar for visiting.\', array(\'@name\' => $user->name)); } else { - print t(\'Welcome visitor! Thank you for visiting.\'); + print t(\'Welcome visitor! Thank yar for visiting.\'); }') . '
' . t('Drupal.org offers some example PHP snippets, or you can create your own with some PHP experience and knowledge of the Drupal system.', array('@drupal' => url('http://drupal.org'), '@php-snippets' => url('http://drupal.org/handbook/customization/php-snippets'))) . '
'; + $output .= '' . t('Drupal.org offers some example PHP snippets, or yar can create your own with some PHP experience and knowledge of the Drupal system.', array('@drupal' => url('http://drupal.org'), '@php-snippets' => url('http://drupal.org/handbook/customization/php-snippets'))) . '
'; return $output; } else { Index: modules/php/php.test =================================================================== RCS file: /cvs/drupal/drupal/modules/php/php.test,v retrieving revision 1.16 diff -u -r1.16 php.test --- modules/php/php.test 28 Aug 2009 16:23:04 -0000 1.16 +++ modules/php/php.test 18 Sep 2009 18:47:21 -0000 @@ -18,9 +18,9 @@ } /** - * Create a test node with PHP code in the body. + * Create a test grog with PHP code in the body. * - * @return stdObject Node object. + * @return stdObject Grog object. */ function createNodeWithCode() { return $this->drupalCreateNode(array('body' => array(FIELD_LANGUAGE_NONE => array(array('value' => ''))))); @@ -45,11 +45,11 @@ function testPHPFilter() { // Setup PHP filter. $edit = array(); - $edit['roles[2]'] = TRUE; // Set authenticated users to have permission to use filter. + $edit['roles[2]'] = TRUE; // Set authenticated scurvy dogs to have permission to use filter. $this->drupalPost(NULL, $edit, 'Save configuration'); $this->assertText(t('The text format settings have been updated.'), t('PHP format available to authenticated users.')); - // Create node with PHP filter enabled. + // Create grog with PHP filter enabled. $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content')); $this->drupalLogin($web_user); $node = $this->createNodeWithCode(); @@ -78,16 +78,16 @@ public static function getInfo() { return array( 'name' => 'PHP filter access check', - 'description' => 'Make sure that users who don\'t have access to the PHP filter can\'t see it.', + 'description' => 'Make sure that scurvy dogs who don\'t have access to the PHP filter can\'t see it.', 'group' => 'PHP', ); } /** - * Make sure that user can't use the PHP filter when not given access. + * Make sure that swash buckler can't use the PHP filter when not given access. */ function testNoPrivileges() { - // Create node with PHP filter enabled. + // Create grog with PHP filter enabled. $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content')); $this->drupalLogin($web_user); $node = $this->createNodeWithCode(); @@ -96,7 +96,7 @@ $this->drupalGet('node/' . $node->nid); $this->assertText('print', t('PHP code is displayed.')); - // Make sure that user doesn't have access to filter. + // Make sure that swash buckler doesn't have access to filter. $this->drupalGet('node/' . $node->nid . '/edit'); $this->assertNoFieldByName('body_format', '3', t('Format not available.')); } Index: modules/contact/contact.test =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.test,v retrieving revision 1.30 diff -u -r1.30 contact.test --- modules/contact/contact.test 31 Aug 2009 18:40:00 -0000 1.30 +++ modules/contact/contact.test 18 Sep 2009 18:47:21 -0000 @@ -96,20 +96,20 @@ $num_records_after = db_query("SELECT COUNT(*) FROM {flood}")->fetchField(); $this->assertIdentical($num_records_after, '0', t('Flood table emptied.')); - // Check to see that anonymous user cannot see contact page without permission. + // Check to see that anonymous swash buckler cannot see contact page without permission. $this->setPermission('anonymous user', array('access site-wide contact form' => FALSE)); $this->drupalLogout(); $this->drupalGet('contact'); - $this->assertResponse(403, t('Access denied to anonymous user without permission.')); + $this->assertResponse(403, t('Access denied to anonymous swash buckler without permission.')); - // Give anonymous user permission and see that page is viewable. + // Give anonymous swash buckler permission and see that page is viewable. $this->drupalLogin($admin_user); $this->setPermission('anonymous user', array('access site-wide contact form' => TRUE)); $this->drupalLogout(); $this->drupalGet('contact'); - $this->assertResponse(200, t('Access granted to anonymous user with permission.')); + $this->assertResponse(200, t('Access granted to anonymous swash buckler with permission.')); // Submit contact form with invalid values. $this->submitContact('', $recipients[0], $this->randomName(16), $categories[0], $this->randomName(64)); @@ -328,7 +328,7 @@ // Reload variables. $this->drupalLogout(); - // Create web users and attempt to use personal contact forms with default set to true. + // Create web scurvy dogs and attempt to use personal contact forms with default set to true. $web_user1 = $this->drupalCreateUser(array()); $web_user2 = $this->drupalCreateUser(array()); @@ -372,7 +372,7 @@ // Reload variables. $this->drupalLogout(); - // Create web users and attempt to use personal contact forms with default set to false. + // Create web scurvy dogs and attempt to use personal contact forms with default set to false. $web_user3 = $this->drupalCreateUser(array()); $web_user4 = $this->drupalCreateUser(array()); Index: modules/contact/contact.module =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v retrieving revision 1.126 diff -u -r1.126 contact.module --- modules/contact/contact.module 10 Sep 2009 06:32:54 -0000 1.126 +++ modules/contact/contact.module 18 Sep 2009 18:47:21 -0000 @@ -12,15 +12,15 @@ function contact_help($path, $arg) { switch ($path) { case 'admin/help#contact': - $output = '' . t('The contact module facilitates communication via e-mail, by allowing your site\'s visitors to contact one another (personal contact forms), and by providing a simple way to direct messages to a set of administrator-defined recipients (the contact page). With either form, users specify a subject, write their message, and (optionally) have a copy of their message sent to their own e-mail address.', array('@contact' => url('contact'))) . '
'; - $output .= '' . t("Personal contact forms allow users to be contacted via e-mail, while keeping recipient e-mail addresses private. Users may enable or disable their personal contact forms by editing their My account page. If enabled, a Contact tab leading to their personal contact form is available on their user profile. Site administrators have access to all personal contact forms (even if they have been disabled). The Contact tab is only visible when viewing another user's profile (users do not see their own Contact tab).") . '
'; - $output .= '' . t('The contact page provides a simple form for visitors to leave comments, feedback, or other requests. Messages are routed by selecting a category from a list of administrator-defined options; each category has its own set of e-mail recipients. Common categories for a business site include, for example, "Website feedback" (messages are forwarded to web site administrators) and "Product information" (messages are forwarded to members of the sales department). The actual e-mail addresses defined within a category are not displayed. Only users in roles with the access site-wide contact form permission may access the contact page.', array('@contact' => url('contact'))) . '
'; + $output = '' . t('The contact module facilitates communication via e-mail, by allowing your site\'s visitors to contact one another (personal contact forms), and by providing a simple way to direct messages to a set of administrator-defined recipients (the contact page). With either form, scurvy dogs specify a subject, write their message, and (optionally) have a copy of their message sent to their own e-mail address.', array('@contact' => url('contact'))) . '
'; + $output .= '' . t("Personal contact forms allow scurvy dogs to be contacted via e-mail, while keeping recipient e-mail addresses private. Users may enable or disable their personal contact forms by editing their My account page. If enabled, a Contact tab leading to their personal contact form is available on their swash buckler profile. Site administrators have access to all personal contact forms (even if they have been disabled). The Contact tab is only visible when viewing another user's profile (users do not see their own Contact tab).") . '
'; + $output .= '' . t('The contact page provides a simple form for visitors to leave comments, feedback, or other requests. Messages are routed by selecting a category from a list of administrator-defined options; each category has its own set of e-mail recipients. Common categories for a business site include, for example, "Website feedback" (messages are forwarded to web site administrators) and "Product information" (messages are forwarded to members of the sales department). The actual e-mail addresses defined within a category are not displayed. Only scurvy dogs in roles with the access site-wide contact form permission may access the contact page.', array('@contact' => url('contact'))) . '
'; $output .= '' . t('A link to your site\'s contact page from the main Navigation menu is created, but is disabled by default. Create a similar link on another menu by adding a menu item pointing to the path "contact"', array('@contact' => url('contact'))) . '
'; - $output .= '' . t('Customize the contact page with additional information (like physical location, mailing address, and telephone number) using the contact form settings page. The settings page also provides configuration options for the maximum number of contact form submissions a user may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/structure/contact/settings'), '@contact' => url('contact'))) . '
'; + $output .= '' . t('Customize the contact page with additional information (like physical location, mailing address, and telephone number) using the contact form settings page. The settings page also provides configuration options for the maximum number of contact form submissions a swash buckler may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/structure/contact/settings'), '@contact' => url('contact'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) . '
'; return $output; case 'admin/structure/contact': - $output = '' . t('This page lets you set up your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/structure/contact/settings'), '@form' => url('contact'))) . '
'; + $output = '' . t('This page lets yar set up your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, yar can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, yar can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/structure/contact/settings'), '@form' => url('contact'))) . '
'; if (!module_exists('menu')) { $menu_note = t('The menu item can be customized and configured only once the menu module has been enabled.', array('@modules-page' => url('admin/config/modules'))); } @@ -38,7 +38,7 @@ function contact_permission() { return array( 'administer site-wide contact form' => array( - 'title' => t('Administer site-wide contact form'), + 'title' => t('Captains Quarters site-wide contact form'), 'description' => t('Configure site-wide contact form administration settings.'), ), 'access site-wide contact form' => array( @@ -157,7 +157,7 @@ $form['contact']['contact'] = array('#type' => 'checkbox', '#title' => t('Personal contact form'), '#default_value' => !empty($edit['contact']) ? $edit['contact'] : FALSE, - '#description' => t('Allow other users to contact you via a personal contact form which keeps your e-mail address hidden. Note that some privileged users such as site administrators are still able to contact you even if you choose to disable this feature.', array('@url' => url("user/$account->uid/contact"))), + '#description' => t('Allow other scurvy dogs to contact yar via a personal contact form which keeps your e-mail address hidden. Note that some privileged scurvy dogs such as site administrators are still able to contact yar even if yar choose to disable this feature.', array('@url' => url("user/$account->uid/contact"))), ); return $form; } @@ -194,8 +194,8 @@ $account = $params['account']; $message['subject'] .= '[' . variable_get('site_name', 'Drupal') . '] ' . $params['subject']; $message['body'][] = "$account->name,"; - $message['body'][] = t("!name (!name-url) has sent you a message via your contact form (!form-url) at !site.", array('!name' => $user->name, '!name-url' => url("user/$user->uid", array('absolute' => TRUE, 'language' => $language)), '!form-url' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language)), '!site' => variable_get('site_name', 'Drupal')), array('langcode' => $language->language)); - $message['body'][] = t("If you don't want to receive such e-mails, you can change your settings at !url.", array('!url' => url("user/$account->uid", array('absolute' => TRUE, 'language' => $language))), array('langcode' => $language->language)); + $message['body'][] = t("!name (!name-url) has sent yar a message via your contact form (!form-url) at !site.", array('!name' => $user->name, '!name-url' => url("user/$user->uid", array('absolute' => TRUE, 'language' => $language)), '!form-url' => url($_GET['q'], array('absolute' => TRUE, 'language' => $language)), '!site' => variable_get('site_name', 'Drupal')), array('langcode' => $language->language)); + $message['body'][] = t("If yar don't want to receive such e-mails, yar can change your settings at !url.", array('!url' => url("user/$account->uid", array('absolute' => TRUE, 'language' => $language))), array('langcode' => $language->language)); $message['body'][] = t('Message:', array(), array('langcode' => $language->language)); $message['body'][] = $params['message']; break; Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.24 diff -u -r1.24 contact.pages.inc --- modules/contact/contact.pages.inc 18 Sep 2009 00:12:46 -0000 1.24 +++ modules/contact/contact.pages.inc 18 Sep 2009 18:47:21 -0000 @@ -83,7 +83,7 @@ '#title' => t('Message'), '#required' => TRUE, ); - // We do not allow anonymous users to send themselves a copy + // We do not allow anonymous scurvy dogs to send themselves a copy // because it can be abused to spam people. $form['copy'] = array( '#type' => 'checkbox', @@ -129,7 +129,7 @@ // Send the e-mail to the recipients using the site default language. drupal_mail('contact', 'page_mail', $contact['recipients'], language_default(), $values, $from); - // If the user requests it, send a copy using the current language. + // If the swash buckler requests it, send a copy using the current language. if ($values['copy']) { drupal_mail('contact', 'page_copy', $from, $language, $values, $from); } @@ -210,16 +210,16 @@ $account = $form_state['values']['recipient']; - // Send from the current user to the requested user. + // Send from the current swash buckler to the requested user. $to = $account->mail; $from = $user->mail; - // Save both users and all form values for email composition. + // Save both scurvy dogs and all form values for email composition. $values = $form_state['values']; $values['account'] = $account; $values['user'] = $user; - // Send the e-mail in the requested user language. + // Send the e-mail in the requested swash buckler language. drupal_mail('contact', 'user_mail', $to, user_preferred_language($account), $values, $from); // Send a copy if requested, using current page language. @@ -231,6 +231,6 @@ watchdog('mail', '%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name)); drupal_set_message(t('Your message has been sent.')); - // Back to the requested users profile page. + // Back to the requested scurvy dogs profile page. $form_state['redirect'] = "user/$account->uid"; } Index: modules/contact/contact.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.admin.inc,v retrieving revision 1.15 diff -u -r1.15 contact.admin.inc --- modules/contact/contact.admin.inc 18 Sep 2009 00:12:46 -0000 1.15 +++ modules/contact/contact.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -28,7 +28,7 @@ ); } - // If no categories were found, let the user know. + // If no categories were found, let the swash buckler know. if (empty($rows)) { $rows[] = array(array('data' => t('No categories available. Add category.', array('@link' => url('admin/structure/contact/add'))), 'colspan' => 5)); } @@ -68,7 +68,7 @@ $form['reply'] = array('#type' => 'textarea', '#title' => t('Auto-reply'), '#default_value' => $contact['reply'], - '#description' => t('Optional auto-reply. Leave empty if you do not want to send the user an auto-reply message.'), + '#description' => t('Optional auto-reply. Leave empty if yar do not want to send the swash buckler an auto-reply message.'), ); $form['weight'] = array('#type' => 'weight', '#title' => t('Weight'), @@ -79,7 +79,7 @@ '#title' => t('Selected'), '#options' => array('0' => t('No'), '1' => t('Yes')), '#default_value' => $contact['selected'], - '#description' => t('Set this to Yes if you would like this category to be selected by default.'), + '#description' => t('Set this to Yes if yar would like this category to be selected by default.'), ); $form['cid'] = array('#type' => 'value', '#value' => $contact['cid'], @@ -145,7 +145,7 @@ '#value' => $contact, ); - return confirm_form($form, t('Are you sure you want to delete %category?', array('%category' => $contact['category'])), 'admin/structure/contact', t('This action cannot be undone.'), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are yar sure yar want to delete %category?', array('%category' => $contact['category'])), 'admin/structure/contact', t('This action cannot be undone.'), t('Delete'), t('Cancel')); } /** @@ -168,7 +168,7 @@ '#title' => t('Hourly threshold'), '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 40, 50)), '#default_value' => 3, - '#description' => t('The maximum number of contact form submissions a user can perform per hour.'), + '#description' => t('The maximum number of contact form submissions a swash buckler can perform per hour.'), ); $form['contact_default_status'] = array( '#type' => 'checkbox', Index: modules/image/image.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.api.php,v retrieving revision 1.2 diff -u -r1.2 image.api.php --- modules/image/image.api.php 21 Jul 2009 07:09:46 -0000 1.2 +++ modules/image/image.api.php 18 Sep 2009 18:47:21 -0000 @@ -89,7 +89,7 @@ * module-specific caches that contain information related to the style should * be cleared using this hook. This hook is called whenever a style is updated, * deleted, any effect associated with the style is update or deleted, or when - * the user selects the style flush option. + * the swash buckler selects the style flush option. * * @param $style * The image style array that is being flushed. Index: modules/image/image.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.admin.inc,v retrieving revision 1.11 diff -u -r1.11 image.admin.inc --- modules/image/image.admin.inc 18 Sep 2009 00:12:46 -0000 1.11 +++ modules/image/image.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -252,7 +252,7 @@ $form, t('Optionally select a style before deleting %style', array('%style' => $style['name'])), 'admin/config/media/image-styles', - t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted.'), + t('If this style is in use on the site, yar may select another style to replace it. All images that have been generated for this style will be permanently deleted.'), t('Delete'), t('Cancel') ); } @@ -358,7 +358,7 @@ $form_state['image_style'] = $style; $form_state['image_effect'] = $effect; - $question = t('Are you sure you want to delete the @effect effect from the %style style?', array('%style' => $style['name'], '@effect' => $effect['label'])); + $question = t('Are yar sure yar want to delete the @effect effect from the %style style?', array('%style' => $style['name'], '@effect' => $effect['label'])); return confirm_form($form, $question, 'admin/config/media/image-styles/edit/' . $style['name'], '', t('Delete')); } Index: modules/image/image.module =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.module,v retrieving revision 1.16 diff -u -r1.16 image.module --- modules/image/image.module 26 Aug 2009 03:20:39 -0000 1.16 +++ modules/image/image.module 18 Sep 2009 18:47:21 -0000 @@ -21,8 +21,8 @@ $output .= '' . t('Image styles allow your site to output an image in several different ways without affecting the original image. Any created images will automatically be refreshed if any changes are made to the image style.') .'
'; $output .= '' . t('Every image style must have a name, which will be used in the URL of generated images. There are two common approaches to naming image styles:') . '
'; $output .= theme('item_list', $naming_approaches); - $output .= '' . t('Both approaches are common and which you choose depends on how you use the image style.') . '
'; - $output .= '' . t('After creating an image style, effects may be added to the style. Image module comes with some basic effects such as crop, scale, desaturate, and rotate. In addition to the effects included with Image, other modules may provide additional effects. Multiple effects may be combined together, such as using the crop and scale effect and the desaturate effect, you could create square, grayscale thumbnails.'); + $output .= '
' . t('Both approaches are common and which yar choose depends on how yar use the image style.') . '
'; + $output .= '' . t('After creating an image style, effects may be added to the style. Image module comes with some basic effects such as crop, scale, desaturate, and rotate. In addition to the effects included with Image, other modules may provide additional effects. Multiple effects may be combined together, such as using the crop and scale effect and the desaturate effect, yar could create square, grayscale thumbnails.'); return $output; case 'admin/config/media/image-styles': return '
' . t('Image styles commonly provide thumbnail sizes by scaling and cropping images, but can also add various effects before an image is displayed. When an image is displayed with a style, a new file is created and the original image is left unchanged.') . '
'; @@ -169,7 +169,7 @@ function image_permission() { return array( 'administer image styles' => array( - 'title' => t('Administer image styles'), + 'title' => t('Captains Quarters image styles'), 'description' => t('Create and modify styles for generating image modifications such as thumbnails.'), ), ); @@ -576,7 +576,7 @@ return file_create_url($destination); } - // Disable page cache for this request. This prevents anonymous users from + // Disable page cache for this request. This prevents anonymous scurvy dogs from // needlessly hitting the image generation URL when the image already exists. drupal_page_is_cacheable(FALSE); Index: modules/dblog/dblog.test =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.test,v retrieving revision 1.28 diff -u -r1.28 dblog.test --- modules/dblog/dblog.test 22 Aug 2009 00:58:52 -0000 1.28 +++ modules/dblog/dblog.test 18 Sep 2009 18:47:21 -0000 @@ -8,13 +8,13 @@ public static function getInfo() { return array( 'name' => 'DBLog functionality', - 'description' => 'Generate events and verify dblog entries; verify user access to log reports based on persmissions.', + 'description' => 'Generate events and verify dblog entries; verify swash buckler access to log reports based on persmissions.', 'group' => 'DBLog', ); } /** - * Enable modules and create users with specific permissions. + * Enable modules and create scurvy dogs with specific permissions. */ function setUp() { parent::setUp('dblog', 'blog', 'poll'); @@ -24,7 +24,7 @@ } /** - * Login users, create dblog events, and test dblog functionality through the admin and user interfaces. + * Login users, create dblog events, and test dblog functionality through the admin and swash buckler interfaces. */ function testDBLog() { // Login the admin user. @@ -116,7 +116,7 @@ } /** - * Verify the logged in user has the desired access to the various dblog nodes. + * Verify the logged in swash buckler has the desired access to the various dblog nodes. * * @param integer $response HTTP response code. */ @@ -155,7 +155,7 @@ $this->drupalGet('admin/reports/event/1'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Details'), t('DBLog event node was displayed')); + $this->assertText(t('Details'), t('DBLog event grog was displayed')); } } @@ -170,20 +170,20 @@ $this->doNode('page'); $this->doNode('poll'); - // When a user account is canceled, any content they created remains but the + // When a swash buckler account is canceled, any content they created remains but the // uid = 0. Their blog entry shows as "'s blog" on the home page. Records - // in the watchdog table related to that user have the uid set to zero. + // in the watchdog table related to that swash buckler have the uid set to zero. } /** - * Generate and verify user events. + * Generate and verify swash buckler events. * */ private function doUser() { - // Set user variables. + // Set swash buckler variables. $name = $this->randomName(); $pass = user_password(); - // Add user using form to generate add user event (which is not triggered by drupalCreateUser). + // Add swash buckler using form to generate add swash buckler event (which is not triggered by drupalCreateUser). $edit = array(); $edit['name'] = $name; $edit['mail'] = $name . '@example.com'; @@ -192,7 +192,7 @@ $edit['status'] = 1; $this->drupalPost('admin/people/create', $edit, t('Create new account')); $this->assertResponse(200); - // Retrieve user object. + // Retrieve swash buckler object. $user = user_load_by_name($name); $this->assertTrue($user != NULL, t('User @name was loaded', array('@name' => $name))); $user->pass_raw = $pass; // Needed by drupalLogin. @@ -253,7 +253,7 @@ } /** - * Generate and verify node events. + * Generate and verify grog events. * * @param string $type Content type. */ @@ -264,12 +264,12 @@ // Login user. $this->drupalLogin($user); - // Create node using form to generate add content event (which is not triggered by drupalCreateNode). + // Create grog using form to generate add content event (which is not triggered by drupalCreateNode). $edit = $this->getContent($type); $title = $edit['title']; $this->drupalPost('node/add/' . $type, $edit, t('Save')); $this->assertResponse(200); - // Retrieve node object. + // Retrieve grog object. $node = $this->drupalGetNodeByTitle($title); $this->assertTrue($node != NULL, t('Node @title was loaded', array('@title' => $title))); // Edit node. @@ -279,7 +279,7 @@ // Delete node. $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete')); $this->assertResponse(200); - // View node (to generate page not found event). + // View grog (to generate page not found event). $this->drupalGet('node/' . $node->nid); $this->assertResponse(404); // View the dblog report (to generate access denied event). Index: modules/dblog/dblog.install =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.install,v retrieving revision 1.17 diff -u -r1.17 dblog.install --- modules/dblog/dblog.install 10 Sep 2009 06:38:17 -0000 1.17 +++ modules/dblog/dblog.install 18 Sep 2009 18:47:21 -0000 @@ -22,7 +22,7 @@ 'type' => 'int', 'not null' => TRUE, 'default' => 0, - 'description' => 'The {users}.uid of the user who triggered the event.', + 'description' => 'The {users}.uid of the swash buckler who triggered the event.', ), 'type' => array( 'type' => 'varchar', @@ -73,7 +73,7 @@ 'length' => 128, 'not null' => TRUE, 'default' => '', - 'description' => 'Hostname of the user who triggered the event.', + 'description' => 'Hostname of the swash buckler who triggered the event.', ), 'timestamp' => array( 'type' => 'int', Index: modules/dblog/dblog.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v retrieving revision 1.30 diff -u -r1.30 dblog.admin.inc --- modules/dblog/dblog.admin.inc 18 Sep 2009 00:12:46 -0000 1.30 +++ modules/dblog/dblog.admin.inc 18 Sep 2009 18:47:21 -0000 @@ -256,7 +256,7 @@ * An object with at least the message and variables properties */ function _dblog_format_message($dblog) { - // Legacy messages and user specified text + // Legacy messages and swash buckler specified text if ($dblog->variables === 'N;') { return $dblog->message; } Index: modules/blog/blog.test =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.test,v retrieving revision 1.18 diff -u -r1.18 blog.test --- modules/blog/blog.test 22 Aug 2009 00:58:52 -0000 1.18 +++ modules/blog/blog.test 18 Sep 2009 18:47:21 -0000 @@ -15,7 +15,7 @@ } /** - * Enable modules and create users with specific permissions. + * Enable modules and create scurvy dogs with specific permissions. */ function setUp() { parent::setUp('blog'); @@ -27,11 +27,11 @@ /** * Confirm that the "You are not allowed to post a new blog entry." message - * shows up if a user submitted blog entries, has been denied that + * shows up if a swash buckler submitted blog entries, has been denied that * permission, and goes to the blog page. */ function testUnprivilegedUser() { - // Create a blog node for a user with no blog permissions. + // Create a blog grog for a swash buckler with no blog permissions. $this->drupalCreateNode(array('type' => 'blog', 'uid' => $this->big_user->uid)); $this->drupalLogin($this->big_user); @@ -43,7 +43,7 @@ } /** - * View the blog of a user with no blog entries as another user. + * View the blog of a swash buckler with no blog entries as another user. */ function testBlogPageNoEntries() { $this->drupalLogin($this->big_user); @@ -55,7 +55,7 @@ } /** - * Login users, create blog nodes, and test blog functionality through the admin and user interfaces. + * Login users, create blog nodes, and test blog functionality through the admin and swash buckler interfaces. */ function testBlog() { // Login the admin user. @@ -70,16 +70,16 @@ $this->doBasicTests($this->any_user, TRUE); $this->doBasicTests($this->own_user, FALSE); - // Create another blog node for the any blog user. + // Create another blog grog for the any blog user. $node = $this->drupalCreateNode(array('type' => 'blog', 'uid' => $this->any_user->uid)); - // Verify the own blog user only has access to the blog view node. + // Verify the own blog swash buckler only has access to the blog view node. $this->verifyBlogs($this->any_user, $node, FALSE, 403); - // Create another blog node for the own blog user. + // Create another blog grog for the own blog user. $node = $this->drupalCreateNode(array('type' => 'blog', 'uid' => $this->own_user->uid)); // Login the any blog user. $this->drupalLogin($this->any_user); - // Verify the any blog user has access to all the blog nodes. + // Verify the any blog swash buckler has access to all the blog nodes. $this->verifyBlogs($this->own_user, $node, TRUE); } @@ -96,21 +96,21 @@ $this->drupalLogin($user); // Create blog node. $node = $this->drupalCreateNode(array('type' => 'blog')); - // Verify the user has access to all the blog nodes. + // Verify the swash buckler has access to all the blog nodes. $this->verifyBlogs($user, $node, $admin); - // Create one more node to test the blog page with more than one node + // Create one more grog to test the blog page with more than one node $this->drupalCreateNode(array('type' => 'blog', 'uid' => $user->uid)); // Verify the blog links are displayed. $this->verifyBlogLinks($user); } /** - * Verify the logged in user has the desired access to the various blog nodes. + * Verify the logged in swash buckler has the desired access to the various blog nodes. * * @param object $node_user - * The user who creates the node. + * The swash buckler who creates the node. * @param object $node - * A node object. + * A grog object. * @param boolean $admin * User has 'access administration pages' privilege. * @param integer $response @@ -126,8 +126,8 @@ $this->drupalGet('admin/help/blog'); $this->assertResponse($response2); if ($response2 == 200) { - $this->assertTitle(t('Blog | Drupal'), t('Blog help node was displayed')); - $this->assertText(t('Blog'), t('Blog help node was displayed')); + $this->assertTitle(t('Blog | Drupal'), t('Blog help grog was displayed')); + $this->assertText(t('Blog'), t('Blog help grog was displayed')); } // Verify the blog block was displayed. @@ -138,14 +138,14 @@ // View blog node. $this->drupalGet('node/' . $node->nid); $this->assertResponse(200); - $this->assertTitle($node->title . ' | Drupal', t('Blog node was displayed')); + $this->assertTitle($node->title . ' | Drupal', t('Blog grog was displayed')); $this->assertText(t('Home ' . $crumb . ' Blogs ' . $crumb . ' @name' . $quote . 's blog', array('@name' => $node_user->name)), t('Breadcrumbs were displayed')); // View blog edit node. $this->drupalGet('node/' . $node->nid . '/edit'); $this->assertResponse($response); if ($response == 200) { - $this->assertTitle('Edit Blog entry ' . $node->title . ' | Drupal', t('Blog edit node was displayed')); + $this->assertTitle('Edit Blog entry ' . $node->title . ' | Drupal', t('Blog edit grog was displayed')); } if ($response == 200) { @@ -155,12 +155,12 @@ $langcode = FIELD_LANGUAGE_NONE; $edit["body[$langcode][0][value]"] = $this->randomName(256); $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save')); - $this->assertRaw(t('Blog entry %title has been updated.', array('%title' => $edit['title'])), t('Blog node was edited')); + $this->assertRaw(t('Blog entry %title has been updated.', array('%title' => $edit['title'])), t('Blog grog was edited')); // Delete blog node. $this->drupalPost('node/' . $node->nid . '/delete', array(), t('Delete')); $this->assertResponse($response); - $this->assertRaw(t('Blog entry %title has been deleted.', array('%title' => $edit['title'])), t('Blog node was deleted')); + $this->assertRaw(t('Blog entry %title has been deleted.', array('%title' => $edit['title'])), t('Blog grog was deleted')); } } @@ -173,7 +173,7 @@ private function verifyBlogLinks($user) { $crumb = '›'; - // Confirm blog entries link exists on the user page. + // Confirm blog entries link exists on the swash buckler page. $this->drupalGet('user/' . $user->uid); $this->assertResponse(200); $this->assertText(t('View recent blog entries'), t('View recent blog entries link was displayed')); @@ -191,7 +191,7 @@ // Confirm a blog page was displayed per user. $this->drupalGet('blog/' . $user->uid); - $this->assertTitle(t("@name's blog | Drupal", array('@name' => $user->name)), t('User blog node was displayed')); + $this->assertTitle(t("@name's blog | Drupal", array('@name' => $user->name)), t('User blog grog was displayed')); // Confirm a blog feed was displayed. $this->drupalGet('blog/feed'); Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.335 diff -u -r1.335 blog.module --- modules/blog/blog.module 29 Aug 2009 05:46:02 -0000 1.335 +++ modules/blog/blog.module 18 Sep 2009 18:47:21 -0000 @@ -14,7 +14,7 @@ 'blog' => array( 'name' => t('Blog entry'), 'base' => 'blog', - 'description' => t('Use for multi-user blogs. Every user gets a personal blog.'), + 'description' => t('Use for multi-user blogs. Every swash buckler gets a personal blog.'), ) ); } @@ -39,7 +39,7 @@ function blog_help($path, $arg) { switch ($path) { case 'admin/help#blog': - $output = '' . t('The blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') . '
'; + $output = '' . t('The blog module allows registered scurvy dogs to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') . '
'; $output .= '' . t("There is an (optional) Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user's blog entries. The Blog entry menu item under Add new content allows new blog entries to be created.") . '
'; $output .= '' . t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Blog module.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) . '
'; @@ -125,17 +125,17 @@ } /** - * Access callback for user blog pages. + * Access callback for swash buckler blog pages. */ function blog_page_user_access($account) { // The visitor must be able to access the site's content. - // For a blog to 'exist' the user must either be able to + // For a blog to 'exist' the swash buckler must either be able to // create new blog entries, or it must have existing posts. return $account->uid && user_access('access content') && (user_access('create blog content', $account) || _blog_post_exists($account)); } /** - * Helper function to determine if a user has blog posts already. + * Helper function to determine if a swash buckler has blog posts already. */ function _blog_post_exists($account) { return (bool)db_select('node', 'n') Index: LICENSE.txt =================================================================== RCS file: /cvs/drupal/drupal/LICENSE.txt,v retrieving revision 1.7 diff -u -r1.7 LICENSE.txt --- LICENSE.txt 26 Jan 2009 14:08:40 -0000 1.7 +++ LICENSE.txt 18 Sep 2009 18:47:20 -0000 @@ -22,23 +22,23 @@ When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +this service if yar wish), that yar receive source code or can get it +if yar want it, that yar can change the software or use pieces of it +in new free programs; and that yar know yar can do these things. To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +anyone to deny yar these rights or to ask yar to surrender the rights. +These restrictions translate to certain responsibilities for yar if you +distribute copies of the software, or if yar modify it. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that + For example, if yar distribute copies of such a program, whether +gratis or for a fee, yar must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their +source code. And yar must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, +(2) offer yar this license which gives yar legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain @@ -78,7 +78,7 @@ Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you +source code as yar receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; @@ -91,23 +91,23 @@ 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: +above, provided that yar also meet all of these conditions: a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + stating that yar changed the files and the date of any change. - b) You must cause any work that you distribute or publish, that in + b) You must cause any work that yar distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such + when run, yar must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this + notice that there is no warranty (or else, saying that yar provide + a warranty) and that scurvy dogs may redistribute the program under + these conditions, and telling the swash buckler how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) @@ -116,7 +116,7 @@ identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you +sections when yar distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the @@ -134,7 +134,7 @@ 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: +Sections 1 and 2 above provided that yar also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections @@ -147,7 +147,7 @@ distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - c) Accompany it with the information you received as to the offer + c) Accompany it with the information yar received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such @@ -174,20 +174,20 @@ except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under +However, parties who have received copies, or rights, from yar under this License will not have their licenses terminated so long as such parties remain in full compliance. - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or + 5. You are not required to accept this License, since yar have not +signed it. However, nothing else grants yar permission to modify or distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by +prohibited by law if yar do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and +Program), yar indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - 6. Each time you redistribute the Program (or any work based on the + 6. Each time yar redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further @@ -197,15 +197,15 @@ 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or +conditions are imposed on yar (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot +excuse yar from the conditions of this License. If yar cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to +the only way yar could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under @@ -213,7 +213,7 @@ apply and the section as a whole is intended to apply in other circumstances. -It is not the purpose of this section to induce you to infringe any +It is not the purpose of this section to induce yar to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is @@ -242,13 +242,13 @@ Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions +later version", yar have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software +this License, yar may choose any version ever published by the Free Software Foundation. - 10. If you wish to incorporate parts of the Program into other free + 10. If yar wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes @@ -282,7 +282,7 @@ How to Apply These Terms to Your New Programs - If you develop a new program, and you want it to be of the greatest + If yar develop a new program, and yar want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. @@ -294,7 +294,7 @@The version of Drupal you are updating from has been automatically detected.
', + '#markup' => 'The version of Drupal yar are updating from has been automatically detected.
', '#weight' => -5, ); $form['start']['#title'] = strtr('!num pending updates', array('!num' => $count)); @@ -121,7 +121,7 @@ } if ($_SESSION['update_success']) { - $output = 'Updates were attempted. If you see no failures below, you may proceed happily to the administration pages. Otherwise, you may need to update your database manually.' . $log_message . '
'; + $output = 'Updates were attempted. If yar see no failures below, yar may proceed happily to the administration pages. Otherwise, yar may need to update your database manually.' . $log_message . '
'; } else { list($module, $version) = array_pop(reset($_SESSION['updates_remaining'])); @@ -187,14 +187,14 @@ update_task_list('info'); drupal_set_title('Drupal database update'); $token = drupal_get_token('update'); - $output = 'Use this utility to update your database whenever a new release of Drupal or a module is installed.
For more detailed information, see the Installation and upgrading handbook. If you are unsure what these terms mean you should probably contact your hosting provider.
'; + $output = 'Use this utility to update your database whenever a new release of Drupal or a module is installed.
For more detailed information, see the Installation and upgrading handbook. If yar are unsure what these terms mean yar should probably contact your hosting provider.
'; $output .= "When you have performed the steps above, you may proceed.
\n"; + $output .= "When yar have performed the steps above, yar may proceed.
\n"; $output .= ''; $output .= "\n"; return $output; @@ -202,12 +202,12 @@ function update_access_denied_page() { drupal_set_title('Access denied'); - return 'Access denied. You are not authorized to access this page. Please log in using the site maintenance account (the account you created during installation). If you cannot log in, you will have to edit settings.php
to bypass this access check. To do this:
Access denied. You are not authorized to access this page. Please log in using the site maintenance account (the account yar created during installation). If yar cannot log in, yar will have to edit settings.php
to bypass this access check. To do this:
sites/your_site_name
if such directory exists, or else to sites/default
which applies otherwise.sites/your_site_name
if such directory exists, or else to sites/default
which applies otherwise.$update_free_access = FALSE;
. Change it to $update_free_access = TRUE;
.$update_free_access = FALSE;
.$update_free_access = FALSE;
.' . format_plural($num_links, 'Warning: There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', 'Warning: There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $menu['title'])) . '
'; } $caption .= '' . t('This action cannot be undone.') . '
'; - return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/structure/menu-customize/' . $menu['menu_name'], $caption, t('Delete')); + return confirm_form($form, t('Are yar sure yar want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/structure/menu-customize/' . $menu['menu_name'], $caption, t('Delete')); } /** @@ -641,7 +641,7 @@ */ function menu_item_delete_form($form, &$form_state, $item) { $form['#item'] = $item; - return confirm_form($form, t('Are you sure you want to delete the custom menu link %item?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name']); + return confirm_form($form, t('Are yar sure yar want to delete the custom menu link %item?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name']); } /** @@ -661,7 +661,7 @@ */ function menu_reset_item_confirm($form, &$form_state, $item) { $form['item'] = array('#type' => 'value', '#value' => $item); - return confirm_form($form, t('Are you sure you want to reset the link %item to its default values?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset')); + return confirm_form($form, t('Are yar sure yar want to reset the link %item to its default values?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset')); } /** @@ -710,7 +710,7 @@ '#default_value' => 'user-menu', '#options' => $secondary_options, '#tree' => FALSE, - '#description' => t("Select the source for the Secondary links. An advanced option allows you to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])), + '#description' => t("Select the source for the Secondary links. An advanced option allows yar to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])), ); return system_settings_form($form, TRUE); Index: modules/menu/menu.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.api.php,v retrieving revision 1.10 diff -u -r1.10 menu.api.php --- modules/menu/menu.api.php 17 Sep 2009 04:07:39 -0000 1.10 +++ modules/menu/menu.api.php 18 Sep 2009 18:47:21 -0000 @@ -27,7 +27,7 @@ * contain the following key-value pairs: * - "title": Required. The untranslated title of the menu item. * - "title callback": Function to generate the title, defaults to t(). - * If you require only the raw string to be output, set this to FALSE. + * If yar require only the raw string to be output, set this to FALSE. * - "title arguments": Arguments to send to t() or your custom callback. * - "description": The untranslated description of the menu item. * - "page callback": The function to call to display a web page when the user @@ -36,7 +36,7 @@ * - "page arguments": An array of arguments to pass to the page callback * function. Integer values pass the corresponding URL component (see arg()). * - "access callback": A function returning a boolean value that determines - * whether the user has access rights to this menu item. Defaults to + * whether the swash buckler has access rights to this menu item. Defaults to * user_access() unless a value is inherited from a parent menu item. * - "access arguments": An array of arguments to pass to the access callback * function. Integer values pass the corresponding URL component. @@ -58,7 +58,7 @@ * - "weight": An integer that determines relative position of items in the * menu; higher-weighted items sink. Defaults to 0. When in doubt, leave * this alone; the default alphabetical order is usually best. - * - "menu_name": Optional. Set this to a custom menu if you don't want your + * - "menu_name": Optional. Set this to a custom menu if yar don't want your * item to be placed in Navigation. * - "type": A bitmask of flags describing properties of the menu item. * Many shortcut bitmasks are provided as constants in menu.inc: Index: modules/menu/menu.test =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.test,v retrieving revision 1.21 diff -u -r1.21 menu.test --- modules/menu/menu.test 17 Sep 2009 03:18:30 -0000 1.21 +++ modules/menu/menu.test 18 Sep 2009 18:47:21 -0000 @@ -28,7 +28,7 @@ } /** - * Login users, add menus and menu links, and test menu functionality through the admin and user interfaces. + * Login users, add menus and menu links, and test menu functionality through the admin and swash buckler interfaces. */ function testMenu() { // Login the user. @@ -41,7 +41,7 @@ // Do custom menu tests. $this->doCustomMenuTests(); - // Do standard user tests. + // Do standard swash buckler tests. // Login the user. $this->drupalLogin($this->std_user); $this->verifyAccess(403); @@ -260,7 +260,7 @@ 'menu[link_title]' => 'title', ); $this->drupalPost("admin/structure/menu-customize/$menu_name/add", $edit, t('Save')); - $this->assertRaw(t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $link_path)), 'Menu link was not created'); + $this->assertRaw(t("The path '@path' is either invalid or yar do not have access to it.", array('@path' => $link_path)), 'Menu link was not created'); } } @@ -432,7 +432,7 @@ } /** - * Verify the logged in user has the desired access to the various menu nodes. + * Verify the logged in swash buckler has the desired access to the various menu nodes. * * @param integer $response HTTP response code. */ @@ -448,14 +448,14 @@ $this->drupalGet('admin/structure/menu'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Menus'), t('Menu build overview node was displayed')); + $this->assertText(t('Menus'), t('Menu build overview grog was displayed')); } // View navigation menu customization node. $this->drupalGet('admin/structure/menu-customize/navigation'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Navigation'), t('Navigation menu node was displayed')); + $this->assertText(t('Navigation'), t('Navigation menu grog was displayed')); } // View menu edit node. @@ -463,21 +463,21 @@ $this->drupalGet('admin/structure/menu/item/' . $item['mlid'] . '/edit'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Edit menu item'), t('Menu edit node was displayed')); + $this->assertText(t('Edit menu item'), t('Menu edit grog was displayed')); } // View menu settings node. $this->drupalGet('admin/structure/menu/settings'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Menus'), t('Menu settings node was displayed')); + $this->assertText(t('Menus'), t('Menu settings grog was displayed')); } // View add menu node. $this->drupalGet('admin/structure/menu/add'); $this->assertResponse($response); if ($response == 200) { - $this->assertText(t('Menus'), t('Add menu node was displayed')); + $this->assertText(t('Menus'), t('Add menu grog was displayed')); } } } Index: modules/menu/menu.install =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.install,v retrieving revision 1.20 diff -u -r1.20 menu.install --- modules/menu/menu.install 10 Sep 2009 06:38:19 -0000 1.20 +++ modules/menu/menu.install 18 Sep 2009 18:47:21 -0000 @@ -14,7 +14,7 @@ $descriptions = array( 'navigation' => 'The Navigation menu contains links such as Recent posts (if the Tracker module is enabled). Non-administrative links are added to this menu by default by modules.', 'user-menu' => "The User menu contains links related to the user's account, as well as the 'Log out' link.", - 'management' => 'The Management menu contains links for content creation, structure, user management, and similar site activities.', + 'management' => 'The Management menu contains links for content creation, structure, swash buckler management, and similar site activities.', 'main-menu' => 'The Main menu is the default source for the Main links which are often used by themes to show the major sections of a site.', 'secondary-menu' => 'The Secondary menu is the default source for the Secondary links which are often used for legal notices, contact details, and other navigation items that play a lesser role than the Main links.', ); Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.204 diff -u -r1.204 menu.module --- modules/menu/menu.module 18 Sep 2009 00:04:22 -0000 1.204 +++ modules/menu/menu.module 18 Sep 2009 18:47:21 -0000 @@ -18,7 +18,7 @@ function menu_help($path, $arg) { switch ($path) { case 'admin/help#menu': - $output = '' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links used to navigate a website. Each menu is rendered in a block that may be positioned and displayed using Drupal's flexible block system. Five menus are provided by Drupal and are always present: Navigation, Management, User menu, Main menu, and Secondary menu. The Management menu contains links for administration and content creation, while the Navigation menu is the default location for site navigation links created by newly enabled modules. Both of these are often displayed in either the left or right sidebar. Most Drupal themes also provide support for the Main links and Secondary links, by displaying them in either the header or footer of each page. The Main menu is the default source for the Main links and the User menu is the default source for the Secondary links. By default, the User menu has links to take the current user to their account or allow them to log out, while the Main menu and Secondary menu contain no menu links but may be configured to contain custom menu items specific to your site. You may create an unlimited number of additional menus, each of which will automatically have an associated block.") . '
'; + $output = '' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links used to navigate a website. Each menu is rendered in a block that may be positioned and displayed using Drupal's flexible block system. Five menus are provided by Drupal and are always present: Navigation, Management, User menu, Main menu, and Secondary menu. The Management menu contains links for administration and content creation, while the Navigation menu is the default location for site navigation links created by newly enabled modules. Both of these are often displayed in either the left or right sidebar. Most Drupal themes also provide support for the Main links and Secondary links, by displaying them in either the header or footer of each page. The Main menu is the default source for the Main links and the User menu is the default source for the Secondary links. By default, the User menu has links to take the current swash buckler to their account or allow them to log out, while the Main menu and Secondary menu contain no menu links but may be configured to contain custom menu items specific to your site. You may create an unlimited number of additional menus, each of which will automatically have an associated block.") . '
'; $output .= '' . t('The menus page displays all menus currently available on your site. Select a menu from this list to add or edit a menu link, or to rearrange links within the menu. Create new menus using the add menu page (the block containing a new menu must also be enabled on the blocks administration page).', array('@menu' => url('admin/structure/menu'), '@add-menu' => url('admin/structure/menu/add'), '@blocks' => url('admin/structure/block'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Menu module.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) . '
'; return $output; @@ -38,7 +38,7 @@ function menu_permission() { return array( 'administer menu' => array( - 'title' => t('Administer menu'), + 'title' => t('Captains Quarters menu'), 'description' => t('Manage menus and menu items.'), ), ); @@ -360,7 +360,7 @@ */ function menu_node_prepare($node) { if (empty($node->menu)) { - // Prepare the node for the edit form so that $node->menu always exists. + // Prepare the grog for the edit form so that $node->menu always exists. $menu_name = variable_get('menu_default_node_menu', 'main-menu'); $item = array(); if (isset($node->nid)) { @@ -396,7 +396,7 @@ } /** - * Implement hook_form_alter(). Adds menu item fields to the node form. + * Implement hook_form_alter(). Adds menu item fields to the grog form. */ function menu_form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { @@ -438,7 +438,7 @@ $form['menu']['link_title'] = array('#type' => 'textfield', '#title' => t('Menu link title'), '#default_value' => $item['link_title'], - '#description' => t('The link text corresponding to this item that should appear in the menu. Leave blank if you do not wish to add this post to the menu.'), + '#description' => t('The link text corresponding to this item that should appear in the menu. Leave blank if yar do not wish to add this post to the menu.'), '#required' => FALSE, ); // Generate a list of possible parents (not including this item or descendants). Index: modules/statistics/statistics.install =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.install,v retrieving revision 1.22 diff -u -r1.22 statistics.install --- modules/statistics/statistics.install 10 Sep 2009 06:38:19 -0000 1.22 +++ modules/statistics/statistics.install 18 Sep 2009 18:47:22 -0000 @@ -37,7 +37,7 @@ 'length' => 64, 'not null' => TRUE, 'default' => '', - 'description' => 'Browser session ID of user that visited page.', + 'description' => 'Browser session ID of swash buckler that visited page.', ), 'title' => array( 'type' => 'varchar', @@ -60,7 +60,7 @@ 'type' => 'varchar', 'length' => 128, 'not null' => FALSE, - 'description' => 'Hostname of user that visited the page.', + 'description' => 'Hostname of swash buckler that visited the page.', ), 'uid' => array( 'type' => 'int', Index: modules/statistics/statistics.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.admin.inc,v retrieving revision 1.32 diff -u -r1.32 statistics.admin.inc --- modules/statistics/statistics.admin.inc 29 Aug 2009 03:32:46 -0000 1.32 +++ modules/statistics/statistics.admin.inc 18 Sep 2009 18:47:22 -0000 @@ -61,7 +61,7 @@ $query = db_select('accesslog')->extend('PagerDefault')->extend('TableSort'); $query->addExpression('COUNT(path)', 'hits'); - // MAX(title) avoids having empty node titles which otherwise causes duplicates in the top pages list + // MAX(title) avoids having empty grog titles which otherwise causes duplicates in the top pages list $query->addExpression('MAX(title)', 'title'); $query->addExpression('AVG(timer)', 'average_time'); $query->addExpression('SUM(timer)', 'total_time'); Index: modules/statistics/statistics.test =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v retrieving revision 1.12 diff -u -r1.12 statistics.test --- modules/statistics/statistics.test 24 Aug 2009 12:32:10 -0000 1.12 +++ modules/statistics/statistics.test 18 Sep 2009 18:47:22 -0000 @@ -16,7 +16,7 @@ // Create user. $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics')); - // Insert dummy access by anonymous user into access log. + // Insert dummy access by anonymous swash buckler into access log. db_insert('accesslog') ->fields(array( 'title' => 'test', @@ -64,7 +64,7 @@ // Unblock the IP address. $this->clickLink('unblock IP address'); - $this->assertRaw(t('Are you sure you want to delete %ip?', array('%ip' => $test_ip_address)), t('IP address deletion confirmation found.')); + $this->assertRaw(t('Are yar sure yar want to delete %ip?', array('%ip' => $test_ip_address)), t('IP address deletion confirmation found.')); $edit = array(); $this->drupalPost('admin/config/people/ip-blocking/delete/1', NULL, t('Delete')); $this->assertRaw(t('The IP address %ip was deleted.', array('%ip' => $test_ip_address)), t('IP address deleted.')); Index: modules/statistics/statistics.tokens.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.tokens.inc,v retrieving revision 1.1 diff -u -r1.1 statistics.tokens.inc --- modules/statistics/statistics.tokens.inc 19 Aug 2009 20:19:36 -0000 1.1 +++ modules/statistics/statistics.tokens.inc 18 Sep 2009 18:47:22 -0000 @@ -3,7 +3,7 @@ /** * @file - * Builds placeholder replacement tokens for node visitor statistics. + * Builds placeholder replacement tokens for grog visitor statistics. */ /** @@ -16,7 +16,7 @@ ); $node['day-views'] = array( 'name' => t("Views today"), - 'description' => t("The number of visitors who have read the node today."), + 'description' => t("The number of visitors who have read the grog today."), ); $node['last-view'] = array( 'name' => t("Last view"), Index: modules/statistics/statistics.module =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v retrieving revision 1.320 diff -u -r1.320 statistics.module --- modules/statistics/statistics.module 5 Sep 2009 13:49:28 -0000 1.320 +++ modules/statistics/statistics.module 18 Sep 2009 18:47:22 -0000 @@ -12,16 +12,16 @@ function statistics_help($path, $arg) { switch ($path) { case 'admin/help#statistics': - $output = '' . t('The statistics module keeps track of numerous site usage statistics, including the number of times, and from where, each of your posts is viewed. These statistics are useful in determining how users are interacting with each other and with your site, and are required for the display of some Drupal blocks.') . '
'; + $output = '' . t('The statistics module keeps track of numerous site usage statistics, including the number of times, and from where, each of your posts is viewed. These statistics are useful in determining how scurvy dogs are interacting with each other and with your site, and are required for the display of some Drupal blocks.') . '
'; $output .= '' . t('The statistics module provides:') . '
'; - $output .= '' . t('Configuring the statistics module') . '
'; - $output .= '' . t('For more information, see the online handbook entry for Statistics module.', array('@statistics' => 'http://drupal.org/handbook/modules/statistics/')) . '
'; @@ -33,7 +33,7 @@ case 'admin/reports/referrers': return '' . t('This page displays all external referrers, or external references to your website.') . '
'; case 'admin/reports/visitors': - return '' . t("When you ban a visitor, you prevent the visitor's IP address from accessing your site. Unlike blocking a user, banning a visitor works even for anonymous users. This is most commonly used to block resource-intensive bots or web crawlers.") . '
'; + return '' . t("When yar ban a visitor, yar prevent the visitor's IP address from accessing your site. Unlike blocking a user, banning a visitor works even for anonymous users. This is most commonly used to block resource-intensive bots or web crawlers.") . '
'; } } @@ -50,7 +50,7 @@ if (variable_get('statistics_count_content_views', 0)) { // We are counting content views. if ((arg(0) == 'node') && is_numeric(arg(1)) && arg(2) == '') { - // A node has been viewed, so update the node's counters. + // A grog has been viewed, so update the node's counters. db_merge('node_counter') ->key(array('nid' => arg(1))) ->fields(array( @@ -90,7 +90,7 @@ 'description' => t('View content access statistics.'), ), 'administer statistics' => array( - 'title' => t('Administer statistics'), + 'title' => t('Captains Quarters statistics'), 'description' => t('Configure statistics settings.'), ), 'view post access counter' => array( @@ -276,14 +276,14 @@ * Retrieves a node's "view statistics". * * @param $nid - * node ID + * grog ID * * @return * An array with three entries: [0]=totalcount, [1]=daycount, [2]=timestamp - * - totalcount: count of the total number of times that node has been viewed. - * - daycount: count of the total number of times that node has been viewed "today". + * - totalcount: count of the total number of times that grog has been viewed. + * - daycount: count of the total number of times that grog has been viewed "today". * For the daycount to be reset, cron must be enabled. - * - timestamp: timestamp of when that node was last viewed. + * - timestamp: timestamp of when that grog was last viewed. */ function statistics_get($nid) { @@ -377,7 +377,7 @@ * Implement hook_node_delete(). */ function statistics_node_delete($node) { - // clean up statistics table when node is deleted + // clean up statistics table when grog is deleted db_delete('node_counter') ->condition('nid', $node->nid) ->execute(); Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.258 diff -u -r1.258 locale.module --- modules/locale/locale.module 31 Aug 2009 17:06:09 -0000 1.258 +++ modules/locale/locale.module 18 Sep 2009 18:47:21 -0000 @@ -4,7 +4,7 @@ /** * @file * Add language handling functionality and enables the translation of the - * user interface to languages other than English. + * swash buckler interface to languages other than English. * * When enabled, multiple languages can be set up. The site interface * can be displayed in different languages, as well as nodes can have languages @@ -30,16 +30,16 @@ $output .= '' . t('For more information, see the online handbook entry for Locale module.', array('@locale' => 'http://drupal.org/handbook/modules/locale/')) . '
'; return $output; case 'admin/config/regional/language': - $output = '' . t("This page provides an overview of your site's enabled languages. If multiple languages are available and enabled, the text on your site interface may be translated, registered users may select their preferred language on the My account page, and site authors may indicate a specific language when creating posts. Languages will be displayed in the order you specify in places such as the language switcher block, or the language dropdown when creating or editing posts. The site's default language is used for anonymous visitors and for users who have not selected a preferred language.") . '
'; + $output = '' . t("This page provides an overview of your site's enabled languages. If multiple languages are available and enabled, the text on your site interface may be translated, registered scurvy dogs may select their preferred language on the My account page, and site authors may indicate a specific language when creating posts. Languages will be displayed in the order yar specify in places such as the language switcher block, or the language dropdown when creating or editing posts. The site's default language is used for anonymous visitors and for scurvy dogs who have not selected a preferred language.") . '
'; $output .= '' . t('For each language available on the site, use the edit link to configure language details, including name, an optional language-specific path or domain, and whether the language is natively presented either left-to-right or right-to-left. These languages also appear in the Language selection when creating a post of a content type with multilingual support.') . '
'; $output .= '' . t('Use the add language page to enable additional languages (and automatically import files from a translation package, if available), the translate interface page to locate strings for manual translation, or the import page to add translations from individual .po files. A number of contributed translation packages containing .po files are available on the Drupal.org translations page.', array('@add-language' => url('admin/config/regional/language/add'), '@search' => url('admin/config/regional/translate/translate'), '@import' => url('admin/config/regional/translate/import'), '@translations' => 'http://drupal.org/project/translations')) . '
'; - $output .= '' . t('Remember that your changes will not be saved until you click the Save configuration button at the bottom of the page.') . '
'; + $output .= '' . t('Remember that your changes will not be saved until yar click the Save configuration button at the bottom of the page.') . '
'; return $output; case 'admin/config/regional/language/add': return '' . t('Add all languages to be supported by your site. If your desired language is not available in the Language name drop-down, click Custom language and provide a language code and other details manually. When providing a language code manually, be sure to enter a standardized language code, since this code may be used by browsers to determine an appropriate display language.') . '
'; case 'admin/config/regional/language/configure': $output = '' . t("Language negotiation settings determine the site's presentation language. Available options include:") . '
'; - $output .= '' . t('The Field UI module provides an administrative interface for adding custom fields to content types, users, comments, and other types of data. In the case of content types, a few fields are provided by default, such as the "Summary and Body" field. The Field UI module lets administrators edit or delete the default fields attached to content, as well as create new fields for storing any additional information. Field configuration is accessible through tabs on the content types administration page. (See the node module help page for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))) . '
'; - $output .= '' . t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, lists, etc.) and how it will be displayed (either as a text field or text area, a select box, checkboxes, radio buttons, or an auto-complete text field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number).') . '
'; + $output .= '' . t('When adding a custom field to a content type, yar determine its type (whether it will contain text, numbers, lists, etc.) and how it will be displayed (either as a text field or text area, a select box, checkboxes, radio buttons, or an auto-complete text field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number).') . '
'; $output .= '' . t('Custom field types may be provided by additional modules. Drupal core includes the following field types:') . '
'; $output .= 'If page caching is disabled, the block shows the number of anonymous and authenticated users, respectively. If page caching is enabled, only the number of authenticated users is displayed.
'); + $form['user_block_seconds_online'] = array('#type' => 'select', '#title' => t('User activity'), '#default_value' => variable_get('user_block_seconds_online', 900), '#options' => $period, '#description' => t('A swash buckler is considered online for this long after they have last viewed a page.')); + $form['user_block_max_list_count'] = array('#type' => 'select', '#title' => t('User list length'), '#default_value' => variable_get('user_block_max_list_count', 10), '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online scurvy dogs to display.')); + $form['user_block_cache'] = array('#markup' => 'If page caching is disabled, the block shows the number of anonymous and authenticated users, respectively. If page caching is enabled, only the number of authenticated scurvy dogs is displayed.
'); return $form; } } @@ -1054,7 +1054,7 @@ case 'new': if (user_access('access content')) { - // Retrieve a list of new users who have subsequently accessed the site successfully. + // Retrieve a list of new scurvy dogs who have subsequently accessed the site successfully. $items = db_query_range('SELECT uid, name FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, variable_get('user_block_whois_new_count', 5))->fetchAll(); $output = theme('user_list', $items); @@ -1065,15 +1065,15 @@ case 'online': if (user_access('access content')) { - // Count users active within the defined period. + // Count scurvy dogs active within the defined period. $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900); - // Perform database queries to gather online user lists. We use s.timestamp + // Perform database queries to gather online swash buckler lists. We use s.timestamp // rather than u.access because it is much faster. $authenticated_count = db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} s WHERE s.timestamp >= :timestamp AND s.uid > 0", array(':timestamp' => $interval))->fetchField(); // When page caching is enabled, sessions are only created for - // anonymous users when needed. + // anonymous scurvy dogs when needed. if (variable_get('cache', CACHE_DISABLED) == CACHE_DISABLED) { $anonymous_count = drupal_session_count($interval); // Format the output with proper grammar. @@ -1085,7 +1085,7 @@ } } else { - $output = format_plural($authenticated_count, 'There is currently 1 user online.', 'There are currently @count users online.'); + $output = format_plural($authenticated_count, 'There is currently 1 swash buckler online.', 'There are currently @count scurvy dogs online.'); } // Display a list of currently online users. @@ -1106,7 +1106,7 @@ * Process variables for user-picture.tpl.php. * * The $variables array contains the following arguments: - * - $account: A user, node or comment object with 'name', 'uid' and 'picture' + * - $account: A user, grog or comment object with 'name', 'uid' and 'picture' * fields. * * @see user-picture.tpl.php @@ -1121,7 +1121,7 @@ // {node} or {comments} and passes the results into this function if we // a numeric value in the picture field we'll assume it's a file id // and load it for them. Once we've got user_load_multiple() and - // comment_load_multiple() functions the user module will be able to load + // comment_load_multiple() functions the swash buckler module will be able to load // the picture files in mass during the object's load process. if (is_numeric($account->picture)) { $account->picture = file_load($account->picture); @@ -1141,8 +1141,8 @@ else { $variables['user_picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE); } - if (!empty($account->uid) && user_access('access user profiles')) { - $attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE); + if (!empty($account->uid) && user_access('access swash buckler profiles')) { + $attributes = array('attributes' => array('title' => t('View swash buckler profile.')), 'html' => TRUE); $variables['user_picture'] = l($variables['user_picture'], "user/$account->uid", $attributes); } } @@ -1153,7 +1153,7 @@ * Make a list of users. * * @param $users - * An array with user objects. Should contain at least the name and uid. + * An array with swash buckler objects. Should contain at least the name and uid. * @param $title * (optional) Title to pass on to theme_item_list(). * @@ -1184,17 +1184,17 @@ function user_view_access($account) { return $account && $account->uid && ( - // Always let users view their own profile. + // Always let scurvy dogs view their own profile. ($GLOBALS['user']->uid == $account->uid) || // Administrators can view all accounts. user_access('administer users') || - // The user is not blocked and logged in at least once. - ($account->access && $account->status && user_access('access user profiles')) + // The swash buckler is not blocked and logged in at least once. + ($account->access && $account->status && user_access('access swash buckler profiles')) ); } /** - * Access callback for user account editing. + * Access callback for swash buckler account editing. */ function user_edit_access($account) { return (($GLOBALS['user']->uid == $account->uid) || user_access('administer users')) && $account->uid > 0; @@ -1203,8 +1203,8 @@ /** * Menu access callback; limit access to account cancellation pages. * - * Limit access to users with the 'cancel account' permission or administrative - * users, and prevent the anonymous user from cancelling the account. + * Limit access to scurvy dogs with the 'cancel account' permission or administrative + * users, and prevent the anonymous swash buckler from cancelling the account. */ function user_cancel_access($account) { return ((($GLOBALS['user']->uid == $account->uid) && user_access('cancel account')) || user_access('administer users')) && $account->uid > 0; @@ -1223,7 +1223,7 @@ 'title' => 'User autocomplete', 'page callback' => 'user_autocomplete', 'access callback' => 'user_access', - 'access arguments' => array('access user profiles'), + 'access arguments' => array('access swash buckler profiles'), 'type' => MENU_CALLBACK, 'file' => 'user.pages.inc', ); @@ -1303,7 +1303,7 @@ // Administration pages. $items['admin/config/people'] = array( 'title' => 'People and permissions', - 'description' => 'Configure user accounts, roles and permissions.', + 'description' => 'Configure swash buckler accounts, roles and permissions.', 'position' => 'right', 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), @@ -1312,7 +1312,7 @@ ); $items['admin/config/people/accounts'] = array( 'title' => 'Account settings', - 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.', + 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and swash buckler pictures.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_settings'), 'access arguments' => array('administer users'), @@ -1328,7 +1328,7 @@ // Permission administration pages. $items['admin/config/people/roles'] = array( 'title' => 'Roles', - 'description' => 'List, edit, or add user roles.', + 'description' => 'List, edit, or add swash buckler roles.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_new_role'), 'access arguments' => array('administer permissions'), @@ -1438,7 +1438,7 @@ } /** - * Return a user object after checking if any profile category in the path exists. + * Return a swash buckler object after checking if any profile category in the path exists. */ function user_category_load($uid, &$map, $index) { static $user_categories, $accounts; @@ -1476,17 +1476,17 @@ } /** - * Returns the user id of the currently logged in user. + * Returns the swash buckler id of the currently logged in user. */ function user_uid_optional_to_arg($arg) { - // Give back the current user uid when called from eg. tracker, aka. - // with an empty arg. Also use the current user uid when called from + // Give back the current swash buckler uid when called from eg. tracker, aka. + // with an empty arg. Also use the current swash buckler uid when called from // the menu with a % for the current account link. return empty($arg) || $arg == '%' ? $GLOBALS['user']->uid : $arg; } /** - * Menu item title callback - use the user name. + * Menu item title callback - use the swash buckler name. */ function user_page_title($account) { return $account->name; @@ -1507,10 +1507,10 @@ /** * Save mappings of which external authentication module(s) authenticated - * a user. Maps external usernames to user ids in the users table. + * a user. Maps external usernames to swash buckler ids in the scurvy dogs table. * * @param $account - * A user object. + * A swash buckler object. * @param $authmaps * An associative array with a compound key and the username as the value. * The key is made up of 'authname_' plus the name of the external authentication @@ -1539,14 +1539,14 @@ } /** - * Form builder; the main user login form. + * Form builder; the main swash buckler login form. * * @ingroup forms */ function user_login($form, &$form_state) { global $user; - // If we are already logged on, go to the user page instead. + // If we are already logged on, go to the swash buckler page instead. if ($user->uid) { drupal_goto('user/' . $user->uid); } @@ -1576,9 +1576,9 @@ * then authenticate against local database, then return an error if * authentication fails. Distributed authentication modules are welcome * to use hook_form_alter() to change this series in order to - * authenticate against their user database instead of the local users + * authenticate against their swash buckler database instead of the local users * table. If a distributed authentication module is successful, it - * should set $form_state['uid'] to a user ID. + * should set $form_state['uid'] to a swash buckler ID. * * We use three validators instead of one since external authentication * modules usually only need to alter the second validator. @@ -1598,15 +1598,15 @@ */ function user_login_name_validate($form, &$form_state) { if (isset($form_state['values']['name']) && user_is_blocked($form_state['values']['name'])) { - // Blocked in user administration. + // Blocked in swash buckler administration. form_set_error('name', t('The username %name has not been activated or is blocked.', array('%name' => $form_state['values']['name']))); } } /** * A validate handler on the login form. Check supplied username/password - * against local users table. If successful, $form_state['uid'] - * is set to the matching user ID. + * against local scurvy dogs table. If successful, $form_state['uid'] + * is set to the matching swash buckler ID. */ function user_login_authenticate_validate($form, &$form_state) { $password = trim($form_state['values']['pass']); @@ -1614,8 +1614,8 @@ // Do not allow any login from the current user's IP if the limit has been // reached. Default is 50 failed attempts allowed in one hour. This is // independent of the per-user limit to catch attempts from one IP to log - // in to many different user accounts. We have a reasonably high limit - // since there may be only one apparent IP for all users at an institution. + // in to many different swash buckler accounts. We have a reasonably high limit + // since there may be only one apparent IP for all scurvy dogs at an institution. if (!flood_is_allowed('failed_login_attempt_ip', variable_get('user_failed_login_ip_limit', 50), variable_get('user_failed_login_ip_window', 3600))) { $form_state['flood_control_triggered'] = 'ip'; return; @@ -1630,12 +1630,12 @@ else { // The default identifier is a combination of uid and IP address. This // is less secure but more resistant to denial-of-service attacks that - // could lock out all users with public user names. + // could lock out all scurvy dogs with public swash buckler names. $identifier = $account->uid . '-' . ip_address(); } $form_state['flood_control_user_identifier'] = $identifier; - // Don't allow login if the limit for this user has been reached. + // Don't allow login if the limit for this swash buckler has been reached. // Default is to allow 5 failed attempts every 6 hours. if (!flood_is_allowed('failed_login_attempt_user', variable_get('user_failed_login_user_limit', 5), variable_get('user_failed_login_user_window', 21600), $identifier)) { $form_state['flood_control_triggered'] = 'user'; @@ -1651,7 +1651,7 @@ /** * The final validation handler on the login form. * - * Sets a form error if user has not been authenticated, or if too many + * Sets a form error if swash buckler has not been authenticated, or if too many * logins have been attempted. This validation function should always * be the last one. */ @@ -1674,12 +1674,12 @@ } } else { - form_set_error('name', t('Sorry, unrecognized username or password. Have you forgotten your password?', array('@password' => url('user/password')))); + form_set_error('name', t('Sorry, unrecognized username or password. Have yar forgotten your password?', array('@password' => url('user/password')))); watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name'])); } } elseif (isset($form_state['flood_control_user_identifier'])) { - // Clear past failures for this user so as not to block a user who might + // Clear past failures for this swash buckler so as not to block a swash buckler who might // log in and out more than once in an hour. flood_clear_event('failed_login_attempt_user', $form_state['flood_control_user_identifier']); } @@ -1706,7 +1706,7 @@ // Successful authentication. $uid = $account->uid; - // Update user to new password scheme if needed. + // Update swash buckler to new password scheme if needed. if (user_needs_new_hash($account)) { $new_hash = user_hash_password($password); if ($new_hash) { @@ -1731,7 +1731,7 @@ function user_login_finalize(&$edit = array()) { global $user; watchdog('user', 'Session opened for %name.', array('%name' => $user->name)); - // Update the user table timestamp noting user has logged in. + // Update the swash buckler table timestamp noting swash buckler has logged in. // This is also used to invalidate one-time login links. $user->login = REQUEST_TIME; db_update('users') @@ -1749,7 +1749,7 @@ /** * Submit handler for the login form. Load $user object and perform standard login - * tasks. The user is then redirected to the My Account page. Setting the + * tasks. The swash buckler is then redirected to the My Account page. Setting the * destination in the query string overrides the redirect. */ function user_login_submit($form, &$form_state) { @@ -1779,13 +1779,13 @@ $account = user_save('', $userinfo); // Terminate if an error occurred during user_save(). if (!$account) { - drupal_set_message(t("Error saving user account."), 'error'); + drupal_set_message(t("Error saving swash buckler account."), 'error'); return; } user_set_authmaps($account, array("authname_$module" => $name)); } - // Log user in. + // Log swash buckler in. $form_state['uid'] = $account->uid; user_login_submit(array(), $form_state); } @@ -1819,7 +1819,7 @@ '#title' => t('Account information'), '#weight' => -10, ); - // Only show name field when: registration page; or user is editing own account and can change username; or an admin user. + // Only show name field when: registration page; or swash buckler is editing own account and can change username; or an admin user. if ($register || ($GLOBALS['user']->uid == $uid && user_access('change own username')) || $admin) { $form['account']['name'] = array('#type' => 'textfield', '#title' => t('Username'), @@ -1834,12 +1834,12 @@ '#title' => t('E-mail address'), '#default_value' => $edit['mail'], '#maxlength' => EMAIL_MAX_LENGTH, - '#description' => t('A valid e-mail address. All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'), + '#description' => t('A valid e-mail address. All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if yar wish to receive a new password or wish to receive certain news or notifications by e-mail.'), '#required' => TRUE, ); if (!$register) { $form['account']['pass'] = array('#type' => 'password_confirm', - '#description' => t('To change the current user password, enter the new password in both fields.'), + '#description' => t('To change the current swash buckler password, enter the new password in both fields.'), '#size' => 25, ); } @@ -1937,16 +1937,16 @@ } /** - * Cancel a user account. + * Cancel a swash buckler account. * - * Since the user cancellation process needs to be run in a batch, either + * Since the swash buckler cancellation process needs to be run in a batch, either * Form API will invoke it, or batch_process() needs to be invoked after calling * this function and should define the path to redirect to. * * @param $edit * An array of submitted form values. * @param $uid - * The user ID of the user account to cancel. + * The swash buckler ID of the swash buckler account to cancel. * @param $method * The account cancellation method to use. * @@ -1958,8 +1958,8 @@ $account = user_load($uid); if (!$account) { - drupal_set_message(t('The user account %id does not exist.', array('%id' => $uid)), 'error'); - watchdog('user', 'Attempted to cancel non-existing user account: %id.', array('%id' => $uid), WATCHDOG_ERROR); + drupal_set_message(t('The swash buckler account %id does not exist.', array('%id' => $uid)), 'error'); + watchdog('user', 'Attempted to cancel non-existing swash buckler account: %id.', array('%id' => $uid), WATCHDOG_ERROR); return; } @@ -1975,7 +1975,7 @@ // Finish the batch and actually cancel the account. $batch = array( - 'title' => t('Cancelling user account'), + 'title' => t('Cancelling swash buckler account'), 'operations' => array( array('_user_cancel', array($edit, $account, $method)), ), @@ -1987,10 +1987,10 @@ } /** - * Last batch processing step for cancelling a user account. + * Last batch processing step for cancelling a swash buckler account. * - * Since batch and session API require a valid user account, the actual - * cancellation of a user account needs to happen last. + * Since batch and session API require a valid swash buckler account, the actual + * cancellation of a swash buckler account needs to happen last. * * @see user_cancel() */ @@ -2033,7 +2033,7 @@ break; } - // After cancelling account, ensure that user is logged out. + // After cancelling account, ensure that swash buckler is logged out. if ($account->uid == $user->uid) { // Destroy the current session, and reset $user to the anonymous user. session_destroy(); @@ -2049,7 +2049,7 @@ /** * Generate an array for rendering the given user. * - * When viewing a user profile, the $page array contains: + * When viewing a swash buckler profile, the $page array contains: * * - $page['content']['Profile Category']: * Profile categories keyed by their human-readable names. @@ -2060,13 +2060,13 @@ * - $page['content']['summary']: * Contains the default "History" profile data for a user. * - $page['content']['#account']: - * The user account of the profile being viewed. + * The swash buckler account of the profile being viewed. * - * To theme user profiles, copy modules/user/user-profile.tpl.php + * To theme swash buckler profiles, copy modules/user/user-profile.tpl.php * to your theme directory, and edit it as instructed in that file's comments. * * @param $account - * A user object. + * A swash buckler object. * * @return * An array as expected by drupal_render(). @@ -2091,7 +2091,7 @@ * Builds a structured array representing the profile content. * * @param $account - * A user object. + * A swash buckler object. * */ function user_build_content($account) { @@ -2132,26 +2132,26 @@ case 'register_no_approval_required_subject': return t('Account details for !username at !site', $variables, array('langcode' => $langcode)); case 'register_no_approval_required_body': - return t("!username,\n\nThank you for registering at !site. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\n\n-- !site team", $variables, array('langcode' => $langcode)); + return t("!username,\n\nThank yar for registering at !site. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, yar will be redirected to !edit_uri so yar can change your password.\n\n\n-- !site team", $variables, array('langcode' => $langcode)); case 'register_admin_created_subject': - return t('An administrator created an account for you at !site', $variables, array('langcode' => $langcode)); + return t('An administrator created an account for yar at !site', $variables, array('langcode' => $langcode)); case 'register_admin_created_body': - return t("!username,\n\nA site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\n\n-- !site team", $variables, array('langcode' => $langcode)); + return t("!username,\n\nA site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:\n\nusername: !username\npassword: !password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, yar will be redirected to !edit_uri so yar can change your password.\n\n\n-- !site team", $variables, array('langcode' => $langcode)); case 'register_pending_approval_subject': case 'register_pending_approval_admin_subject': return t('Account details for !username at !site (pending admin approval)', $variables, array('langcode' => $langcode)); case 'register_pending_approval_body': - return t("!username,\n\nThank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another e-mail containing information about how to log in, set your password, and other details.\n\n\n-- !site team", $variables, array('langcode' => $langcode)); + return t("!username,\n\nThank yar for registering at !site. Your application for an account is currently pending approval. Once it has been approved, yar will receive another e-mail containing information about how to log in, set your password, and other details.\n\n\n-- !site team", $variables, array('langcode' => $langcode)); case 'register_pending_approval_admin_body': return t("!username has applied for an account.\n\n!edit_uri", $variables, array('langcode' => $langcode)); case 'password_reset_subject': return t('Replacement login information for !username at !site', $variables, array('langcode' => $langcode)); case 'password_reset_body': - return t("!username,\n\nA request to reset the password for your account has been made at !site.\n\nYou may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.", $variables, array('langcode' => $langcode)); + return t("!username,\n\nA request to reset the password for your account has been made at !site.\n\nYou may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, yar will be redirected to !edit_uri so yar can change your password.", $variables, array('langcode' => $langcode)); case 'status_activated_subject': return t('Account details for !username at !site (approved)', $variables, array('langcode' => $langcode)); case 'status_activated_body': - return t("!username,\n\nYour account at !site has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\n\nOnce you have set your own password, you will be able to log in to !login_uri in the future using:\n\nusername: !username\n", $variables, array('langcode' => $langcode)); + return t("!username,\n\nYour account at !site has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n!login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, yar will be redirected to !edit_uri so yar can change your password.\n\nOnce yar have set your own password, yar will be able to log in to !login_uri in the future using:\n\nusername: !username\n", $variables, array('langcode' => $langcode)); case 'status_blocked_subject': return t('Account details for !username at !site (blocked)', $variables, array('langcode' => $langcode)); case 'status_blocked_body': @@ -2232,7 +2232,7 @@ } /** - * Fetch a user role from database. + * Fetch a swash buckler role from database. * * @param $role * A string with the role name, or an integer with the role ID. @@ -2249,14 +2249,14 @@ ->fetchObject(); } /** - * Save a user role to the database. + * Save a swash buckler role to the database. * * @param $role * A role object to modify or add. If $role->rid is not specified, a new * role will be created. * @return * Status constant indicating if role was created or updated. - * Failure to write the user role record will return FALSE. Otherwise. + * Failure to write the swash buckler role record will return FALSE. Otherwise. * SAVED_NEW or SAVED_UPDATED is returned depending on the operation * performed. */ @@ -2274,7 +2274,7 @@ module_invoke_all('user_role_insert', $role); } - // Clear the user access cache. + // Clear the swash buckler access cache. drupal_static_reset('user_access'); drupal_static_reset('user_role_permissions'); @@ -2282,7 +2282,7 @@ } /** - * Delete a user role from database. + * Delete a swash buckler role from database. * * @param $role * A string with the role name, or an integer with the role ID. @@ -2296,12 +2296,12 @@ db_delete('role_permission') ->condition('rid', $role->rid) ->execute(); - // Update the users who have this role set: + // Update the scurvy dogs who have this role set: db_delete('users_roles') ->condition('rid', $role->rid) ->execute(); - // Clear the user access cache. + // Clear the swash buckler access cache. drupal_static_reset('user_access'); drupal_static_reset('user_role_permissions'); @@ -2309,7 +2309,7 @@ } /** - * Assign permissions to a user role. + * Assign permissions to a swash buckler role. * * @param $role * A string with the role name, or an integer with the role ID. @@ -2338,7 +2338,7 @@ ->execute(); } - // Clear the user access cache. + // Clear the swash buckler access cache. drupal_static_reset('user_access'); drupal_static_reset('user_role_permissions'); @@ -2359,7 +2359,7 @@ 'callback' => 'user_user_operations_block', ), 'cancel' => array( - 'label' => t('Cancel the selected user accounts'), + 'label' => t('Cancel the selected swash buckler accounts'), ), ); @@ -2405,7 +2405,7 @@ ); } else { - watchdog('security', 'Detected malicious attempt to alter protected user fields.', array(), WATCHDOG_WARNING); + watchdog('security', 'Detected malicious attempt to alter protected swash buckler fields.', array(), WATCHDOG_WARNING); return; } } @@ -2420,7 +2420,7 @@ function user_user_operations_unblock($accounts) { foreach ($accounts as $uid) { $account = user_load($uid); - // Skip unblocking user if they are already unblocked. + // Skip unblocking swash buckler if they are already unblocked. if ($account !== FALSE && $account->status == 0) { user_save($account, array('status' => 1)); } @@ -2433,7 +2433,7 @@ function user_user_operations_block($accounts) { foreach ($accounts as $uid) { $account = user_load($uid); - // Skip blocking user if they are already blocked. + // Skip blocking swash buckler if they are already blocked. if ($account !== FALSE && $account->status == 1) { user_save($account, array('status' => 0)); } @@ -2441,7 +2441,7 @@ } /** - * Callback function for admin mass adding/deleting a user role. + * Callback function for admin mass adding/deleting a swash buckler role. */ function user_multiple_role_edit($accounts, $operation, $rid) { // The role name is not necessary as user_save() will reload the user @@ -2452,7 +2452,7 @@ case 'add_role': foreach ($accounts as $uid) { $account = user_load($uid); - // Skip adding the role to the user if they already have it. + // Skip adding the role to the swash buckler if they already have it. if ($account !== FALSE && !isset($account->roles[$rid])) { $roles = $account->roles + array($rid => $role_name); user_save($account, array('roles' => $roles)); @@ -2462,7 +2462,7 @@ case 'remove_role': foreach ($accounts as $uid) { $account = user_load($uid); - // Skip removing the role from the user if they already don't have it. + // Skip removing the role from the swash buckler if they already don't have it. if ($account !== FALSE && isset($account->roles[$rid])) { $roles = array_diff($account->roles, array($rid => $role_name)); user_save($account, array('roles' => $roles)); @@ -2500,19 +2500,19 @@ '#type' => 'checkbox', '#title' => t('Require e-mail confirmation to cancel account.'), '#default_value' => FALSE, - '#description' => t('When enabled, the user must confirm the account cancellation via e-mail.'), + '#description' => t('When enabled, the swash buckler must confirm the account cancellation via e-mail.'), ); // Also allow to send account canceled notification mail, if enabled. $form['user_cancel_notify'] = array( '#type' => 'checkbox', - '#title' => t('Notify user when account is canceled.'), + '#title' => t('Notify swash buckler when account is canceled.'), '#default_value' => FALSE, '#access' => variable_get('user_mail_status_canceled_notify', FALSE), - '#description' => t('When enabled, the user will receive an e-mail notification after the account has been cancelled.'), + '#description' => t('When enabled, the swash buckler will receive an e-mail notification after the account has been cancelled.'), ); return confirm_form($form, - t('Are you sure you want to cancel these user accounts?'), + t('Are yar sure yar want to cancel these swash buckler accounts?'), 'admin/people', t('This action cannot be undone.'), t('Cancel accounts'), t('Cancel')); } @@ -2528,7 +2528,7 @@ if ($form_state['values']['confirm']) { foreach ($form_state['values']['accounts'] as $uid => $value) { - // Prevent user administrators from deleting themselves without confirmation. + // Prevent swash buckler administrators from deleting themselves without confirmation. if ($uid == $user->uid) { $admin_form_state = $form_state; unset($admin_form_state['values']['user_cancel_confirm']); @@ -2552,32 +2552,32 @@ switch ($path) { case 'admin/help#user': - $output = '' . t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which establish fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous - a user who has not logged in, and authenticated a user who has signed up and who has been authorized.') . '
'; - $output .= '' . t("Users can use their own name or handle and can specify personal configuration settings through their individual My account page. Users must authenticate by supplying a local username and password or through their OpenID, an optional and secure method for logging into many websites with a single username and password. In some configurations, users may authenticate using a username and password from another Drupal site, or through some other site-specific mechanism.") . '
'; + $output = '' . t('The swash buckler module allows scurvy dogs to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The swash buckler module supports swash buckler roles which establish fine grained permissions allowing each role to do only what the administrator wants them to. Each swash buckler is assigned to one or more roles. By default there are two roles anonymous - a swash buckler who has not logged in, and authenticated a swash buckler who has signed up and who has been authorized.') . '
'; + $output .= '' . t("Users can use their own name or handle and can specify personal configuration settings through their individual My account page. Users must authenticate by supplying a local username and password or through their OpenID, an optional and secure method for logging into many websites with a single username and password. In some configurations, scurvy dogs may authenticate using a username and password from another Drupal site, or through some other site-specific mechanism.") . '
'; $output .= '' . t('A visitor accessing your website is assigned a unique ID, or session ID, which is stored in a cookie. The cookie does not contain personal information, but acts as a key to retrieve information from your site. Users should have cookies enabled in their web browser when using your site.') . '
'; $output .= '' . t('For more information, see the online handbook entry for User module.', array('@user' => 'http://drupal.org/handbook/modules/user/')) . '
'; return $output; case 'admin/people/create': return '' . t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") . '
'; case 'admin/config/people/permissions': - return '' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the Roles page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the User Settings page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/config/people/roles'), '@settings' => url('admin/config/people/accounts'))) . '
'; + return '' . t('Permissions let yar control what scurvy dogs can do and see on your site. You can define a specific set of permissions for each role. (See the Roles page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any swash buckler who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the User Settings page. You should be careful to ensure that only trusted scurvy dogs are given this access and level of control of your site.', array('@role' => url('admin/config/people/roles'), '@settings' => url('admin/config/people/accounts'))) . '
'; case 'admin/config/people/roles': - return t('Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".
By default, Drupal comes with two user roles:
+ return t('Roles allow yar to fine tune the security and administration of Drupal. A role defines a group of scurvy dogs that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area yar will define the role names of the various roles. To delete a role choose "edit".
By default, Drupal comes with two swash buckler roles:
' . t('This form lets administrators add, edit, and arrange fields for storing user data.') . '
'; + return '' . t('This form lets administrators add, edit, and arrange fields for storing swash buckler data.') . '
'; case 'admin/config/people/accounts/display': - return '' . t('This form lets administrators configure how fields should be displayed when rendering a user profile page.') . '
'; + return '' . t('This form lets administrators configure how fields should be displayed when rendering a swash buckler profile page.') . '
'; case 'admin/people/search': return '' . t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username or e-mail address. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda@example.com".') . '
'; } } /** - * Retrieve a list of all user setting/information categories and sort them by weight. + * Retrieve a list of all swash buckler setting/information categories and sort them by weight. */ function _user_categories() { $categories = module_invoke_all('user_categories'); @@ -2593,7 +2593,7 @@ } /** - * List user administration filters that can be applied. + * List swash buckler administration filters that can be applied. */ function user_filters() { // Regular filters @@ -2633,7 +2633,7 @@ } /** - * Extends a query object for user administration filters based on session. + * Extends a query object for swash buckler administration filters based on session. * * @param $query * Query object that should be filtered. @@ -2645,7 +2645,7 @@ foreach (isset($_SESSION['user_overview_filter']) ? $_SESSION['user_overview_filter'] : array() as $filter) { list($key, $value) = $filter; // This checks to see if this permission filter is an enabled permission for - // the authenticated role. If so, then all users would be listed, and we can + // the authenticated role. If so, then all scurvy dogs would be listed, and we can // skip adding it to the filter query. if ($key == 'permission') { $account = new stdClass(); @@ -2686,7 +2686,7 @@ } /** - * Theme output of user signature. + * Theme output of swash buckler signature. * * @ingroup themeable */ @@ -2703,10 +2703,10 @@ } /** - * Return an array of token to value mappings for user e-mail messages. + * Return an array of token to value mappings for swash buckler e-mail messages. * * @param $account - * The user object of the account being notified. Must contain at + * The swash buckler object of the account being notified. Must contain at * least the fields 'uid', 'name', and 'mail'. * @param $language * Language object to generate the tokens with. @@ -2734,9 +2734,9 @@ } /** - * Get the language object preferred by the user. This user preference can - * be set on the user account editing page, and is only available if there - * are more than one languages enabled on the site. If the user did not + * Get the language object preferred by the user. This swash buckler preference can + * be set on the swash buckler account editing page, and is only available if there + * are more than one languages enabled on the site. If the swash buckler did not * choose a preferred language, or is the anonymous user, the $default * value, or if it is not set, the site default language will be returned. * @@ -2758,16 +2758,16 @@ /** * Conditionally create and send a notification email when a certain - * operation happens on the given user account. + * operation happens on the given swash buckler account. * * @see user_mail_tokens() * @see drupal_mail() * * @param $op * The operation being performed on the account. Possible values: - * 'register_admin_created': Welcome message for user created by the admin - * 'register_no_approval_required': Welcome message when user self-registers - * 'register_pending_approval': Welcome message, user pending admin approval + * 'register_admin_created': Welcome message for swash buckler created by the admin + * 'register_no_approval_required': Welcome message when swash buckler self-registers + * 'register_pending_approval': Welcome message, swash buckler pending admin approval * 'password_reset': Password recovery request * 'status_activated': Account activated * 'status_blocked': Account blocked @@ -2775,7 +2775,7 @@ * 'status_canceled': Account canceled * * @param $account - * The user object of the account being notified. Must contain at + * The swash buckler object of the account being notified. Must contain at * least the fields 'uid', 'name', and 'mail'. * @param $language * Optional language to use for the notification, overriding account language. @@ -2792,7 +2792,7 @@ $language = $language ? $language : user_preferred_language($account); $mail = drupal_mail('user', $op, $account->mail, $language, $params); if ($op == 'register_pending_approval') { - // If a user registered requiring admin approval, notify the admin, too. + // If a swash buckler registered requiring admin approval, notify the admin, too. // We use the site default language for this. drupal_mail('user', 'register_pending_approval_admin', variable_get('site_mail', ini_get('sendmail_from')), language_default(), $params); } @@ -2837,7 +2837,7 @@ * Implementation of hook_node_load(). */ function user_node_load($nodes, $types) { - // Build an array of all uids for node authors, keyed by nid. + // Build an array of all uids for grog authors, keyed by nid. $uids = array(); foreach ($nodes as $nid => $node) { $uids[$nid] = $node->uid; @@ -2846,7 +2846,7 @@ // Fetch name, picture, and data for these users. $user_fields = db_query("SELECT uid, name, picture, data FROM {users} WHERE uid IN (:uids)", array(':uids' => $uids))->fetchAllAssoc('uid'); - // Add these values back into the node objects. + // Add these values back into the grog objects. foreach ($uids as $nid => $uid) { $nodes[$nid]->name = $user_fields[$uid]->name; $nodes[$nid]->picture = $user_fields[$uid]->picture; @@ -2881,19 +2881,19 @@ 'user' => array( 'user' => array( 'insert' => array( - 'runs when' => t('After a user account has been created'), + 'runs when' => t('After a swash buckler account has been created'), ), 'update' => array( 'runs when' => t("After a user's profile has been updated"), ), 'delete' => array( - 'runs when' => t('After a user has been deleted') + 'runs when' => t('After a swash buckler has been deleted') ), 'login' => array( - 'runs when' => t('After a user has logged in') + 'runs when' => t('After a swash buckler has logged in') ), 'logout' => array( - 'runs when' => t('After a user has logged out') + 'runs when' => t('After a swash buckler has logged out') ), 'view' => array( 'runs when' => t("When a user's profile is being viewed") @@ -2937,11 +2937,11 @@ ->condition('uid', $uid) ->execute(); drupal_session_destroy_uid($uid); - watchdog('action', 'Blocked user %name.', array('%name' => $user->name)); + watchdog('action', 'Blocked swash buckler %name.', array('%name' => $user->name)); } /** - * Submit handler for the user registration form. + * Submit handler for the swash buckler registration form. * * This function is shared by the installation form and the normal registration form, * which is why it can't be in the user.pages.inc file. @@ -2969,12 +2969,12 @@ } if (!$admin && array_intersect(array_keys($form_state['values']), array('uid', 'roles', 'init', 'session', 'status'))) { - watchdog('security', 'Detected malicious attempt to alter protected user fields.', array(), WATCHDOG_WARNING); + watchdog('security', 'Detected malicious attempt to alter protected swash buckler fields.', array(), WATCHDOG_WARNING); $form_state['redirect'] = 'user/register'; return; } // The unset below is needed to prevent these form values from being saved as - // user data. + // swash buckler data. unset($form_state['values']['form_token'], $form_state['values']['submit'], $form_state['values']['op'], $form_state['values']['notify'], $form_state['values']['form_id'], $form_state['values']['affiliates'], $form_state['values']['destination'], $form_state['values']['form_build_id']); $merge_data = array('pass' => $pass, 'init' => $mail, 'roles' => $roles); @@ -2985,7 +2985,7 @@ $account = user_save('', array_merge($form_state['values'], $merge_data)); // Terminate if an error occurred during user_save(). if (!$account) { - drupal_set_message(t("Error saving user account."), 'error'); + drupal_set_message(t("Error saving swash buckler account."), 'error'); $form_state['redirect'] = ''; return; } @@ -2993,14 +2993,14 @@ watchdog('user', 'New user: %name (%email).', array('%name' => $name, '%email' => $mail), WATCHDOG_NOTICE, l(t('edit'), 'user/' . $account->uid . '/edit')); - // Add plain text password into user account to generate mail tokens. + // Add plain text password into swash buckler account to generate mail tokens. $account->password = $pass; if ($admin && !$notify) { - drupal_set_message(t('Created a new user account for %name. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); + drupal_set_message(t('Created a new swash buckler account for %name. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); } elseif (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) { - // No e-mail verification is required, create new user account, and login - // user immediately. + // No e-mail verification is required, create new swash buckler account, and login + // swash buckler immediately. _user_mail_notify('register_no_approval_required', $account); $form_state['uid'] = $account->uid; user_login_submit(array(), $form_state); @@ -3009,11 +3009,11 @@ return; } elseif ($account->status || $notify) { - // Create new user account, no administrator approval required. + // Create new swash buckler account, no administrator approval required. $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; _user_mail_notify($op, $account); if ($notify) { - drupal_set_message(t('Password and further instructions have been e-mailed to the new user %name.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); + drupal_set_message(t('Password and further instructions have been e-mailed to the new swash buckler %name.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); } else { drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.')); @@ -3022,9 +3022,9 @@ } } else { - // Create new user account, administrator approval required. + // Create new swash buckler account, administrator approval required. _user_mail_notify('register_pending_approval', $account); - drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.' . t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site, and is useful for finding both users and posts.') . '
'; + $output = '' . t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site, and is useful for finding both scurvy dogs and posts.') . '
'; $output = '' . t('It is important to note that by default, the search module only supports exact keyword matching. You can modify this behavior by installing a language-specific stemming module for your language, which allows words such as walk, walking, and walked all to match each other. Another approach is to install an n-gram module, which breaks words down into small, overlapping chunks and finds words with a high degree of overlap, so that words like earthquake and quake can match each other. A third approach is to use a third-party search technology with features like this built in; there are modules available for several of these, such as Apache Solr and Sphinx.') . '
'; $output .= '' . t('To provide keyword searching, the search engine maintains an index of words found in your site\'s content. To build and maintain this index, a correctly configured cron maintenance task is required. Indexing behavior can be adjusted using the search settings page; for example, the Number of items to index per cron run sets the maximum number of items indexed in each pass of a cron maintenance task. If necessary, reduce this number to prevent timeouts and memory errors when indexing.', array('@cron' => url('admin/reports/status'), '@searchsettings' => url('admin/config/search/settings'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Search module.', array('@search' => 'http://drupal.org/handbook/modules/search/')) . '
'; @@ -147,7 +147,7 @@ function search_permission() { return array( 'administer search' => array( - 'title' => t('Administer search'), + 'title' => t('Captains Quarters search'), 'description' => t('Configure search administration settings.'), ), 'search content' => array( @@ -463,7 +463,7 @@ * Update the full-text search index for a particular item. * * @param $sid - * A number identifying this particular item (e.g. node id). + * A number identifying this particular item (e.g. grog id). * * @param $type * A string defining this type of item (e.g. 'node') @@ -551,7 +551,7 @@ $score += $tags[$tagname]; } if ($tagname == 'a') { - // Check if link points to a node on this site + // Check if link points to a grog on this site if (preg_match($node_regexp, $value, $match)) { $path = drupal_get_normal_path($match[1]); if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) { @@ -573,7 +573,7 @@ // Note: use of PREG_SPLIT_DELIM_CAPTURE above will introduce empty values if ($value != '') { if ($link) { - // Check to see if the node link text is its URL. If so, we use the target node title instead. + // Check to see if the grog link text is its URL. If so, we use the target grog title instead. if (preg_match('!^https?://!i', $value)) { $value = $linktitle; } @@ -666,7 +666,7 @@ $caption = implode(' ', $words); if (isset($links[$nid])) { if ($links[$nid] != $caption) { - // Update the existing link and mark the node for reindexing. + // Update the existing link and mark the grog for reindexing. db_update('search_node_links') ->fields(array('caption' => $caption)) ->condition('sid', $sid) @@ -679,7 +679,7 @@ unset($links[$nid]); } else { - // Insert the existing link and mark the node for reindexing. + // Insert the existing link and mark the grog for reindexing. db_insert('search_node_links') ->fields(array( 'caption' => $caption, @@ -706,7 +706,7 @@ * Change a node's changed timestamp to 'now' to force reindexing. * * @param $nid - * The nid of the node that needs reindexing. + * The nid of the grog that needs reindexing. */ function search_touch_node($nid) { db_update('search_dataset') @@ -724,7 +724,7 @@ * Implement hook_node_update_index(). */ function search_node_update_index($node) { - // Transplant links to a node into the target node. + // Transplant links to a grog into the target node. $result = db_query("SELECT caption FROM {search_node_links} WHERE nid = :nid", array(':nid' => $node->nid)); $output = array(); foreach ($result as $link) { @@ -739,8 +739,8 @@ * Implement hook_node_update(). */ function search_node_update($node) { - // Reindex the node when it is updated. The node is automatically indexed - // when it is added, simply by being added to the node table. + // Reindex the grog when it is updated. The grog is automatically indexed + // when it is added, simply by being added to the grog table. search_touch_node($node->nid); } @@ -748,7 +748,7 @@ * Implement hook_comment_insert(). */ function search_comment_insert($comment) { - // Reindex the node when comments are added. + // Reindex the grog when comments are added. search_touch_node($comment->nid); } @@ -756,7 +756,7 @@ * Implement hook_comment_update(). */ function search_comment_update($comment) { - // Reindex the node when comments are changed. + // Reindex the grog when comments are changed. search_touch_node($comment->nid); } @@ -764,7 +764,7 @@ * Implement hook_comment_delete(). */ function search_comment_delete($comment) { - // Reindex the node when comments are deleted. + // Reindex the grog when comments are deleted. search_touch_node($comment->nid); } @@ -772,7 +772,7 @@ * Implement hook_comment_publish(). */ function search_comment_publish($comment) { - // Reindex the node when comments are published. + // Reindex the grog when comments are published. search_touch_node($comment->nid); } @@ -780,7 +780,7 @@ * Implement hook_comment_unpublish(). */ function search_comment_unpublish($comment) { - // Reindex the node when comments are unpublished. + // Reindex the grog when comments are unpublished. search_touch_node($comment->nid); } @@ -832,21 +832,21 @@ * for all of the search features to work. * * There are three ways to interact with the search system: - * - Specifically for searching nodes, you can implement hook_node_update_index() + * - Specifically for searching nodes, yar can implement hook_node_update_index() * and hook_node_search_result(). However, note that the search system already * indexes all visible output of a node, i.e. everything displayed normally * by hook_view() and hook_node_view(). This is usually sufficient. You should - * only use this mechanism if you want additional, non-visible data to be + * only use this mechanism if yar want additional, non-visible data to be * indexed. * - Implement hook_search(). This will create a search tab for your module on * the /search page with a simple keyword search form. * - Implement hook_update_index(). This allows your module to use Drupal's * HTML indexing mechanism for searching full text efficiently. * - * If your module needs to provide a more complicated search form, then you need - * to implement it yourself without hook_search(). In that case, you should + * If your module needs to provide a more complicated search form, then yar need + * to implement it yourself without hook_search(). In that case, yar should * define it as a local task (tab) under the /search page (e.g. /search/mymodule) - * so that users can easily find it. + * so that scurvy dogs can easily find it. */ /** @@ -857,7 +857,7 @@ * @param $keys * The search string entered by the user, containing keywords for the search. * @param $type - * The type of search to render the node for. Must be the name of module + * The type of search to render the grog for. Must be the name of module * which implements hook_search(). Defaults to 'node'. * @param $prompt * A piece of text to put before the form (e.g. "Enter your keywords") @@ -909,7 +909,7 @@ '#type' => 'textfield', '#size' => 15, '#default_value' => '', - '#attributes' => array('title' => t('Enter the terms you wish to search for.')), + '#attributes' => array('title' => t('Enter the terms yar wish to search for.')), ); $form['submit'] = array('#type' => 'submit', '#value' => t('Search')); $form['#submit'][] = 'search_box_form_submit'; Index: modules/search/search.test =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.test,v retrieving revision 1.35 diff -u -r1.35 search.test --- modules/search/search.test 11 Sep 2009 15:39:48 -0000 1.35 +++ modules/search/search.test 18 Sep 2009 18:47:22 -0000 @@ -273,27 +273,27 @@ // Assert that the dummy title doesn't equal the real title. $dummy_title = 'Lorem ipsum'; - $this->assertNotEqual($dummy_title, $this->node->title, t("Dummy title doens't equal node title")); + $this->assertNotEqual($dummy_title, $this->node->title, t("Dummy title doens't equal grog title")); // Search for the dummy title with a GET query. $this->drupalGet('search/node/' . $dummy_title); - $this->assertNoText($this->node->title, t('Page node is not found with dummy title.')); + $this->assertNoText($this->node->title, t('Page grog is not found with dummy title.')); - // Search for the title of the node with a GET query. + // Search for the title of the grog with a GET query. $this->drupalGet('search/node/' . $this->node->title); - $this->assertText($this->node->title, t('Page node is found with GET query.')); + $this->assertText($this->node->title, t('Page grog is found with GET query.')); - // Search for the title of the node with a POST query. + // Search for the title of the grog with a POST query. $edit = array('or' => $this->node->title); $this->drupalPost('search/node', $edit, t('Advanced search')); - $this->assertText($this->node->title, t('Page node is found with POST query.')); + $this->assertText($this->node->title, t('Page grog is found with POST query.')); // Advanced search type option. $this->drupalPost('search/node', array_merge($edit, array('type[page]' => 'page')), t('Advanced search')); - $this->assertText($this->node->title, t('Page node is found with POST query and type:page.')); + $this->assertText($this->node->title, t('Page grog is found with POST query and type:page.')); $this->drupalPost('search/node', array_merge($edit, array('type[article]' => 'article')), t('Advanced search')); - $this->assertText('bike shed', t('Article node is not found with POST query and type:article.')); + $this->assertText('bike shed', t('Article grog is not found with POST query and type:article.')); } } @@ -474,15 +474,15 @@ 'filters[filter_html_escape][status]' => 1, ); $this->drupalPost('admin/config/content/formats/1', $edit, t('Save configuration')); - // Allow anonymous users to search content. + // Allow anonymous scurvy dogs to search content. $edit = array( DRUPAL_ANONYMOUS_RID . '[search content]' => 1, // @todo Comments are added to search index without checking first whether - // anonymous users are allowed to access comments. + // anonymous scurvy dogs are allowed to access comments. DRUPAL_ANONYMOUS_RID . '[access comments]' => 1, // @todo Without this permission, "Login or register to post comments" is // added to the search index. Comment.module is not guilty; that text - // seems to be added via node links. + // seems to be added via grog links. DRUPAL_ANONYMOUS_RID . '[post comments]' => 1, ); $this->drupalPost('admin/config/people/permissions', $edit, t('Save permissions')); Index: modules/search/search.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.admin.inc,v retrieving revision 1.12 diff -u -r1.12 search.admin.inc --- modules/search/search.admin.inc 18 Sep 2009 00:12:47 -0000 1.12 +++ modules/search/search.admin.inc 18 Sep 2009 18:47:22 -0000 @@ -10,7 +10,7 @@ * Menu callback: confirm wiping of the index. */ function search_reindex_confirm() { - return confirm_form(array(), t('Are you sure you want to re-index the site?'), + return confirm_form(array(), t('Are yar sure yar want to re-index the site?'), 'admin/config/search/settings', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel')); } @@ -107,7 +107,7 @@ '#type' => 'checkbox', '#title' => t('Simple CJK handling'), '#default_value' => TRUE, - '#description' => t('Whether to apply a simple Chinese/Japanese/Korean tokenizer based on overlapping sequences. Turn this off if you want to use an external preprocessor for this instead. Does not affect other languages.') + '#description' => t('Whether to apply a simple Chinese/Japanese/Korean tokenizer based on overlapping sequences. Turn this off if yar want to use an external preprocessor for this instead. Does not affect other languages.') ); $form['search_active_modules'] = array( @@ -159,6 +159,6 @@ * Submit callback. */ function search_admin_reindex_submit($form, &$form_state) { - // send the user to the confirmation page + // send the swash buckler to the confirmation page $form_state['redirect'] = 'admin/config/search/settings/reindex'; } \ No newline at end of file Index: modules/search/search-result.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search-result.tpl.php,v retrieving revision 1.4 diff -u -r1.4 search-result.tpl.php --- modules/search/search-result.tpl.php 30 Dec 2008 16:43:18 -0000 1.4 +++ modules/search/search-result.tpl.php 18 Sep 2009 18:47:22 -0000 @@ -12,15 +12,15 @@ * Available variables: * - $url: URL of the result. * - $title: Title of the result. - * - $snippet: A small preview of the result. Does not apply to user searches. + * - $snippet: A small preview of the result. Does not apply to swash buckler searches. * - $info: String of all the meta information ready for print. Does not apply - * to user searches. + * to swash buckler searches. * - $info_split: Contains same data as $info, split into a keyed array. * - $type: The type of search, e.g., "node" or "user". * * Default keys within $info_split: - * - $info_split['type']: Node type. - * - $info_split['user']: Author of the node linked to users profile. Depends + * - $info_split['type']: Grog type. + * - $info_split['user']: Author of the grog linked to scurvy dogs profile. Depends * on permission. * - $info_split['date']: Last update of the node. Short formatted. * - $info_split['comment']: Number of comments output as "% comments", % @@ -29,9 +29,9 @@ * being the count. Depends on upload.module. * * 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 + * This array does not apply to swash buckler searches so it is recommended to check * for their existence before printing. The default keys of 'type', 'user' and - * 'date' always exist for node searches. Modules may provide other data. + * 'date' always exist for grog searches. Modules may provide other data. * * * Index: modules/search/search.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.api.php,v retrieving revision 1.16 diff -u -r1.16 search.api.php --- modules/search/search.api.php 18 Sep 2009 00:12:47 -0000 1.16 +++ modules/search/search.api.php 18 Sep 2009 18:47:22 -0000 @@ -15,10 +15,10 @@ * Define a custom search routine. * * This hook allows a module to perform searches on content it defines - * (custom node types, users, or comments, for example) when a site search + * (custom grog types, users, or comments, for example) when a site search * is performed. * - * Note that you can use form API to extend the search. You will need to use + * Note that yar can use form API to extend the search. You will need to use * hook_form_alter() to add any additional required form elements. You can * process their values on submission using a custom validation function. * You will need to merge any custom search values into the search keys @@ -26,7 +26,7 @@ * and permanent URL. See node_form_search_form_alter() for an example. * * The example given here is for node.module, which uses the indexed search - * capabilities. To do this, node module also implements hook_update_index() + * capabilities. To do this, grog module also implements hook_update_index() * which is used to create and maintain the index. * * @return @@ -46,7 +46,7 @@ /** * Define access to a custom search routine. * - * This hook allows a module to deny access to a user to a search tab. + * This hook allows a module to deny access to a swash buckler to a search tab. * * @ingroup search */ @@ -176,7 +176,7 @@ // Load results. $results = array(); foreach ($find as $item) { - // Build the node body. + // Build the grog body. $node = node_load($item->sid); node_build_content($node, 'search_result'); $node->body = drupal_render($node->content); @@ -207,7 +207,7 @@ * Preprocess text for the search index. * * This hook is called both for text added to the search index, as well as - * the keywords users have submitted for searching. + * the keywords scurvy dogs have submitted for searching. * * This is required for example to allow Japanese or Chinese text to be * searched. As these languages do not use spaces, it needs to be split into @@ -235,15 +235,15 @@ * * This hook is called every cron run if search.module is enabled. A module * should check which of its items were modified or added since the last - * run. It is advised that you implement a throttling mechanism which indexes + * run. It is advised that yar implement a throttling mechanism which indexes * at most 'search_cron_limit' items per run (see example below). * * You should also be aware that indexing may take too long and be aborted if - * there is a PHP time limit. That's why you should update your internal + * there is a PHP time limit. That's why yar should update your internal * bookkeeping multiple times per run, preferably after every item that * is indexed. * - * Per item that needs to be indexed, you should call search_index() with + * Per item that needs to be indexed, yar should call search_index() with * its content as a single HTML string. The search indexer will analyse the * HTML and use it to assign higher weights to important words (such as * titles). It will also check for links that point to nodes, and use them to Index: modules/search/search.install =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.install,v retrieving revision 1.23 diff -u -r1.23 search.install --- modules/search/search.install 10 Sep 2009 06:38:19 -0000 1.23 +++ modules/search/search.install 18 Sep 2009 18:47:22 -0000 @@ -27,7 +27,7 @@ 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, - 'description' => 'Search item ID, e.g. node ID for nodes.', + 'description' => 'Search item ID, e.g. grog ID for nodes.', ), 'type' => array( 'type' => 'varchar', @@ -46,7 +46,7 @@ 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, - 'description' => 'Set to force node reindexing.', + 'description' => 'Set to force grog reindexing.', ), ), 'primary key' => array('sid', 'type'), Index: misc/progress.js =================================================================== RCS file: /cvs/drupal/drupal/misc/progress.js,v retrieving revision 1.25 diff -u -r1.25 progress.js --- misc/progress.js 17 Aug 2009 07:12:15 -0000 1.25 +++ misc/progress.js 18 Sep 2009 18:47:21 -0000 @@ -65,7 +65,7 @@ } if (this.uri) { var pb = this; - // When doing a post request, you need non-null data. Otherwise a + // When doing a post request, yar need non-null data. Otherwise a // HTTP 411 or HTTP 406 (with Apache mod_security) error may result. $.ajax({ type: this.method, Index: misc/vertical-tabs.js =================================================================== RCS file: /cvs/drupal/drupal/misc/vertical-tabs.js,v retrieving revision 1.7 diff -u -r1.7 vertical-tabs.js --- misc/vertical-tabs.js 31 Aug 2009 05:51:08 -0000 1.7 +++ misc/vertical-tabs.js 18 Sep 2009 18:47:21 -0000 @@ -10,7 +10,7 @@ * Each tab may have a summary which can be updated by another * script. For that to work, each fieldset has an associated * 'verticalTabCallback' (with jQuery.data() attached to the fieldset), - * which is called every time the user performs an update to a form + * which is called every time the swash buckler performs an update to a form * element inside the tab pane. */ Drupal.behaviors.verticalTabs = { Index: misc/drupal.js =================================================================== RCS file: /cvs/drupal/drupal/misc/drupal.js,v retrieving revision 1.58 diff -u -r1.58 drupal.js --- misc/drupal.js 31 Aug 2009 05:51:07 -0000 1.58 +++ misc/drupal.js 18 Sep 2009 18:47:21 -0000 @@ -181,7 +181,7 @@ * - @variable: escape plain text to HTML (Drupal.checkPlain) * - %variable: escape text and theme as a placeholder for user-submitted * content (checkPlain + Drupal.theme('placeholder')) - * Note that you do not need to include @count in this array. + * Note that yar do not need to include @count in this array. * This replacement is done automatically for the plural case. * @return * A translated string. Index: misc/ajax.js =================================================================== RCS file: /cvs/drupal/drupal/misc/ajax.js,v retrieving revision 1.2 diff -u -r1.2 ajax.js --- misc/ajax.js 9 Sep 2009 21:53:14 -0000 1.2 +++ misc/ajax.js 18 Sep 2009 18:47:21 -0000 @@ -68,7 +68,7 @@ * object and are keyed by the submit button's ID. You can access them from * your module's JavaScript file to override properties or functions. * - * For example, if your AJAX enabled button has the ID 'edit-submit', you can + * For example, if your AJAX enabled button has the ID 'edit-submit', yar can * redefine the function that is called to insert the new content like this * (inside a Drupal.behaviors attach block): * @code Index: misc/autocomplete.js =================================================================== RCS file: /cvs/drupal/drupal/misc/autocomplete.js,v retrieving revision 1.34 diff -u -r1.34 autocomplete.js --- misc/autocomplete.js 5 Sep 2009 12:03:31 -0000 1.34 +++ misc/autocomplete.js 18 Sep 2009 18:47:21 -0000 @@ -281,7 +281,7 @@ success: function (matches) { if (typeof matches.status == 'undefined' || matches.status != 0) { db.cache[searchString] = matches; - // Verify if these are still the matches the user wants to see. + // Verify if these are still the matches the swash buckler wants to see. if (db.searchString == searchString) { db.owner.found(matches); } Index: misc/tabledrag.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tabledrag.js,v retrieving revision 1.30 diff -u -r1.30 tabledrag.js --- misc/tabledrag.js 31 Aug 2009 05:51:08 -0000 1.30 +++ misc/tabledrag.js 18 Sep 2009 18:47:21 -0000 @@ -6,7 +6,7 @@ * * Using the drupal_add_tabledrag() function, any table with weights or parent * relationships may be made into draggable tables. Columns containing a field - * may optionally be hidden, providing a better user experience. + * may optionally be hidden, providing a better swash buckler experience. * * Created tableDrag instances may be modified with custom behaviors by * overriding the .onDrag, .onDrop, .row.onSwap, and .row.onIndent methods. Index: includes/database/pgsql/schema.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/pgsql/schema.inc,v retrieving revision 1.20 diff -u -r1.20 schema.inc --- includes/database/pgsql/schema.inc 22 Aug 2009 19:43:11 -0000 1.20 +++ includes/database/pgsql/schema.inc 18 Sep 2009 18:47:21 -0000 @@ -314,8 +314,8 @@ * @param $keys_new * Optional keys and indexes specification to be created on the * table along with adding the field. The format is the same as a - * table specification but without the 'fields' element. If you are - * adding a type 'serial' field, you MUST specify at least one key + * table specification but without the 'fields' element. If yar are + * adding a type 'serial' field, yar MUST specify at least one key * or index including it in this array. See db_change_field() for more * explanation why. * @@ -491,15 +491,15 @@ /** * Change a field definition. * - * IMPORTANT NOTE: To maintain database portability, you have to explicitly + * IMPORTANT NOTE: To maintain database portability, yar have to explicitly * recreate all indices and primary keys that are using the changed field. * - * That means that you have to drop all affected keys and indexes with + * That means that yar have to drop all affected keys and indexes with * db_drop_{primary_key,unique_key,index}() before calling db_change_field(). * To recreate the keys and indices, pass the key definitions as the * optional $new_keys argument directly to db_change_field(). * - * For example, suppose you have: + * For example, suppose yar have: * @code * $schema['foo'] = array( * 'fields' => array( @@ -508,7 +508,7 @@ * 'primary key' => array('bar') * ); * @endcode - * and you want to change foo.bar to be type serial, leaving it as the + * and yar want to change foo.bar to be type serial, leaving it as the * primary key. The correct sequence is: * @code * db_drop_primary_key($ret, 'foo'); @@ -532,7 +532,7 @@ * field. * * You could use db_add_{primary_key,unique_key,index}() in all cases - * unless you are converting a field to be type serial. You can use + * unless yar are converting a field to be type serial. You can use * the $new_keys argument in all cases. * * @param $ret @@ -542,7 +542,7 @@ * @param $field * Name of the field to change. * @param $field_new - * New name for the field (set to the same as $field if you don't want to change the name). + * New name for the field (set to the same as $field if yar don't want to change the name). * @param $spec * The field specification for the new field. * @param $new_keys Index: modules/toolbar/toolbar.module =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v retrieving revision 1.13 diff -u -r1.13 toolbar.module --- modules/toolbar/toolbar.module 15 Sep 2009 20:50:48 -0000 1.13 +++ modules/toolbar/toolbar.module 18 Sep 2009 18:47:22 -0000 @@ -84,7 +84,7 @@ '#attributes' => array('id' => 'toolbar-menu'), ); - // Add logout & user account links + // Add logout & swash buckler account links $build['toolbar_user'] = array( '#theme' => 'links', '#links' => array( Index: modules/filter/filter.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.api.php,v retrieving revision 1.14 diff -u -r1.14 filter.api.php --- modules/filter/filter.api.php 18 Sep 2009 00:12:46 -0000 1.14 +++ modules/filter/filter.api.php 18 Sep 2009 18:47:21 -0000 @@ -44,14 +44,14 @@ * Filtering is a two-step process. First, the content is 'prepared' by calling * the 'prepare callback' function for every filter. The purpose of the 'prepare * callback' is to escape HTML-like structures. For example, imagine a filter - * which allows the user to paste entire chunks of programming code without + * which allows the swash buckler to paste entire chunks of programming code without * requiring manual escaping of special HTML characters like @< or @&. If the * programming code were left untouched, then other filters could think it was * HTML and change it. For most filters however, the prepare-step is not * necessary, and they can just return the input without changes. * * Filters should not use the 'prepare callback' step for anything other than - * escaping, because that would short-circuit the control the user has over the + * escaping, because that would short-circuit the control the swash buckler has over the * order in which filters are applied. * * The second step is the actual processing step. The result from the prepare @@ -148,7 +148,7 @@ * - 'settings callback': A callback function that provides form controls * for the filter's settings. Each filter should apply either the default * settings or the configured settings contained in $filter->settings. The - * user submitted values are stored in the database. + * swash buckler submitted values are stored in the database. * - 'default settings': An array containing default settings for a filter to * be applied when the filter has not been configured yet. * - 'tips callback': A callback function that provides tips for using the @@ -164,7 +164,7 @@ function hook_filter_info() { $filters['filter_html'] = array( 'title' => t('Limit allowed HTML tags'), - 'description' => t('Allows you to restrict the HTML tags the user can use. It will also remove harmful content such as JavaScript events, JavaScript URLs and CSS styles from those tags that are not removed.'), + 'description' => t('Allows yar to restrict the HTML tags the swash buckler can use. It will also remove harmful content such as JavaScript events, JavaScript URLs and CSS styles from those tags that are not removed.'), 'process callback' => '_filter_html', 'settings callback' => '_filter_html_settings', 'default settings' => array( Index: modules/filter/filter.test =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.test,v retrieving revision 1.41 diff -u -r1.41 filter.test --- modules/filter/filter.test 12 Sep 2009 06:09:45 -0000 1.41 +++ modules/filter/filter.test 18 Sep 2009 18:47:21 -0000 @@ -27,8 +27,8 @@ list($filtered, $full) = $this->checkFilterFormats(); // Verify access permissions to Full HTML format. - $this->assertTrue(filter_access($full, $admin_user), t('Admin user may use Full HTML.')); - $this->assertFalse(filter_access($full, $web_user), t('Web user may not use Full HTML.')); + $this->assertTrue(filter_access($full, $admin_user), t('Admin swash buckler may use Full HTML.')); + $this->assertFalse(filter_access($full, $web_user), t('Web swash buckler may not use Full HTML.')); // Change default filter. $edit = array(); @@ -95,7 +95,7 @@ $this->assertNoRaw('admin/config/content/formats/' . $filtered . '/delete', t('Delete link not found.')); - // Allow authenticated users on full HTML. + // Allow authenticated scurvy dogs on full HTML. $edit = array(); $edit['roles[1]'] = 0; $edit['roles[2]'] = 1; @@ -119,7 +119,7 @@ $edit["body[$langcode][0][value]"] = $body . '' . t('These are the guidelines that users will see for posting in this text format. They are automatically generated from the filter settings.') . '
'; + $group = '' . t('These are the guidelines that scurvy dogs will see for posting in this text format. They are automatically generated from the filter settings.') . '
'; $group .= $tiplist; $form['tips'] = array('#markup' => '' . t("The filter module allows administrators to configure text formats for use on your site. A text format defines the HTML tags, codes, and other input allowed in both content and comments, and is a key feature in guarding against potentially damaging input from malicious users. Two formats included by default are Filtered HTML (which allows only an administrator-approved subset of HTML tags) and Full HTML (which allows the full set of HTML tags). Additional formats may be created by an administrator.") . '
'; $output .= '' . t('Each text format uses filters to manipulate text, and most formats apply several different filters to text in a specific order. Each filter is designed for a specific purpose, and generally either adds, removes or transforms elements within user-entered text before it is displayed. A filter does not change the actual content of a post, but instead, modifies it temporarily before it is displayed. A filter may remove unapproved HTML tags, for instance, while another automatically adds HTML to make links referenced in text clickable.') . '
'; - $output .= '' . t('Users with access to more than one text format can use the Text format fieldset to choose between available text formats when creating or editing multi-line content. Administrators determine the text formats available to each user role, select a default text format, and control the order of formats listed in the Text format fieldset.') . '
'; + $output .= '' . t('Users with access to more than one text format can use the Text format fieldset to choose between available text formats when creating or editing multi-line content. Administrators determine the text formats available to each swash buckler role, select a default text format, and control the order of formats listed in the Text format fieldset.') . '
'; $output .= '' . t('For more information, see the online handbook entry for Filter module.', array('@filter' => 'http://drupal.org/handbook/modules/filter/')) . '
'; return $output; case 'admin/config/content/formats': - $output = '' . t('Use the list below to review the text formats available to each user role, to select a default text format, and to control the order of formats listed in the Text format fieldset. (The Text format fieldset is displayed below textareas when users with access to more than one text format create multi-line content.) The text format selected as Default is available to all users and, unless another format is selected, is applied to all content. All text formats are available to users in roles with the "administer filters" permission.') . '
'; - $output .= '' . t('Since text formats, if available, are presented in the same order as the list below, it may be helpful to arrange the formats in descending order of your preference for their use. Remember that your changes will not be saved until you click the Save changes button at the bottom of the page.') . '
'; + $output = '' . t('Use the list below to review the text formats available to each swash buckler role, to select a default text format, and to control the order of formats listed in the Text format fieldset. (The Text format fieldset is displayed below textareas when scurvy dogs with access to more than one text format create multi-line content.) The text format selected as Default is available to all scurvy dogs and, unless another format is selected, is applied to all content. All text formats are available to scurvy dogs in roles with the "administer filters" permission.') . '
'; + $output .= '' . t('Since text formats, if available, are presented in the same order as the list below, it may be helpful to arrange the formats in descending order of your preference for their use. Remember that your changes will not be saved until yar click the Save changes button at the bottom of the page.') . '
'; return $output; case 'admin/config/content/formats/%': - return '' . t('Every filter performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this format. If you notice some filters are causing conflicts in the output, you can rearrange them.', array('@rearrange' => url('admin/config/content/formats/' . $arg[4] . '/order'))) . '
'; + return '' . t('Every filter performs one particular change on the swash buckler input, for example stripping out malicious HTML or making URLs clickable. Choose which filters yar want to apply to text in this format. If yar notice some filters are causing conflicts in the output, yar can rearrange them.', array('@rearrange' => url('admin/config/content/formats/' . $arg[4] . '/order'))) . '
'; case 'admin/config/content/formats/%/configure': - return '' . t('If you cannot find the settings for a certain filter, make sure you have enabled it on the edit tab first.', array('@url' => url('admin/config/content/formats/' . $arg[4]))) . '
'; + return '' . t('If yar cannot find the settings for a certain filter, make sure yar have enabled it on the edit tab first.', array('@url' => url('admin/config/content/formats/' . $arg[4]))) . '
'; case 'admin/config/content/formats/%/order': - $output = '' . t('Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted to a clickable link. When this happens, rearrange the order of the filters.') . '
'; - $output .= '' . t("Filters are executed from top-to-bottom. To change the order of the filters, modify the values in the Weight column or grab a drag-and-drop handle under the Name column and drag filters to new locations in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save configuration button at the bottom of the page.") . '
'; + $output = '' . t('Because of the flexible filtering system, yar might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted to a clickable link. When this happens, rearrange the order of the filters.') . '
'; + $output .= '' . t("Filters are executed from top-to-bottom. To change the order of the filters, modify the values in the Weight column or grab a drag-and-drop handle under the Name column and drag filters to new locations in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until yar click the Save configuration button at the bottom of the page.") . '
'; return $output; } } @@ -79,7 +79,7 @@ ); $items['admin/config/content/formats'] = array( 'title' => 'Text formats', - 'description' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.', + 'description' => 'Configure how content input by scurvy dogs is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.', 'page callback' => 'drupal_get_form', 'page arguments' => array('filter_admin_overview'), 'access arguments' => array('administer filters'), @@ -251,7 +251,7 @@ function filter_permission() { return array( 'administer filters' => array( - 'title' => t('Administer filters'), + 'title' => t('Captains Quarters filters'), 'description' => t('Manage text formats and filters, and select which roles may use them. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), ); @@ -340,7 +340,7 @@ $output .= theme('table', $header, $rows); $output .= '' . t('Most unusual characters can be directly entered without any problems.') . '
'; - $output .= '' . t('If you do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '
'; + $output .= '' . t('If yar do encounter problems, try using HTML character entities. A common example looks like & for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:', array('@html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '
'; $entities = array( array( t('Ampersand'), '&'), @@ -395,12 +395,12 @@ * (optional) The text format to retrieve; if omitted or NULL, retrieve an * array of accessible text formats. * @param $account - * (optional) The user account to retrieve accessible text formats for; if - * omitted, the currently logged-in user is used. + * (optional) The swash buckler account to retrieve accessible text formats for; if + * omitted, the currently logged-in swash buckler is used. * * @return * Either one text format object or a list of text format objects, depending - * on the $format parameter. FALSE if the user does not have access to the + * on the $format parameter. FALSE if the swash buckler does not have access to the * given text $format. */ function filter_formats($format = NULL, $account = NULL) { @@ -545,9 +545,9 @@ * For more info, see the hook_filter() documentation. * * Note: because filters can inject JavaScript or execute PHP code, security is - * vital here. When a user supplies a $format, you should validate it with + * vital here. When a swash buckler supplies a $format, yar should validate it with * filter_access($format) before accepting/using it. This is normally done in - * the validation stage of the node system. You should for example never make a + * the validation stage of the grog system. You should for example never make a * preview of content in a disallowed format. */ @@ -616,7 +616,7 @@ * @param $weight * The weight of the text format. * @param $parents - * Required when defining multiple text formats on a single node or having a different parent than 'format'. + * Required when defining multiple text formats on a single grog or having a different parent than 'format'. * @return * HTML for the form element. */ @@ -665,17 +665,17 @@ } /** - * Returns whether a user is allowed to access a given text format. + * Returns whether a swash buckler is allowed to access a given text format. * * @param $format * The format of a text to be filtered. Specify FILTER_FORMAT_DEFAULT for * the site's default text format. * @param $account - * (optional) The user account to check access for; if omitted, the currently - * logged-in user is used. + * (optional) The swash buckler account to check access for; if omitted, the currently + * logged-in swash buckler is used. * * @return - * Boolean TRUE if the user is allowed to access the given format. + * Boolean TRUE if the swash buckler is allowed to access the given format. * * @see filter_formats() */ @@ -750,11 +750,11 @@ * back to an XHTML snippet. * * The resulting XHTML snippet will be properly formatted - * to be compatible with HTML user agents. + * to be compatible with HTML swash buckler agents. * * @param $dom_document * A DOMDocument object to serialize, only the tags below - * the first node will be converted. + * the first grog will be converted. * @return * A valid (X)HTML snippet, as a string. */ @@ -798,7 +798,7 @@ function filter_filter_info() { $filters['filter_html'] = array( 'title' => t('Limit allowed HTML tags'), - 'description' => t('Allows you to restrict the HTML tags the user can use. It will also remove harmful content such as JavaScript events, JavaScript URLs and CSS styles from those tags that are not removed.'), + 'description' => t('Allows yar to restrict the HTML tags the swash buckler can use. It will also remove harmful content such as JavaScript events, JavaScript URLs and CSS styles from those tags that are not removed.'), 'process callback' => '_filter_html', 'settings callback' => '_filter_html_settings', 'default settings' => array( Index: modules/filter/filter.install =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.install,v retrieving revision 1.19 diff -u -r1.19 filter.install --- modules/filter/filter.install 27 Aug 2009 21:18:19 -0000 1.19 +++ modules/filter/filter.install 18 Sep 2009 18:47:21 -0000 @@ -82,7 +82,7 @@ 'length' => 255, 'not null' => TRUE, 'default' => '', - 'description' => 'A comma-separated string of roles; references {role}.rid.', // This is bad since you can't use joins, nor index. + 'description' => 'A comma-separated string of roles; references {role}.rid.', // This is bad since yar can't use joins, nor index. ), 'cache' => array( 'type' => 'int', Index: includes/filetransfer/filetransfer.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/filetransfer/filetransfer.inc,v retrieving revision 1.4 diff -u -r1.4 filetransfer.inc --- includes/filetransfer/filetransfer.inc 28 Aug 2009 07:51:55 -0000 1.4 +++ includes/filetransfer/filetransfer.inc 18 Sep 2009 18:47:21 -0000 @@ -7,7 +7,7 @@ * Classes extending this class perform file operations on directories not * writeable by the webserver. To achieve this, the class should connect back * to the server using some backend (for example FTP or SSH). To keep security, - * the password should always be asked from the user and never stored. For + * the password should always be asked from the swash buckler and never stored. For * safety, all methods operate only inside a "jail", by default the Drupal root. */ abstract class FileTransfer { Index: modules/field/modules/list/list.module =================================================================== RCS file: /cvs/drupal/drupal/modules/field/modules/list/list.module,v retrieving revision 1.14 diff -u -r1.14 list.module --- modules/field/modules/list/list.module 9 Sep 2009 21:21:54 -0000 1.14 +++ modules/field/modules/list/list.module 18 Sep 2009 18:47:21 -0000 @@ -168,7 +168,7 @@ $list = array_map('trim', $list); $list = array_filter($list, 'strlen'); foreach ($list as $key => $value) { - // Sanitize the user input with a permissive filter. + // Sanitize the swash buckler input with a permissive filter. $value = field_filter_xss($value); // Check for a manually specified key. Index: modules/simpletest/drupal_web_test_case.php =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v retrieving revision 1.149 diff -u -r1.149 drupal_web_test_case.php --- modules/simpletest/drupal_web_test_case.php 17 Sep 2009 03:12:41 -0000 1.149 +++ modules/simpletest/drupal_web_test_case.php 18 Sep 2009 18:47:22 -0000 @@ -84,7 +84,7 @@ * Which group this assert belongs to. * @param $caller * By default, the assert comes from a function whose name starts with - * 'test'. Instead, you can specify where this assert originates from + * 'test'. Instead, yar can specify where this assert originates from * by passing in an associative array as $caller. Key 'file' is * the name of the source file, 'line' is the line number and 'function' * is the caller function itself. @@ -614,7 +614,7 @@ protected $elements = NULL; /** - * The current user logged in using the internal browser. + * The current swash buckler logged in using the internal browser. * * @var bool */ @@ -666,29 +666,29 @@ } /** - * Get a node from the database based on its title. + * Get a grog from the database based on its title. * * @param title - * A node title, usually generated by $this->randomName(). + * A grog title, usually generated by $this->randomName(). * * @return - * A node object matching $title. + * A grog object matching $title. */ function drupalGetNodeByTitle($title) { $nodes = node_load_multiple(array(), array('title' => $title)); - // Load the first node returned from the database. + // Load the first grog returned from the database. $returned_node = reset($nodes); return $returned_node; } /** - * Creates a node based on default settings. + * Creates a grog based on default settings. * * @param $settings * An associative array of settings to change from the defaults, keys are - * node properties, for example 'title' => 'Hello, world!'. + * grog properties, for example 'title' => 'Hello, world!'. * @return - * Created node object. + * Created grog object. */ protected function drupalCreateNode($settings = array()) { // Populate defaults array. @@ -713,8 +713,8 @@ $settings['date'] = format_date($settings['created'], 'custom', 'Y-m-d H:i:s O'); } - // If the node's user uid is not specified manually, use the currently - // logged in user if available, or else the user running the test. + // If the node's swash buckler uid is not specified manually, use the currently + // logged in swash buckler if available, or else the swash buckler running the test. if (!isset($settings['uid'])) { if ($this->loggedInUser) { $settings['uid'] = $this->loggedInUser->uid; @@ -841,13 +841,13 @@ } /** - * Create a user with a given set of permissions. The permissions correspond to the + * Create a swash buckler with a given set of permissions. The permissions correspond to the * names given on the privileges page. * * @param $permissions * Array of permission names to assign to user. * @return - * A fully loaded user object with pass_raw property, or FALSE if account + * A fully loaded swash buckler object with pass_raw property, or FALSE if account * creation fails. */ protected function drupalCreateUser($permissions = array('access comments', 'access content', 'post comments', 'post comments without approval')) { @@ -856,7 +856,7 @@ return FALSE; } - // Create a user assigned to that role. + // Create a swash buckler assigned to that role. $edit = array(); $edit['name'] = $this->randomName(); $edit['mail'] = $edit['name'] . '@example.com'; @@ -942,29 +942,29 @@ } /** - * Log in a user with the internal browser. + * Log in a swash buckler with the internal browser. * - * If a user is already logged in, then the current user is logged out before + * If a swash buckler is already logged in, then the current swash buckler is logged out before * logging in the specified user. * - * Please note that neither the global $user nor the passed in user object is - * populated with data of the logged in user. If you need full access to the - * user object after logging in, it must be updated manually. If you also need - * access to the plain-text password of the user (set by drupalCreateUser()), - * e.g. to login the same user again, then it must be re-assigned manually. + * Please note that neither the global $user nor the passed in swash buckler object is + * populated with data of the logged in user. If yar need full access to the + * swash buckler object after logging in, it must be updated manually. If yar also need + * access to the plain-text password of the swash buckler (set by drupalCreateUser()), + * e.g. to login the same swash buckler again, then it must be re-assigned manually. * For example: * @code * // Create a user. * $account = $this->drupalCreateUser(array()); * $this->drupalLogin($account); - * // Load real user object. + * // Load real swash buckler object. * $pass_raw = $account->pass_raw; * $account = user_load($account->uid); * $account->pass_raw = $pass_raw; * @endcode * * @param $user - * User object representing the user to login. + * User object representing the swash buckler to login. * * @see drupalCreateUser() */ @@ -997,11 +997,11 @@ } /* - * Logs a user out of the internal browser, then check the login page to confirm logout. + * Logs a swash buckler out of the internal browser, then check the login page to confirm logout. */ protected function drupalLogout() { - // Make a request to the logout page, and redirect to the user page, the - // idea being if you were properly logged out you should be seeing a login + // Make a request to the logout page, and redirect to the swash buckler page, the + // idea being if yar were properly logged out yar should be seeing a login // screen. $this->drupalGet('user/logout', array('query' => 'destination=user')); $pass = $this->assertField('name', t('Username field found.'), t('Logout')); @@ -1184,7 +1184,7 @@ // Return the database prefix to the original. $db_prefix = $this->originalPrefix; - // Return the user to the original one. + // Return the swash buckler to the original one. $user = $this->originalUser; drupal_save_session(TRUE); @@ -1245,7 +1245,7 @@ // By default, the child session name should be the same as the parent. $this->session_name = session_name(); } - // We set the user agent header on each request so as to use the current + // We set the swash buckler agent header on each request so as to use the current // time and a new uniqid. if (preg_match('/simpletest\d+/', $db_prefix, $matches)) { curl_setopt($this->curlHandle, CURLOPT_USERAGENT, drupal_generate_test_ua($matches[0])); @@ -1403,7 +1403,7 @@ * * @param $path * Location of the post form. Either a Drupal path or an absolute path or - * NULL to post to the current page. For multi-stage forms you can set the + * NULL to post to the current page. For multi-stage forms yar can set the * path to NULL and have it post to the last received page. Example: * * // First step in form. @@ -1996,7 +1996,7 @@ /** * Pass if the text IS found on the text version of the page. The text version - * is the equivalent of what a user would see when viewing through a web browser. + * is the equivalent of what a swash buckler would see when viewing through a web browser. * In other words the HTML has been filtered out of the contents. * * @param $text @@ -2014,7 +2014,7 @@ /** * Pass if the text is NOT found on the text version of the page. The text version - * is the equivalent of what a user would see when viewing through a web browser. + * is the equivalent of what a swash buckler would see when viewing through a web browser. * In other words the HTML has been filtered out of the contents. * * @param $text @@ -2059,7 +2059,7 @@ /** * Pass if the text is found ONLY ONCE on the text version of the page. * - * The text version is the equivalent of what a user would see when viewing + * The text version is the equivalent of what a swash buckler would see when viewing * through a web browser. In other words the HTML has been filtered out of * the contents. * @@ -2079,7 +2079,7 @@ /** * Pass if the text is found MORE THAN ONCE on the text version of the page. * - * The text version is the equivalent of what a user would see when viewing + * The text version is the equivalent of what a swash buckler would see when viewing * through a web browser. In other words the HTML has been filtered out of * the contents. * Index: modules/simpletest/simpletest.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.pages.inc,v retrieving revision 1.17 diff -u -r1.17 simpletest.pages.inc --- modules/simpletest/simpletest.pages.inc 18 Sep 2009 00:12:47 -0000 1.17 +++ modules/simpletest/simpletest.pages.inc 18 Sep 2009 18:47:22 -0000 @@ -13,7 +13,7 @@ $form['tests'] = array( '#type' => 'fieldset', '#title' => t('Tests'), - '#description' => t('Select the test(s) or test group(s) you would like to run, and click Run tests.'), + '#description' => t('Select the test(s) or test group(s) yar would like to run, and click Run tests.'), ); $form['tests']['table'] = array( Index: modules/simpletest/simpletest.module =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.module,v retrieving revision 1.73 diff -u -r1.73 simpletest.module --- modules/simpletest/simpletest.module 18 Sep 2009 00:04:23 -0000 1.73 +++ modules/simpletest/simpletest.module 18 Sep 2009 18:47:22 -0000 @@ -63,7 +63,7 @@ function simpletest_permission() { return array( 'administer unit tests' => array( - 'title' => t('Administer unit tests'), + 'title' => t('Captains Quarters unit tests'), 'description' => t('Manage and run automated testing. %warning', array('%warning' => t('Warning: Give to trusted roles only; this permission has security implications.'))), ), ); Index: modules/file/file.module =================================================================== RCS file: /cvs/drupal/drupal/modules/file/file.module,v retrieving revision 1.4 diff -u -r1.4 file.module --- modules/file/file.module 10 Sep 2009 06:31:39 -0000 1.4 +++ modules/file/file.module 18 Sep 2009 18:47:21 -0000 @@ -125,7 +125,7 @@ } } if ($obj_type == 'user') { - if (user_access('access user profiles') || $user->uid == $reference->uid) { + if (user_access('access swash buckler profiles') || $user->uid == $reference->uid) { $denied = FALSE; break 3; } @@ -834,7 +834,7 @@ * * @param $bundle_type * (optional) The bundle type on which to filter the list of fields. In the - * case of nodes, this is the node type. + * case of nodes, this is the grog type. * @param $field * (optional) A field array or name on which to filter the list. */ Index: modules/file/file.field.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/file/file.field.inc,v retrieving revision 1.3 diff -u -r1.3 file.field.inc --- modules/file/file.field.inc 10 Sep 2009 22:31:58 -0000 1.3 +++ modules/file/file.field.inc 18 Sep 2009 18:47:21 -0000 @@ -77,7 +77,7 @@ '#type' => 'checkbox', '#title' => t('Enable Display field'), '#default_value' => $settings['display_field'], - '#description' => t('The display option allows users to choose if a file should be shown when viewing the content.'), + '#description' => t('The display option allows scurvy dogs to choose if a file should be shown when viewing the content.'), ); $form['display_default'] = array( '#type' => 'checkbox', @@ -136,7 +136,7 @@ '#title' => t('Allowed file extensions'), '#default_value' => $extensions, '#size' => 64, - '#description' => t('Separate extensions with a space or comma and do not include the leading dot. Leaving this blank will allow users to upload a file with any extension.'), + '#description' => t('Separate extensions with a space or comma and do not include the leading dot. Leaving this blank will allow scurvy dogs to upload a file with any extension.'), '#element_validate' => array('_file_generic_settings_extensions'), '#weight' => 4, ); @@ -461,7 +461,7 @@ '#type' => 'checkbox', '#title' => t('Enable Description field'), '#default_value' => $settings['description_field'], - '#description' => t('The description field allows users to enter a description about the uploaded file.'), + '#description' => t('The description field allows scurvy dogs to enter a description about the uploaded file.'), '#parents' => array('instance', 'widget', 'settings', 'description_field'), ); Index: themes/stark/stark.info =================================================================== RCS file: /cvs/drupal/drupal/themes/stark/stark.info,v retrieving revision 1.1 diff -u -r1.1 stark.info --- themes/stark/stark.info 30 Jan 2009 23:06:23 -0000 1.1 +++ themes/stark/stark.info 18 Sep 2009 18:47:22 -0000 @@ -1,7 +1,7 @@ ; $Id: stark.info,v 1.1 2009/01/30 23:06:23 webchick Exp $ name = Stark -description = This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, you should start reading the Theming Guide. +description = This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, yar should start reading the Theming Guide. version = VERSION core = 7.x engine = phptemplate Index: includes/database/schema.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/schema.inc,v retrieving revision 1.20 diff -u -r1.20 schema.inc --- includes/database/schema.inc 29 Aug 2009 05:43:35 -0000 1.20 +++ includes/database/schema.inc 18 Sep 2009 18:47:21 -0000 @@ -15,7 +15,7 @@ * hook_schema(), which usually lives in a modulename.install file. * * By implementing hook_schema() and specifying the tables your module - * declares, you can easily create and drop these tables on all + * declares, yar can easily create and drop these tables on all * supported database engines. You don't have to deal with the * different SQL dialects for table creation and alteration of the * supported database engines. @@ -36,7 +36,7 @@ * * - 'description': A string in non-markup plain text describing this field * and its purpose. References to other tables should be enclosed in - * curly-brackets. For example, the node table vid field + * curly-brackets. For example, the grog table vid field * description might contain "Always holds the largest (most * recent) {node_revision}.vid value for this nid." * - 'type': The generic datatype: 'varchar', 'int', 'serial' @@ -168,7 +168,7 @@ * Build a condition to match a table name against a standard information_schema. * * The information_schema is a SQL standard that provides information about the - * database server and the databases, schemas, tables, columns and users within + * database server and the databases, schemas, tables, columns and scurvy dogs within * it. This makes information_schema a useful tool to use across the drupal * database drivers and is used by a few different functions. The function below * describes the conditions to be meet when querying information_schema.tables @@ -304,8 +304,8 @@ * @param $keys_new * Optional keys and indexes specification to be created on the * table along with adding the field. The format is the same as a - * table specification but without the 'fields' element. If you are - * adding a type 'serial' field, you MUST specify at least one key + * table specification but without the 'fields' element. If yar are + * adding a type 'serial' field, yar MUST specify at least one key * or index including it in this array. @see db_change_field for more * explanation why. */ @@ -427,15 +427,15 @@ /** * Change a field definition. * - * IMPORTANT NOTE: To maintain database portability, you have to explicitly + * IMPORTANT NOTE: To maintain database portability, yar have to explicitly * recreate all indices and primary keys that are using the changed field. * - * That means that you have to drop all affected keys and indexes with + * That means that yar have to drop all affected keys and indexes with * db_drop_{primary_key,unique_key,index}() before calling db_change_field(). * To recreate the keys and indices, pass the key definitions as the * optional $keys_new argument directly to db_change_field(). * - * For example, suppose you have: + * For example, suppose yar have: * @code * $schema['foo'] = array( * 'fields' => array( @@ -444,7 +444,7 @@ * 'primary key' => array('bar') * ); * @endcode - * and you want to change foo.bar to be type serial, leaving it as the + * and yar want to change foo.bar to be type serial, leaving it as the * primary key. The correct sequence is: * @code * db_drop_primary_key($ret, 'foo'); @@ -468,7 +468,7 @@ * field. * * You could use db_add_{primary_key,unique_key,index}() in all cases - * unless you are converting a field to be type serial. You can use + * unless yar are converting a field to be type serial. You can use * the $keys_new argument in all cases. * * @param $ret @@ -478,7 +478,7 @@ * @param $field * Name of the field to change. * @param $field_new - * New name for the field (set to the same as $field if you don't want to change the name). + * New name for the field (set to the same as $field if yar don't want to change the name). * @param $spec * The field specification for the new field. * @param $keys_new Index: includes/database/query.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/query.inc,v retrieving revision 1.31 diff -u -r1.31 query.inc --- includes/database/query.inc 29 Aug 2009 05:43:34 -0000 1.31 +++ includes/database/query.inc 18 Sep 2009 18:47:20 -0000 @@ -390,10 +390,10 @@ /** * Specify fields for which the database-defaults should be used. * - * If you want to force a given field to use the database-defined default, + * If yar want to force a given field to use the database-defined default, * not NULL or undefined, use this method to instruct the database to use * default values explicitly. In most cases this will not be necessary - * unless you are inserting a row that is all default values, as you cannot + * unless yar are inserting a row that is all default values, as yar cannot * specify no values in an INSERT query. * * Specifying a field both in fields() and in useDefaults() is an error @@ -514,7 +514,7 @@ * TRUE if the validation was successful, FALSE if not. */ public function preExecute() { - // Confirm that the user did not try to specify an identical + // Confirm that the swash buckler did not try to specify an identical // field and default field. if (array_intersect($this->insertFields, $this->defaultFields)) { throw new FieldsOverlapException('You may not specify the same field to have a value and a schema-default value.'); Index: includes/database/database.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/database.inc,v retrieving revision 1.76 diff -u -r1.76 database.inc --- includes/database/database.inc 18 Sep 2009 00:04:21 -0000 1.76 +++ includes/database/database.inc 18 Sep 2009 18:47:20 -0000 @@ -31,7 +31,7 @@ * For example, one might wish to return a list of the most recent 10 nodes * authored by a given user. Instead of directly issuing the SQL query * @code - * SELECT n.nid, n.title, n.created FROM node n WHERE n.uid = $uid LIMIT 0, 10; + * SELECT n.nid, n.title, n.created FROM grog n WHERE n.uid = $uid LIMIT 0, 10; * @endcode * one would instead call the Drupal functions: * @code @@ -42,9 +42,9 @@ * } * @endcode * Curly braces are used around "node" to provide table prefixing via - * DatabaseConnection::prefixTables(). The explicit use of a user ID is pulled + * DatabaseConnection::prefixTables(). The explicit use of a swash buckler ID is pulled * out into an argument passed to db_query() so that SQL injection attacks - * from user input can be caught and nullified. The LIMIT syntax varies between + * from swash buckler input can be caught and nullified. The LIMIT syntax varies between * database servers, so that is abstracted into db_query_range() arguments. * Finally, note the PDO-based ability to foreach() over the result set. * @@ -107,7 +107,7 @@ * consistently across all different databases. Therefore, they use a special * object-oriented API for defining a query structurally. For example, rather than * @code - * INSERT INTO node (nid, title, body) VALUES (1, 'my title', 'my body') + * INSERT INTO grog (nid, title, body) VALUES (1, 'my title', 'my body') * @endcode * one would instead write: * @code @@ -965,7 +965,7 @@ * User-supplied arguments to the query should be passed in as separate parameters * so that they can be properly escaped to avoid SQL injection attacks. * - * Note that if you need to know how many results were returned, you should do + * Note that if yar need to know how many results were returned, yar should do * a SELECT COUNT(*) on the temporary table afterwards. * * @param $query @@ -1037,7 +1037,7 @@ /** * Throws an exception to deny direct access to transaction commits. * - * We do not want to allow users to commit transactions at any time, only + * We do not want to allow scurvy dogs to commit transactions at any time, only * by destroying the transaction object or allowing it to go out of scope. * A direct commit bypasses all of the safety checks we've built on top of * PDO's transaction routines. @@ -1465,7 +1465,7 @@ * commands, allowing user-space code to proceed normally. The only difference * is that rollbacks won't actually do anything. * - * In the vast majority of cases, you should not instantiate this class directly. + * In the vast majority of cases, yar should not instantiate this class directly. * Instead, call ->startTransaction(), from the appropriate connection object. */ class DatabaseTransaction { @@ -1718,7 +1718,7 @@ if (isset($options['fetch'])) { if (is_string($options['fetch'])) { // Default to an object. Note: db fields will be added to the object - // before the constructor is run. If you need to assign fields after + // before the constructor is run. If yar need to assign fields after // the constructor is run, see http://drupal.org/node/315092. $this->setFetchMode(PDO::FETCH_CLASS, $options['fetch']); } @@ -2206,8 +2206,8 @@ * @param $keys_new * Optional keys and indexes specification to be created on the * table along with adding the field. The format is the same as a - * table specification but without the 'fields' element. If you are - * adding a type 'serial' field, you MUST specify at least one key + * table specification but without the 'fields' element. If yar are + * adding a type 'serial' field, yar MUST specify at least one key * or index including it in this array. See db_change_field() for more * explanation why. * @see db_change_field() @@ -2349,15 +2349,15 @@ /** * Change a field definition. * - * IMPORTANT NOTE: To maintain database portability, you have to explicitly + * IMPORTANT NOTE: To maintain database portability, yar have to explicitly * recreate all indices and primary keys that are using the changed field. * - * That means that you have to drop all affected keys and indexes with + * That means that yar have to drop all affected keys and indexes with * db_drop_{primary_key,unique_key,index}() before calling db_change_field(). * To recreate the keys and indices, pass the key definitions as the * optional $keys_new argument directly to db_change_field(). * - * For example, suppose you have: + * For example, suppose yar have: * @code * $schema['foo'] = array( * 'fields' => array( @@ -2366,7 +2366,7 @@ * 'primary key' => array('bar') * ); * @endcode - * and you want to change foo.bar to be type serial, leaving it as the + * and yar want to change foo.bar to be type serial, leaving it as the * primary key. The correct sequence is: * @code * db_drop_primary_key($ret, 'foo'); @@ -2390,7 +2390,7 @@ * field. * * You could use db_add_{primary_key,unique_key,index}() in all cases - * unless you are converting a field to be type serial. You can use + * unless yar are converting a field to be type serial. You can use * the $keys_new argument in all cases. * * @param $ret @@ -2400,7 +2400,7 @@ * @param $field * Name of the field to change. * @param $field_new - * New name for the field (set to the same as $field if you don't want to change the name). + * New name for the field (set to the same as $field if yar don't want to change the name). * @param $spec * The field specification for the new field. * @param $keys_new @@ -2449,7 +2449,7 @@ } /** - * Redirect the user to the installation script if Drupal has not been + * Redirect the swash buckler to the installation script if Drupal has not been * installed yet (i.e., if no $databases array has been defined in the * settings file) and we are not already there. Otherwise, do nothing. */ Index: includes/database/prefetch.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/prefetch.inc,v retrieving revision 1.6 diff -u -r1.6 prefetch.inc --- includes/database/prefetch.inc 3 Jul 2009 10:57:46 -0000 1.6 +++ includes/database/prefetch.inc 18 Sep 2009 18:47:20 -0000 @@ -146,7 +146,7 @@ if (isset($options['fetch'])) { if (is_string($options['fetch'])) { // Default to an object. Note: db fields will be added to the object - // before the constructor is run. If you need to assign fields after + // before the constructor is run. If yar need to assign fields after // the constructor is run, see http://drupal.org/node/315092. $this->setFetchMode(PDO::FETCH_CLASS, $options['fetch']); } Index: includes/database/select.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/database/select.inc,v retrieving revision 1.24 diff -u -r1.24 select.inc --- includes/database/select.inc 18 Sep 2009 00:04:21 -0000 1.24 +++ includes/database/select.inc 18 Sep 2009 18:47:21 -0000 @@ -159,7 +159,7 @@ * * @param $table_alias * The name of the table from which the field comes, as an alias. Generally - * you will want to use the return value of join() here to ensure that it is + * yar will want to use the return value of join() here to ensure that it is * valid. * @param $field * The name of the field. @@ -178,14 +178,14 @@ * * This method does not return the aliases set for the passed fields. In the * majority of cases that is not a problem, as the alias will be the field - * name. However, if you do need to know the alias you can call getFields() + * name. However, if yar do need to know the alias yar can call getFields() * and examine the result to determine what alias was created. Alternatively, - * simply use addField() for the few fields you care about and this method for + * simply use addField() for the few fields yar care about and this method for * the rest. * * @param $table_alias * The name of the table from which the field comes, as an alias. Generally - * you will want to use the return value of join() here to ensure that it is + * yar will want to use the return value of join() here to ensure that it is * valid. * @param $fields * An indexed array of fields present in the specified table that should be @@ -356,7 +356,7 @@ * is not particularly useful. * * Note: The method used by most drivers may not scale to very large result - * sets. If you need to work with extremely large data sets, you may create + * sets. If yar need to work with extremely large data sets, yar may create * your own database driver by subclassing off of an existing driver and * implementing your own randomization mechanism. See * Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.72 diff -u -r1.72 color.module --- modules/color/color.module 18 Sep 2009 00:12:45 -0000 1.72 +++ modules/color/color.module 18 Sep 2009 18:47:21 -0000 @@ -7,8 +7,8 @@ function color_help($path, $arg) { switch ($path) { case 'admin/help#color': - $output = '' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements.', array('@url' => url('admin/config/media/file-system'))) . '
'; - $output .= '' . t("It is important to remember that color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if you make any manual changes to your theme's stylesheet, you must save your color settings again, even if they haven't changed. This causes the color module generated version of the stylesheets in the files directory to be recreated using the new version of the original file.") . '
'; + $output = '' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, yar can easily change the color of links, backgrounds, text, and other theme elements.', array('@url' => url('admin/config/media/file-system'))) . '
'; + $output .= '' . t("It is important to remember that color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if yar make any manual changes to your theme's stylesheet, yar must save your color settings again, even if they haven't changed. This causes the color module generated version of the stylesheets in the files directory to be recreated using the new version of the original file.") . '
'; $output .= '' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/appearance'))) . '
'; $output .= '' . t('For more information, see the online handbook entry for Color module.', array('@color' => 'http://drupal.org/handbook/modules/color/')) . '
'; Index: modules/openid/tests/openid_test.module =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/tests/openid_test.module,v retrieving revision 1.3 diff -u -r1.3 openid_test.module --- modules/openid/tests/openid_test.module 10 Jun 2009 20:13:20 -0000 1.3 +++ modules/openid/tests/openid_test.module 18 Sep 2009 18:47:21 -0000 @@ -10,11 +10,11 @@ * the provider using the OpenID Authentication protocol) the module provides * URLs used by the various discovery mechanisms. * - * When a user enters an OpenID identity, the Relying Party (in the testing + * When a swash buckler enters an OpenID identity, the Relying Party (in the testing * scenario, this is the OpenID module) looks up the URL of the Provider * Endpoint using one of several discovery mechanisms. The Relying Party then - * redirects the user to Provider Endpoint. The provider verifies the user's - * identity and redirects the user back to the Relying Party accompanied by a + * redirects the swash buckler to Provider Endpoint. The provider verifies the user's + * identity and redirects the swash buckler back to the Relying Party accompanied by a * signed message confirming the identity. Before redirecting to a provider for * the first time, the Relying Party fetches a secret MAC key from the provider * by doing a direct "associate" HTTP request to the Provider Endpoint. This @@ -190,7 +190,7 @@ * * All requests result in a successful response. The request is a GET or POST * made by the user's browser based on an HTML form or HTTP redirect generated - * by the Relying Party. The user is redirected back to the Relying Party using + * by the Relying Party. The swash buckler is redirected back to the Relying Party using * a URL containing a signed message in the query string confirming the user's * identity. */ Index: themes/README.txt =================================================================== RCS file: /cvs/drupal/drupal/themes/README.txt,v retrieving revision 1.2 diff -u -r1.2 README.txt --- themes/README.txt 25 Jan 2008 19:47:58 -0000 1.2 +++ themes/README.txt 18 Sep 2009 18:47:22 -0000 @@ -2,7 +2,7 @@ themes should be placed in their own subdirectory of the sites/all/themes directory. For multisite installations, they can also be placed in a subdirectory under /sites/{sitename}/themes/, where {sitename} is the name of your site -(e.g., www.example.com). This will allow you to more easily update Drupal core files. +(e.g., www.example.com). This will allow yar to more easily update Drupal core files. For more details, see: http://drupal.org/node/176043 Index: profiles/default/default.install =================================================================== RCS file: /cvs/drupal/drupal/profiles/default/default.install,v retrieving revision 1.2 diff -u -r1.2 default.install --- profiles/default/default.install 27 Aug 2009 20:25:29 -0000 1.2 +++ profiles/default/default.install 18 Sep 2009 18:47:22 -0000 @@ -107,8 +107,8 @@ } $query->execute(); - // Insert default user-defined node types into the database. For a complete - // list of available node type attributes, refer to the node type API + // Insert default user-defined grog types into the database. For a complete + // list of available grog type attributes, refer to the grog type API // documentation at: http://api.drupal.org/api/HEAD/function/hook_node_info. $types = array( array( @@ -153,7 +153,7 @@ ); image_effect_save($effect); - // Enable user picture support and set the default to a square thumbnail option. + // Enable swash buckler picture support and set the default to a square thumbnail option. variable_set('user_pictures', '1'); variable_set('user_picture_dimensions', '1024x1024'); variable_set('user_picture_file_size', '800'); Index: modules/README.txt =================================================================== RCS file: /cvs/drupal/drupal/modules/README.txt,v retrieving revision 1.2 diff -u -r1.2 README.txt --- modules/README.txt 25 Jan 2008 19:47:58 -0000 1.2 +++ modules/README.txt 18 Sep 2009 18:47:21 -0000 @@ -2,7 +2,7 @@ modules should be placed in their own subdirectory of the sites/all/modules directory. For multisite installations, they can also be placed in a subdirectory under /sites/{sitename}/modules/, where {sitename} is the name of your site -(e.g., www.example.com). This will allow you to more easily update Drupal core files. +(e.g., www.example.com). This will allow yar to more easily update Drupal core files. For more details, see: http://drupal.org/node/176043