[TASK] Move LanguageService to EXT:core 74/52774/6
authorBenni Mack <benni@typo3.org>
Thu, 11 May 2017 15:29:10 +0000 (17:29 +0200)
committerGeorg Ringer <georg.ringer@gmail.com>
Fri, 12 May 2017 17:43:09 +0000 (19:43 +0200)
The main $GLOBALS['LANG'] class has been moved to the core extension into the "Localization"
namespace, where all other related XLF/XML factory, store and parser classes reside.

This is done in order to streamline the localization of core-relevant files, since this class will
also be used in frontend context.

EXT:lang now contains the backend module, as well as most XLF files.

Resolves: #81196
Releases: master
Change-Id: I0e5d8260f5c5a28254658c68766990b4f4662a2a
Reviewed-on: https://review.typo3.org/52774
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
230 files changed:
composer.json
composer.lock
typo3/sysext/about/Classes/Controller/ModulesController.php
typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
typo3/sysext/backend/Classes/Clipboard/Clipboard.php
typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
typo3/sysext/backend/Classes/ContextMenu/ItemProviders/AbstractProvider.php
typo3/sysext/backend/Classes/Controller/BackendController.php
typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
typo3/sysext/backend/Classes/Controller/ContextMenuController.php
typo3/sysext/backend/Classes/Controller/EditDocumentController.php
typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
typo3/sysext/backend/Classes/Controller/File/EditFileController.php
typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php
typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
typo3/sysext/backend/Classes/Controller/LoginController.php
typo3/sysext/backend/Classes/Controller/NewRecordController.php
typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
typo3/sysext/backend/Classes/Controller/PageLayoutController.php
typo3/sysext/backend/Classes/Controller/Wizard/AbstractWizardController.php
typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
typo3/sysext/backend/Classes/Form/Container/FlexFormContainerContainer.php
typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php
typo3/sysext/backend/Classes/Form/Container/FlexFormSectionContainer.php
typo3/sysext/backend/Classes/Form/Container/FlexFormTabsContainer.php
typo3/sysext/backend/Classes/Form/Container/FullRecordContainer.php
typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
typo3/sysext/backend/Classes/Form/Container/ListOfFieldsContainer.php
typo3/sysext/backend/Classes/Form/Container/OuterWrapContainer.php
typo3/sysext/backend/Classes/Form/Container/PaletteAndSingleContainer.php
typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
typo3/sysext/backend/Classes/Form/Container/TabsContainer.php
typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
typo3/sysext/backend/Classes/Form/Element/FileInfoElement.php
typo3/sysext/backend/Classes/Form/Element/GroupElement.php
typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php
typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php
typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php
typo3/sysext/backend/Classes/Form/Element/InputTextElement.php
typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
typo3/sysext/backend/Classes/Form/Element/TextElement.php
typo3/sysext/backend/Classes/Form/FieldControl/EditPopup.php
typo3/sysext/backend/Classes/Form/FieldControl/InsertClipboard.php
typo3/sysext/backend/Classes/Form/FieldWizard/DefaultLanguageDifferences.php
typo3/sysext/backend/Classes/Form/FieldWizard/LocalizationStateSelector.php
typo3/sysext/backend/Classes/Form/FieldWizard/RecordsOverview.php
typo3/sysext/backend/Classes/Form/FieldWizard/TableList.php
typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaCheckboxItems.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaColumnsProcessFieldLabels.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaRadioItems.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaRecordTitle.php
typo3/sysext/backend/Classes/Form/NodeExpansion/FieldControl.php
typo3/sysext/backend/Classes/Form/Wizard/SuggestWizardDefaultReceiver.php
typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
typo3/sysext/backend/Classes/History/RecordHistory.php
typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
typo3/sysext/backend/Classes/Module/BaseScriptClass.php
typo3/sysext/backend/Classes/Module/ModuleLoader.php
typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
typo3/sysext/backend/Classes/Template/Components/MetaInformation.php
typo3/sysext/backend/Classes/Template/ModuleTemplate.php
typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/backend/Classes/View/BackendLayoutView.php
typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseSystemLanguageRowsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessFieldLabelsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInputPlaceholdersTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRadioItemsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
typo3/sysext/backend/Tests/Unit/Form/NodeExpansion/FieldControlTest.php
typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php
typo3/sysext/beuser/Classes/Controller/BackendUserController.php
typo3/sysext/beuser/Classes/Controller/PermissionAjaxController.php
typo3/sysext/beuser/Classes/Controller/PermissionController.php
typo3/sysext/core/Classes/Category/CategoryRegistry.php
typo3/sysext/core/Classes/Core/Bootstrap.php
typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php
typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
typo3/sysext/core/Classes/Database/QueryGenerator.php
typo3/sysext/core/Classes/Database/QueryView.php
typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
typo3/sysext/core/Classes/Localization/LanguageService.php [new file with mode: 0644]
typo3/sysext/core/Classes/Page/PageRenderer.php
typo3/sysext/core/Classes/Resource/Service/UserStorageCapabilityService.php
typo3/sysext/core/Classes/Resource/Utility/BackendUtility.php
typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
typo3/sysext/core/Classes/Service/IsoCodeService.php
typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
typo3/sysext/core/Documentation/Changelog/master/Important-81196-LanguageServiceMovedToCoreExtension.rst [new file with mode: 0644]
typo3/sysext/core/Migrations/Code/ClassAliasMap.php [new file with mode: 0644]
typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php [new file with mode: 0644]
typo3/sysext/core/Tests/Functional/Tca/BackendGroupsVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/BackendUsersVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/CategoryVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/CollectionVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FileCollectionVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FileStorageVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/FilemountsVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/LanguageVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/NewsVisibleFieldsTest.php
typo3/sysext/core/Tests/Functional/Tca/PagesVisibleFieldsTest.php
typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
typo3/sysext/cshmanual/Classes/Controller/HelpController.php
typo3/sysext/cshmanual/Classes/Domain/Repository/TableManualRepository.php
typo3/sysext/documentation/Classes/Controller/DocumentController.php
typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php
typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
typo3/sysext/feedit/Classes/FrontendEditAssetLoader.php
typo3/sysext/felogin/Tests/Functional/Tca/ContentVisibleFieldsTest.php
typo3/sysext/filelist/Classes/Controller/FileListController.php
typo3/sysext/filelist/Classes/FileFacade.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/filemetadata/Tests/Functional/Tca/FileMetadataVisibleFieldsTest.php
typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
typo3/sysext/form/Classes/Controller/FormEditorController.php
typo3/sysext/form/Classes/Controller/FormManagerController.php
typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php
typo3/sysext/form/Classes/Service/TranslationService.php
typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php
typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
typo3/sysext/frontend/Classes/Hooks/TableColumnHooks.php
typo3/sysext/frontend/Classes/Utility/EidUtility.php
typo3/sysext/frontend/Classes/View/AdminPanelView.php
typo3/sysext/frontend/Tests/Functional/Tca/BackendLayoutVisibleFieldsTest.php
typo3/sysext/frontend/Tests/Functional/Tca/ContentVisibleFieldsTest.php
typo3/sysext/frontend/Tests/Functional/Tca/DomainVisibleFieldsTest.php
typo3/sysext/frontend/Tests/Functional/Tca/FrontendGroupsVisibleFieldsTest.php
typo3/sysext/frontend/Tests/Functional/Tca/FrontendUsersVisibleFieldsTest.php
typo3/sysext/frontend/Tests/Functional/Tca/PagesLanguageOverlayVisibleFieldsTest.php
typo3/sysext/frontend/Tests/Functional/Tca/TemplateVisibleFieldsTest.php
typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
typo3/sysext/func/Classes/Controller/PageFunctionsController.php
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Classes/ImportExport.php
typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
typo3/sysext/indexed_search/Classes/FileContentParser.php
typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
typo3/sysext/indexed_search/Tests/Functional/Tca/IndexConfigVisibleFieldsTest.php
typo3/sysext/info/Classes/Controller/InfoModuleController.php
typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
typo3/sysext/install/Classes/Report/InstallStatusReport.php
typo3/sysext/install/Classes/Updates/RowUpdater/L10nModeUpdater.php
typo3/sysext/lang/Classes/Controller/LanguageController.php
typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
typo3/sysext/lang/Classes/LanguageService.php [deleted file]
typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
typo3/sysext/linkvalidator/Classes/Linktype/AbstractLinktype.php
typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
typo3/sysext/recordlist/Classes/Browser/AbstractElementBrowser.php
typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php
typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php
typo3/sysext/recordlist/Classes/RecordList.php
typo3/sysext/recordlist/Classes/View/FolderUtilityRenderer.php
typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
typo3/sysext/recycler/Classes/Domain/Model/Tables.php
typo3/sysext/recycler/Classes/Task/CleanerFieldProvider.php
typo3/sysext/recycler/Classes/Task/CleanerTask.php
typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
typo3/sysext/reports/Classes/Controller/ReportController.php
typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
typo3/sysext/reports/Classes/Report/Status/FalStatus.php
typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
typo3/sysext/reports/Classes/Report/Status/Status.php
typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
typo3/sysext/reports/Classes/Report/Status/Typo3Status.php
typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
typo3/sysext/rsaauth/Classes/BackendWarnings.php
typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
typo3/sysext/setup/Classes/Controller/SetupModuleController.php
typo3/sysext/sv/Classes/Report/ServicesListReport.php
typo3/sysext/sv/Tests/Unit/Report/ServicesListReportTest.php
typo3/sysext/sys_action/Classes/ActionTask.php
typo3/sysext/sys_action/Tests/Functional/Tca/ActionVisibleFieldsTest.php
typo3/sysext/sys_note/Tests/Functional/Tca/NoteVisibleFieldsTest.php
typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
typo3/sysext/version/Classes/Hook/DataHandlerHook.php
typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
typo3/sysext/workspaces/Classes/Controller/AbstractController.php
typo3/sysext/workspaces/Classes/Controller/PreviewController.php
typo3/sysext/workspaces/Classes/Controller/Remote/RemoteServer.php
typo3/sysext/workspaces/Classes/Controller/ReviewController.php
typo3/sysext/workspaces/Classes/Domain/Record/AbstractRecord.php
typo3/sysext/workspaces/Classes/Service/HistoryService.php
typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php

index 768a20b..e102459 100644 (file)
@@ -74,6 +74,7 @@
                "typo3/class-alias-loader": {
                        "always-add-alias-loader": true,
                        "class-alias-maps": [
+                               "typo3/sysext/core/Migrations/Code/ClassAliasMap.php",
                                "typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php",
                                "typo3/sysext/fluid/Migrations/Code/ClassAliasMap.php",
                                "typo3/sysext/version/Migrations/Code/ClassAliasMap.php"
index 5c9adc8..859c2d1 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "6bd821b873ba18b3123a8ce5f3c9fe87",
+    "content-hash": "0687a7dfa8c67cbaccd2e10d83e1a634",
     "packages": [
         {
             "name": "cogpowered/finediff",
index 069f210..e6c98ee 100644 (file)
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\About\Controller;
 use TYPO3\CMS\Backend\Module\ModuleLoader;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Backend\View\BackendTemplateView;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * 'About modules' script - the default start-up module.
index 652334a..8515992 100644 (file)
@@ -936,7 +936,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index a3f59fd..b31c442 100644 (file)
@@ -1041,7 +1041,7 @@ class Clipboard
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 34074c5..fdf6592 100644 (file)
@@ -18,9 +18,9 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Contains translation tools
index da593aa..589bdbd 100644 (file)
@@ -19,8 +19,8 @@ use TYPO3\CMS\Backend\Clipboard\Clipboard;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Abstract provider is a base class for context menu item providers
index 3b8b489..1c5bcf4 100644 (file)
@@ -878,7 +878,7 @@ class BackendController
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 79c83d9..a404508 100644 (file)
@@ -159,7 +159,7 @@ class ElementHistoryController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 93b35ca..71a52f9 100644 (file)
@@ -701,7 +701,7 @@ class ElementInformationController
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 89529d6..f7fc1df 100644 (file)
@@ -272,7 +272,7 @@ class MoveElementController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 2552f53..2e64689 100644 (file)
@@ -547,7 +547,7 @@ class NewContentElementController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 6ee7c66..cc83c11 100644 (file)
@@ -19,8 +19,8 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Clipboard\Clipboard;
 use TYPO3\CMS\Backend\ContextMenu\ContextMenu;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Script Class for the Context Sensitive Menu in TYPO3
index 936e8fb..6a8e706 100644 (file)
@@ -1976,7 +1976,7 @@ class EditDocumentController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index c6c80ed..2147df3 100644 (file)
@@ -263,7 +263,7 @@ class CreateFolderController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 53093d8..6ca34b4 100644 (file)
@@ -287,7 +287,7 @@ class EditFileController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 0aabc01..c7ef406 100644 (file)
@@ -214,7 +214,7 @@ class FileUploadController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index a9a08a5..3a1d718 100644 (file)
@@ -204,7 +204,7 @@ class RenameFileController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index f3dd16f..265f55e 100644 (file)
@@ -19,12 +19,12 @@ use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Module\AbstractModule;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\Exception\InsufficientFileAccessPermissionsException;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Script Class for the rename-file form
index ee1311c..6b288a0 100644 (file)
@@ -256,7 +256,7 @@ class FileSystemNavigationFrameController
     /**
      * Returns an instance of LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 8361bd9..ba3b420 100644 (file)
@@ -508,7 +508,7 @@ class LoginController
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 104671a..e56288c 100644 (file)
@@ -739,7 +739,7 @@ class NewRecordController extends AbstractModule
     /**
      * Return language service instance
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 37e4dc7..24f025d 100644 (file)
@@ -16,13 +16,13 @@ namespace TYPO3\CMS\Backend\Controller;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\OnlineMedia\Helpers\OnlineMediaHelperRegistry;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Class OnlineMediaController handles uploading online media
index 5ddc634..a210245 100644 (file)
@@ -1164,7 +1164,7 @@ class PageLayoutController
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 1ab211f..315c9d1 100644 (file)
@@ -18,8 +18,8 @@ use TYPO3\CMS\Backend\Module\AbstractModule;
 use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Type\Bitmask\Permission;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Class AbstractWizardController
index d91c88d..d89d444 100644 (file)
@@ -216,7 +216,7 @@ class BackendModuleRepository implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Return language service instance
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 9000efa..7e496f8 100644 (file)
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Flex form container implementation
index b986978..52dbc4c 100644 (file)
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Type\Bitmask\JsConfirmation;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * The container handles single elements.
index b263246..d86e61f 100644 (file)
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Handle flex form sections.
index 726d349..2fa9d16 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Handle flex forms that have tabs (multiple "sheets").
index 9595852..49ebf68 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * A container rendering a "full record". This is an entry container used as first
index 56c2bec..18a9491 100644 (file)
@@ -20,11 +20,11 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\OnlineMedia\Helpers\OnlineMediaHelperRegistry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Inline element entry container.
index 453b779..9e7797b 100644 (file)
@@ -23,13 +23,13 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Type\Bitmask\Permission;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render a single inline record relation.
index b051988..2c6d1cd 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render a given list of field of a TCA table.
index d15fc61..44ef896 100644 (file)
@@ -18,9 +18,9 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render header and footer row.
index 73c8b8d..3e1e90d 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
  */
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Handle palettes and single fields.
index 29c4e8f..9376b79 100644 (file)
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Backend\Form\Container;
 use TYPO3\CMS\Backend\Form\InlineStackProcessor;
 use TYPO3\CMS\Backend\Form\Utility\FormEngineUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Type\Bitmask\JsConfirmation;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Container around a "single field".
index 5ac2b67..4da144f 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Backend\Form\Container;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render all tabs of a record that has tabs.
index cb54e9d..a364faa 100644 (file)
@@ -18,10 +18,10 @@ use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Backend\Form\NodeFactory;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Base class for form elements of FormEngine. Contains several helper methods used by single elements.
index 2a34f1a..9569d23 100644 (file)
@@ -16,11 +16,11 @@ namespace TYPO3\CMS\Backend\Form\Element;
  */
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * This renderType is used with type=user in FAL for table sys_file and
index f98d387..9dacd53 100644 (file)
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Backend\Form\Element;
 use TYPO3\CMS\Backend\Form\InlineStackProcessor;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Generation of elements of the type "group"
index 439c3d6..7463a5d 100644 (file)
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Backend\Form\Element;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render an input field with a color picker
index 732d7f2..ea1540a 100644 (file)
@@ -15,10 +15,10 @@ namespace TYPO3\CMS\Backend\Form\Element;
  */
 
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Generation of TCEform elements of the type "input type=text"
index 1f5806c..e554710 100644 (file)
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Backend\Form\Element;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\LinkHandling\LinkService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException;
 use TYPO3\CMS\Core\Resource\Exception\FolderDoesNotExistException;
 use TYPO3\CMS\Core\Resource\File;
@@ -25,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
 use TYPO3\CMS\Frontend\Service\TypoLinkCodecService;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Link input element.
index a11d618..eef65c3 100644 (file)
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Backend\Form\Element;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * General type=input element.
index 2b609f2..85754ac 100644 (file)
@@ -16,9 +16,9 @@ namespace TYPO3\CMS\Backend\Form\Element;
 
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render a widget with two boxes side by side.
index 14c1391..8ddf64f 100644 (file)
@@ -15,10 +15,10 @@ namespace TYPO3\CMS\Backend\Form\Element;
  */
 
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Generation of TCEform elements of the type "text"
index 41e32eb..1c4fe06 100644 (file)
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Backend\Form\FieldControl;
 
 use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Renders the icon with link parameters to edit a selected element,
index a12fd2f..dd3fd36 100644 (file)
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Backend\Form\FieldControl;
  */
 
 use TYPO3\CMS\Backend\Form\AbstractNode;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Renders the icon "insert record from clipboard",
index 53f6398..e4f06c8 100644 (file)
@@ -17,9 +17,9 @@ namespace TYPO3\CMS\Backend\Form\FieldWizard;
 
 use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\DiffUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Renders the diff-view of default language record content compared with what the record was originally
index 0f3f525..6fbdd1e 100644 (file)
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Form\FieldWizard;
 
 use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Core\DataHandling\Localization\State;
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
  * Allows to define the localization state per field.
index 0e3ea4f..f31933c 100644 (file)
@@ -20,8 +20,8 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render details of selected records,
index 7d26d22..32c62e6 100644 (file)
@@ -18,8 +18,8 @@ namespace TYPO3\CMS\Backend\Form\FieldWizard;
 use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Render list of tables and link to element browser,
index 5c7401a..80517d2 100644 (file)
@@ -28,13 +28,13 @@ use TYPO3\CMS\Core\Database\RelationHandler;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Imaging\IconRegistry;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Contains methods used by Data providers that handle elements
index c141bc1..8da04be 100644 (file)
@@ -16,10 +16,10 @@ namespace TYPO3\CMS\Backend\Form\FormDataProvider;
 
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Fill the "systemLanguageRows" part of the result array
index c2bcbe8..0f3aebe 100644 (file)
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Backend\Form\FormDataProvider;
  */
 
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
  * Resolve checkbox items and set processed item list in processedTca
index 904613d..e0a9690 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Backend\Form\FormDataProvider;
  */
 
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Works on processedTca to determine the final value of field labels.
index 58a5b50..acc1680 100644 (file)
@@ -23,11 +23,11 @@ use TYPO3\CMS\Backend\Form\InlineStackProcessor;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Database\RelationHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Versioning\VersionState;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Resolve and prepare inline data.
index 4ab3582..b3e932e 100644 (file)
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Backend\Form\FormDataProvider;
 use TYPO3\CMS\Backend\Form\FormDataCompiler;
 use TYPO3\CMS\Backend\Form\FormDataGroup\TcaInputPlaceholderRecord;
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Resolve placeholders for fields of type input or text. The placeholder value
index 7922e6e..2eb3e0d 100644 (file)
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Backend\Form\FormDataProvider;
  */
 
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
  * Resolve radio items and set processed item list in processedTca
index ff94a90..4f95ef6 100644 (file)
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Backend\Form\FormDataProvider;
 
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Determine the title of a record and write it to $result['recordTitle'].
index 2799257..b69003f 100644 (file)
@@ -18,9 +18,9 @@ namespace TYPO3\CMS\Backend\Form\NodeExpansion;
 use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Service\DependencyOrderingService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Field controls are additional HTML on a single element level that are typically
index 7ab1feb..a967c83 100644 (file)
@@ -24,8 +24,8 @@ use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Default implementation of a handler class for an ajax record selector.
index 7c96f2a..cee3109 100644 (file)
@@ -20,9 +20,9 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryHelper;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Type\Bitmask\Permission;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * TYPO3 backend user authentication in the TSFE frontend.
index 8ea2789..ad29af9 100644 (file)
@@ -1045,7 +1045,7 @@ class RecordHistory
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 995734a..0e57551 100644 (file)
@@ -17,9 +17,9 @@ namespace TYPO3\CMS\Backend\Module;
 use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Parent class for 'Extension Objects' in backend modules.
index 10694e2..b5d900b 100644 (file)
@@ -16,11 +16,11 @@ namespace TYPO3\CMS\Backend\Module;
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Parent class for 'ScriptClasses' in backend modules.
index f2671b2..dd090c4 100644 (file)
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Backend\Module;
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * This document provides a class that loads the modules for the TYPO3 interface.
index 4ffa127..91a86b9 100644 (file)
@@ -23,8 +23,8 @@ use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Library with a single function addElement that returns table
index 0fcf6a2..634c8fd 100644 (file)
@@ -17,12 +17,12 @@ namespace TYPO3\CMS\Backend\Template\Components;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\Exception\InsufficientFolderAccessPermissionsException;
 use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
 use TYPO3\CMS\Core\Resource\FolderInterface;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * MetaInformation
index 3f5053d..f8b6622 100644 (file)
@@ -19,6 +19,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
@@ -26,7 +27,6 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\Exception\InvalidTemplateResourceException;
 use TYPO3\CMS\Fluid\View\StandaloneView;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * A class taking care of the "outer" HTML of a module, especially
index 15d0d00..bb58c70 100644 (file)
@@ -25,8 +25,8 @@ use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Base class for creating a browsable array/page/folder tree in HTML
index 9468de8..a260ec7 100644 (file)
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Backend\Tree\View;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Resource\Folder;
@@ -24,7 +25,6 @@ use TYPO3\CMS\Core\Resource\FolderInterface;
 use TYPO3\CMS\Core\Resource\InaccessibleFolder;
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Generate a folder tree,
index 6542034..e367234 100644 (file)
@@ -23,8 +23,8 @@ use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\StartTimeRestriction;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Position map class - generating a page tree / content element list which links for inserting (copy/move) of records.
index f4c25c7..82031dc 100644 (file)
@@ -30,6 +30,7 @@ use TYPO3\CMS\Core\Database\RelationHandler;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\AbstractFile;
 use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
 use TYPO3\CMS\Core\Resource\File;
@@ -44,7 +45,6 @@ use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Core\Versioning\VersionState;
 use TYPO3\CMS\Frontend\Page\PageRepository;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Standard functions available for the TYPO3 backend.
index bb00d53..4db6848 100644 (file)
@@ -460,7 +460,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 14bc776..71f11f2 100644 (file)
@@ -18,7 +18,7 @@ use Prophecy\Argument;
 use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Backend\Form\Element\InputDateTimeElement;
 use TYPO3\CMS\Backend\Form\NodeFactory;
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
  * Test case
index d7547d3..aba5808 100644 (file)
@@ -22,11 +22,11 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\QueryRestrictionContainerInterface;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index b5bcf4c..a1bc799 100644 (file)
@@ -17,11 +17,11 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\CMS\Backend\Form\FormDataProvider\TcaCheckboxItems;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index 614ae0f..21f27ae 100644 (file)
@@ -15,7 +15,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
  */
 
 use TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsProcessFieldLabels;
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
  * Test case
index 89c9da4..cfbe720 100644 (file)
@@ -19,8 +19,8 @@ use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\CMS\Backend\Form\FormDataGroup\FlexFormSegment;
 use TYPO3\CMS\Backend\Form\FormDataProvider\TcaFlexProcess;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index 3c97a44..cb1b49f 100644 (file)
@@ -18,8 +18,8 @@ use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\CMS\Backend\Form\FormDataCompiler;
 use TYPO3\CMS\Backend\Form\FormDataGroup\TcaInputPlaceholderRecord;
 use TYPO3\CMS\Backend\Form\FormDataProvider\TcaInputPlaceholders;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index d715f0c..c9b6739 100644 (file)
@@ -17,11 +17,11 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\CMS\Backend\Form\FormDataProvider\TcaRadioItems;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index 9023cb2..efe8a9d 100644 (file)
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\CMS\Backend\Form\FormDataProvider\TcaRecordTitle;
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
  * Test case
index 5aee8d7..df3df88 100644 (file)
@@ -27,12 +27,12 @@ use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\DefaultRestrictionContainer;
 use TYPO3\CMS\Core\Database\RelationHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index c40a7e3..27607f4 100644 (file)
@@ -18,7 +18,7 @@ use Prophecy\Argument;
 use TYPO3\CMS\Backend\Form\AbstractNode;
 use TYPO3\CMS\Backend\Form\NodeExpansion\FieldControl;
 use TYPO3\CMS\Backend\Form\NodeFactory;
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
index bd54b0f..9a6de40 100644 (file)
@@ -29,8 +29,8 @@ use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\DefaultRestrictionContainer;
 use TYPO3\CMS\Core\Database\RelationHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index cc24eb1..e184c6e 100644 (file)
@@ -19,11 +19,11 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Backend\View\BackendTemplateView;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Backend module user/group action controller
index 1a6a4fd..0551f2e 100644 (file)
@@ -16,11 +16,11 @@ namespace TYPO3\CMS\Beuser\Controller;
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Session\Backend\SessionBackendInterface;
 use TYPO3\CMS\Core\Session\SessionManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Backend module user administration controller
index 696513e..6ab2075 100644 (file)
@@ -275,7 +275,7 @@ class PermissionAjaxController
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 8b2b66b..dea4afe 100644 (file)
@@ -401,7 +401,7 @@ class PermissionController extends ActionController
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 7014abb..996e788 100644 (file)
@@ -14,11 +14,11 @@ namespace TYPO3\CMS\Core\Category;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Class to register category configurations.
index 132835b..9158a02 100644 (file)
@@ -957,8 +957,8 @@ class Bootstrap
      */
     public function initializeLanguageObject()
     {
-        /** @var $GLOBALS['LANG'] \TYPO3\CMS\Lang\LanguageService */
-        $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Lang\LanguageService::class);
+        /** @var $GLOBALS['LANG'] \TYPO3\CMS\Core\Localization\LanguageService */
+        $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
         $GLOBALS['LANG']->init($GLOBALS['BE_USER']->uc['lang']);
         return $this;
     }
index 4d8774f..ccbdd81 100644 (file)
@@ -15,10 +15,10 @@ namespace TYPO3\CMS\Core\DataHandling;
  */
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Provides services around item processing
index bf7204c..de0e7cf 100644 (file)
@@ -22,10 +22,10 @@ use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Database\RelationHandler;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * This processor analyses the provided data-map before actually being process
index d4ad1ba..8ce211f 100644 (file)
@@ -19,9 +19,9 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Database\Query\QueryHelper;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Class for generating front end for building queries
index 008a702..71b1d0c 100644 (file)
@@ -21,13 +21,13 @@ use TYPO3\CMS\Core\Database\Query\QueryHelper;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageRendererResolver;
 use TYPO3\CMS\Core\Utility\CsvUtility;
 use TYPO3\CMS\Core\Utility\DebugUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Class used in module tools/dbint (advanced search) and which may hold code specific for that module
index 6b28d65..6b0a4fc 100644 (file)
@@ -15,13 +15,13 @@ namespace TYPO3\CMS\Core\FormProtection;
  */
 
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * This class creates and manages instances of the various form protection
index c7ecc28..271d2c0 100644 (file)
@@ -16,11 +16,11 @@ namespace TYPO3\CMS\Core\Hooks;
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * DataHandler hook class to check the integrity of submitted be_groups data
diff --git a/typo3/sysext/core/Classes/Localization/LanguageService.php b/typo3/sysext/core/Classes/Localization/LanguageService.php
new file mode 100644 (file)
index 0000000..fcc08c2
--- /dev/null
@@ -0,0 +1,345 @@
+<?php
+namespace TYPO3\CMS\Core\Localization;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Utility\ArrayUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+/**
+ * Contains the TYPO3 Backend Language class
+ * For detailed information about how localization is handled,
+ * please refer to the 'Inside TYPO3' document which describes this.
+ * This class is normally instantiated as the global variable $GLOBALS['LANG']
+ * It's only available in the backend and under certain circumstances in the frontend
+ * @see \TYPO3\CMS\Backend\Template\DocumentTemplate
+ */
+class LanguageService
+{
+    /**
+     * This is set to the language that is currently running for the user
+     *
+     * @var string
+     */
+    public $lang = 'default';
+
+    /**
+     * If TRUE, will show the key/location of labels in the backend.
+     *
+     * @var bool
+     */
+    public $debugKey = false;
+
+    /**
+     * Internal cache for read LL-files
+     *
+     * @var array
+     */
+    public $LL_files_cache = [];
+
+    /**
+     * Internal cache for ll-labels (filled as labels are requested)
+     *
+     * @var array
+     */
+    public $LL_labels_cache = [];
+
+    /**
+     * List of language dependencies for actual language. This is used for local variants of a language
+     * that depend on their "main" language, like Brazilian Portuguese or Canadian French.
+     *
+     * @var array
+     */
+    protected $languageDependencies = [];
+
+    /**
+     * LanguageService constructor.
+     */
+    public function __construct()
+    {
+        $this->debugKey = (bool)$GLOBALS['TYPO3_CONF_VARS']['BE']['languageDebug'];
+    }
+
+    /**
+     * Initializes the backend language.
+     * This is for example done in \TYPO3\CMS\Backend\Template\DocumentTemplate with lines like these:
+     * $LANG = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
+     * $LANG->init($GLOBALS['BE_USER']->uc['lang']);
+     *
+     * @throws \RuntimeException
+     * @param string $languageKey The language key (two character string from backend users profile)
+     */
+    public function init($languageKey)
+    {
+        // Find the requested language in this list based on the $languageKey
+        /** @var $locales \TYPO3\CMS\Core\Localization\Locales */
+        $locales = GeneralUtility::makeInstance(Locales::class);
+        // Language is found. Configure it:
+        if (in_array($languageKey, $locales->getLocales())) {
+            // The current language key
+            $this->lang = $languageKey;
+            $this->languageDependencies[] = $languageKey;
+            foreach ($locales->getLocaleDependencies($languageKey) as $language) {
+                $this->languageDependencies[] = $language;
+            }
+        }
+    }
+
+    /**
+     * Debugs localization key.
+     *
+     * @param string $value value to debug
+     * @return string
+     */
+    public function debugLL($value)
+    {
+        return $this->debugKey ? '[' . $value . ']' : '';
+    }
+
+    /**
+     * Returns the label with key $index from the globally loaded $LOCAL_LANG array.
+     * Mostly used from modules with only one LOCAL_LANG file loaded into the global space.
+     *
+     * @param string $index Label key
+     * @return string
+     */
+    public function getLL($index)
+    {
+        return $this->getLLL($index, $GLOBALS['LOCAL_LANG']);
+    }
+
+    /**
+     * Returns the label with key $index from the $LOCAL_LANG array used as the second argument
+     *
+     * @param string $index Label key
+     * @param array $localLanguage $LOCAL_LANG array to get label key from
+     * @return string
+     */
+    public function getLLL($index, $localLanguage)
+    {
+        // Get Local Language. Special handling for all extensions that
+        // read PHP LL files and pass arrays here directly.
+        if (isset($localLanguage[$this->lang][$index])) {
+            $value = is_string($localLanguage[$this->lang][$index])
+                ? $localLanguage[$this->lang][$index]
+                : $localLanguage[$this->lang][$index][0]['target'];
+        } elseif (isset($localLanguage['default'][$index])) {
+            $value = is_string($localLanguage['default'][$index])
+                ? $localLanguage['default'][$index]
+                : $localLanguage['default'][$index][0]['target'];
+        } else {
+            $value = '';
+        }
+        return $value . $this->debugLL($index);
+    }
+
+    /**
+     * splitLabel function
+     *
+     * All translations are based on $LOCAL_LANG variables.
+     * 'language-splitted' labels can therefore refer to a local-lang file + index.
+     * Refer to 'Inside TYPO3' for more details
+     *
+     * @param string $input Label key/reference
+     * @return string
+     */
+    public function sL($input)
+    {
+        $identifier = $input . '_' . (int)$this->debugKey;
+        if (isset($this->LL_labels_cache[$this->lang][$identifier])) {
+            return $this->LL_labels_cache[$this->lang][$identifier];
+        }
+        if (strpos($input, 'LLL:') === 0) {
+            $restStr = trim(substr($input, 4));
+            $extPrfx = '';
+                // ll-file referred to is found in an extension.
+            if (strpos($restStr, 'EXT:') === 0) {
+                $restStr = trim(substr($restStr, 4));
+                $extPrfx = 'EXT:';
+            }
+            $parts = explode(':', $restStr);
+            $parts[0] = $extPrfx . $parts[0];
+                // Getting data if not cached
+            if (!isset($this->LL_files_cache[$parts[0]])) {
+                $this->LL_files_cache[$parts[0]] = $this->readLLfile($parts[0]);
+            }
+            $output = $this->getLLL($parts[1], $this->LL_files_cache[$parts[0]]);
+        } else {
+            // Use a constant non-localizable label
+            $output = $input;
+        }
+        $output .= $this->debugLL($input);
+        $this->LL_labels_cache[$this->lang][$identifier] = $output;
+        return $output;
+    }
+
+    /**
+     * Loading $TCA_DESCR[$table]['columns'] with content from locallang files
+     * as defined in $TCA_DESCR[$table]['refs']
+     * $TCA_DESCR is a global var
+     *
+     * @param string $table Table name found as key in global array $TCA_DESCR
+     */
+    public function loadSingleTableDescription($table)
+    {
+        // First the 'table' cannot already be loaded in [columns]
+            // and secondly there must be a references to locallang files available in [refs]
+        if (is_array($GLOBALS['TCA_DESCR'][$table]) && !isset($GLOBALS['TCA_DESCR'][$table]['columns']) && is_array($GLOBALS['TCA_DESCR'][$table]['refs'])) {
+            // Init $TCA_DESCR for $table-key
+            $GLOBALS['TCA_DESCR'][$table]['columns'] = [];
+                // Get local-lang for each file in $TCA_DESCR[$table]['refs'] as they are ordered.
+            foreach ($GLOBALS['TCA_DESCR'][$table]['refs'] as $llfile) {
+                $localLanguage = $this->includeLLFile($llfile, 0, 1);
+                    // Traverse all keys
+                if (is_array($localLanguage['default'])) {
+                    foreach ($localLanguage['default'] as $lkey => $lVal) {
+                        // Exploding by '.':
+                            // 0-n => fieldname,
+                            // n+1 => type from (alttitle, description, details, syntax, image_descr,image,seeAlso),
+                            // n+2 => special instruction, if any
+                        $keyParts = explode('.', $lkey);
+                        $keyPartsCount = count($keyParts);
+                            // Check if last part is special instruction
+                            // Only "+" is currently supported
+                        $specialInstruction = $keyParts[$keyPartsCount - 1] === '+';
+                        if ($specialInstruction) {
+                            array_pop($keyParts);
+                        }
+                            // If there are more than 2 parts, get the type from the last part
+                            // and merge back the other parts with a dot (.)
+                            // Otherwise just get type and field name straightaway
+                        if ($keyPartsCount > 2) {
+                            $type = array_pop($keyParts);
+                            $fieldName = implode('.', $keyParts);
+                        } else {
+                            $fieldName = $keyParts[0];
+                            $type = $keyParts[1];
+                        }
+                            // Detecting 'hidden' labels, converting to normal fieldname
+                        if ($fieldName === '_') {
+                            $fieldName = '';
+                        }
+                        if ($fieldName !== '' && $fieldName[0] === '_') {
+                            $fieldName = substr($fieldName, 1);
+                        }
+                            // Append label
+                        $label = $lVal[0]['target'] ? :
+                            $lVal[0]['source'];
+                        if ($specialInstruction) {
+                            $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] .= LF . $label;
+                        } else {
+                            // Substitute label
+                            $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] = $label;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Includes locallang file (and possibly additional localized version if configured for)
+     * Read language labels will be merged with $LOCAL_LANG (if $setGlobal = TRUE).
+     *
+     * @param string $fileRef $fileRef is a file-reference
+     * @param bool $setGlobal Setting in global variable $LOCAL_LANG (or returning the variable)
+     * @param bool $mergeLocalOntoDefault
+     * @return mixed if $setGlobal===TRUE, LL-files set $LOCAL_LANG in global scope, or array is returned from function
+     */
+    public function includeLLFile($fileRef, $setGlobal = true, $mergeLocalOntoDefault = false)
+    {
+        $globalLanguage = [];
+            // Get default file
+        $localLanguage = $this->readLLfile($fileRef);
+        if (is_array($localLanguage) && !empty($localLanguage)) {
+            // it depends on, whether we should return the result or set it in the global $LOCAL_LANG array
+            if ($setGlobal) {
+                $globalLanguage = (array)$GLOBALS['LOCAL_LANG'];
+                ArrayUtility::mergeRecursiveWithOverrule($globalLanguage, $localLanguage);
+            } else {
+                $globalLanguage = $localLanguage;
+            }
+                // Merge local onto default
+            if ($mergeLocalOntoDefault && $this->lang !== 'default' && is_array($globalLanguage[$this->lang]) && is_array($globalLanguage['default'])) {
+                // array_merge can be used so far the keys are not
+                    // numeric - which we assume they are not...
+                $globalLanguage['default'] = array_merge($globalLanguage['default'], $globalLanguage[$this->lang]);
+                unset($globalLanguage[$this->lang]);
+            }
+        }
+            // Return value if not global is set.
+        if (!$setGlobal) {
+            return $globalLanguage;
+        } else {
+            $GLOBALS['LOCAL_LANG'] = $globalLanguage;
+            return null;
+        }
+    }
+
+    /**
+     * Includes a locallang file and returns the $LOCAL_LANG array found inside.
+     *
+     * @param string $fileRef Input is a file-reference to be a 'local_lang' file containing a $LOCAL_LANG array
+     * @return array value of $LOCAL_LANG found in the included file, empty if non found
+     */
+    protected function readLLfile($fileRef)
+    {
+        /** @var $languageFactory LocalizationFactory */
+        $languageFactory = GeneralUtility::makeInstance(LocalizationFactory::class);
+
+        if ($this->lang !== 'default') {
+            $languages = array_reverse($this->languageDependencies);
+        } else {
+            $languages = ['default'];
+        }
+        $localLanguage = [];
+        foreach ($languages as $language) {
+            $tempLL = $languageFactory->getParsedData($fileRef, $language);
+            $localLanguage['default'] = $tempLL['default'];
+            if (!isset($localLanguage[$this->lang])) {
+                $localLanguage[$this->lang] = $localLanguage['default'];
+            }
+            if ($this->lang !== 'default' && isset($tempLL[$language])) {
+                // Merge current language labels onto labels from previous language
+                    // This way we have a labels with fall back applied
+                ArrayUtility::mergeRecursiveWithOverrule($localLanguage[$this->lang], $tempLL[$language], true, false);
+            }
+        }
+        return $localLanguage;
+    }
+
+    /**
+     * Gets labels with a specific fetched from the current locallang file.
+     * This is useful for e.g gathering javascript labels.
+     *
+     * @param string $prefix Prefix to select the correct labels
+     * @param string $strip Sub-prefix to be removed from label names in the result
+     * @return array Processed labels
+     */
+    public function getLabelsWithPrefix($prefix, $strip = '')
+    {
+        $extraction = [];
+        $labels = array_merge((array)$GLOBALS['LOCAL_LANG']['default'], (array)$GLOBALS['LOCAL_LANG'][$this->lang]);
+        // Regular expression to strip the selection prefix and possibly something from the label name:
+        $labelPattern = '#^' . preg_quote($prefix, '#') . '(' . preg_quote($strip, '#') . ')?#';
+        // Iterate through all locallang labels:
+        foreach ($labels as $label => $value) {
+            if (strpos($label, $prefix) === 0) {
+                $key = preg_replace($labelPattern, '', $label);
+                $extraction[$key] = $value;
+            }
+        }
+        return $extraction;
+    }
+}
index 062df50..a2ffbbf 100644 (file)
@@ -2658,7 +2658,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * Returns global language service instance
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 0e9356f..591818b 100644 (file)
@@ -14,12 +14,12 @@ namespace TYPO3\CMS\Core\Resource\Service;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Utility class to render capabilities of the storage.
index d3f9672..536c33d 100644 (file)
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Core\Resource\Utility;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Resource\AbstractFile;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Some Backend Utility functions for working with resources
index dfec37d..552fbb5 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Core\Resource\Utility;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\FolderInterface;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Utility function for working with resource-lists
index 535ebd9..9618652 100644 (file)
@@ -247,7 +247,7 @@ class IsoCodeService
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 01337f7..8092171 100644 (file)
@@ -22,10 +22,10 @@ use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Exception;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Frontend\Configuration\TypoScript\ConditionMatching\ConditionMatcher;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * TSParser extension class to TemplateService
index 939e5a5..8fde475 100644 (file)
@@ -18,6 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Resource\DuplicationBehavior;
@@ -40,7 +41,6 @@ use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Resource\ResourceStorage;
 use TYPO3\CMS\Core\Type\Exception\InvalidEnumerationValueException;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Contains functions for performing file operations like copying, pasting, uploading, moving,
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-81196-LanguageServiceMovedToCoreExtension.rst b/typo3/sysext/core/Documentation/Changelog/master/Important-81196-LanguageServiceMovedToCoreExtension.rst
new file mode 100644 (file)
index 0000000..d20aeee
--- /dev/null
@@ -0,0 +1,21 @@
+.. include:: ../../Includes.txt
+
+===========================================================
+Important: #81196 - LanguageService moved to core extension
+===========================================================
+
+See :issue:`81196`
+
+Description
+===========
+
+The PHP class `TYPO3\CMS\Lang\LanguageService` - very well known for being available as 
+php:`$GLOBALS['LANG']` in the TYPO3 backend scope, and responsible for translating labels from
+XLF/XML files, has been moved to EXT:core, the core system extension.
+
+The new class is named `TYPO3\CMS\Core\Localization\LanguageService`. A class alias for backwards-
+compatibility is available, so the instantiating or referencing the old class name still works.
+
+The class alias functionality will be dropped in TYPO3 v10.
+
+.. index:: PHP-API
\ No newline at end of file
diff --git a/typo3/sysext/core/Migrations/Code/ClassAliasMap.php b/typo3/sysext/core/Migrations/Code/ClassAliasMap.php
new file mode 100644 (file)
index 0000000..d95341e
--- /dev/null
@@ -0,0 +1,4 @@
+<?php
+return [
+    'TYPO3\\CMS\\Lang\\LanguageService' => \TYPO3\CMS\Core\Localization\LanguageService::class
+];
diff --git a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
new file mode 100644 (file)
index 0000000..2bdcf10
--- /dev/null
@@ -0,0 +1,10 @@
+<?php
+namespace {
+    die('Access denied');
+}
+
+namespace TYPO3\CMS\Lang {
+    class LanguageService extends \TYPO3\CMS\Core\Localization\LanguageService
+    {
+    }
+}
index 53650b6..4a670ed 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class BackendGroupsVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 32476bc..3ef3704 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class BackendUsersVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 278d47a..5272c9b 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class CategoryVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 3525a83..d603fae 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class CollectionVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 7c9495b..8672aef 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class FileCollectionVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 76c50c1..f0d76d0 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class FileMetadataVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 07a0b2a..178449e 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class FileStorageVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 319fdd9..f67d222 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class FilemountsVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index dada98e..3c2d8f7 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class LanguageVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index a2da2ab..d488550 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class NewsVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index dca4610..917599c 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Page\PageRepository;
-use TYPO3\CMS\Lang\LanguageService;
 
 class PagesVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index ca8ef37..518e1c9 100644 (file)
@@ -854,7 +854,7 @@ class DataHandlerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     public function checkValueForInputConvertsNullToEmptyString()
     {
         $previousLanguageService = $GLOBALS['LANG'];
-        $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Lang\LanguageService::class);
+        $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
         $GLOBALS['LANG']->init('default');
         $expectedResult = ['value' => ''];
         $this->assertSame($expectedResult, $this->subject->_call('checkValueForInput', null, ['type' => 'string', 'max' => 40], 'tt_content', 'NEW55c0e67f8f4d32.04974534', 89, 'table_caption'));
index 62df519..09cb5dc 100644 (file)
@@ -146,7 +146,7 @@ class FormProtectionFactoryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
             ->method('enqueue')
             ->with($this->isInstanceOf(\TYPO3\CMS\Core\Messaging\FlashMessage::class))
             ->will($this->returnCallback([$this, 'enqueueAjaxFlashMessageCallback']));
-        $languageServiceMock = $this->createMock(\TYPO3\CMS\Lang\LanguageService::class);
+        $languageServiceMock = $this->createMock(\TYPO3\CMS\Core\Localization\LanguageService::class);
         $languageServiceMock->expects($this->once())->method('sL')->will($this->returnValue('foo'));
 
         FormProtectionFactory::getMessageClosure($languageServiceMock, $flashMessageQueueMock, true)->__invoke();
index e0b410f..3a7b024 100644 (file)
@@ -33,7 +33,7 @@ class ExtendedFileUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
      */
     protected function setUp()
     {
-        $GLOBALS['LANG'] = $this->getMockBuilder(\TYPO3\CMS\Lang\LanguageService::class)
+        $GLOBALS['LANG'] = $this->getMockBuilder(\TYPO3\CMS\Core\Localization\LanguageService::class)
             ->setMethods(['sL'])
             ->getMock();
     }
index 3f0fb77..e623c99 100644 (file)
@@ -19,11 +19,11 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Backend\View\BackendTemplateView;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Cshmanual\Domain\Repository\TableManualRepository;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Main help module controller
index 2631f27..d283e4f 100644 (file)
@@ -408,7 +408,7 @@ class TableManualRepository
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index e1492c7..c308539 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Documentation\Controller;
  */
 
 use TYPO3\CMS\Backend\View\BackendTemplateView;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Documentation\Domain\Repository\DocumentRepository;
@@ -25,7 +26,6 @@ use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\Extbase\SignalSlot\Dispatcher;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Main controller of the Documentation module.
index 99647c7..fb39294 100644 (file)
@@ -287,7 +287,7 @@ class LocalizationUtility
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected static function getLanguageService()
     {
index c229f29..e1215ce 100644 (file)
@@ -218,7 +218,7 @@ class ConfigurationController extends AbstractModuleController
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 751a323..2f41e33 100644 (file)
@@ -13,8 +13,8 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Extbase\Mvc\View\JsonView;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Controller for actions relating to update of full extension list from TER
index e694c2f..3ea1602 100644 (file)
@@ -50,7 +50,7 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface
     protected $listUtility = null;
 
     /**
-     * @var \TYPO3\CMS\Lang\LanguageService
+     * @var \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected $languageService = null;
 
@@ -62,7 +62,7 @@ class ExtensionStatus implements \TYPO3\CMS\Reports\StatusProviderInterface
         $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $this->repositoryRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class);
         $this->listUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
-        $this->languageService = $this->objectManager->get(\TYPO3\CMS\Lang\LanguageService::class);
+        $this->languageService = $this->objectManager->get(\TYPO3\CMS\Core\Localization\LanguageService::class);
         $this->languageService->includeLLFile('EXT:extensionmanager/Resources/Private/Language/locallang.xlf');
     }
 
index e0835cb..e3a09df 100644 (file)
@@ -35,7 +35,7 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
     protected $installUtility;
 
     /**
-     * @var \TYPO3\CMS\Lang\LanguageService
+     * @var \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected $languageService;
 
@@ -56,9 +56,9 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
-     * @param \TYPO3\CMS\Lang\LanguageService $languageService
+     * @param \TYPO3\CMS\Core\Localization\LanguageService $languageService
      */
-    public function injectLanguageService(\TYPO3\CMS\Lang\LanguageService $languageService)
+    public function injectLanguageService(\TYPO3\CMS\Core\Localization\LanguageService $languageService)
     {
         $this->languageService = $languageService;
     }
index 2095e88..ac1fcfd 100644 (file)
@@ -43,7 +43,7 @@ class UpdateFromTerControllerTest extends \TYPO3\TestingFramework\Core\Unit\Unit
     protected $repositoryHelperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Lang\LanguageService
+     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Localization\LanguageService
      */
     protected $languageServiceMock;
 
@@ -56,7 +56,7 @@ class UpdateFromTerControllerTest extends \TYPO3\TestingFramework\Core\Unit\Unit
             ->getMock();
         $this->extensionRepositoryMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, [], [$this->mockObjectManager]);
         $this->repositoryHelperMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class, ['updateExtList'], [], '', false);
-        $this->languageServiceMock = $this->getMockBuilder(\TYPO3\CMS\Lang\LanguageService::class)
+        $this->languageServiceMock = $this->getMockBuilder(\TYPO3\CMS\Core\Localization\LanguageService::class)
             ->setMethods(['__none'])
             ->getMock();
     }
index 8128eb4..d2f841b 100644 (file)
@@ -30,7 +30,7 @@ class ExtensionStatusTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     protected $mockRepositoryRepository;
 
     /**
-     * @var \TYPO3\CMS\Lang\LanguageService
+     * @var \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected $mockLanguageService;
 
@@ -44,7 +44,7 @@ class ExtensionStatusTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
         $this->mockRepositoryRepository = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class)
             ->setConstructorArgs([$this->mockObjectManager])
             ->getMock();
-        $this->mockLanguageService = $this->createMock(\TYPO3\CMS\Lang\LanguageService::class);
+        $this->mockLanguageService = $this->createMock(\TYPO3\CMS\Core\Localization\LanguageService::class);
     }
 
     /**
index fc75558..5aa43e4 100644 (file)
@@ -138,7 +138,7 @@ class FileHandlingUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest
         $this->expectException(ExtensionManagerException::class);
         $this->expectExceptionCode(1337280417);
         $fileHandlerMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, ['removeDirectory', 'addDirectory']);
-        $languageServiceMock = $this->getMockBuilder(\TYPO3\CMS\Lang\LanguageService::class)->getMock();
+        $languageServiceMock = $this->getMockBuilder(\TYPO3\CMS\Core\Localization\LanguageService::class)->getMock();
         $fileHandlerMock->_set('languageService', $languageServiceMock);
         $fileHandlerMock->_call('makeAndClearExtensionDir', 'testing123', 'fakepath');
     }
index e88c11e..46b65ad 100644 (file)
@@ -55,7 +55,7 @@ class FrontendEditAssetLoader
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 5add445..9e25d2a 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Felogin\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class ContentVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 9eb0ce4..5a41e13 100644 (file)
@@ -663,7 +663,7 @@ class FileListController extends ActionController
     /**
      * Returns an instance of LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index cb24744..56dd458 100644 (file)
@@ -309,7 +309,7 @@ class FileFacade
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index d6a3fc3..bce7459 100644 (file)
@@ -1107,7 +1107,7 @@ class FileList extends AbstractRecordList
     /**
      * Returns an instance of LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index a4f7891..fd92a4a 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Filemetadata\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class FileMetadataVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 6f3c632..0ecf432 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\FluidStyledContent\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class ContentVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 3820a59..2ad764c 100644 (file)
@@ -20,6 +20,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Backend\View\BackendTemplateView;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\TemplateView;
@@ -28,7 +29,6 @@ use TYPO3\CMS\Form\Domain\Exception\RenderingException;
 use TYPO3\CMS\Form\Domain\Factory\ArrayFormFactory;
 use TYPO3\CMS\Form\Mvc\Persistence\Exception\PersistenceManagerException;
 use TYPO3\CMS\Form\Service\TranslationService;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * The form editor controller
index 46cb2fb..42035ba 100644 (file)
@@ -23,6 +23,7 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
@@ -30,7 +31,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\View\JsonView;
 use TYPO3\CMS\Form\Exception as FormException;
 use TYPO3\CMS\Form\Service\TranslationService;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * The form manager controller
index 565e8a6..2ad809d 100644 (file)
@@ -17,12 +17,12 @@ namespace TYPO3\CMS\Form\Hooks;
 
 use TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInterface;
 use TYPO3\CMS\Core\Error\Exception;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Extbase\Service\FlexFormService;
 use TYPO3\CMS\Form\Mvc\Configuration\Exception\ParseErrorException;
 use TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Contains a preview rendering for the page module of CType="form_formframework"
index bf42a14..37a53f0 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Form\Service;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Localization\Locales;
 use TYPO3\CMS\Core\Localization\LocalizationFactory;
 use TYPO3\CMS\Core\SingletonInterface;
@@ -26,7 +27,6 @@ use TYPO3\CMS\Form\Domain\Model\FormElements\FormElementInterface;
 use TYPO3\CMS\Form\Domain\Model\Renderable\RootRenderableInterface;
 use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Advanced translations
index c54ad20..d71a003 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Form\Tests\Unit\Mvc\Service;
  */
 
 use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Localization\LanguageStore;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
@@ -22,7 +23,6 @@ use TYPO3\CMS\Form\Domain\Model\FormElements\GenericFormElement;
 use TYPO3\CMS\Form\Domain\Model\FormElements\Page;
 use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
 use TYPO3\CMS\Form\Service\TranslationService;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index 8823cb3..2dcb1d2 100644 (file)
@@ -446,7 +446,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index dc81c30..66b650f 100644 (file)
@@ -36,7 +36,7 @@ class TableColumnHooks
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 07345a9..89a32b0 100644 (file)
@@ -14,11 +14,11 @@ namespace TYPO3\CMS\Frontend\Utility;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Tools for scripts using the eID feature of the TYPO3 Frontend.
index ceacb5d..e926966 100644 (file)
@@ -1038,7 +1038,7 @@ class AdminPanelView
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 473c579..05e110d 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Frontend\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class BackendLayoutVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 17afa29..da8fdf7 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Frontend\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class ContentVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 54337eb..dba4ab2 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Frontend\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class DomainVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index d855018..7774142 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Frontend\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class FrontendGroupsVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index ae9e27a..8fab0a4 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Frontend\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class FrontendUsersVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 8b9bb84..9fd56e3 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Core\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Page\PageRepository;
-use TYPO3\CMS\Lang\LanguageService;
 
 class PagesLanguageOverlayVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index be2ad92..e95e897 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Frontend\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class TemplateVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 05ff864..36f498f 100644 (file)
@@ -13,9 +13,9 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\View;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Test case
index e5bd0f4..e563ae9 100644 (file)
@@ -216,7 +216,7 @@ class PageFunctionsController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 1b4d49c..462f44c 100644 (file)
@@ -27,6 +27,7 @@ use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Resource\DuplicationBehavior;
@@ -42,7 +43,6 @@ use TYPO3\CMS\Impexp\Domain\Repository\PresetRepository;
 use TYPO3\CMS\Impexp\Export;
 use TYPO3\CMS\Impexp\Import;
 use TYPO3\CMS\Impexp\View\ExportPageTreeView;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Main script class for the Import / Export facility
index 7388b25..95f584a 100644 (file)
@@ -18,6 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\Exception\InsufficientFolderAccessPermissionsException;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\DebugUtility;
@@ -26,7 +27,6 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\File\ExtendedFileUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * EXAMPLE for using the impexp-class for exporting stuff:
index fa11bd4..7397df7 100644 (file)
@@ -18,6 +18,7 @@ use TYPO3\CMS\Backend\View\BackendTemplateView;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
@@ -25,7 +26,6 @@ use TYPO3\CMS\Extbase\Mvc\Web\Request as WebRequest;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\IndexedSearch\Domain\Repository\AdministrationRepository;
 use TYPO3\CMS\IndexedSearch\Indexer;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Administration controller
index d5b0e9f..c40e6c3 100644 (file)
@@ -54,7 +54,7 @@ class FileContentParser
     public $pObj;
 
     /**
-     * @var \TYPO3\CMS\Lang\LanguageService|\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
+     * @var \TYPO3\CMS\Core\Localization\LanguageService|\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
      */
     protected $langObject;
 
index 1e57f44..484ddd8 100644 (file)
@@ -53,7 +53,7 @@ class CrawlerHook
     {
         // To make sure the backend charset is available:
         if (!is_object($GLOBALS['LANG'])) {
-            $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Lang\LanguageService::class);
+            $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
             $GLOBALS['LANG']->init($GLOBALS['BE_USER']->uc['lang']);
         }
     }
index b00af13..56648fb 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\IndexedSearch\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class IndexConfigVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 52eeef5..dbfddfe 100644 (file)
@@ -41,7 +41,7 @@ class InfoModuleController extends BaseScriptClass
     protected $backendUser;
 
     /**
-     * @var \TYPO3\CMS\Lang\LanguageService
+     * @var \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected $languageService;
 
index 5a1fdd5..3e6c8e2 100644 (file)
@@ -355,7 +355,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index d2dbd52..da4c9de 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Install\Report;
  */
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Install\Service\Exception;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status;
 
 /**
index d6817cc..5d21dc5 100644 (file)
@@ -20,9 +20,9 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\DataHandling\Localization\DataMapProcessor;
 use TYPO3\CMS\Core\DataHandling\Localization\State;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Versioning\VersionState;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Migrate values for database records having columns
index aa26f5f..eb260f6 100644 (file)
@@ -312,7 +312,7 @@ class LanguageController extends ActionController
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index c6b5bf9..08fc48d 100644 (file)
@@ -217,7 +217,7 @@ class LanguageRepository
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
diff --git a/typo3/sysext/lang/Classes/LanguageService.php b/typo3/sysext/lang/Classes/LanguageService.php
deleted file mode 100644 (file)
index dc1c0bc..0000000
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-namespace TYPO3\CMS\Lang;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Localization\Locales;
-use TYPO3\CMS\Core\Localization\LocalizationFactory;
-use TYPO3\CMS\Core\Utility\ArrayUtility;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-/**
- * Contains the TYPO3 Backend Language class
- * For detailed information about how localization is handled,
- * please refer to the 'Inside TYPO3' document which describes this.
- * This class is normally instantiated as the global variable $GLOBALS['LANG']
- * It's only available in the backend and under certain circumstances in the frontend
- * @see \TYPO3\CMS\Backend\Template\DocumentTemplate
- */
-class LanguageService
-{
-    /**
-     * This is set to the language that is currently running for the user
-     *
-     * @var string
-     */
-    public $lang = 'default';
-
-    /**
-     * If TRUE, will show the key/location of labels in the backend.
-     *
-     * @var bool
-     */
-    public $debugKey = false;
-
-    /**
-     * Internal cache for read LL-files
-     *
-     * @var array
-     */
-    public $LL_files_cache = [];
-
-    /**
-     * Internal cache for ll-labels (filled as labels are requested)
-     *
-     * @var array
-     */
-    public $LL_labels_cache = [];
-
-    /**
-     * List of language dependencies for actual language. This is used for local variants of a language
-     * that depend on their "main" language, like Brazilian Portuguese or Canadian French.
-     *
-     * @var array
-     */
-    protected $languageDependencies = [];
-
-    /**
-     * LanguageService constructor.
-     */
-    public function __construct()
-    {
-        $this->debugKey = (bool)$GLOBALS['TYPO3_CONF_VARS']['BE']['languageDebug'];
-    }
-
-    /**
-     * Initializes the backend language.
-     * This is for example done in \TYPO3\CMS\Backend\Template\DocumentTemplate with lines like these:
-     * $LANG = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lang\LanguageService::class);
-     * $LANG->init($GLOBALS['BE_USER']->uc['lang']);
-     *
-     * @throws \RuntimeException
-     * @param string $languageKey The language key (two character string from backend users profile)
-     */
-    public function init($languageKey)
-    {
-        // Find the requested language in this list based on the $languageKey
-        /** @var $locales \TYPO3\CMS\Core\Localization\Locales */
-        $locales = GeneralUtility::makeInstance(Locales::class);
-        // Language is found. Configure it:
-        if (in_array($languageKey, $locales->getLocales())) {
-            // The current language key
-            $this->lang = $languageKey;
-            $this->languageDependencies[] = $languageKey;
-            foreach ($locales->getLocaleDependencies($languageKey) as $language) {
-                $this->languageDependencies[] = $language;
-            }
-        }
-    }
-
-    /**
-     * Debugs localization key.
-     *
-     * @param string $value value to debug
-     * @return string
-     */
-    public function debugLL($value)
-    {
-        return $this->debugKey ? '[' . $value . ']' : '';
-    }
-
-    /**
-     * Returns the label with key $index from the globally loaded $LOCAL_LANG array.
-     * Mostly used from modules with only one LOCAL_LANG file loaded into the global space.
-     *
-     * @param string $index Label key
-     * @return string
-     */
-    public function getLL($index)
-    {
-        return $this->getLLL($index, $GLOBALS['LOCAL_LANG']);
-    }
-
-    /**
-     * Returns the label with key $index from the $LOCAL_LANG array used as the second argument
-     *
-     * @param string $index Label key
-     * @param array $localLanguage $LOCAL_LANG array to get label key from
-     * @return string
-     */
-    public function getLLL($index, $localLanguage)
-    {
-        // Get Local Language. Special handling for all extensions that
-        // read PHP LL files and pass arrays here directly.
-        if (isset($localLanguage[$this->lang][$index])) {
-            $value = is_string($localLanguage[$this->lang][$index])
-                ? $localLanguage[$this->lang][$index]
-                : $localLanguage[$this->lang][$index][0]['target'];
-        } elseif (isset($localLanguage['default'][$index])) {
-            $value = is_string($localLanguage['default'][$index])
-                ? $localLanguage['default'][$index]
-                : $localLanguage['default'][$index][0]['target'];
-        } else {
-            $value = '';
-        }
-        return $value . $this->debugLL($index);
-    }
-
-    /**
-     * splitLabel function
-     *
-     * All translations are based on $LOCAL_LANG variables.
-     * 'language-splitted' labels can therefore refer to a local-lang file + index.
-     * Refer to 'Inside TYPO3' for more details
-     *
-     * @param string $input Label key/reference
-     * @return string
-     */
-    public function sL($input)
-    {
-        $identifier = $input . '_' . (int)$this->debugKey;
-        if (isset($this->LL_labels_cache[$this->lang][$identifier])) {
-            return $this->LL_labels_cache[$this->lang][$identifier];
-        }
-        if (strpos($input, 'LLL:') === 0) {
-            $restStr = trim(substr($input, 4));
-            $extPrfx = '';
-                // ll-file referred to is found in an extension.
-            if (strpos($restStr, 'EXT:') === 0) {
-                $restStr = trim(substr($restStr, 4));
-                $extPrfx = 'EXT:';
-            }
-            $parts = explode(':', $restStr);
-            $parts[0] = $extPrfx . $parts[0];
-                // Getting data if not cached
-            if (!isset($this->LL_files_cache[$parts[0]])) {
-                $this->LL_files_cache[$parts[0]] = $this->readLLfile($parts[0]);
-            }
-            $output = $this->getLLL($parts[1], $this->LL_files_cache[$parts[0]]);
-        } else {
-            // Use a constant non-localizable label
-            $output = $input;
-        }
-        $output .= $this->debugLL($input);
-        $this->LL_labels_cache[$this->lang][$identifier] = $output;
-        return $output;
-    }
-
-    /**
-     * Loading $TCA_DESCR[$table]['columns'] with content from locallang files
-     * as defined in $TCA_DESCR[$table]['refs']
-     * $TCA_DESCR is a global var
-     *
-     * @param string $table Table name found as key in global array $TCA_DESCR
-     */
-    public function loadSingleTableDescription($table)
-    {
-        // First the 'table' cannot already be loaded in [columns]
-            // and secondly there must be a references to locallang files available in [refs]
-        if (is_array($GLOBALS['TCA_DESCR'][$table]) && !isset($GLOBALS['TCA_DESCR'][$table]['columns']) && is_array($GLOBALS['TCA_DESCR'][$table]['refs'])) {
-            // Init $TCA_DESCR for $table-key
-            $GLOBALS['TCA_DESCR'][$table]['columns'] = [];
-                // Get local-lang for each file in $TCA_DESCR[$table]['refs'] as they are ordered.
-            foreach ($GLOBALS['TCA_DESCR'][$table]['refs'] as $llfile) {
-                $localLanguage = $this->includeLLFile($llfile, 0, 1);
-                    // Traverse all keys
-                if (is_array($localLanguage['default'])) {
-                    foreach ($localLanguage['default'] as $lkey => $lVal) {
-                        // Exploding by '.':
-                            // 0-n => fieldname,
-                            // n+1 => type from (alttitle, description, details, syntax, image_descr,image,seeAlso),
-                            // n+2 => special instruction, if any
-                        $keyParts = explode('.', $lkey);
-                        $keyPartsCount = count($keyParts);
-                            // Check if last part is special instruction
-                            // Only "+" is currently supported
-                        $specialInstruction = $keyParts[$keyPartsCount - 1] === '+';
-                        if ($specialInstruction) {
-                            array_pop($keyParts);
-                        }
-                            // If there are more than 2 parts, get the type from the last part
-                            // and merge back the other parts with a dot (.)
-                            // Otherwise just get type and field name straightaway
-                        if ($keyPartsCount > 2) {
-                            $type = array_pop($keyParts);
-                            $fieldName = implode('.', $keyParts);
-                        } else {
-                            $fieldName = $keyParts[0];
-                            $type = $keyParts[1];
-                        }
-                            // Detecting 'hidden' labels, converting to normal fieldname
-                        if ($fieldName === '_') {
-                            $fieldName = '';
-                        }
-                        if ($fieldName !== '' && $fieldName[0] === '_') {
-                            $fieldName = substr($fieldName, 1);
-                        }
-                            // Append label
-                        $label = $lVal[0]['target'] ? :
-                            $lVal[0]['source'];
-                        if ($specialInstruction) {
-                            $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] .= LF . $label;
-                        } else {
-                            // Substitute label
-                            $GLOBALS['TCA_DESCR'][$table]['columns'][$fieldName][$type] = $label;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Includes locallang file (and possibly additional localized version if configured for)
-     * Read language labels will be merged with $LOCAL_LANG (if $setGlobal = TRUE).
-     *
-     * @param string $fileRef $fileRef is a file-reference
-     * @param bool $setGlobal Setting in global variable $LOCAL_LANG (or returning the variable)
-     * @param bool $mergeLocalOntoDefault
-     * @return mixed if $setGlobal===TRUE, LL-files set $LOCAL_LANG in global scope, or array is returned from function
-     */
-    public function includeLLFile($fileRef, $setGlobal = true, $mergeLocalOntoDefault = false)
-    {
-        $globalLanguage = [];
-            // Get default file
-        $localLanguage = $this->readLLfile($fileRef);
-        if (is_array($localLanguage) && !empty($localLanguage)) {
-            // it depends on, whether we should return the result or set it in the global $LOCAL_LANG array
-            if ($setGlobal) {
-                $globalLanguage = (array)$GLOBALS['LOCAL_LANG'];
-                ArrayUtility::mergeRecursiveWithOverrule($globalLanguage, $localLanguage);
-            } else {
-                $globalLanguage = $localLanguage;
-            }
-                // Merge local onto default
-            if ($mergeLocalOntoDefault && $this->lang !== 'default' && is_array($globalLanguage[$this->lang]) && is_array($globalLanguage['default'])) {
-                // array_merge can be used so far the keys are not
-                    // numeric - which we assume they are not...
-                $globalLanguage['default'] = array_merge($globalLanguage['default'], $globalLanguage[$this->lang]);
-                unset($globalLanguage[$this->lang]);
-            }
-        }
-            // Return value if not global is set.
-        if (!$setGlobal) {
-            return $globalLanguage;
-        } else {
-            $GLOBALS['LOCAL_LANG'] = $globalLanguage;
-            return null;
-        }
-    }
-
-    /**
-     * Includes a locallang file and returns the $LOCAL_LANG array found inside.
-     *
-     * @param string $fileRef Input is a file-reference to be a 'local_lang' file containing a $LOCAL_LANG array
-     * @return array value of $LOCAL_LANG found in the included file, empty if non found
-     */
-    protected function readLLfile($fileRef)
-    {
-        /** @var $languageFactory LocalizationFactory */
-        $languageFactory = GeneralUtility::makeInstance(LocalizationFactory::class);
-
-        if ($this->lang !== 'default') {
-            $languages = array_reverse($this->languageDependencies);
-        } else {
-            $languages = ['default'];
-        }
-        $localLanguage = [];
-        foreach ($languages as $language) {
-            $tempLL = $languageFactory->getParsedData($fileRef, $language);
-            $localLanguage['default'] = $tempLL['default'];
-            if (!isset($localLanguage[$this->lang])) {
-                $localLanguage[$this->lang] = $localLanguage['default'];
-            }
-            if ($this->lang !== 'default' && isset($tempLL[$language])) {
-                // Merge current language labels onto labels from previous language
-                    // This way we have a labels with fall back applied
-                ArrayUtility::mergeRecursiveWithOverrule($localLanguage[$this->lang], $tempLL[$language], true, false);
-            }
-        }
-        return $localLanguage;
-    }
-
-    /**
-     * Gets labels with a specific fetched from the current locallang file.
-     * This is useful for e.g gathering javascript labels.
-     *
-     * @param string $prefix Prefix to select the correct labels
-     * @param string $strip Sub-prefix to be removed from label names in the result
-     * @return array Processed labels
-     */
-    public function getLabelsWithPrefix($prefix, $strip = '')
-    {
-        $extraction = [];
-        $labels = array_merge((array)$GLOBALS['LOCAL_LANG']['default'], (array)$GLOBALS['LOCAL_LANG'][$this->lang]);
-        // Regular expression to strip the selection prefix and possibly something from the label name:
-        $labelPattern = '#^' . preg_quote($prefix, '#') . '(' . preg_quote($strip, '#') . ')?#';
-        // Iterate through all locallang labels:
-        foreach ($labels as $label => $value) {
-            if (strpos($label, $prefix) === 0) {
-                $key = preg_replace($labelPattern, '', $label);
-                $extraction[$key] = $value;
-            }
-        }
-        return $extraction;
-    }
-}
index 5daffac..a719a27 100644 (file)
@@ -20,8 +20,8 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryHelper;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Html\HtmlParser;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * This class provides Processing plugin implementation
index 38c7bea..1202fc6 100644 (file)
@@ -13,7 +13,7 @@ namespace TYPO3\CMS\Linkvalidator\Linktype;
  *
  * The TYPO3 project - inspiring people to share!
  */
-use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 
 /**
  * This class provides Check Base plugin implementation
index 7acc823..bfe29b2 100644 (file)
@@ -750,7 +750,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 0573ced..0de4b10 100644 (file)
@@ -15,13 +15,13 @@ namespace TYPO3\CMS\Linkvalidator\Task;
  */
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Mail\MailMessage;
 use TYPO3\CMS\Core\Service\MarkerBasedTemplateService;
 use TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MailUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Linkvalidator\LinkAnalyzer;
 use TYPO3\CMS\Scheduler\Task\AbstractTask;
 
index 18f3ff1..d87bb0e 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Linkvalidator\Task;
  */
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface;
 use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
 use TYPO3\CMS\Scheduler\Task\AbstractTask;
index 5bd0621..f1b277f 100644 (file)
@@ -20,9 +20,9 @@ use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Base class for element browsers
index d96b6ee..dcabce2 100644 (file)
@@ -21,9 +21,9 @@ use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Service\DependencyOrderingService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Recordlist\LinkHandler\LinkHandlerInterface;
 
 /**
index 2a69adc..7fe9687 100644 (file)
@@ -19,8 +19,8 @@ use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Recordlist\Browser\ElementBrowserInterface;
 
 /**
index 6722d62..48690b2 100644 (file)
@@ -18,9 +18,9 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Script Class, putting the frameset together.
index 88eb34a..c09fe39 100644 (file)
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Recordlist\LinkHandler;
 
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Recordlist\Controller\AbstractLinkBrowserController;
 
 /**
index c284be0..60bb03d 100644 (file)
@@ -26,13 +26,13 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Type\Bitmask\Permission;
 use TYPO3\CMS\Core\TypoScript\TypoScriptService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Script Class for the Web > List module; rendering the listing of records on a page
index 15d1eae..79fe7a6 100644 (file)
@@ -16,10 +16,10 @@ namespace TYPO3\CMS\Recordlist\View;
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\Folder;
 use TYPO3\CMS\Core\Resource\OnlineMedia\Helpers\OnlineMediaHelperRegistry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Recordlist\Tree\View\LinkParameterProviderInterface;
 
 /**
index 9b93d1f..7c25727 100644 (file)
@@ -113,7 +113,7 @@ class DeletedRecordsController
     /**
      * Returns an instance of LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index c6b42cb..0a1fcbb 100644 (file)
@@ -175,7 +175,7 @@ class RecyclerAjaxController
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 33ce50e..dfc84e1 100644 (file)
@@ -224,7 +224,7 @@ class RecyclerModuleController extends ActionController
     /**
      * Returns an instance of LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 63a5300..c7e91ea 100644 (file)
@@ -83,7 +83,7 @@ class Tables
     /**
      * Returns an instance of LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index b0d9b37..a7af82f 100644 (file)
@@ -203,7 +203,7 @@ class CleanerFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProvid
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 1bec478..51b2004 100644 (file)
@@ -242,7 +242,7 @@ class CleanerTask extends AbstractTask
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index f16cc71..a1e8984 100644 (file)
@@ -219,7 +219,7 @@ class RecyclerUtility
     /**
      * Returns an instance of LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected static function getLanguageService()
     {
index c193039..33037c9 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Recycler\Tests\Unit\Task;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Recycler\Task\CleanerFieldProvider;
 use TYPO3\CMS\Recycler\Task\CleanerTask;
 use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
index d600863..36f1cf8 100644 (file)
@@ -15,10 +15,10 @@ namespace TYPO3\CMS\Reports\Controller;
  */
 use TYPO3\CMS\Backend\View\BackendTemplateView;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\ReportInterface;
 
 /**
index 5ec5525..cbc441b 100644 (file)
@@ -17,12 +17,12 @@ namespace TYPO3\CMS\Reports\Report\Status;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessageService;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status as ReportStatus;
 use TYPO3\CMS\Reports\StatusProviderInterface;
 
index 5695db6..dea40df 100644 (file)
@@ -16,9 +16,9 @@ namespace TYPO3\CMS\Reports\Report\Status;
 
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\StorageRepository;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status as ReportStatus;
 use TYPO3\CMS\Reports\StatusProviderInterface;
 
index d38112a..12cd429 100644 (file)
@@ -17,10 +17,10 @@ namespace TYPO3\CMS\Reports\Report\Status;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\TypoScript\ConfigurationForm;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status as ReportStatus;
 use TYPO3\CMS\Reports\StatusProviderInterface;
 use TYPO3\CMS\Saltedpasswords\Salt\SaltFactory;
index 2df473b..5134dba 100644 (file)
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\ExtendedStatusProviderInterface;
 use TYPO3\CMS\Reports\ReportInterface;
 use TYPO3\CMS\Reports\Status as ReportStatus;
index c5b79ff..a36f519 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status as ReportStatus;
 use TYPO3\CMS\Reports\StatusProviderInterface;
 
index 5342535..2b239ff 100644 (file)
@@ -13,9 +13,9 @@ namespace TYPO3\CMS\Reports\Report\Status;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status as ReportStatus;
 use TYPO3\CMS\Reports\StatusProviderInterface;
 
index 68573e1..8eac17e 100644 (file)
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * The TYPO3 project - inspiring people to share!
  */
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status as ReportStatus;
 
 /**
index e969f2a..a6e9c4f 100644 (file)
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Reports\Task;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Mail\MailMessage;
 use TYPO3\CMS\Core\Registry;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Status;
 use TYPO3\CMS\Scheduler\Task\AbstractTask;
 
index c13b5de..89dba34 100644 (file)
@@ -13,9 +13,9 @@ namespace TYPO3\CMS\Reports\Task;
  *
  * The TYPO3 project - inspiring people to share!
  */
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface;
 use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
 use TYPO3\CMS\Scheduler\Task\AbstractTask;
index 8a022a3..e37730f 100644 (file)
@@ -24,7 +24,7 @@ class Typo3StatusTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['LANG'] = $this->createMock(\TYPO3\CMS\Lang\LanguageService::class);
+        $GLOBALS['LANG'] = $this->createMock(\TYPO3\CMS\Core\Localization\LanguageService::class);
     }
 
     /**
index c8900dc..e15fb34 100644 (file)
@@ -57,7 +57,7 @@ class BackendWarnings
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 16a9c2e..5ff6e5e 100644 (file)
@@ -18,9 +18,9 @@ namespace TYPO3\CMS\RteCKEditor\Controller;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Configuration\Richtext;
 use TYPO3\CMS\Core\LinkHandling\LinkService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Recordlist\Controller\AbstractLinkBrowserController;
 
 /**
index 472e926..f9fe36f 100644 (file)
@@ -431,7 +431,7 @@ class ExtensionManagerConfigurationUtility
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 5ee83bb..0c573ec 100644 (file)
@@ -196,7 +196,7 @@ class FileStorageExtractionAdditionalFieldProvider implements AdditionalFieldPro
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index d15f268..2d1658c 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Scheduler\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class TaskGroupVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 70f9b18..d4a710a 100644 (file)
@@ -1084,7 +1084,7 @@ class SetupModuleController extends AbstractModule
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 0b08130..e6c1e44 100644 (file)
@@ -229,7 +229,7 @@ class ServicesListReport implements ReportInterface
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 3c9980d..d33e4e4 100644 (file)
@@ -17,9 +17,9 @@ namespace TYPO3\sv\Tests\Unit\Report;
 
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Reports\Controller\ReportController;
 use TYPO3\CMS\Sv\Report\ServicesListReport;
 
index da703e1..2b6e1c7 100644 (file)
@@ -1049,7 +1049,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index ca6bc3e..73db2df 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\SysAction\Tests\Functional\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class ActionVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 86b6757..ab6404b 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\SysNote\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class NoteVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 88cfd51..b0db16c 100644 (file)
@@ -16,11 +16,11 @@ namespace TYPO3\CMS\T3editor\Form\Element;
 
 use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\T3editor\T3editor;
 
 /**
index e554104..6ba9c2d 100644 (file)
@@ -481,7 +481,7 @@ class TaskModuleController extends BaseScriptClass
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 391e30c..242c080 100644 (file)
@@ -17,12 +17,12 @@ namespace TYPO3\CMS\Tstemplate\Controller;
 use TYPO3\CMS\Backend\Module\AbstractFunctionModule;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\TypoScript\ExtendedTemplateService;
 use TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\HttpUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * This class displays the Info/Modify screen of the Web > Template module
index bb854a4..1bd3712 100644 (file)
@@ -21,11 +21,11 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Database\ReferenceIndex;
 use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Service\MarkerBasedTemplateService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Versioning\VersionState;
-use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * Contains some parts for staging, versioning and workspaces
@@ -621,8 +621,8 @@ class DataHandlerHook
                     if (!isset($languageObjects[$recipientLanguage])) {
                         // a LANG object in this language hasn't been
                         // instantiated yet, so this is done here
-                        /** @var $languageObject \TYPO3\CMS\Lang\LanguageService */
-                        $languageObject = GeneralUtility::makeInstance(\TYPO3\CMS\Lang\LanguageService::class);
+                        /** @var $languageObject \TYPO3\CMS\Core\Localization\LanguageService */
+                        $languageObject = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageService::class);
                         $languageObject->init($recipientLanguage);
                         $languageObjects[$recipientLanguage] = $languageObject;
                     } else {
index cc8d6a8..f107b79 100644 (file)
@@ -337,7 +337,7 @@ class ViewModuleController extends ActionController
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 174cecf..0250b9a 100644 (file)
@@ -192,7 +192,7 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index ea8fcc7..c2039a0 100644 (file)
@@ -147,7 +147,7 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu
     /**
      * Returns LanguageService
      *
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 2c27af8..1b530aa 100644 (file)
@@ -148,7 +148,7 @@ class AbstractController extends ActionController
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index da62bcc..079b4a8 100644 (file)
@@ -239,7 +239,7 @@ class PreviewController extends AbstractController
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 2f146cf..79df01f 100644 (file)
@@ -21,6 +21,7 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Html\RteHtmlParser;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Utility\DiffUtility;
@@ -28,7 +29,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3\CMS\Lang\LanguageService;
 use TYPO3\CMS\Workspaces\Service\GridDataService;
 use TYPO3\CMS\Workspaces\Service\HistoryService;
 use TYPO3\CMS\Workspaces\Service\StagesService;
index 2ffb5dd..22279a1 100644 (file)
@@ -271,7 +271,7 @@ class ReviewController extends AbstractController
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index eaa289a..24e1611 100644 (file)
@@ -58,7 +58,7 @@ abstract class AbstractRecord
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected static function getLanguageService()
     {
index 1f2b304..8f64270 100644 (file)
@@ -175,7 +175,7 @@ class HistoryService implements \TYPO3\CMS\Core\SingletonInterface
     }
 
     /**
-     * @return \TYPO3\CMS\Lang\LanguageService
+     * @return \TYPO3\CMS\Core\Localization\LanguageService
      */
     protected function getLanguageService()
     {
index 6059cd9..73aaaa7 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Workspaces\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class WorkspaceStageVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
index 6137754..60d8632 100644 (file)
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Workspaces\Tests\Unit\Tca;
  */
 
 use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
+use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Lang\LanguageService;
 
 class WorkspaceVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {