--- color.module.orig 2011-02-11 09:57:27.000000000 -0500 +++ color.module 2011-02-11 09:57:43.000000000 -0500 @@ -216,7 +216,7 @@ function color_scheme_form($complete_for if (isset($names[$name])) { $form['palette'][$name] = array( '#type' => 'textfield', - '#title' => $names[$name], + '#title' => t($names[$name]), '#default_value' => $value, '#size' => 8, ); --- options.module.orig 2011-02-11 09:58:47.000000000 -0500 +++ options.module 2011-02-11 09:59:24.000000000 -0500 @@ -201,7 +201,7 @@ function _options_properties($type, $mul if (!$required) { $properties['empty_option'] = 'option_none'; } - else if (!$has_value) { + elseif (!$has_value) { $properties['empty_option'] = 'option_select'; } } --- field_ui.module.orig 2011-02-11 10:00:22.000000000 -0500 +++ field_ui.module 2011-02-11 10:00:38.000000000 -0500 @@ -360,7 +360,7 @@ function field_ui_form_node_type_form_al */ function field_ui_form_node_type_form_submit($form, &$form_state) { if ($form_state['clicked_button']['#parents'][0] === 'save_continue') { - $form_state['redirect'] = _field_ui_bundle_admin_path('node', $form_state['values']['type']) .'/fields'; + $form_state['redirect'] = _field_ui_bundle_admin_path('node', $form_state['values']['type']) . '/fields'; } } --- filter.module.orig 2011-02-11 10:01:48.000000000 -0500 +++ filter.module 2011-02-11 10:02:33.000000000 -0500 @@ -336,7 +336,7 @@ function filter_permission() { // viewing this will have access to that page. $format_name_replacement = user_access('administer filters') ? l($format->name, 'admin/config/content/formats/' . $format->format) : drupal_placeholder($format->name); $perms[$permission] = array( - 'title' => t("Use the !text_format text format", array('!text_format' => $format_name_replacement,)), + 'title' => t("Use the !text_format text format", array('!text_format' => $format_name_replacement)), 'description' => drupal_placeholder(t('Warning: This permission may have security implications depending on how the text format is configured.')), ); } @@ -1529,7 +1529,7 @@ function _filter_url_escape_comments($ma if (isset($escape)) { $mode = $escape; - if ($escape){ + if ($escape) { $comments = array(); } return; --- image.module.orig 2011-02-11 10:03:04.000000000 -0500 +++ image.module 2011-02-11 10:03:21.000000000 -0500 @@ -46,7 +46,7 @@ function image_help($path, $arg) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Manipulating images') . '
'; - $output .= '
' . t('With the Image module you can scale, crop, resize, rotate and desaturate images without affecting the original image using image styles. When you change an image style, the module automatically refreshes all created images. Every image style must have a name, which will be used in the URL of the generated images. There are two common approaches to naming image styles (which you use will depend on how the image style is being applied):',array('@image' => url('admin/config/media/image-styles'))); + $output .= '
' . t('With the Image module you can scale, crop, resize, rotate and desaturate images without affecting the original image using image styles. When you change an image style, the module automatically refreshes all created images. Every image style must have a name, which will be used in the URL of the generated images. There are two common approaches to naming image styles (which you use will depend on how the image style is being applied):', array('@image' => url('admin/config/media/image-styles'))); $output .= ''; $output .= t('After you create an image style, you can add effects: crop, scale, resize, rotate, and desaturate (other contributed modules provide additional effects). For example, by combining effects as crop, scale, and desaturate, you can create square, grayscale thumbnails.') . '
'; --- node.module.orig 2011-02-11 10:03:54.000000000 -0500 +++ node.module 2011-02-11 10:06:01.000000000 -0500 @@ -2126,7 +2126,8 @@ function node_block_view($delta = '') { $block['content'] = theme('node_recent_block', array( 'nodes' => $nodes, )); - } else { + } + else { $block['content'] = t('No content available.'); } } @@ -3808,7 +3809,8 @@ function node_requirements($phase) { $grant_count = db_query('SELECT COUNT(*) FROM {node_access}')->fetchField(); if ($grant_count != 1 || count(module_implements('node_grants')) > 0) { $value = format_plural($grant_count, 'One permission in use', '@count permissions in use', array('@count' => $grant_count)); - } else { + } + 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 content 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, content will automatically use the new permissions.'); --- system.module.orig 2011-02-11 10:08:43.000000000 -0500 +++ system.module 2011-02-11 10:10:02.000000000 -0500 @@ -970,7 +970,7 @@ function system_menu() { ); $items['admin/config/system/site-information'] = array( 'title' => 'Site information', - 'description' => t('Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.'), + 'description' => 'Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_information_settings'), 'access arguments' => array('administer site configuration'), @@ -979,7 +979,7 @@ function system_menu() { ); $items['admin/config/system/cron'] = array( 'title' => t('Cron'), - 'description' => t('Manage automatic site maintenance tasks.'), + 'description' => 'Manage automatic site maintenance tasks.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_cron_settings'), 'access arguments' => array('administer site configuration'), @@ -2827,7 +2827,7 @@ function confirm_form($form, $question, $options = array('path' => $path); } - drupal_set_title($question, PASS_THROUGH); + drupal_set_title(t($question), PASS_THROUGH); $form['#attributes']['class'][] = 'confirmation'; $form['description'] = array('#markup' => $description); @@ -2840,7 +2840,7 @@ function confirm_form($form, $question, ); $form['actions']['cancel'] = array( '#type' => 'link', - '#title' => $no ? $no : t('Cancel'), + '#title' => $no ? t($no) : t('Cancel'), '#href' => $options['path'], '#options' => $options, ); --- search.module.orig 2011-02-11 10:06:54.000000000 -0500 +++ search.module 2011-02-11 10:08:33.000000000 -0500 @@ -987,7 +987,7 @@ function search_form($form, &$form_state $form['basic'] = array('#type' => 'container', '#attributes' => array('class' => array('container-inline'))); $form['basic']['keys'] = array( '#type' => 'textfield', - '#title' => $prompt, + '#title' => t($prompt), '#default_value' => $keys, '#size' => $prompt ? 40 : 20, '#maxlength' => 255, --- taxonomy.module.orig 2011-02-11 10:10:38.000000000 -0500 +++ taxonomy.module 2011-02-11 10:12:05.000000000 -0500 @@ -26,7 +26,7 @@ function taxonomy_help($path, $arg) { $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Creating vocabularies') . '
'; - $output .= '
' . t('Users with sufficient permissions can create vocabularies and terms through the Taxonomy page. The page listing the terms provides a drag-and-drop interface for controlling the order of the terms and sub-terms within a vocabulary, in a hierarchical fashion. A controlled vocabulary classifying music by genre with terms and sub-terms could look as follows:', array('@taxo' => url('admin/structure/taxonomy'), '@perm' => url('admin/people/permissions', array('fragment'=>'module-taxonomy')))); + $output .= '
' . t('Users with sufficient permissions can create vocabularies and terms through the Taxonomy page. The page listing the terms provides a drag-and-drop interface for controlling the order of the terms and sub-terms within a vocabulary, in a hierarchical fashion. A controlled vocabulary classifying music by genre with terms and sub-terms could look as follows:', array('@taxo' => url('admin/structure/taxonomy'), '@perm' => url('admin/people/permissions', array('fragment' => 'module-taxonomy')))); $output .= '
  • ' . t('vocabulary: Music') . '
    • '; $output .= '
    • ' . t('term: Jazz') . '
      • '; $output .= '
      • ' . t('sub-term: Swing') . '
        • '; @@ -1444,7 +1444,7 @@ function taxonomy_field_formatter_prepar $items[$id][$delta]['taxonomy_term'] = $terms[$item['tid']]; } // Terms to be created are not in $terms, but are still legitimate. - else if ($item['tid'] == 'autocreate') { + elseif ($item['tid'] == 'autocreate') { // Leave the item in place. } // Otherwise, unset the instance value, since the term does not exist. --- toolbar.module.orig 2011-02-11 10:12:48.000000000 -0500 +++ toolbar.module 2011-02-11 10:13:39.000000000 -0500 @@ -96,7 +96,7 @@ function theme_toolbar_toggle($variables $toggle_text = t('Hide shortcuts'); $variables['attributes']['class'][] = 'toggle-active'; } - return '' . $toggle_text . ''; + return '' . $toggle_text . ''; } /** @@ -184,7 +184,7 @@ function toolbar_view() { $module_path = drupal_get_path('module', 'toolbar'); $build = array( '#theme' => 'toolbar', - '#attached'=> array( + '#attached' => array( 'js' => array( $module_path . '/toolbar.js', array( @@ -264,7 +264,7 @@ function toolbar_view() { 'toolbar-drawer', 'clearfix', ); - if(_toolbar_is_collapsed()) { + if (_toolbar_is_collapsed()) { $toolbar_drawer_classes[] = 'collapsed'; } $build['toolbar_drawer_classes'] = implode(' ', $toolbar_drawer_classes); --- user.module.orig 2011-02-11 10:14:00.000000000 -0500 +++ user.module 2011-02-11 10:15:21.000000000 -0500 @@ -1096,7 +1096,7 @@ function user_account_form(&$form, &$for // @todo This should be solved more elegantly. See issue #119038. $checkbox_authenticated = array( '#type' => 'checkbox', - '#title' => $roles[DRUPAL_AUTHENTICATED_RID], + '#title' => t($roles[DRUPAL_AUTHENTICATED_RID]), '#default_value' => TRUE, '#disabled' => TRUE, );