Commit c109aa25 authored by Sybille Peters's avatar Sybille Peters 🙋 Committed by Andreas Fernandez
Browse files

[TASK] Fix redirects label inconsistency

Different labels for various fields of a redirect record
were used in redirect list and redirect edit form.
For example, both "Destination" and "Target" were used
for the same field.

This patch unifies the labels, preferring labels
from the edit form (locallang_db.xlf).

This frees up some language labels which can be removed
in v12.

Resolves: #95832
Related: #96015
Releases: master, 11.5
Change-Id: I2950a29ed5f20f74de3091d391e44bba292563af
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72217

Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Tested-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Reviewed-by: Andreas Fernandez's avatarAndreas Fernandez <a.fernandez@scripting-base.de>
parent 2281c94b
......@@ -26,10 +26,10 @@ List
You will see a list of the existing redirects with the following columns labels.
#. **Source Host**
#. **Source Domain**
#. **Source Path**
#. **Destination**
#. **# Hits**: Number of "hits" (only if hit counter is on)
#. **Target**
#. **Count**: Number of "hits" (only if hit counter is on)
#. **Last Hit on**: When was the most recent redirect "hit" (only if hit
counter is on)
#. *Action buttons*: View page, edit, disable and delete |action_buttons_image|
......@@ -200,7 +200,7 @@ the hit counter for a specific redirect and also see read-only statistics.
Number of hits for this particular redirect. (How often was the page
accessed which triggered this redirect?)
.. confval:: Last Hit On
.. confval:: Last Hit on
:Field: lasthiton
:Editable: read only
......
......@@ -61,7 +61,7 @@
<source>Count</source>
</trans-unit>
<trans-unit id="sys_redirect.lasthiton" resname="sys_redirect.lasthiton">
<source>Last Hit On</source>
<source>Last Hit on</source>
</trans-unit>
<trans-unit id="sys_redirect.hitcountState" resname="sys_redirect.hitcountState">
<source>Hit Counter</source>
......
......@@ -55,15 +55,15 @@
<thead>
<tr>
<th>
<f:render section="listHeaderSorting" arguments="{field: 'source_host', label: 'source_host', demand: demand}"/>
<f:render section="listHeaderSorting" arguments="{field: 'source_host', label: 'sys_redirect.source_host', demand: demand}"/>
</th>
<th>
<f:render section="listHeaderSorting" arguments="{field: 'source_path', label: 'source_path', demand: demand}"/>
<f:render section="listHeaderSorting" arguments="{field: 'source_path', label: 'sys_redirect.source_path', demand: demand}"/>
</th>
<th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:destination"/></th>
<th><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_db.xlf:sys_redirect.target"/></th>
<f:if condition="{showHitCounter}">
<th><f:render section="listHeaderSorting" arguments="{field: 'hitcount', label: 'hits', demand: demand}"/></th>
<th><f:render section="listHeaderSorting" arguments="{field: 'lasthiton', label: 'hit_last', demand: demand}"/></th>
<th><f:render section="listHeaderSorting" arguments="{field: 'hitcount', label: 'sys_redirect.hitcount', demand: demand}"/></th>
<th><f:render section="listHeaderSorting" arguments="{field: 'lasthiton', label: 'sys_redirect.lasthiton', demand: demand}"/></th>
</f:if>
<th></th>
</tr>
......@@ -162,11 +162,11 @@
<f:section name="listHeaderSorting">
<f:if condition="{demand.orderField} === {field}">
<f:then>
<a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, orderField: field, orderDirection: demand.reverseOrderDirection}')}"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:{label}"/></a>
<a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, orderField: field, orderDirection: demand.reverseOrderDirection}')}"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_db.xlf:{label}"/></a>
<core:icon identifier="status-status-sorting-{demand.orderDirection}"/>
</f:then>
<f:else>
<a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, orderField: field, orderDirection: demand.defaultOrderDirection}')}"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:{label}"/></a>
<a href="{f:be.uri(route:'site_redirects', parameters: '{action: \'overview\', demand: demand.parameters, orderField: field, orderDirection: demand.defaultOrderDirection}')}"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_db.xlf:{label}"/></a>
</f:else>
</f:if>
</f:section>
......@@ -177,7 +177,7 @@
<input type="hidden" name="orderDirection" value="{demand.orderDirection}">
<div class="row row-cols-auto align-items-end g-3 mb-4">
<div class="col">
<label for="demand-source-host" class="form-label"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:source_host"/></label>
<label for="demand-source-host" class="form-label"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_db.xlf:sys_redirect.source_host"/></label>
<select id="demand-source-host" class="form-select" name="demand[source_host]" data-on-change="submit">
<option value=""><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.source_host.showAll"/></option>
<f:for each="{hosts}" as="host">
......@@ -190,7 +190,7 @@
<input type="text" id="demand-source-path" class="form-control" name="demand[source_path]" value="{demand.sourcePath}"/>
</div>
<div class="col">
<label for="demand-target" class="form-label"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_module_redirect.xlf:filter.destination"/></label>
<label for="demand-target" class="form-label"><f:translate key="LLL:EXT:redirects/Resources/Private/Language/locallang_db.xlf:sys_redirect.target"/></label>
<input type="text" id="demand-target" class="form-control" name="demand[target]" value="{demand.target}"/>
</div>
<div class="col">
......
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