diff --git a/diff.module b/diff.module index 8531a59..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 an option to view the differences between two node revisions. Users with the View revisions permission will 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 an optional View changes button while editing a post.') . '

'; + $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:') . '

'; } @@ -341,7 +341,7 @@ function diff_form_node_type_form_alter(&$form, $form_state) { $form['diff']['diff_show_diff_inline_node'] = array( '#type' => 'checkbox', '#title' => t('Show inline differences for this content type'), - '#description' => t("You must enable the Inline differences block to use this feature."), + '#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), ); @@ -353,10 +353,9 @@ function diff_form_node_type_form_alter(&$form, $form_state) { ); $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'), diff --git a/diff.pages.inc b/diff.pages.inc index 9278922..3c091ab 100644 --- a/diff.pages.inc +++ b/diff.pages.inc @@ -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 924ff67..96dbd80 100644 --- a/diff.tokens.inc +++ b/diff.tokens.inc @@ -14,8 +14,8 @@ function diff_token_info() { 'description' => t('The differences between the current revision and the previous revision of this node.'), ); $node['diff-markdown'] = array( - 'name' => t('Latest differences (markdowned)'), - 'description' => t('The differences between the current revision and the previous revision of this node using markdown'),` + '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(