Commit 47126e08 authored by frjo's avatar frjo
Browse files

Issue #1545342 by Alan D: Fix remaning mentions of node and replace them with content.

parent d928427a
......@@ -445,12 +445,12 @@ function colorbox_field_formatter_settings_form($field, $instance, $view_mode, $
$image_styles_hide = $image_styles;
$image_styles_hide['hide'] = t('Hide (do not display image)');
$element['colorbox_node_style'] = array(
'#title' => t('Node image style'),
'#title' => t('Content image style'),
'#type' => 'select',
'#default_value' => $settings['colorbox_node_style'],
'#empty_option' => t('None (original image)'),
'#options' => $image_styles_hide,
'#description' => t('Image style to use in the node.'),
'#description' => t('Image style to use in the content.'),
);
$element['colorbox_image_style'] = array(
'#title' => t('Colorbox image style'),
......@@ -507,7 +507,7 @@ function colorbox_field_formatter_settings_form($field, $instance, $view_mode, $
'#type' => 'select',
'#default_value' => $settings['colorbox_caption'],
'#options' => $caption,
'#description' => t('Automatic will use the first none empty value of the title, the alt text and the node title.'),
'#description' => t('Automatic will use the first none empty value of the title, the alt text and the entity title.'),
);
$element['colorbox_caption_custom'] = array(
'#title' => t('Custom caption'),
......@@ -563,13 +563,13 @@ function colorbox_field_formatter_settings_summary($field, $instance, $view_mode
// Styles could be lost because of enabled/disabled modules that defines
// their styles in code.
if (isset($image_styles[$settings['colorbox_node_style']])) {
$summary[] = t('Node image style: @style', array('@style' => $image_styles[$settings['colorbox_node_style']]));
$summary[] = t('Content image style: @style', array('@style' => $image_styles[$settings['colorbox_node_style']]));
}
else if ($settings['colorbox_node_style'] == 'hide') {
$summary[] = t('Node image style: Hide');
$summary[] = t('Content image style: Hide');
}
else {
$summary[] = t('Node image style: Original image');
$summary[] = t('Content image style: Original image');
}
if (isset($image_styles[$settings['colorbox_image_style']])) {
......
......@@ -40,7 +40,7 @@ function theme_colorbox_image_formatter($variables) {
switch ($settings['colorbox_caption']) {
case 'auto':
// If the title is empty use alt or the node title in that order.
// If the title is empty use alt or the entity title in that order.
if (!empty($image['title'])) {
$caption = $image['title'];
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment