Skip to content

Commit 4f40f12

Browse files
linawolflinawolf
authored
[BUGFIX] Treat literals like other Code (#729)
1 parent 0cb7cd1 commit 4f40f12

File tree

21 files changed

+81
-73
lines changed

21 files changed

+81
-73
lines changed

‎Documentation-rendertest/Confval/ConfvalTrees.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,11 @@ Long default values
120120
If set and the user account cannot be found in the forgot password
121121
dialogue, an error message will be shown that the account could not be
122122
found.
123+
124+
.. confval:: title
125+
:type: string (language reference)
126+
:name: widget-tag-title
127+
:required:
128+
:Example: `LLL:EXT:dashboard/Resources/Private/Language/locallang.xlf:widgets.t3news.title`
129+
130+
Defines the title of the widget. Language references are resolved.

‎packages/typo3-docs-theme/resources/template/inline/literal.html.twig

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/typo3-docs-theme/resources/template/inline/textroles/literal.html.twig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{% apply spaceless %}
2+
<code class="code-inline" translate="no">{{ replaceLineBreakOpportunityTags(node.value) }}</code>
3+
{% endapply %}

‎tests/Integration/tests-full/breadcrumb/expected/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<!-- content start -->
124124
<section class="section" id="typo3-extension-oauth2-mfc-oauth2" data-rst-anchor="start">
125125
<a id="start"></a>
126-
<h1>TYPO3 Extension <code class="code-inline" translate="no">oauth2</code> (<code class="code-inline" translate="no">mfc/oauth2</code>)<a class="headerlink" href="#typo3-extension-oauth2-mfc-oauth2" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
126+
<h1>TYPO3 Extension <code>oauth2</code> (<code>mfc/oauth2</code>)<a class="headerlink" href="#typo3-extension-oauth2-mfc-oauth2" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
127127

128128
<p>Lorem Ipsum Dolor.</p>
129129

‎tests/Integration/tests-full/breadcrumb/expected/yetAnotherPage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<div itemprop="articleBody">
124124
<!-- content start -->
125125
<section class="section" id="another-page">
126-
<h1>Another <code>Page</code><a class="headerlink" href="#another-page" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
126+
<h1>Another <code class="code-inline" translate="no">Page</code><a class="headerlink" href="#another-page" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
127127

128128
<p>Lorem Ipsum Dolor.</p>
129129

‎tests/Integration/tests-full/edit-on-github/edit-on-github-per-page/expected/page1.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<!-- content start -->
129129
<section class="section" id="avatar-viewhelper-be-avatar" data-rst-anchor="typo3-backend-avatar">
130130
<a id="typo3-backend-avatar"></a>
131-
<h1>Avatar ViewHelper <code>&lt;be:avatar&gt;</code><a class="headerlink" href="#avatar-viewhelper-be-avatar" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
131+
<h1>Avatar ViewHelper <code class="code-inline" translate="no">&lt;be:<wbr>avatar&gt;</code><a class="headerlink" href="#avatar-viewhelper-be-avatar" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
132132

133133
<p>Render the avatar markup, including the <code class="code-inline"
134134
translate="no"

‎tests/Integration/tests/admonitions/expected/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h1>Admonitions: Tip, Note, Warning, See also, etc<a class="headerlink" href="#admonitions-tip-note-warning-see-also-etc" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
44

55
<div class="admonition custom-admonition" role="alert">
6-
<p class="admonition-title">Custom admonition</p>
6+
<p class="admonition-title">Custom admonition</p>
77

88
<p>Some Custom admonitions</p>
99

@@ -47,7 +47,7 @@ <h2>Tip<a class="headerlink" href="#tip" data-bs-toggle="modal" data-bs-target="
4747

4848
<div class="admonition hint" role="alert">
4949
<p class="admonition-title">Hint</p>
50-
<p>One line hint</p>
50+
<p>One line hint</p>
5151

5252
</div>
5353
</section>

‎tests/Integration/tests/code/code-generic/expected/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<section class="section" id="code">
33
<h1>Code<a class="headerlink" href="#code" data-bs-toggle="modal" data-bs-target="#linkReferenceModal" title="Reference this headline"></a></h1>
44

5-
<p><code>some code</code></p>
5+
<p><code class="code-inline" translate="no">some code</code></p>
66

77
</section>
88
<!-- content end -->

‎tests/Integration/tests/command-list/expected/index.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ <h2>Global commands<a class="headerlink" href="#global-commands" data-bs-toggle=
229229
<div class="command-description-help">
230230
<div class="h4">Help</div>
231231

232-
<p>The <code>list</code> command lists all commands:</p>
232+
<p>The <code class="code-inline" translate="no">list</code> command lists all commands:</p>
233233
<div class="code-block-wrapper" translate="no">
234234

235235
<pre class="code-block"><code>bin/typo3 list
@@ -581,13 +581,13 @@ <h2>Global commands<a class="headerlink" href="#global-commands" data-bs-toggle=
581581
<div class="admonition warning" role="alert">
582582
<p class="admonition-title">Warning</p>
583583

584-
<p>Variable <code>TYPO3_DB_PASSWORD</code> (option <code>--password</code>) can be used to provide a
585-
password for the database and <code>TYPO3_SETUP_ADMIN_PASSWORD</code>
586-
(option <code>--admin-user-password</code>) for the admin user password.
584+
<p>Variable <code class="code-inline" translate="no">TYPO3_<wbr>DB_<wbr>PASSWORD</code> (option <code class="code-inline" translate="no">--<wbr>password</code>) can be used to provide a
585+
password for the database and <code class="code-inline" translate="no">TYPO3_<wbr>SETUP_<wbr>ADMIN_<wbr>PASSWORD</code>
586+
(option <code class="code-inline" translate="no">--<wbr>admin-<wbr>user-<wbr>password</code>) for the admin user password.
587587
Using this can be a security risk since the password may end up in shell
588588
history files. Prefer the interactive mode. Additionally, writing a command
589589
to shell history can be suppressed by prefixing the command with a space
590-
when using <code>bash</code> or <code>zsh</code>.</p>
590+
when using <code class="code-inline" translate="no">bash</code> or <code class="code-inline" translate="no">zsh</code>.</p>
591591

592592
</div>
593593
</div>
@@ -1028,7 +1028,7 @@ <h2>All commands<a class="headerlink" href="#all-commands" data-bs-toggle="modal
10281028
<div class="command-description-help">
10291029
<div class="h4">Help</div>
10301030

1031-
<p>The <code>completion</code> command dumps the shell completion script required
1031+
<p>The <code class="code-inline" translate="no">completion</code> command dumps the shell completion script required
10321032
to use shell autocompletion (currently, bash, fish, zsh completion are supported).</p>
10331033
<div class="rubric">Static installation</div>
10341034
<p>Dump the script to a global completion file and restart your shell:</p>
@@ -1061,7 +1061,7 @@ <h2>All commands<a class="headerlink" href="#all-commands" data-bs-toggle="modal
10611061
<span class="code-block-check-tooltip code-block-hide" aria-live="polite">Copied!</span>
10621062
</div>
10631063
</div><div class="rubric">Dynamic installation</div>
1064-
<p>Add this to the end of your shell configuration file (e.g. <code>&quot;~/.bashrc&quot;</code>):</p>
1064+
<p>Add this to the end of your shell configuration file (e.g. <code class="code-inline" translate="no">&quot;~/.<wbr>bashrc&quot;</code>):</p>
10651065
<div class="code-block-wrapper" translate="no">
10661066

10671067
<pre class="code-block"><code>eval &quot;$(/var/www/html/completion )&quot;</code></pre>
@@ -1285,7 +1285,7 @@ <h2>All commands<a class="headerlink" href="#all-commands" data-bs-toggle="modal
12851285
<div class="command-description-help">
12861286
<div class="h4">Help</div>
12871287

1288-
<p>The <code>help</code> command displays help for a given command:</p>
1288+
<p>The <code class="code-inline" translate="no">help</code> command displays help for a given command:</p>
12891289
<div class="code-block-wrapper" translate="no">
12901290

12911291
<pre class="code-block"><code>help list
@@ -1309,7 +1309,7 @@ <h2>All commands<a class="headerlink" href="#all-commands" data-bs-toggle="modal
13091309
<span class="code-block-check-tooltip code-block-hide" aria-live="polite">Copied!</span>
13101310
</div>
13111311
</div>
1312-
<p>To display the list of available commands, please use the <code>list</code> command.</p>
1312+
<p>To display the list of available commands, please use the <code class="code-inline" translate="no">list</code> command.</p>
13131313

13141314
</div>
13151315
</dd>
@@ -1543,7 +1543,7 @@ <h2>All commands<a class="headerlink" href="#all-commands" data-bs-toggle="modal
15431543
<div class="command-description-help">
15441544
<div class="h4">Help</div>
15451545

1546-
<p>The <code>list</code> command lists all commands:</p>
1546+
<p>The <code class="code-inline" translate="no">list</code> command lists all commands:</p>
15471547
<div class="code-block-wrapper" translate="no">
15481548

15491549
<pre class="code-block"><code>list
@@ -2024,13 +2024,13 @@ <h2>All commands<a class="headerlink" href="#all-commands" data-bs-toggle="modal
20242024
<div class="admonition warning" role="alert">
20252025
<p class="admonition-title">Warning</p>
20262026

2027-
<p>Variable <code>TYPO3_DB_PASSWORD</code> (option <code>--password</code>) can be used to provide a
2028-
password for the database and <code>TYPO3_SETUP_ADMIN_PASSWORD</code>
2029-
(option <code>--admin-user-password</code>) for the admin user password.
2027+
<p>Variable <code class="code-inline" translate="no">TYPO3_<wbr>DB_<wbr>PASSWORD</code> (option <code class="code-inline" translate="no">--<wbr>password</code>) can be used to provide a
2028+
password for the database and <code class="code-inline" translate="no">TYPO3_<wbr>SETUP_<wbr>ADMIN_<wbr>PASSWORD</code>
2029+
(option <code class="code-inline" translate="no">--<wbr>admin-<wbr>user-<wbr>password</code>) for the admin user password.
20302030
Using this can be a security risk since the password may end up in shell
20312031
history files. Prefer the interactive mode. Additionally, writing a command
20322032
to shell history can be suppressed by prefixing the command with a space
2033-
when using <code>bash</code> or <code>zsh</code>.</p>
2033+
when using <code class="code-inline" translate="no">bash</code> or <code class="code-inline" translate="no">zsh</code>.</p>
20342034

20352035
</div>
20362036
</div>

‎tests/Integration/tests/commands/expected/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,13 @@ <h1>Document Title<a class="headerlink" href="#document-title" data-bs-toggle="m
547547
<div class="admonition warning" role="alert">
548548
<p class="admonition-title">Warning</p>
549549

550-
<p>Variable <code>TYPO3_DB_PASSWORD</code> (option <code>--password</code>) can be used to provide a
551-
password for the database and <code>TYPO3_SETUP_ADMIN_PASSWORD</code>
552-
(option <code>--admin-user-password</code>) for the admin user password.
550+
<p>Variable <code class="code-inline" translate="no">TYPO3_<wbr>DB_<wbr>PASSWORD</code> (option <code class="code-inline" translate="no">--<wbr>password</code>) can be used to provide a
551+
password for the database and <code class="code-inline" translate="no">TYPO3_<wbr>SETUP_<wbr>ADMIN_<wbr>PASSWORD</code>
552+
(option <code class="code-inline" translate="no">--<wbr>admin-<wbr>user-<wbr>password</code>) for the admin user password.
553553
Using this can be a security risk since the password may end up in shell
554554
history files. Prefer the interactive mode. Additionally, writing a command
555555
to shell history can be suppressed by prefixing the command with a space
556-
when using <code>bash</code> or <code>zsh</code>.</p>
556+
when using <code class="code-inline" translate="no">bash</code> or <code class="code-inline" translate="no">zsh</code>.</p>
557557

558558
</div>
559559
</div>

‎tests/Integration/tests/confval/confval-basic/expected/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
1515
<dd class="field-even">string
1616
</dd>
1717
<dt class="field-odd">Default</dt>
18-
<dd class="field-odd"><code class="code-inline" translate="no">&quot;Hello World&quot;</code>
18+
<dd class="field-odd"><code>&quot;Hello World&quot;</code>
1919
</dd>
2020
</dl>
2121
<div class="confval-description">

‎tests/Integration/tests/confval/confval-duplicate-with-name/expected/anotherDomain.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-dom
1515
<dd class="field-even">string
1616
</dd>
1717
<dt class="field-odd">Default</dt>
18-
<dd class="field-odd"><code class="code-inline" translate="no">&quot;Hello World&quot;</code>
18+
<dd class="field-odd"><code>&quot;Hello World&quot;</code>
1919
</dd>
2020
</dl>
2121
<div class="confval-description">

‎tests/Integration/tests/confval/confval-duplicate-with-name/expected/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
1515
<dd class="field-even">string
1616
</dd>
1717
<dt class="field-odd">Default</dt>
18-
<dd class="field-odd"><code class="code-inline" translate="no">&quot;Hello World&quot;</code>
18+
<dd class="field-odd"><code>&quot;Hello World&quot;</code>
1919
</dd>
2020
</dl>
2121
<div class="confval-description">

‎tests/Integration/tests/confval/confval-duplicate/expected/anotherDomain.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1>Confval in another domain<a class="headerlink" href="#confval-in-another-dom
1515
<dd class="field-even">string
1616
</dd>
1717
<dt class="field-odd">Default</dt>
18-
<dd class="field-odd"><code class="code-inline" translate="no">&quot;Hello World&quot;</code>
18+
<dd class="field-odd"><code>&quot;Hello World&quot;</code>
1919
</dd>
2020
</dl>
2121
<div class="confval-description">

‎tests/Integration/tests/confval/confval-duplicate/expected/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
1515
<dd class="field-even">string
1616
</dd>
1717
<dt class="field-odd">Default</dt>
18-
<dd class="field-odd"><code class="code-inline" translate="no">&quot;Hello World&quot;</code>
18+
<dd class="field-odd"><code>&quot;Hello World&quot;</code>
1919
</dd>
2020
</dl>
2121
<div class="confval-description">

‎tests/Integration/tests/confval/confval-menu-tree-anchor/expected/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h1>Confval<a class="headerlink" href="#confval" data-bs-toggle="modal" data-bs-
6262
<div class="confval-description">
6363

6464
<p>Array of cObjects. Use this to define cObjects for the different
65-
values of <code>cobj-case-key</code>. If <code>cobj-case-key</code> has a certain value,
65+
values of <code class="code-inline" translate="no">cobj-<wbr>case-<wbr>key</code>. If <code class="code-inline" translate="no">cobj-<wbr>case-<wbr>key</code> has a certain value,
6666
the according cObject will be rendered. The cObjects can have any name, but not
6767
the names of the other properties of the cObject CASE.</p>
6868

‎tests/Integration/tests/confval/confval-menu-tree-multiple/expected/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ <h2>Properties of CASE<a class="headerlink" href="#properties-of-case" data-bs-t
6666
<div class="confval-description">
6767

6868
<p>Array of cObjects. Use this to define cObjects for the different
69-
values of <code>cobj-case-key</code>. If <code>cobj-case-key</code> has a certain value,
69+
values of <code class="code-inline" translate="no">cobj-<wbr>case-<wbr>key</code>. If <code class="code-inline" translate="no">cobj-<wbr>case-<wbr>key</code> has a certain value,
7070
the according cObject will be rendered. The cObjects can have any name, but not
7171
the names of the other properties of the cObject CASE.</p>
7272

@@ -238,7 +238,7 @@ <h2>Properties of COA<a class="headerlink" href="#properties-of-coa" data-bs-tog
238238
</dl>
239239
<div class="confval-description">
240240

241-
<p>If <code>if</code> returns false, the COA is <strong>not</strong> rendered.</p>
241+
<p>If <code class="code-inline" translate="no">if</code> returns false, the COA is <strong>not</strong> rendered.</p>
242242

243243
</div>
244244
</dd>

0 commit comments

Comments
 (0)