From e7427f83e6cbd0616315bd447270b5887adc00c6 Mon Sep 17 00:00:00 2001
From: Simon Gilli <typo3@gilbertsoft.org>
Date: Mon, 1 Nov 2021 19:42:13 +0100
Subject: [PATCH] [BUGFIX] Add missing file extensions of language files
In some places the file extensions of language files are missing and
properly added with this patch.
Resolves: #95842
Releases: master
Change-Id: Iea638f9386a094214115d2c7c2c039b2c0f37f82
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72018
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Benni Mack <benni@typo3.org>
---
.../Private/Templates/ColumnSelector.html | 2 +-
.../Private/Templates/Page/NewPages.html | 30 +++++++++----------
.../Classes/Controller/FileListController.php | 2 +-
.../Private/Templates/File/List.html | 6 ++--
.../Mod/Wizards/NewContentElement.tsconfig | 2 +-
.../Classes/RecordList/DatabaseRecordList.php | 8 ++---
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ColumnSelector.html b/typo3/sysext/backend/Resources/Private/Templates/ColumnSelector.html
index 3a5a95db31a3..b7c73fc0a2bf 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ColumnSelector.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ColumnSelector.html
@@ -4,7 +4,7 @@
<div class="row row-cols-auto justify-content-between">
<div class="col flex-grow-1">
<div class="input-group">
- <span class="input-group-addon" id="columns-filter-label"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:columnsFilter" /></span>
+ <span class="input-group-addon" id="columns-filter-label"><f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:columnsFilter" /></span>
<input type="search" name="columns-filter" class="form-control" value="" aria-labelledby="columns-filter-label" placeholder="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.enterSearchString')}">
</div>
</div>
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Page/NewPages.html b/typo3/sysext/backend/Resources/Private/Templates/Page/NewPages.html
index b557f8b7eec0..6461e6d0f8e3 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Page/NewPages.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Page/NewPages.html
@@ -8,14 +8,14 @@
/>
<h1>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:title" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:title" />
</h1>
<f:if condition="!{canCreateNew}">
<f:then>
<f:be.infobox
- title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:canNotCreateNew.title')}"
- message="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:canNotCreateNew.message')}"
+ title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:canNotCreateNew.title')}"
+ message="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:canNotCreateNew.message')}"
state="-1"
/>
</f:then>
@@ -25,15 +25,15 @@
<f:if condition="{pagesCreated}">
<f:then>
<f:be.infobox
- title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:pagesCreated.title')}"
- message="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:pagesCreated.message')}"
+ title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:pagesCreated.title')}"
+ message="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:pagesCreated.message')}"
state="-1"
/>
</f:then>
<f:else>
<f:be.infobox
- title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:noPagesCreated.title')}"
- message="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:noPagesCreated.message')}"
+ title="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:noPagesCreated.title')}"
+ message="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:noPagesCreated.message')}"
state="1"
/>
</f:else>
@@ -41,7 +41,7 @@
<f:if condition="{visiblePages}">
<div class="form-group">
<h2>
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:newSubPages"/>
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:newSubPages"/>
</h2>
<f:for each="{visiblePages}" as="page">
<core:iconForRecord table="pages" row="{page}" />
@@ -69,7 +69,7 @@
<input
class="btn btn-default t3js-newmultiplepages-createnewfields"
type="button"
- value="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:addMoreLines')}"
+ value="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:addMoreLines')}"
/>
</div>
@@ -77,19 +77,19 @@
<div class="form-check">
<input type="checkbox" class="form-check-input" name="createInListEnd" id="createInListEnd" value="1" />
<label for="createInListEnd" class="form-check-label">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:listEnd" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:listEnd" />
</label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" name="hidePages" id="hidePages" value="1" />
<label for="hidePages" class="form-check-label">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:hidePages" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:hidePages" />
</label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" name="hidePagesInMenus" id="hidePagesInMenus" value="1" />
<label for="hidePagesInMenus" class="form-check-label">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:hidePagesInMenus" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:hidePagesInMenus" />
</label>
</div>
</div>
@@ -99,12 +99,12 @@
class="btn btn-default"
type="submit"
name="create"
- value="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:create')}"
+ value="{f:translate(key:'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:create')}"
/>
<input
class="btn btn-default"
type="reset"
- value="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:reset')}"
+ value="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:reset')}"
/>
</div>
</form>
@@ -118,7 +118,7 @@
<div class="row">
<div class="form-group col-8">
<label for="page_new_{line.index}">
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new:newPage"/> {line.label}:
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_pages_new.xlf:newPage"/> {line.label}:
</label>
<div class="form-control-wrap">
<input class="form-control" type="text" id="page_new_{line.index}" name="pages[NEW{line.index}][title]" placeholder="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.title')}" />
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index b5d4c5baa0ba..7b76121aaf71 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -424,7 +424,7 @@ class FileListController implements LoggerAwareInterface
['id' => $this->id, 'table' => '_FILE']
),
'title' => sprintf(
- $lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:showColumnsSelection'),
+ $lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:showColumnsSelection'),
$lang->sL($GLOBALS['TCA']['sys_file']['ctrl']['title'] ?? ''),
),
]);
diff --git a/typo3/sysext/filelist/Resources/Private/Templates/File/List.html b/typo3/sysext/filelist/Resources/Private/Templates/File/List.html
index c7dc915bf808..b7b41045cba1 100644
--- a/typo3/sysext/filelist/Resources/Private/Templates/File/List.html
+++ b/typo3/sysext/filelist/Resources/Private/Templates/File/List.html
@@ -136,12 +136,12 @@
url="{columnSelector.url}"
target="{listUrl}"
title="{columnSelector.title}"
- ok="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:updateColumnView')}"
+ ok="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:updateColumnView')}"
close="{f:translate(key: 'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.cancel')}"
- error="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:updateColumnView.error')}">
+ error="{f:translate(key: 'LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:updateColumnView.error')}">
<button type="button" class="btn btn-default btn-sm" title="{columnSelector.title}">
<core:icon identifier="actions-options" size="small" />
- <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:showColumns" />
+ <f:translate key="LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:showColumns" />
</button>
</typo3-backend-column-selector-button>
</div>
diff --git a/typo3/sysext/form/Configuration/TsConfig/Page/Mod/Wizards/NewContentElement.tsconfig b/typo3/sysext/form/Configuration/TsConfig/Page/Mod/Wizards/NewContentElement.tsconfig
index ab206050f0d0..f5baf5022126 100644
--- a/typo3/sysext/form/Configuration/TsConfig/Page/Mod/Wizards/NewContentElement.tsconfig
+++ b/typo3/sysext/form/Configuration/TsConfig/Page/Mod/Wizards/NewContentElement.tsconfig
@@ -4,7 +4,7 @@ mod.wizards.newContentElement.wizardItems.forms {
formframework {
iconIdentifier = content-form
title = LLL:EXT:form/Resources/Private/Language/locallang.xlf:form_new_wizard_title
- description = LLL:EXT:form/Resources/Private/Language/locallang:form_new_wizard_description
+ description = LLL:EXT:form/Resources/Private/Language/locallang.xlf:form_new_wizard_description
tt_content_defValues {
CType = form_formframework
}
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index ded6705a7ad7..ebb316056ac5 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -2088,7 +2088,7 @@ class DatabaseRecordList
['id' => $this->id, 'table' => $table]
);
$columnSelectorTitle = sprintf(
- $lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:showColumnsSelection'),
+ $lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:showColumnsSelection'),
$lang->sL($GLOBALS['TCA'][$table]['ctrl']['title'] ?? '') ?: $table,
);
@@ -2098,13 +2098,13 @@ class DatabaseRecordList
url="' . htmlspecialchars($columnSelectorUrl) . '"
target="' . htmlspecialchars($this->listURL() . '#t3-table-' . $tableIdentifier) . '"
title="' . htmlspecialchars($columnSelectorTitle) . '"
- ok="' . htmlspecialchars($lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:updateColumnView')) . '"
+ ok="' . htmlspecialchars($lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:updateColumnView')) . '"
close="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.cancel')) . '"
- error="' . htmlspecialchars($lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:updateColumnView.error')) . '"
+ error="' . htmlspecialchars($lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:updateColumnView.error')) . '"
>
<button type="button" class="btn btn-default btn-sm" title="' . htmlspecialchars($columnSelectorTitle) . '">' .
$this->iconFactory->getIcon('actions-options', Icon::SIZE_SMALL) . ' ' .
- htmlspecialchars($lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector:showColumns')) .
+ htmlspecialchars($lang->sL('LLL:EXT:backend/Resources/Private/Language/locallang_column_selector.xlf:showColumns')) .
'</button>
</typo3-backend-column-selector-button>
</div>';
--
GitLab