diff -u b/core/modules/views/views.views.inc b/core/modules/views/views.views.inc --- b/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -321,6 +321,9 @@ } } + /** @var \Drupal\Core\Render\RendererInterface $renderer */ + $renderer = \Drupal::service('renderer'); + // Description of the field tables. // @todo Generalize this code to make it work with any table layout. See // https://www.drupal.org/node/2079019. @@ -449,7 +452,12 @@ } if ($aliases) { $data[$table_alias][$field_alias]['aliases'] = $aliases; - $data[$table_alias][$field_alias]['help'] .= ' ' . t('Also known as: @also.', array('@also' => implode(', ', $also_known))); + $result = [ + '#type' => 'inline_template', + '#template' => '{% for item in items %}{% if not loop.first %}, {% endif %}{{ item }}{% endfor %}', + '#context' => ['items' => $also_known], + ]; + $data[$table_alias][$field_alias]['help'] .= ' ' . t('Also known as: @also.', array('@also' => $renderer->renderPlain($result))); } $keys = array_keys($field_columns); @@ -550,7 +558,12 @@ } if ($aliases) { $data[$table_alias][$column_real_name]['aliases'] = $aliases; - $data[$table_alias][$column_real_name]['help'] .= ' ' . t('Also known as: @also.', array('@also' => implode(', ', $also_known))); + $result = [ + '#type' => 'inline_template', + '#template' => '{% for item in items %}{% if not loop.first %}, {% endif %}{{ item }}{% endfor %}', + '#context' => ['items' => $aliases], + ]; + $data[$table_alias][$column_real_name]['help'] .= ' ' . t('Also known as: @also.', array('@also' => $renderer->renderPlain($result))); } $data[$table_alias][$column_real_name]['argument'] = array( diff -u b/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php --- b/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -1130,12 +1130,8 @@ $last = end($keys); foreach ($contents as $key => $pid) { if ($key != $last) { - if ($group_info['groups'][$gid] == 'OR') { - $store[$pid]['#link'] = $this->t('@link    OR', ['@link' => $store[$pid]['#link']]); - } - else { - $store[$pid]['#link'] = $this->t('@link    AND', ['@link' => $store[$pid]['#link']]); - } + $operator = $group_info['groups'][$gid] == 'OR' ? $this->t('OR') : $this->t('AND'); + $store[$pid]['#link'] = SafeMarkup::format('@link @operator', ['@link' => $store[$pid]['#link'], '@operator' => $operator]); } $build['fields'][$pid] = $store[$pid]; } only in patch2: unchanged: --- a/core/modules/views_ui/css/views_ui.admin.theme.css +++ b/core/modules/views_ui/css/views_ui.admin.theme.css @@ -512,6 +512,14 @@ td.group-title { margin-right: 0.2083em; } +.views-ui-display-tab-setting > span { + margin-left: 0.5em; /* LTR */ +} +[dir="rtl"] .views-ui-display-tab-setting > span { + margin-left: 0; + margin-right: 0.5em; +} + /** Applies an overridden(italics) font style to overridden buckets. * The better way to implement this would be to add the overridden class * to the bucket header when the bucket is overridden and style it as a