Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1970068 by dawehner, Bojhan: Please remove all please(s) from the views UI.

8.0.x
Alex Pott 2013-04-15 11:00:23 +01:00
parent 99b39dc7d8
commit 677a98f63b
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/views/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
View File

@ -132,7 +132,7 @@ abstract class AreaPluginBase extends HandlerBase {
),
);
$form['tokens']['help'] = array(
'#markup' => '<p>' . 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.') . '</p>',
'#markup' => '<p>' . 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.') . '</p>',
);
foreach (array_keys($options) as $type) {
if (!empty($options[$type])) {

2
core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
View File

@ -863,7 +863,7 @@ abstract class FieldPluginBase extends HandlerBase {
// We have some options, so make a list.
if (!empty($options)) {
$output = t('<p>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.</p>');
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.</p>');
foreach (array_keys($options) as $type) {
if (!empty($options[$type])) {
$items = array();

4
core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
View File

@ -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))
);
}

2
core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
View File

@ -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' => '<div class="messages warning sql-rewrite-warning js-hide">' . t('WARNING: Disabling SQL rewriting means that node access security is disabled. This may allow users to see data they should not be able to see if your view is misconfigured. Please use this option only if you understand and accept this security risk.') . '</div>',
'#suffix' => '<div class="messages warning sql-rewrite-warning js-hide">' . t('WARNING: Disabling SQL rewriting means that node access security is disabled. This may allow users to see data they should not be able to see if your view is misconfigured. Use this option only if you understand and accept this security risk.') . '</div>',
);
$form['distinct'] = array(
'#type' => 'checkbox',

19
core/modules/views/views.module
View File

@ -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();

2
core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
View File

@ -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.');
}
}