From 7e91b644ce2a25ac04f0490f3c67286e2a3e37c3 Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Fri, 24 Oct 2014 12:04:14 +0200 Subject: [PATCH] Adjust the template hint (see #7369) --- .tx/config | 10 ++++++++++ system/modules/core/dca/tl_image_size.php | 5 ++--- system/modules/core/dca/tl_image_size_item.php | 5 ++--- system/modules/core/languages/en/tl_image_size.xlf | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.tx/config b/.tx/config index 40f8d1afd9..98804bd740 100644 --- a/.tx/config +++ b/.tx/config @@ -122,6 +122,16 @@ source_file = system/modules/core/languages/en/tl_form_field.xlf source_lang = en file_filter = system/modules/core/languages//tl_form_field.xlf +[contao.v3_4-core-tl_image_size] +source_file = system/modules/core/languages/en/tl_image_size.xlf +source_lang = en +file_filter = system/modules/core/languages//tl_image_size.xlf + +[contao.v3_4-core-tl_image_size_item] +source_file = system/modules/core/languages/en/tl_image_size_item.xlf +source_lang = en +file_filter = system/modules/core/languages//tl_image_size_item.xlf + [contao.v3_4-core-tl_install] source_file = system/modules/core/languages/en/tl_install.xlf source_lang = en diff --git a/system/modules/core/dca/tl_image_size.php b/system/modules/core/dca/tl_image_size.php index f05dfe0d6a..4dc3cc09ae 100644 --- a/system/modules/core/dca/tl_image_size.php +++ b/system/modules/core/dca/tl_image_size.php @@ -262,9 +262,8 @@ public function listImageSize($row) /** * Show a hint if a JavaScript library needs to be included in the page layout - * @param object */ - public function showJsLibraryHint($dc) + public function showJsLibraryHint() { if ($_POST || Input::get('act') != 'edit') { @@ -278,7 +277,7 @@ public function showJsLibraryHint($dc) } System::loadLanguageFile('tl_layout'); - Message::addInfo(sprintf($GLOBALS['TL_LANG']['tl_image_size']['picturefill'], $GLOBALS['TL_LANG']['tl_layout']['addPicturefill'][0])); + Message::addInfo(sprintf($GLOBALS['TL_LANG']['tl_image_size']['picturefill'], 'picturefill.js', 'respimage.js')); } diff --git a/system/modules/core/dca/tl_image_size_item.php b/system/modules/core/dca/tl_image_size_item.php index 594496aaae..afcaa46669 100644 --- a/system/modules/core/dca/tl_image_size_item.php +++ b/system/modules/core/dca/tl_image_size_item.php @@ -277,9 +277,8 @@ public function listImageSizeItem($row) /** * Show a hint if a JavaScript library needs to be included in the page layout - * @param object */ - public function showJsLibraryHint($dc) + public function showJsLibraryHint() { if ($_POST || Input::get('act') != 'edit') { @@ -293,7 +292,7 @@ public function showJsLibraryHint($dc) } System::loadLanguageFile('tl_layout'); - Message::addInfo(sprintf($GLOBALS['TL_LANG']['tl_image_size']['picturefill'], $GLOBALS['TL_LANG']['tl_layout']['addPicturefill'][0])); + Message::addInfo(sprintf($GLOBALS['TL_LANG']['tl_image_size']['picturefill'], 'picturefill.js', 'respimage.js')); } diff --git a/system/modules/core/languages/en/tl_image_size.xlf b/system/modules/core/languages/en/tl_image_size.xlf index a5cd17f0d2..b9298805ef 100644 --- a/system/modules/core/languages/en/tl_image_size.xlf +++ b/system/modules/core/languages/en/tl_image_size.xlf @@ -99,7 +99,7 @@ Delete image size ID %s - The <em>%s</em> option needs to be enabled in the page layout. + The <em>%s</em> or <em>%s</em> polyfill needs to be enabled in the page layout.