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 line numbering and usage of an external CSS stylesheet for example, are not available.', array(
+ '#title' => $this->t('Use built-in PHP function highlight_string() for PHP source code.'),
+ '#description' => $this->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 line numbering and usage of an external CSS stylesheet for example, are not available.', array(
'@highlight-string' => \Drupal::l('highlight_string()', Url::fromUri('http://php.net/manual/en/function.highlight-string.php')),
)),
'#default_value' => $config->get('use_highlight_string_for_php'),
@@ -147,9 +147,9 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
// Option to disable Keyword URL's.
$form['highlighting_options']['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: @keyword-urls).', array(
- '@keyword-urls' => \Drupal::l(t('Keyword URLs'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#keyword-urls')),
+ '#title' => $this->t('Enable GeSHi keyword URLs'),
+ '#description' => $this->t('For some languages GeSHi can link language keywords (e.g. standard library functions) to their online documentation. (GeSHi documentation: @keyword-urls).', array(
+ '@keyword-urls' => \Drupal::l($this->t('Keyword URLs'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#keyword-urls')),
)),
'#default_value' => $config->get('enable_keyword_urls'),
);
@@ -157,21 +157,21 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
// Styling, layout and CSS.
$form['styling'] = array(
'#type' => 'fieldset',
- '#title' => t('Styling, layout and CSS'),
+ '#title' => $this->t('Styling, layout and CSS'),
'#collapsible' => TRUE,
);
// CSS mode.
$form['styling']['css_mode'] = array(
'#type' => 'radios',
- '#title' => t('CSS mode for syntax highlighting'),
+ '#title' => $this->t('CSS mode for syntax highlighting'),
'#options' => array(
- GeshiFilter::CSS_INLINE => t('Inline CSS style attributes.'),
- GeshiFilter::CSS_CLASSES_AUTOMATIC => t('Use CSS classes and an automatically managed external CSS style sheet.'),
- GeshiFilter::CSS_CLASSES_ONLY => t('Only add CSS classes to the markup.'),
+ GeshiFilter::CSS_INLINE => $this->t('Inline CSS style attributes.'),
+ GeshiFilter::CSS_CLASSES_AUTOMATIC => $this->t('Use CSS classes and an automatically managed external CSS style sheet.'),
+ GeshiFilter::CSS_CLASSES_ONLY => $this->t('Only add CSS classes to the markup.'),
),
'#default_value' => $config->get('css_mode', GeshiFilter::CSS_INLINE),
- '#description' => t('Inline CSS is easier to set up, does not depend on
+ '#description' => $this->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.
@@ -183,28 +183,28 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
rules to the pages (e.g. based on @css-defaults).
(GeSHi documentation: @css-classes).',
array(
- '@css-classes' => \Drupal::l(t('Using CSS Classes'),
+ '@css-classes' => \Drupal::l($this->t('Using CSS Classes'),
Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#using-css-classes')
),
- '@download-method' => \Drupal::l(t('download method'), Url::fromRoute('system.file_system_settings')),
- '@css-defaults' => \Drupal::l(t('these defaults'), Url::fromRoute('geshifilter.generate_css')),
+ '@download-method' => \Drupal::l($this->t('download method'), Url::fromRoute('system.file_system_settings')),
+ '@css-defaults' => \Drupal::l($this->t('these defaults'), Url::fromRoute('geshifilter.generate_css')),
)
),
);
// Code container.
$container_options = array(
- GESHI_HEADER_PRE => t('%val: uses a @cnt wrapper, efficient whitespace coding, no automatic line wrapping, generates invalid HTML with line numbering.', array(
+ GESHI_HEADER_PRE => $this->t('%val: uses a @cnt wrapper, efficient whitespace coding, no automatic line wrapping, generates invalid HTML with line numbering.', array(
'%val' => 'GESHI_HEADER_PRE',
'@cnt' => '',
)),
- GESHI_HEADER_DIV => t('%val: uses a @cnt wrapper, enables automatic line wrapping.', array(
+ GESHI_HEADER_DIV => $this->t('%val: uses a @cnt wrapper, enables automatic line wrapping.', array(
'%val' => 'GESHI_HEADER_DIV',
'@cnt' => '',
)),
);
if (version_compare(GESHI_VERSION, '1.0.8', '>=')) {
- $container_options[GESHI_HEADER_PRE_VALID] = t('%val: uses @pre
+ $container_options[GESHI_HEADER_PRE_VALID] = $this->t('%val: uses @pre
wrappers, ensures valid HTML with line numbering, but generates more
markup.',
array(
@@ -213,20 +213,20 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
'@li' => '',
)
);
- $container_options[GESHI_HEADER_PRE_TABLE] = t('%val: uses a @table construction for adding line numbers which avoids selection/copy/paste problems.', array(
+ $container_options[GESHI_HEADER_PRE_TABLE] = $this->t('%val: uses a @table construction for adding line numbers which avoids selection/copy/paste problems.', array(
'%val' => 'GESHI_HEADER_PRE_TABLE',
'@table' => '',
));
}
if (version_compare(GESHI_VERSION, '1.0.7.2', '>=')) {
- $container_options[GESHI_HEADER_NONE] = t('%val: uses no wrapper.', array('%val' => 'GESHI_HEADER_NONE'));
+ $container_options[GESHI_HEADER_NONE] = $this->t('%val: uses no wrapper.', array('%val' => 'GESHI_HEADER_NONE'));
}
$form['styling']['code_container'] = array(
'#type' => 'radios',
- '#title' => t('Code container, wrapping technique'),
- '#description' => t('Define the wrapping technique to use for code blocks. (GeSHi documentation: @code-container).',
- array('@code-container' => \Drupal::l(t('The Code Container'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#the-code-container')))
+ '#title' => $this->t('Code container, wrapping technique'),
+ '#description' => $this->t('Define the wrapping technique to use for code blocks. (GeSHi documentation: @code-container).',
+ array('@code-container' => \Drupal::l($this->t('The Code Container'), Url::fromUri('http://qbnz.com/highlighter/geshi-doc.html#the-code-container')))
),
'#options' => $container_options,
'#default_value' => $config->get('code_container'),
@@ -293,7 +293,7 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
}
$cache = \Drupal::cache();
$cache->delete('geshifilter_available_languages_cache');
- drupal_set_message(t('Flushed the GeSHi language definition cache.'));
+ drupal_set_message($this->t('Flushed the GeSHi language definition cache.'));
}
/**
@@ -308,35 +308,35 @@ class GeshiFilterSettingsForm extends ConfigFormBase {
// Generic tags.
$form["tags"] = array(
'#type' => 'textfield',
- '#title' => t('Generic syntax highlighting tags'),
+ '#title' => $this->t('Generic syntax highlighting tags'),
'#default_value' => $this->tags(),
- '#description' => t('Tags that should activate the GeSHi syntax highlighting. Specify a space-separated list of tagnames.'),
+ '#description' => $this->t('Tags that should activate the GeSHi syntax highlighting. Specify a space-separated list of tagnames.'),
);
// Container tag styles.
$form["tag_styles"] = array(
'#type' => 'checkboxes',
- '#title' => t('Container tag style'),
+ '#title' => $this->t('Container tag style'),
'#options' => array(
GeshiFilter::BRACKETS_ANGLE => '' . htmlentities(' ... ') . '',
GeshiFilter::BRACKETS_SQUARE => '[foo] ... [/foo]',
GeshiFilter::BRACKETS_DOUBLESQUARE => '[[foo]] ... [[/foo]]',
- GeshiFilter::BRACKETS_PHPBLOCK => t('PHP style source code blocks: @php and @percent', array(
+ GeshiFilter::BRACKETS_PHPBLOCK => $this->t('PHP style source code blocks: @php and @percent', array(
'@php' => '',
'@percent' => '<% ... %>',
)),
),
'#default_value' => $this->tagStyles(),
- '#description' => t('Select the container tag styles that should trigger GeSHi syntax highlighting.'),
+ '#description' => $this->t('Select the container tag styles that should trigger GeSHi syntax highlighting.'),
);
// Setting to decode entities, see https://www.drupal.org/node/2047021.
$config = $this->config('geshifilter.settings');
$form["decode_entities"] = array(
'#type' => 'checkbox',
- '#title' => t('Decode entities'),
+ '#title' => $this->t('Decode entities'),
'#default_value' => $config->get('decode_entities'),
- '#description' => t('Decode entities, for example, if the code has been typed in a WYSIWYG editor.'),
+ '#description' => $this->t('Decode entities, for example, if the code has been typed in a WYSIWYG editor.'),
);
return $form;
}
diff --git a/src/GeshiFilterCss.php b/src/GeshiFilterCss.php
index 8283ebf..a49507c 100644
--- a/src/GeshiFilterCss.php
+++ b/src/GeshiFilterCss.php
@@ -79,7 +79,7 @@ class GeshiFilterCss {
}
}
else {
- drupal_set_message(t('Error while generating CSS rules: could not load GeSHi library.'), 'error');
+ drupal_set_message($this->t('Error while generating CSS rules: could not load GeSHi library.'), 'error');
}
return $output;
}
@@ -107,7 +107,7 @@ class GeshiFilterCss {
drupal_set_message(t('(Re)generated external CSS style sheet %file.', array('%file' => $ret->getFilename())));
}
else {
- drupal_set_message(t('Could not generate external CSS file. Check the settings of your file system.',
+ drupal_set_message($t('Could not generate external CSS file. Check the settings of your file system.',
array(
'!filesystem' => Url::fromRoute('system.file_system_settings')->toString(),
)), 'error');
diff --git a/src/Plugin/Filter/GeshiFilterFilter.php b/src/Plugin/Filter/GeshiFilterFilter.php
index 6d3c4f8..8aad538 100644
--- a/src/Plugin/Filter/GeshiFilterFilter.php
+++ b/src/Plugin/Filter/GeshiFilterFilter.php
@@ -208,7 +208,7 @@ class GeshiFilterFilter extends FilterBase {
$tag_style_examples[] = '' . SafeMarkup::checkPlain('[[foo]]') . '';
}
if (!$bracket_open) {
- drupal_set_message(t('Could not determine a valid tag style for GeSHi filtering.'), 'error');
+ drupal_set_message($this->t('Could not determine a valid tag style for GeSHi filtering.'), 'error');
$bracket_open = SafeMarkup::checkPlain('<');
$bracket_close = SafeMarkup::checkPlain('>');
}
@@ -221,32 +221,32 @@ class GeshiFilterFilter extends FilterBase {
$lang_attributes = GeshiFilter::whitespaceExplode(GeshiFilter::ATTRIBUTES_LANGUAGE);
// Syntax highlighting tags.
- $output = '' . t('Syntax highlighting of source code can be enabled with the following tags:') . '
';
+ $output = '' . $this->t('Syntax highlighting of source code can be enabled with the following tags:') . '
';
$items = array();
// Seneric tags.
$tags = array();
foreach ($generic_code_tags as $tag) {
$tags[] = $bracket_open . $tag . $bracket_close;
}
- $items[] = t('Generic syntax highlighting tags: @tags.', array('@tags' => Markup::create(implode(', ', $tags))));
+ $items[] = $this->t('Generic syntax highlighting tags: @tags.', array('@tags' => Markup::create(implode(', ', $tags))));
// Language tags.
$tags = array();
foreach ($language_tags as $tag) {
- $tags[] = t('@tag for @lang source code', array(
+ $tags[] = $this->t('@tag for @lang source code', array(
'@tag' => Markup::create($bracket_open . $tag . $bracket_close),
'@lang' => $languages[$tag_to_lang[$tag]],
));
}
- $items[] = '' . t('Language specific syntax highlighting tags:') . implode(', ', $tags) . ' ';
+ $items[] = '' . $this->t('Language specific syntax highlighting tags:') . implode(', ', $tags) . ' ';
// PHP specific delimiters.
if (in_array(GeshiFilter::BRACKETS_PHPBLOCK, $tag_styles)) {
- $items[] = t('PHP source code can also be enclosed in <?php ... ?> or <% ... %>, but additional options like line numbering are not possible here.');
+ $items[] = $this->t('PHP source code can also be enclosed in <?php ... ?> or <% ... %>, but additional options like line numbering are not possible here.');
}
$output .= '' . implode('', $items) . '
';
// Options and tips.
- $output .= '' . t('Options and tips:') . '
';
+ $output .= '' . $this->t('Options and tips:') . '
';
$items = array();
// Info about language attribute to language mapping.
@@ -260,9 +260,9 @@ class GeshiFilterFilter extends FilterBase {
ksort($att_to_full);
$att_for_full = array();
foreach ($att_to_full as $att => $fullname) {
- $att_for_full[] = t('"@langcode" (for @fullname)', array('@langcode' => $att, '@fullname' => $fullname));
+ $att_for_full[] = $this->t('"@langcode" (for @fullname)', array('@langcode' => $att, '@fullname' => $fullname));
}
- $items[] = t('The language for the generic syntax highlighting tags can be
+ $items[] = $this->t('The language for the generic syntax highlighting tags can be
specified with one of the attribute(s): %attributes. The possible values
are: @languages.', array(
'%attributes' => implode(', ', $lang_attributes),
@@ -272,11 +272,11 @@ class GeshiFilterFilter extends FilterBase {
// Tag style options.
if (count($tag_style_examples) > 1) {
- $items[] = t('The supported tag styles are: @tag_styles.', array('@tag_styles' => Markup::create(implode(', ', $tag_style_examples))));
+ $items[] = $this->t('The supported tag styles are: @tag_styles.', array('@tag_styles' => Markup::create(implode(', ', $tag_style_examples))));
}
// Line numbering options.
- $items[] = t('Line numbering can be enabled/disabled with the
+ $items[] = $this->t('Line numbering can be enabled/disabled with the
attribute "%linenumbers". Possible values are: "%off" for no line
numbers, "%normal" for normal line numbers and "%fancy" for fancy line
numbers (every nth line number highlighted). The start line
@@ -294,12 +294,12 @@ class GeshiFilterFilter extends FilterBase {
);
// Block versus inline.
- $items[] = t('If the source code between the tags contains a newline (e.g.
+ $items[] = $this->t('If the source code between the tags contains a newline (e.g.
immediatly after the opening tag), the highlighted source code will be
displayed as a code block. Otherwise it will be displayed inline.');
// Code block title.
- $items[] = t('A title can be added to a code block with the attribute "%title".', array(
+ $items[] = $this->t('A title can be added to a code block with the attribute "%title".', array(
'%title' => GeshiFilter::ATTRIBUTE_TITLE,
));
@@ -311,42 +311,42 @@ class GeshiFilterFilter extends FilterBase {
$output .= render($render);
// Defaults.
- $output .= '' . t('Defaults:') . '
';
+ $output .= '' . $this->t('Defaults:') . '
';
$items = array();
$default_highlighting = $this->config->get('default_highlighting');
switch ($default_highlighting) {
case GeshiFilter::DEFAULT_DONOTHING:
- $description = t("when no language attribute is specified the code
+ $description = $this->t("when no language attribute is specified the code
block won't be processed by the GeSHi filter");
break;
case GeshiFilter::DEFAULT_PLAINTEXT:
- $description = t('when no language attribute is specified, no syntax
+ $description = $this->t('when no language attribute is specified, no syntax
highlighting will be done');
break;
default:
- $description = t('the default language used for syntax highlighting is
+ $description = $this->t('the default language used for syntax highlighting is
"%default_lang"', array('%default_lang' => $default_highlighting));
break;
}
- $items[] = t('Default highlighting mode for generic syntax highlighting
+ $items[] = $this->t('Default highlighting mode for generic syntax highlighting
tags: @description.', array('@description' => $description));
$default_line_numbering = $this->config->get('default_line_numbering');
switch ($default_line_numbering) {
case GeshiFilter::LINE_NUMBERS_DEFAULT_NONE:
- $description = t('no line numbers');
+ $description = $this->t('no line numbers');
break;
case GeshiFilter::LINE_NUMBERS_DEFAULT_NORMAL:
- $description = t('normal line numbers');
+ $description = $this->t('normal line numbers');
break;
default:
- $description = t('fancy line numbers (every @n lines)', array('@n' => $default_line_numbering));
+ $description = $this->t('fancy line numbers (every @n lines)', array('@n' => $default_line_numbering));
break;
}
- $items[] = t('Default line numbering: @description.', array('@description' => $description));
+ $items[] = $this->t('Default line numbering: @description.', array('@description' => $description));
$render = array(
'#theme' => 'item_list',
'#items' => $items,
@@ -364,13 +364,13 @@ class GeshiFilterFilter extends FilterBase {
foreach ($language_tags as $tag) {
$tags[] = '' . $bracket_open . SafeMarkup::checkPlain($tag) . $bracket_close . '';
}
- $output = t('You can enable syntax highlighting of source code with the following tags: @tags.', array('@tags' => Markup::create(implode(', ', $tags))));
+ $output = $this->t('You can enable syntax highlighting of source code with the following tags: @tags.', array('@tags' => Markup::create(implode(', ', $tags))));
// Tag style options.
if (count($tag_style_examples) > 1) {
- $output .= ' ' . t('The supported tag styles are: @tag_styles.', array('@tag_styles' => Markup::create(implode(', ', $tag_style_examples))));
+ $output .= ' ' . $this->t('The supported tag styles are: @tag_styles.', array('@tag_styles' => Markup::create(implode(', ', $tag_style_examples))));
}
if (in_array(GeshiFilter::BRACKETS_PHPBLOCK, $tag_styles)) {
- $output .= ' ' . t('PHP source code can also be enclosed in <?php ... ?> or <% ... %>.');
+ $output .= ' ' . $this->t('PHP source code can also be enclosed in <?php ... ?> or <% ... %>.');
}
}
return $output;
@@ -398,7 +398,7 @@ class GeshiFilterFilter extends FilterBase {
// Per language tags.
$form['per_language_settings'] = array(
'#type' => 'fieldset',
- '#title' => t('Per language tags'),
+ '#title' => $this->t('Per language tags'),
'#collapsible' => TRUE,
'table' => $this->perLanguageSettings('enabled', FALSE, TRUE),
);
@@ -407,7 +407,7 @@ class GeshiFilterFilter extends FilterBase {
}
else {
$form['info'] = array(
- '#markup' => '' . t('GeSHi filter is configured to use global tag
+ '#markup' => '
' . $this->t('GeSHi filter is configured to use global tag
settings. For separate settings per text format, enable this option in
the general GeSHi filter settings.', array(
':geshi_admin_url' => Url::fromRoute('geshifilter.settings')->toString(),
@@ -520,32 +520,32 @@ class GeshiFilterFilter extends FilterBase {
// Generic tags.
$form["tags"] = array(
'#type' => 'textfield',
- '#title' => t('Generic syntax highlighting tags'),
+ '#title' => $this->t('Generic syntax highlighting tags'),
'#default_value' => $this->tags(),
- '#description' => t('Tags that should activate the GeSHi syntax highlighting. Specify a space-separated list of tagnames.'),
+ '#description' => $this->t('Tags that should activate the GeSHi syntax highlighting. Specify a space-separated list of tagnames.'),
);
// Container tag styles.
$form["tag_styles"] = array(
'#type' => 'checkboxes',
- '#title' => t('Container tag style'),
+ '#title' => $this->t('Container tag style'),
'#options' => array(
GeshiFilter::BRACKETS_ANGLE => '' . htmlentities(' ... ') . '',
GeshiFilter::BRACKETS_SQUARE => '' . htmlentities('[foo] ... [/foo]') . '',
GeshiFilter::BRACKETS_DOUBLESQUARE => '' . htmlentities('[[foo]] ... [[/foo]]') . '',
- GeshiFilter::BRACKETS_PHPBLOCK => t('PHP style source code blocks: @php and @percent', array(
+ GeshiFilter::BRACKETS_PHPBLOCK => $this->t('PHP style source code blocks: @php and @percent', array(
'@php' => '',
'@percent' => '<% ... %>',
)),
),
'#default_value' => $this->tagStyles(),
- '#description' => t('Select the container tag styles that should trigger GeSHi syntax highlighting.'),
+ '#description' => $this->t('Select the container tag styles that should trigger GeSHi syntax highlighting.'),
);
// Decode entities.
$form["decode_entities"] = array(
'#type' => 'checkbox',
- '#title' => t('Decode entities'),
+ '#title' => $this->t('Decode entities'),
'#default_value' => $this->settings['general_tags']['decode_entities'],
- '#description' => t('Decode entities, for example, if the code has been typed in a WYSIWYG editor.'),
+ '#description' => $this->t('Decode entities, for example, if the code has been typed in a WYSIWYG editor.'),
);
return $form;
}
@@ -569,16 +569,16 @@ class GeshiFilterFilter extends FilterBase {
protected function perLanguageSettings($view, $add_checkbox, $add_tag_option) {
$form = array();
$header = array(
- t('Language'),
- t('GeSHi language code'),
+ $this->t('Language'),
+ $this->t('GeSHi language code'),
);
if ($add_tag_option) {
- $header[] = t('Tag/language attribute value');
+ $header[] = $this->t('Tag/language attribute value');
}
$form['language'] = array(
'#type' => 'table',
'#header' => $header,
- '#empty' => t('Nome language is available.'),
+ '#empty' => $this->t('Nome language is available.'),
);
// Table body.