Index: geshifilter.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.admin.inc,v
retrieving revision 1.19
diff -u -r1.19 geshifilter.admin.inc
--- geshifilter.admin.inc 4 Sep 2008 09:13:15 -0000 1.19
+++ geshifilter.admin.inc 25 Dec 2008 23:05:18 -0000
@@ -117,22 +117,22 @@
GESHIFILTER_LINE_NUMBERS_DEFAULT_FANCY10 => t('fancy line numbers (every @n lines)', array('@n' => GESHIFILTER_LINE_NUMBERS_DEFAULT_FANCY10)),
GESHIFILTER_LINE_NUMBERS_DEFAULT_FANCY20 => t('fancy line numbers (every @n lines)', array('@n' => GESHIFILTER_LINE_NUMBERS_DEFAULT_FANCY20)),
),
- '#description' => t('Select the default line numbering scheme: no line numbers, normal line numbers or fancy line numbers. With fancy line numbers every nth line number is highlighted. (GeSHi documentation: !link).',
- array('!link' => l('Line numbers', 'http://qbnz.com/highlighter/geshi-doc.html#line-numbers'))),
+ '#description' => t('Select the default line numbering scheme: no line numbers, normal line numbers or fancy line numbers. With fancy line numbers every nth line number is highlighted. (GeSHi documentation: Line numbers).',
+ array('!link' => 'http://qbnz.com/highlighter/geshi-doc.html#line-numbers')),
);
// highlight_string usage option
$form['geshifilter_highlighting_options']['geshifilter_use_highlight_string_for_php'] = array(
'#type' => 'checkbox',
'#title' => t('Use built-in PHP function highlight_string() for PHP source code.'),
- '#description' => t('When enabled, PHP source code will be syntax highlighted with the built-in PHP function !highlight_string instead of with the GeSHi library. GeSHi features like for example line numbering and usage of an external CSS stylesheet are not available.', array('!highlight_string' => l('highlight_string()', 'http://php.net/manual/en/function.highlight-string.php'))),
+ '#description' => t('When enabled, PHP source code will be syntax highlighted with the built-in PHP function highlight_string() instead of with the GeSHi library. GeSHi features like for example line numbering and usage of an external CSS stylesheet are not available.', array('!highlight_string' => 'http://php.net/manual/en/function.highlight-string.php')),
'#default_value' => variable_get('geshifilter_use_highlight_string_for_php', FALSE),
);
// Option to disable Keyword URL's
$form['geshifilter_highlighting_options']['geshifilter_enable_keyword_urls'] = array(
'#type' => 'checkbox',
'#title' => t('Enable GeSHi keyword URLs'),
- '#description' => t('For some languages GeSHi can link language keywords (e.g. standard library functions) to their online documentation. (GeSHi documentation: !link)',
- array('!link' => l('Keyword URLs', 'http://qbnz.com/highlighter/geshi-doc.html#keyword-urls'))),
+ '#description' => t('For some languages GeSHi can link language keywords (e.g. standard library functions) to their online documentation. (GeSHi documentation: Keyword URLs).',
+ array('!link' => 'http://qbnz.com/highlighter/geshi-doc.html#keyword-urls')),
'#default_value' => variable_get('geshifilter_enable_keyword_urls', TRUE),
);
@@ -165,8 +165,8 @@
$form['geshifilter_styling']['geshifilter_code_container'] = array(
'#type' => 'radios',
'#title' => t('Code container'),
- '#description' => t('Define the container element to use for code blocks. (GeSHi documentation: !link).',
- array('!link' => l('The Code Container', 'http://qbnz.com/highlighter/geshi-doc.html#the-code-container'))
+ '#description' => t('Define the container element to use for code blocks. (GeSHi documentation: The Code Container).',
+ array('!link' => 'http://qbnz.com/highlighter/geshi-doc.html#the-code-container')
),
'#options' => array(
GESHI_HEADER_PRE => t('Use @cnt container (efficient whitespace coding, no automatic line wrapping)', array('@cnt' => '')),
@@ -525,8 +525,8 @@
drupal_set_message(t('Generated external CSS file %file.', array('%file' => $ret)));
}
else {
- drupal_set_message(t('Could not generate external CSS file. Check the settings of your !filesystem.',
- array('!filesystem' => l(t('file system'), 'admin/settings/file-system'))), 'error');
+ drupal_set_message(t('Could not generate external CSS file. Check the settings of your file system.',
+ array('!filesystem' => url('admin/settings/file-system'))), 'error');
}
}
}
Index: geshifilter.conflicts.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.conflicts.inc,v
retrieving revision 1.4
diff -u -r1.4 geshifilter.conflicts.inc
--- geshifilter.conflicts.inc 21 Jul 2008 17:44:23 -0000 1.4
+++ geshifilter.conflicts.inc 25 Dec 2008 23:05:18 -0000
@@ -81,9 +81,9 @@
// check tag escaping of html filter
if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_ESCAPE) {
$conflicts[] = array(
- 'description' => t('%cfilter is configured to "%escape", which is likely to cause propblems with %geshifilter.',
- array('%cfilter' => $cfilter->name, '%geshifilter' => $geshifilter->name, '%escape' => t('Escape all tags'))),
- 'solution' => l(t('Configure HTML filtering to "%strip"', array('%strip' => t('Strip disallowed tags'))), "admin/settings/filters/$format/configure", array('html' => TRUE)),
+ 'description' => t('%cfilter is configured to "Escape all tags", which is likely to cause problems with %geshifilter.',
+ array('%cfilter' => $cfilter->name, '%geshifilter' => $geshifilter->name)),
+ 'solution' => l(t('Configure HTML filtering to "Strip disallowed tags"'), "admin/settings/filters/$format/configure", array('html' => TRUE)),
);
}
return $conflicts;
Index: geshifilter.filtertips.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.filtertips.inc,v
retrieving revision 1.5
diff -u -r1.5 geshifilter.filtertips.inc
--- geshifilter.filtertips.inc 21 Jul 2008 17:44:23 -0000 1.5
+++ geshifilter.filtertips.inc 25 Dec 2008 23:05:18 -0000
@@ -41,7 +41,7 @@
// language tags
$tags = array();
foreach ($language_tags as $tag) {
- $tags[] = '"'. $bracket_open . $tag . $bracket_close .'" '. t('for @lang source code', array('@lang' => $languages[$tag_to_lang[$tag]]));
+ $tags[] = t('"@tag-code" for @lang source code', array('@tag-code' => $bracket_open . $tag . $bracket_close, '@lang' => $languages[$tag_to_lang[$tag]]));
}
$items[] = t('Language specific syntax highlighting tags: !tags.', array('!tags' => implode(', ', $tags)));
// PHP specific delimiters
Index: geshifilter.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.module,v
retrieving revision 1.41
diff -u -r1.41 geshifilter.module
--- geshifilter.module 21 Jul 2008 17:44:23 -0000 1.41
+++ geshifilter.module 25 Dec 2008 23:05:19 -0000
@@ -225,8 +225,8 @@
$requirements[] = array(
'title' => 'GeSHi filter',
'value' => t('GeSHi library not found.'),
- 'description' => t('You should install the GeSHi library and set its path in the !geshisettings.',
- array('!geshisettings' => l('GeSHi settings', 'admin/settings/geshifilter'))),
+ 'description' => t('You should install the GeSHi library and set its path in the GeSHi settings.',
+ array('!geshisettings' => url('admin/settings/geshifilter'))),
'severity' => REQUIREMENT_ERROR,
);
}
Index: geshifilter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.inc,v
retrieving revision 1.5
diff -u -r1.5 geshifilter.inc
--- geshifilter.inc 21 Jul 2008 17:44:23 -0000 1.5
+++ geshifilter.inc 25 Dec 2008 23:05:18 -0000
@@ -50,7 +50,7 @@
}
else {
$geshi_library['success'] = FALSE;
- $geshi_library['message'] = t('GeSHi library error: Could not find a known version of the GeSHi library at %dir.' , array('%dir' => $geshi_dir));
+ $geshi_library['message'] = t('GeSHi library error: Could not find a known version of the GeSHi library at directory %dir.' , array('%dir' => $geshi_dir));
}
// store in cache if needed
if ($use_cache) {