Commit 35aa3899 authored by gbyte.co's avatar gbyte.co

Clean up

parent 2f39bf62
......@@ -76,7 +76,7 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
$form['simple_sitemap_settings']['status'] = [
'#type' => 'fieldset',
'#title' => $this->t('Sitemap status'),
'#markup' => '<div class="description">' . $this->t('Sitemaps can be regenerated on demand here.<br/> ') . '</div>',
'#markup' => '<div class="description">' . $this->t('Sitemaps can be regenerated on demand here.') . '</div>',
'#description' => $this->t('Variants can be configured <a href="@url">here</a>.', ['@url' => $GLOBALS['base_url'] . '/admin/config/search/simplesitemap/variants']),
];
......@@ -125,7 +125,7 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
$index_progress = [
'#theme' => 'progress_bar',
'#percent' => $percent,
'#message' => t('@indexed out of @total items have been processed.', ['@indexed' => $indexed_count, '@total' => $total_count]),
'#message' => $this->t('@indexed out of @total items have been processed.<br/>Each sitemap variant is published after all of its items have been processed.', ['@indexed' => $indexed_count, '@total' => $total_count]),
];
$form['simple_sitemap_settings']['status']['progress']['bar']['#markup'] = render($index_progress);
}
......@@ -356,7 +356,7 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
$base_url = $form_state->getValue('base_url');
$form_state->setValue('base_url', rtrim($base_url, '/'));
if ($base_url !== '' && !UrlHelper::isValid($base_url, TRUE)) {
$form_state->setErrorByName('base_url', t('The base URL is invalid.'));
$form_state->setErrorByName('base_url', $this->t('The base URL is invalid.'));
}
}
......
......@@ -25,7 +25,7 @@ trait BatchTrait {
'title' => $this->t('Generating XML sitemaps'),
'init_message' => $this->t('Initializing...'),
'error_message' => $this->t(self::$batchErrorMessage),
'progress_message' => $this->t('Processing items from queue. Each sitemap variant is published as soon as its items have been processed.'),
'progress_message' => $this->t('Processing items from the queue.<br/>Each sitemap variant is published after all of its items have been processed.'),
'operations' => [[ __CLASS__ . '::' . 'doBatchGenerateSitemap', []]],
'finished' => [__CLASS__, 'finishGeneration'],
];
......
......@@ -17,6 +17,7 @@ use Drupal\simple_sitemap\Plugin\simple_sitemap\SitemapGenerator\SitemapGenerato
* @package Drupal\simple_sitemap
*/
class Simplesitemap {
/**
* @var \Drupal\simple_sitemap\EntityHelper
*/
......
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