Index: geshifilter.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.module,v
retrieving revision 1.18.2.62
diff -u -r1.18.2.62 geshifilter.module
--- geshifilter.module 1 May 2008 20:08:57 -0000 1.18.2.62
+++ geshifilter.module 25 Dec 2008 23:49:52 -0000
@@ -235,8 +235,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.filtertips.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.filtertips.inc,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 geshifilter.filtertips.inc
--- geshifilter.filtertips.inc 1 May 2008 17:01:02 -0000 1.1.2.3
+++ geshifilter.filtertips.inc 25 Dec 2008 23:49:52 -0000
@@ -36,7 +36,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.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.admin.inc,v
retrieving revision 1.15.2.5
diff -u -r1.15.2.5 geshifilter.admin.inc
--- geshifilter.admin.inc 4 Sep 2008 09:17:01 -0000 1.15.2.5
+++ geshifilter.admin.inc 25 Dec 2008 23:49:52 -0000
@@ -120,22 +120,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),
);
@@ -156,9 +156,9 @@
GESHIFILTER_CSS_CLASSES_ONLY => t('Only add CSS classes to the markup.'),
),
'#default_value' => variable_get('geshifilter_css_mode', GESHIFILTER_CSS_INLINE),
- '#description' => t('Inline CSS is easier to set up, does not depend on an external style sheets and is consequently more robust to copy/paste operations like content aggregation. However, usage of CSS classes and an external stylesheet requires much less markup code and bandwidth. The external style sheet can be managed automatically by the GeSHi filter module, but this feature requires the public download method. If the GeSHi filter is configured to only add the CSS classes to the markup, the administrator or themer is responsible for adding the appropriate CSS rules to the pages (e.g. based on these defaults). (GeSHi documentation: !geshidoc).',
+ '#description' => t('Inline CSS is easier to set up, does not depend on an external style sheets and is consequently more robust to copy/paste operations like content aggregation. However, usage of CSS classes and an external stylesheet requires much less markup code and bandwidth. The external style sheet can be managed automatically by the GeSHi filter module, but this feature requires the public download method. If the GeSHi filter is configured to only add the CSS classes to the markup, the administrator or themer is responsible for adding the appropriate CSS rules to the pages (e.g. based on these defaults). (GeSHi documentation: Using CSS Classes).',
array(
- '!geshidoc' => l('Using CSS Classes', 'http://qbnz.com/highlighter/geshi-doc.html#using-css-classes'),
+ '!geshidoc' => 'http://qbnz.com/highlighter/geshi-doc.html#using-css-classes',
'!filesystem' => url('admin/settings/file-system'),
'!cssdefaults' => url('admin/settings/geshifilter/generate_css'),
)),
@@ -168,8 +168,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' => '')),
@@ -520,8 +520,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.1.2.4
diff -u -r1.1.2.4 geshifilter.conflicts.inc
--- geshifilter.conflicts.inc 1 May 2008 17:01:02 -0000 1.1.2.4
+++ geshifilter.conflicts.inc 25 Dec 2008 23:49:52 -0000
@@ -76,9 +76,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(), NULL, NULL, FALSE, TRUE),
+ 'description' => t('%cfilter is configured to "Escape all tags", which is likely to cause propblems 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(), NULL, NULL, FALSE, TRUE),
);
}
return $conflicts;
Index: geshifilter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geshifilter/geshifilter.inc,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 geshifilter.inc
--- geshifilter.inc 1 May 2008 17:01:02 -0000 1.4.2.2
+++ geshifilter.inc 25 Dec 2008 23:49:52 -0000
@@ -45,7 +45,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) {