diff --git a/core/modules/help_topics/help_topics/user.security_account_settings.html.twig b/core/modules/help_topics/help_topics/user.security_account_settings.html.twig index d524596..5e21da7 100644 --- a/core/modules/help_topics/help_topics/user.security_account_settings.html.twig +++ b/core/modules/help_topics/help_topics/user.security_account_settings.html.twig @@ -13,6 +13,7 @@ related:

{% trans %}What are variables in email message text?{% endtrans %}

{% trans %}Variables are short text strings, enclosed in square brackets [], that you can insert into configured email message text. When an individual message is generated, data from your site is substituted for the variables. Some commonly-used variables are:{% endtrans %}

+{# ALLOW-UNTRANSLATED #}
[site:name]
{% trans %}The name of your web site.{% endtrans %}
@@ -28,7 +29,8 @@ related:
{% trans %}The user's email address.{% endtrans %}
[user:one-time-login-url]
{% trans %}An expiring URL that a user can use to log in once, if they need to reset their password.{% endtrans %}
- +
+{# END-ALLOW-UNTRANSLATED #}

{% trans %}Steps{% endtrans %}

  1. {% trans %}In the Manage administrative menu, navigate to Configuration > People > Account settings.{% endtrans %}
  2. diff --git a/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php b/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php index a8ef4eb..5a569d4 100644 --- a/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php +++ b/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php @@ -128,9 +128,14 @@ protected function verifyTopic($id, $definitions, $response = 200) { $body = trim($body); $this->assertNotEmpty($body, 'Topic ' . $id . ' Twig file contains some text outside of front matter'); - // Verify that if we remove all the translated text, whitespace, and - // HTML tags, there is nothing left (that is, all text is translated). + // Verify that if we remove all the translated text, whitespace, comments, + // and HTML tags, there is nothing left (that is, all text is translated). + // Also allow sections bracketed by + // {# ALLOW-UNTRANSLATED #}...{# END-ALLOW-UNTRANSLATED #} + // to be untranslated. $text = preg_replace('|\{\% trans \%\}.*\{\% endtrans \%\}|sU', '', $body); + $text = preg_replace('|\{# ALLOW-UNTRANSLATED #\}.*\{# END-ALLOW-UNTRANSLATED #\}|sU', '', $body); + $text = preg_replace('|\{# .* #\}|sU', '', $body); $text = strip_tags($text); $text = preg_replace('|\s+|', '', $text); $this->assertEmpty($text, 'Topic ' . $id . ' Twig file has all of its text translated');