From f77b7106daaa316154f7b7a9b45245ffd1c4321f Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole Date: Sat, 6 Jul 2013 16:15:51 +0100 Subject: [PATCH] Issue #1966514 by Sutharsan, ivansf: Fixed Do not use \' in translatable strings. --- core/modules/views/lib/Drupal/views/ManyToOneHelper.php | 2 +- .../lib/Drupal/views/Plugin/views/field/FieldPluginBase.php | 5 ++--- .../views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php b/core/modules/views/lib/Drupal/views/ManyToOneHelper.php index ccd3c3b27f4..08c8cd9c65f 100644 --- a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php +++ b/core/modules/views/lib/Drupal/views/ManyToOneHelper.php @@ -37,7 +37,7 @@ class ManyToOneHelper { $form['reduce_duplicates'] = array( '#type' => 'checkbox', '#title' => t('Reduce duplicates'), - '#description' => t('This filter can cause items that have more than one of the selected options to appear as duplicate results. If this filter causes duplicate results to occur, this checkbox can reduce those duplicates; however, the more terms it has to search for, the less performant the query will be, so use this with caution. Shouldn\'t be set on single-value fields, as it may cause values to disappear from display, if used on an incompatible field.'), + '#description' => t("This filter can cause items that have more than one of the selected options to appear as duplicate results. If this filter causes duplicate results to occur, this checkbox can reduce those duplicates; however, the more terms it has to search for, the less performant the query will be, so use this with caution. Shouldn't be set on single-value fields, as it may cause values to disappear from display, if used on an incompatible field."), '#default_value' => !empty($this->handler->options['reduce_duplicates']), '#weight' => 4, ); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index fda023ab39e..0289031c35a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -859,11 +859,10 @@ abstract class FieldPluginBase extends HandlerBase { $this->documentSelfTokens($options[t('Fields')]); // Default text. - $output = t('

You must add some additional fields to this display before using this field. These fields may be marked as Exclude from display if you prefer. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.

'); + $output = '

' . t('You must add some additional fields to this display before using this field. These fields may be marked as Exclude from display if you prefer. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.') . '

'; // We have some options, so make a list. if (!empty($options)) { - $output = t('

The following tokens are available for this field. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields. -If you would like to have the characters \'[\' and \']\' use the html entity codes \'%5B\' or \'%5D\' or they will get replaced with empty space.

'); + $output = '

' . t("The following tokens are available for this field. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields. If you would like to have the characters '[' and ']' use the html entity codes '%5B' or '%5D' or they will get replaced with empty space.") . '

'; foreach (array_keys($options) as $type) { if (!empty($options[$type])) { $items = array(); diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php index 9631e384ae0..bfac4e68671 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php @@ -56,7 +56,7 @@ class BasicSettingsForm extends SystemConfigFormBase { $form['basic']['ui_show_display_embed'] = array( '#type' => 'checkbox', '#title' => t('Show the embed display in the ui.'), - '#description' => t('Allow advanced user to use the embed view display. The plugin itself works if it\'s not visible in the ui'), + '#description' => t("Allow advanced user to use the embed view display. The plugin itself works if it's not visible in the ui"), '#default_value' => $config->get('ui.show.display_embed'), );