From a9107d83166f798b8258de6e213768b01de52409 Mon Sep 17 00:00:00 2001 From: "Adam J. DiCarlo" Date: Wed, 24 Oct 2012 14:51:23 -0700 Subject: [PATCH] Issue #1785742 by hass, rocketeerbkw, twardnw, adamdicarlo: Fixed Diff module string review. --- diff.info | 2 +- diff.module | 33 +++++++++++++++------------------ diff.pages.inc | 10 +++++----- diff.tokens.inc | 8 ++++---- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/diff.info b/diff.info index c62ccaa..0759a5f 100644 --- a/diff.info +++ b/diff.info @@ -1,5 +1,5 @@ name = Diff -description = Show difference between node revisions. +description = Show differences between content revisions. core = 7.x files[] = DiffEngine.php diff --git a/diff.module b/diff.module index 561a5ca..80a59a3 100644 --- a/diff.module +++ b/diff.module @@ -37,11 +37,11 @@ define('DIFF_SORT_CUSTOM', '-1'); function diff_help($path, $arg) { switch ($path) { case 'admin/help#diff': - $output = '

' . t('The diff module overwrites the normal revisions view. The revisions table is enhanced with a possibility to view the difference between two node revisions. Users with the %view_revisions permission will also be able to view the changes between any two selected revisions. You may disable this for individual content types on the content type configuration page. This module also provides a nifty %preview_changes button while editing a post.', array('%preview_changes' => t('View changes'), '%view_revisions' => t('view revisions'))) . '

'; + $output = '

' . t('The Diff module replaces the normal Revisions node tab. Diff enhances the listing of revisions with an option to view the differences between any two node revisions. Access to this feature is controlled with the View revisions permission. The feature can be disabled for an entire content type on the content type configuration page. Diff also provides an optional View changes button while editing a node.') . '

'; return $output; case 'node/%/revisions/%/view': // The translated strings should match node_help('node/%/revisions'). - return '

' . t('The revisions let you track differences between multiple versions of a post.') . '

'; + return '

' . t('Revisions allow you to track differences between multiple versions of your content, and revert back to older versions.') . '

'; case 'node/%/revisions/view/%/%': return '

' . t('Comparing two revisions:') . '

'; } @@ -91,7 +91,7 @@ function diff_menu() { 'file' => 'diff.pages.inc', ); $items['node/%node/revisions/view'] = array( - 'title' => 'Diff', + 'title' => 'Compare revisions', 'page callback' => 'diff_diffs_show', 'page arguments' => array(1, 4, 5, 6), 'type' => MENU_LOCAL_TASK, @@ -102,7 +102,7 @@ function diff_menu() { ); $items['node/%node/revisions/view/latest'] = array( - 'title' => 'Show latest diff', + 'title' => 'Show latest difference', 'page callback' => 'diff_latest', 'page arguments' => array(1), 'type' => MENU_LOCAL_TASK, @@ -268,7 +268,7 @@ function diff_entity_info_alter(&$entity_info) { * Implements hook_block_info(). */ function diff_block_info() { - return array('inline' => array('info' => t('Inline diff'))); + return array('inline' => array('info' => t('Inline differences'))); } /** @@ -327,36 +327,35 @@ function diff_form_node_type_form_alter(&$form, $form_state) { if (isset($form['type'])) { $type = $form['#node_type']; $form['diff'] = array( - '#title' => t('Diff'), + '#title' => t('Compare revisions'), '#type' => 'fieldset', '#group' => 'additional_settings', '#tree' => FALSE, ); $form['diff']['diff_show_preview_changes_node'] = array( '#type' => 'checkbox', - '#title' => t('Show %preview_changes button on node edit form', array('%preview_changes' => t('View changes'))), + '#title' => t('Show View changes button on node edit form'), '#weight' => 10, '#default_value' => variable_get('diff_show_preview_changes_node_' . $type->type, TRUE), ); $form['diff']['diff_show_diff_inline_node'] = array( '#type' => 'checkbox', - '#title' => t('Show diffs inline for this content type'), - '#description' => t("You must enable the 'Inline diff' block to use this feature"), + '#title' => t('Show inline differences for this content type'), + '#description' => t('You must enable the Inline differences block to use this feature.'), '#weight' => 10, '#default_value' => variable_get('diff_show_diff_inline_node_' . $type->type, FALSE), ); $form['diff']['diff_enable_revisions_page_node'] = array( '#type' => 'checkbox', - '#title' => t('Enable the %revisions page for this content type', array('%revisions' => t('Revisions'))), + '#title' => t('Enable the Revisions page for this content type'), '#weight' => 11, '#default_value' => variable_get('diff_enable_revisions_page_node_' . $type->type, TRUE), ); $form['diff']['diff_view_mode_standard_node'] = array( '#type' => 'checkbox', - '#title' => t('Use %view_mode view mode when doing standard field comparisons', array('%view_mode' => t('Diff standard'))), - '#description' => t('

You need to enable this view mode in the @type_label types %custom_display_settings to control settings other than just what fields are shown. Once enabled you can configure many of the diff options used to compare these fields.

If it is not selected, all compatable fields will be compared using default settings.

', array( + '#title' => t('Use Diff standard view mode when doing standard field comparisons'), + '#description' => t("

You need to enable this view mode in the @type_label type's Custom display settings to control settings other than just what fields are shown. Once enabled you can configure many of the diff options used to compare these fields.

If it is not selected, all compatible fields will be compared using default settings.

", array( '@type_label' => $type->name, - '%custom_display_settings' => t('Custom display settings'), )), '#weight' => 12, '#default_value' => variable_get('diff_view_mode_standard_node_' . $type->type, FALSE), @@ -369,9 +368,7 @@ function diff_form_node_type_form_alter(&$form, $form_state) { $form['diff']['diff_view_mode_preview_node'] = array( '#type' => 'select', '#title' => t('Standard comparison preview'), - '#description' => t('This governs the %current view mode when doing standard comparisons.', array( - '%current' => t('Current revision:'), - )), + '#description' => t('Governs the Current revision view mode when doing standard comparisons.'), '#options' => $options, '#weight' => 13, '#default_value' => variable_get('diff_view_mode_preview_node_' . $type->type, 'full'), @@ -381,7 +378,7 @@ function diff_form_node_type_form_alter(&$form, $form_state) { $form['diff']['diff_view_mode_inline_node'] = array( '#type' => 'select', '#title' => t('Inline diff view mode'), - '#description' => t('This governs what view mode is used to compare and display content in this block.'), + '#description' => t('Governs which view mode is used to compare and display content in this block.'), '#options' => $options, '#weight' => 14, '#default_value' => variable_get('diff_view_mode_inline_node_' . $type->type, 'diff_complete'), @@ -549,7 +546,7 @@ function diff_inline_form($form, $form_state, $node, $revisions) { ); $form['revision'] = array( '#type' => 'select', - '#options' => array(0 => '< ' . t('No highlighting') . ' >'), + '#options' => array(0 => t('- No highlighting -')), '#default_value' => (arg(2) === 'revisions' && arg(3) === $node->vid) ? $node->vid : 0, '#ajax' => array( 'callback' => 'diff_inline_ajax', diff --git a/diff.pages.inc b/diff.pages.inc index 1803516..3c091ab 100644 --- a/diff.pages.inc +++ b/diff.pages.inc @@ -115,7 +115,7 @@ function diff_node_revisions($form, $form_state, $node) { '#default_value' => $new_vid, ); - $form['submit'] = array('#type' => 'submit', '#value' => t('Show diff')); + $form['submit'] = array('#type' => 'submit', '#value' => t('Compare')); if (count($revision_list) > REVISION_LIST_SIZE) { $form['#suffix'] = theme('pager'); @@ -170,7 +170,7 @@ function diff_diffs_show($node, $old_vid, $new_vid, $state = NULL) { // Same title as the 'Revisions' tab. Blocked by non-page requests. if (node_is_page($node)) { - drupal_set_title(t('Revisions for @title', array('@title' => $node->title))); + drupal_set_title(t('Revisions for %title', array('%title' => $node->title)), PASS_THROUGH); } $node_revisions = node_revision_list($node); @@ -194,14 +194,14 @@ function diff_diffs_show($node, $old_vid, $new_vid, $state = NULL) { $nav_suffix = ($default_state != $state) ? '/' . str_replace('_', '-', $state) : ''; $next_vid = _diff_get_next_vid($node_revisions, $new_vid); if ($next_vid) { - $next_link = l(t('next diff >'), 'node/' . $node->nid . '/revisions/view/' . $new_vid . '/' . $next_vid . $nav_suffix, array('absolute' => 1)); + $next_link = l(t('next difference >'), 'node/' . $node->nid . '/revisions/view/' . $new_vid . '/' . $next_vid . $nav_suffix, array('absolute' => 1)); } else { $next_link = ''; } $prev_vid = _diff_get_previous_vid($node_revisions, $old_vid); if ($prev_vid) { - $prev_link = l(t('< previous diff'), 'node/' . $node->nid . '/revisions/view/' . $prev_vid . '/' . $old_vid . $nav_suffix, array('absolute' => 1)); + $prev_link = l(t('< previous difference'), 'node/' . $node->nid . '/revisions/view/' . $prev_vid . '/' . $old_vid . $nav_suffix, array('absolute' => 1)); } else { $prev_link = ''; @@ -275,7 +275,7 @@ function diff_diffs_show($node, $old_vid, $new_vid, $state = NULL) { $header .= '
' . t('Current revision:') . '
'; } else { - $header .= '
' . t('Revision of !new_date:', array('!new_date' => format_date($new_node->revision_timestamp))) . '
'; + $header .= '
' . t('Revision of @new_date:', array('@new_date' => format_date($new_node->revision_timestamp))) . '
'; } $build['diff_preview']['header']['#markup'] = $header; // Don't include node links (final argument) when viewing the diff. diff --git a/diff.tokens.inc b/diff.tokens.inc index 9a8a7d2..96dbd80 100644 --- a/diff.tokens.inc +++ b/diff.tokens.inc @@ -10,12 +10,12 @@ */ function diff_token_info() { $node['diff'] = array( - 'name' => t('Latest diff'), - 'description' => t('The difference between the current revision and the previous revision of this node.'), + 'name' => t('Latest differences'), + 'description' => t('The differences between the current revision and the previous revision of this node.'), ); $node['diff-markdown'] = array( - 'name' => t('Latest diff (markdowned)'), - 'description' => t('The difference between the current revision and the previous revision of this node, but comparison uses a markdowned state.'), + 'name' => t('Latest differences (marked down)'), + 'description' => t('The differences between the current revision and the previous revision of this node, but with a marked-down form of each revision used for comparison.'), ); return array( -- 1.7.8