From 358645969d6c2d700f15f791bd0633b6216ffe39 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 26 Jan 2025 16:44:07 +0100
Subject: [PATCH] TASK: Replace leftover usages of <I18n /> if possible

---
 .../Drawer/UserDropDown/RestoreButtonItem.js  | 10 +---
 .../Containers/Drawer/UserDropDown/index.js   |  6 +--
 .../src/Containers/Modals/InsertMode/index.js | 53 +++++--------------
 .../Modals/KeyboardShortcutModal/index.js     |  8 +--
 .../Modals/NodeCreationDialog/index.js        |  2 +-
 .../Modals/NodeVariantCreationDialog/index.js | 10 ++--
 6 files changed, 30 insertions(+), 59 deletions(-)

diff --git a/packages/neos-ui/src/Containers/Drawer/UserDropDown/RestoreButtonItem.js b/packages/neos-ui/src/Containers/Drawer/UserDropDown/RestoreButtonItem.js
index fa987c633a..80b80e9b52 100644
--- a/packages/neos-ui/src/Containers/Drawer/UserDropDown/RestoreButtonItem.js
+++ b/packages/neos-ui/src/Containers/Drawer/UserDropDown/RestoreButtonItem.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import {Icon} from '@neos-project/react-ui-components';
 import {connect} from 'react-redux';
 import {actions} from '@neos-project/neos-ui-redux-store';
-import I18n, {translate} from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import buttonTheme from './style.module.css';
 
@@ -39,13 +39,7 @@ export default class RestoreButtonItem extends React.PureComponent {
                         aria-hidden="true"
                         className={buttonTheme.dropDown__itemIcon}
                     />
-                    <I18n
-                        id="impersonate.label.restoreUserButton"
-                        sourceName="Main"
-                        packageKey="Neos.Neos"
-                        fallback={`Back to user "${originUser.fullName}"`}
-                        params={{0: originUser.fullName}}
-                    />
+                    {translate('Neos.Neos:Main:impersonate.label.restoreUserButton', 'Back to user "{0}"', {0: originUser.fullName})}
                 </button>
             </li>
         ) : null);
diff --git a/packages/neos-ui/src/Containers/Drawer/UserDropDown/index.js b/packages/neos-ui/src/Containers/Drawer/UserDropDown/index.js
index 18efa136ab..c576700985 100644
--- a/packages/neos-ui/src/Containers/Drawer/UserDropDown/index.js
+++ b/packages/neos-ui/src/Containers/Drawer/UserDropDown/index.js
@@ -7,7 +7,7 @@ import {Icon, DropDown} from '@neos-project/react-ui-components';
 import UserImage from './UserImage';
 import RestoreButtonItem from './RestoreButtonItem';
 
-import I18n from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import style from './style.module.css';
 @connect(state => ({
@@ -36,7 +36,7 @@ export default class UserDropDown extends PureComponent {
                         <li className={style.dropDown__item}>
                             <a title="User Settings" href={userSettingsUri}>
                                 <Icon icon="wrench" aria-hidden="true" className={style.dropDown__itemIcon}/>
-                                <I18n id="userSettings.label" sourceName="Modules" packageKey="Neos.Neos" fallback="User Settings"/>
+                                {translate('Neos.Neos:Modules:userSettings.label', 'User Settings')}
                             </a>
                         </li>
                         <li className={style.dropDown__item}>
@@ -44,7 +44,7 @@ export default class UserDropDown extends PureComponent {
                                 <input type="hidden" name="__csrfToken" value={csrfToken}/>
                                 <button onClick={e => e.stopPropagation()} type="submit" name="" value="logout">
                                     <Icon icon="sign-out-alt" aria-hidden="true" className={style.dropDown__itemIcon}/>
-                                    <I18n id="logout" sourceName="Main" packageKey="Neos.Neos" fallback="Logout"/>
+                                    {translate('Neos.Neos:Main:logout', 'Logout')}
                                 </button>
                             </form>
                         </li>
diff --git a/packages/neos-ui/src/Containers/Modals/InsertMode/index.js b/packages/neos-ui/src/Containers/Modals/InsertMode/index.js
index 2ecf952785..f85057d592 100644
--- a/packages/neos-ui/src/Containers/Modals/InsertMode/index.js
+++ b/packages/neos-ui/src/Containers/Modals/InsertMode/index.js
@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 import {neos} from '@neos-project/neos-ui-decorators';
 
 import {Button, Dialog, Icon} from '@neos-project/react-ui-components';
-import I18n, {translate} from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import {InsertModeSelector} from '@neos-project/neos-ui-containers';
 
@@ -81,41 +81,22 @@ export default class InsertModeModal extends PureComponent {
 
     renderTitle() {
         const {subjectContextPaths, referenceContextPath, operationType} = this.props;
-
+        const parameters = {
+            source: this.renderNodeLabel(subjectContextPaths),
+            target: this.renderNodeLabel([referenceContextPath])
+        };
+
+        let label = '';
+        if (operationType === actionTypes.CR.Nodes.COPY) {
+            label = translate('Neos.Neos:Main:copy__from__to--title', '', parameters);
+        } else if (operationType === actionTypes.CR.Nodes.CUT || operationType === actionTypes.CR.Nodes.MOVE) {
+            label = translate('Neos.Neos:Main:move__from__to--title', '', parameters);
+        }
         return (
             <div>
                 <Icon icon="clipboard"/>
                 <span className={style.modalTitle}>
-                    {operationType === actionTypes.CR.Nodes.COPY &&
-                        <I18n
-                            key="copy"
-                            id="Neos.Neos:Main:copy__from__to--title"
-                            params={{
-                                source: this.renderNodeLabel(subjectContextPaths),
-                                target: this.renderNodeLabel([referenceContextPath])
-                            }}
-                            />
-                    }
-                    {operationType === actionTypes.CR.Nodes.CUT &&
-                        <I18n
-                            key="move"
-                            id="Neos.Neos:Main:move__from__to--title"
-                            params={{
-                                source: this.renderNodeLabel(subjectContextPaths),
-                                target: this.renderNodeLabel([referenceContextPath])
-                            }}
-                            />
-                    }
-                    {operationType === actionTypes.CR.Nodes.MOVE &&
-                        <I18n
-                            key="move"
-                            id="Neos.Neos:Main:move__from__to--title"
-                            params={{
-                                source: this.renderNodeLabel(subjectContextPaths),
-                                target: this.renderNodeLabel([referenceContextPath])
-                            }}
-                            />
-                    }
+                    {label}
                 </span>
             </div>
         );
@@ -173,13 +154,7 @@ export default class InsertModeModal extends PureComponent {
                 >
                 <div className={style.modalContents}>
                     <p>
-                        <I18n
-                            id="Neos.Neos:Main:copy__from__to--description"
-                            params={{
-                                source: this.renderNodeLabel(subjectContextPaths),
-                                target: this.renderNodeLabel([referenceContextPath])
-                            }}
-                            />
+                        {translate('Neos.Neos:Main:copy__from__to--description', '', {source: this.renderNodeLabel(subjectContextPaths), target: this.renderNodeLabel([referenceContextPath])})}
                     </p>
                     <InsertModeSelector
                         mode={this.state.mode}
diff --git a/packages/neos-ui/src/Containers/Modals/KeyboardShortcutModal/index.js b/packages/neos-ui/src/Containers/Modals/KeyboardShortcutModal/index.js
index 3f26ad6983..fa6b5bd921 100644
--- a/packages/neos-ui/src/Containers/Modals/KeyboardShortcutModal/index.js
+++ b/packages/neos-ui/src/Containers/Modals/KeyboardShortcutModal/index.js
@@ -4,7 +4,7 @@ import {connect} from 'react-redux';
 
 import {neos} from '@neos-project/neos-ui-decorators';
 import {actions} from '@neos-project/neos-ui-redux-store';
-import I18n, {translate} from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import {Dialog, Button} from '@neos-project/react-ui-components';
 import style from './style.module.css';
@@ -26,7 +26,7 @@ class KeyboardShortcutModal extends PureComponent {
     renderShortcut = ({id, description, keys}) => (
         <div key={id} className={style.keyboardShortcut}>
             <div className={style.keyboardShortcut__label}>
-                <I18n id={`Neos.Neos.Ui:Main:Shortcut__${id}`} fallback={description} />
+                {translate(`Neos.Neos.Ui:Main:Shortcut__${id}`, description)}
             </div>
             <div className={style.keyboardShortcut__keys}>{keys}</div>
         </div>
@@ -52,12 +52,12 @@ class KeyboardShortcutModal extends PureComponent {
         return (
             <Dialog
                 actions={[this.renderCloseAction()]}
-                title={<I18n fallback="Keyboard Shortcuts" />}
+                title="Keyboard Shortcuts"
                 isOpen={isOpen}
                 onRequestClose={() => close()}
                 >
                 <div className={style.keyboardShortcutIntroText}>
-                    <I18n id={`Neos.Neos.Ui:Main:Shortcut__Introduction`} fallback={''} />
+                    {translate('Neos.Neos.Ui:Main:Shortcut__Introduction')}
                 </div>
                 <div className={style.keyboardShortcutList}>
                     {hotkeyRegistry.getAllAsList().map(key => this.renderShortcut(key))}
diff --git a/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js b/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js
index 514ba359ab..7f266041ea 100644
--- a/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js
+++ b/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js
@@ -220,7 +220,7 @@ export default class NodeCreationDialog extends PureComponent {
 
         return (
             <span>
-                <I18n fallback="Create new" id="createNew"/>&nbsp;
+                {translate('Neos.Neos:Main:createNew', 'Create new')}&nbsp;
                 <I18n id={label} fallback={label}/>
             </span>
         );
diff --git a/packages/neos-ui/src/Containers/Modals/NodeVariantCreationDialog/index.js b/packages/neos-ui/src/Containers/Modals/NodeVariantCreationDialog/index.js
index d577cae831..3ade0e2dc4 100644
--- a/packages/neos-ui/src/Containers/Modals/NodeVariantCreationDialog/index.js
+++ b/packages/neos-ui/src/Containers/Modals/NodeVariantCreationDialog/index.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 
 import {Button, Dialog} from '@neos-project/react-ui-components';
-import I18n, {translate} from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import {selectors, actions} from '@neos-project/neos-ui-redux-store';
 import {neos} from '@neos-project/neos-ui-decorators';
@@ -147,14 +147,16 @@ export default class NodeVariantCreationDialog extends PureComponent {
                 >
                 <div className={style.modalContents}>
                     <div>
-                        <I18n id="Neos.Neos:Main:content.dimension.createDialog.nodeTypeDoesNotExistInDimension" fallback="TODO" params={i18nParams}/>
+                        {translate('Neos.Neos:Main:content.dimension.createDialog.nodeTypeDoesNotExistInDimension', '', i18nParams)}
                     </div>
 
                     <div>
-                        <I18n id="Neos.Neos:Main:content.dimension.createDialog.createEmptyOrCopy" fallback="TODO" params={i18nParams}/>
+                        {translate('Neos.Neos:Main:content.dimension.createDialog.createEmptyOrCopy', '', i18nParams)}
                     </div>
                     {numberOfParentNodesToBeCreated > 0 ?
-                        <div><I18n id="Neos.Neos:Main:content.dimension.createDialog.existingAncestorDocuments" fallback="TODO" params={{numberOfNodesMissingInRootline: numberOfParentNodesToBeCreated}}/></div> : null
+                        <div>
+                            {translate('Neos.Neos:Main:content.dimension.createDialog.existingAncestorDocuments', '', {numberOfNodesMissingInRootline: numberOfParentNodesToBeCreated})}
+                        </div> : null
                     }
                 </div>
             </Dialog>