diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php index 17e7bfa3062..245273ecb3a 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php @@ -132,7 +132,7 @@ abstract class AreaPluginBase extends HandlerBase { ), ); $form['tokens']['help'] = array( - '#markup' => '
' . t('The following tokens are available. If you would like to have the characters \'[\' and \']\' please use the html entity codes \'%5B\' or \'%5D\' or they will get replaced with empty space.') . '
', + '#markup' => '' . t('The following tokens are available. 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])) { 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 c5e3e344897..bc8dfffdb39 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 @@ -863,7 +863,7 @@ abstract class FieldPluginBase extends HandlerBase { // 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 \']\' please use the html entity codes \'%5B\' or \'%5D\' or they will get replaced with empty space.
'); +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/lib/Drupal/views/Plugin/views/pager/SqlBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php index 4f553e3a0f6..f96a938458b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php @@ -195,14 +195,14 @@ abstract class SqlBase extends PagerPluginBase { $error = TRUE; } if ($error) { - form_set_error('pager_options][expose][items_per_page_options', t('Please insert a list of integer numeric values separated by commas: e.g: 10, 20, 50, 100')); + form_set_error('pager_options][expose][items_per_page_options', t('Insert a list of integer numeric values separated by commas: e.g: 10, 20, 50, 100')); } // Take sure that the items_per_page is part of the expose settings. if (!empty($form_state['values']['pager_options']['expose']['items_per_page']) && !empty($form_state['values']['pager_options']['items_per_page'])) { $items_per_page = $form_state['values']['pager_options']['items_per_page']; if (array_search($items_per_page, $options) === FALSE) { - form_set_error('pager_options][expose][items_per_page_options', t('Please insert the items per page (@items_per_page) from above.', + form_set_error('pager_options][expose][items_per_page_options', t('Insert the items per page (@items_per_page) from above.', array('@items_per_page' => $items_per_page)) ); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php index c04bc993a2b..2262f26a750 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php @@ -223,7 +223,7 @@ class Sql extends QueryPluginBase { '#description' => t('Disabling SQL rewriting will disable node_access checks as well as other modules that implement hook_query_alter().'), '#type' => 'checkbox', '#default_value' => !empty($this->options['disable_sql_rewrite']), - '#suffix' => ' ', + '#suffix' => ' ', ); $form['distinct'] = array( '#type' => 'checkbox', diff --git a/core/modules/views/views.module b/core/modules/views/views.module index d3373187c49..0e5838a6b66 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -775,11 +775,12 @@ function &views_set_page_view($view = NULL) { } /** - * Find out what, if any, page view is currently in use. Please note that - * this returns a reference, so be careful! You can unintentionally modify the - * $view object. + * Find out what, if any, page view is currently in use. * - * @return Drupal\views\ViewExecutable + * Note that this returns a reference, so be careful! You can unintentionally + * modify the $view object. + * + * @return \Drupal\views\ViewExecutable * A fully formed, empty $view object. */ function &views_get_page_view() { @@ -802,11 +803,13 @@ function &views_set_current_view($view = NULL) { } /** - * Find out what, if any, current view is currently in use. Please note that - * this returns a reference, so be careful! You can unintentionally modify the - * $view object. + * Find out what, if any, current view is currently in use. * - * @return Drupal\views\ViewExecutable + * Note that this returns a reference, so be careful! You can unintentionally + * modify the $view object. + * + * @return \Drupal\views\ViewExecutable + * THe current view object. */ function &views_get_current_view() { return views_set_current_view(); diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php index b791226633c..edeb3c063f5 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php @@ -136,7 +136,7 @@ abstract class ViewFormControllerBase extends EntityFormController { $tabs[$id]['#access'] = TRUE; // Add a class to mark the error and a title to make a hover tip. $tabs[$id]['#link']['localized_options']['attributes']['class'][] = 'error'; - $tabs[$id]['#link']['localized_options']['attributes']['title'] = t('This display has one or more validation errors; please review it.'); + $tabs[$id]['#link']['localized_options']['attributes']['title'] = t('This display has one or more validation errors.'); } }