From 08857156e6df8dd9b7063d57de5eeae2f1336e1e Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 26 Jan 2025 16:25:35 +0100
Subject: [PATCH] TASK: Replace usages of <I18n /> with only one parameter

Also appends Neos.Neos:Main if necessary, which was forgotten in:

05fe5f8e214ec42da43f3d6c46ade2c027220e95
---
 .../neos-ui-containers/src/InsertModeSelector/index.js    | 4 ++--
 .../src/Editors/Image/Components/ResizeControls/index.js  | 4 ++--
 .../neos-ui-editors/src/Editors/SelectBox/index.spec.js   | 2 +-
 .../src/Editors/SelectBox/selectBoxHelpers.spec.ts        | 2 +-
 packages/neos-ui-validators/src/Count/index.tsx           | 4 ++--
 packages/neos-ui-validators/src/NumberRange/index.tsx     | 4 ++--
 packages/neos-ui-views/src/Data/DataLoader/index.js       | 4 ++--
 .../src/Containers/Modals/UnappliedChangesDialog/index.js | 8 ++++----
 .../RightSideBar/Inspector/SelectedElement/index.js       | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/neos-ui-containers/src/InsertModeSelector/index.js b/packages/neos-ui-containers/src/InsertModeSelector/index.js
index 2fd3ad9c91..84b916c024 100644
--- a/packages/neos-ui-containers/src/InsertModeSelector/index.js
+++ b/packages/neos-ui-containers/src/InsertModeSelector/index.js
@@ -2,7 +2,7 @@ import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 
 import {ButtonGroup, Button, ResourceIcon} from '@neos-project/react-ui-components';
-import I18n, {translate} from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import style from './style.module.css';
 
@@ -86,7 +86,7 @@ export default class InsertModeSelector extends PureComponent {
         return (
             <div className={style.root}>
                 <span className={style.label}>
-                    <I18n id="Neos.Neos:Main:insertMode"/>&nbsp;
+                    {translate('Neos.Neos:Main:insertMode')}&nbsp;
                 </span>
                 <ButtonGroup value={mode} onSelect={this.handleSelect} className={style.buttonGroup}>
                     <Button
diff --git a/packages/neos-ui-editors/src/Editors/Image/Components/ResizeControls/index.js b/packages/neos-ui-editors/src/Editors/Image/Components/ResizeControls/index.js
index 931d93b521..0250a9e86f 100644
--- a/packages/neos-ui-editors/src/Editors/Image/Components/ResizeControls/index.js
+++ b/packages/neos-ui-editors/src/Editors/Image/Components/ResizeControls/index.js
@@ -49,7 +49,7 @@ const ResizeControls = props => {
     return (
         <div>
             <div className={style.resizeControls__item}>
-                <div className={style.resizeControls__label}>{translate('width', 'Width')}:</div>
+                <div className={style.resizeControls__label}>{translate('Neos.Neos:Main:width', 'Width')}:</div>
                 <div className={style.resizeControls}>
                     <span className={style.resizeControls__before}>
                         <CheckBox
@@ -74,7 +74,7 @@ const ResizeControls = props => {
                 </div>
             </div>
             <div>
-                <div className={style.resizeControls__label}>{translate('height', 'Height')}:</div>
+                <div className={style.resizeControls__label}>{translate('Neos.Neos:Main:height', 'Height')}:</div>
                 <div className={style.resizeControls}>
                     <span className={style.resizeControls__before}>
                         <CheckBox
diff --git a/packages/neos-ui-editors/src/Editors/SelectBox/index.spec.js b/packages/neos-ui-editors/src/Editors/SelectBox/index.spec.js
index fa064edf5c..ba03872962 100644
--- a/packages/neos-ui-editors/src/Editors/SelectBox/index.spec.js
+++ b/packages/neos-ui-editors/src/Editors/SelectBox/index.spec.js
@@ -6,7 +6,7 @@ import TestBackend from 'react-dnd-test-backend';
 import {DndProvider as DragDropContextProvider} from 'react-dnd';
 import SelectBoxEditor from './index.js';
 import {WrapWithMockGlobalRegistry, MockDataSourceDataLoader} from '../../_lib/testUtils';
-import {setupI18n} from "@neos-project/neos-ui-i18n";
+import {setupI18n} from '@neos-project/neos-ui-i18n';
 
 const optionValues = {
     foo: {
diff --git a/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.spec.ts b/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.spec.ts
index 146762acac..0852956b36 100644
--- a/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.spec.ts
+++ b/packages/neos-ui-editors/src/Editors/SelectBox/selectBoxHelpers.spec.ts
@@ -1,6 +1,6 @@
 import {processSelectBoxOptions} from './selectBoxHelpers';
 import {I18nRegistry} from '@neos-project/neos-ts-interfaces';
-import {setupI18n} from "@neos-project/neos-ui-i18n";
+import {setupI18n} from '@neos-project/neos-ui-i18n';
 
 const fakeI18NRegistry = {
     translate: (id) => id ?? ''
diff --git a/packages/neos-ui-validators/src/Count/index.tsx b/packages/neos-ui-validators/src/Count/index.tsx
index 35f6960349..9715a6c5af 100644
--- a/packages/neos-ui-validators/src/Count/index.tsx
+++ b/packages/neos-ui-validators/src/Count/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import I18n from '@neos-project/neos-ui-i18n';
+import I18n, {translate} from '@neos-project/neos-ui-i18n';
 import logger from '@neos-project/utils-logger';
 
 /**
@@ -28,7 +28,7 @@ const Count = (value: any, validatorOptions: CountOptions) => {
     }
 
     if (typeof value !== 'object' || value === null) {
-        return <I18n id="content.inspector.validators.countValidator.notCountable"/>;
+        return translate('Neos.Neos:Main:content.inspector.validators.countValidator.notCountable', '');
     }
 
     const {length} = Object.keys(value);
diff --git a/packages/neos-ui-validators/src/NumberRange/index.tsx b/packages/neos-ui-validators/src/NumberRange/index.tsx
index e0cf204ce4..41952977c7 100644
--- a/packages/neos-ui-validators/src/NumberRange/index.tsx
+++ b/packages/neos-ui-validators/src/NumberRange/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import I18n from '@neos-project/neos-ui-i18n';
+import I18n, {translate} from '@neos-project/neos-ui-i18n';
 import logger from '@neos-project/utils-logger';
 
 /**
@@ -33,7 +33,7 @@ const NumberRange = (value: any, validatorOptions: NumberRangeOptions) => {
     }
 
     if (value.length > 0 && !Number.isSafeInteger(number)) {
-        return <I18n id="content.inspector.validators.numberRangeValidator.validNumberExpected"/>;
+        return translate('Neos.Neos:Main:content.inspector.validators.numberRangeValidator.validNumberExpected', '');
     }
     if (number < minimum || number > maximum) {
         const label = validatorOptions?.validationErrorMessage ?? 'content.inspector.validators.numberRangeValidator.numberShouldBeInRange';
diff --git a/packages/neos-ui-views/src/Data/DataLoader/index.js b/packages/neos-ui-views/src/Data/DataLoader/index.js
index 5dde983736..048ec06338 100644
--- a/packages/neos-ui-views/src/Data/DataLoader/index.js
+++ b/packages/neos-ui-views/src/Data/DataLoader/index.js
@@ -5,9 +5,9 @@ import {neos} from '@neos-project/neos-ui-decorators';
 import {selectors} from '@neos-project/neos-ui-redux-store';
 import Widget from '../../Widget/index';
 import Icon from '@neos-project/react-ui-components/src/Icon/';
-import I18n from '@neos-project/neos-ui-i18n';
 import style from './style.module.css';
 import isEqual from 'lodash.isequal';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 /*
  * This HOC is responsible for fetching data for Data views and wraping
@@ -91,7 +91,7 @@ export default () => WrappedComponent => {
             }
 
             if (!this.state.data) {
-                return (<div><I18n id="Neos.Neos:Main:loading"/></div>);
+                return (<div>{translate('Neos.Neos:Main:loading')}</div>);
             }
 
             return (<WrappedComponent data={this.state.data} {...this.props}/>);
diff --git a/packages/neos-ui/src/Containers/Modals/UnappliedChangesDialog/index.js b/packages/neos-ui/src/Containers/Modals/UnappliedChangesDialog/index.js
index a13d2c0c37..bffd9b0b19 100644
--- a/packages/neos-ui/src/Containers/Modals/UnappliedChangesDialog/index.js
+++ b/packages/neos-ui/src/Containers/Modals/UnappliedChangesDialog/index.js
@@ -6,7 +6,7 @@ import {actions, selectors} from '@neos-project/neos-ui-redux-store';
 import {neos} from '@neos-project/neos-ui-decorators';
 
 import {Icon, Dialog, Button} from '@neos-project/react-ui-components';
-import I18n, {translate} from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import style from './style.module.css';
 
@@ -85,7 +85,7 @@ export default class UnappliedChangesDialog extends PureComponent {
                 className={`${style.button} ${style.discardButton}`}
                 >
                 <Icon icon="ban" className={style.buttonIcon}/>
-                <I18n id="Neos.Neos:Main:content.inspector.unappliedChangesDialog.button.danger"/>
+                {translate('Neos.Neos:Main:content.inspector.unappliedChangesDialog.button.danger')}
             </Button>
         );
     }
@@ -100,7 +100,7 @@ export default class UnappliedChangesDialog extends PureComponent {
                 onClick={this.handleResume}
                 className={`${style.button} ${style.resumeButton}`}
                 >
-                <I18n id="Neos.Neos:Main:content.inspector.unappliedChangesDialog.button.default"/>
+                {translate('Neos.Neos:Main:content.inspector.unappliedChangesDialog.button.default')}
             </Button>
         );
     }
@@ -119,7 +119,7 @@ export default class UnappliedChangesDialog extends PureComponent {
                 className={`${style.button} ${style.publishButton}`}
                 >
                 <Icon icon="check" className={style.buttonIcon}/>
-                <I18n id="Neos.Neos:Main:content.inspector.unappliedChangesDialog.button.success"/>
+                {translate('Neos.Neos:Main:content.inspector.unappliedChangesDialog.button.success')}
             </Button>
         );
     }
diff --git a/packages/neos-ui/src/Containers/RightSideBar/Inspector/SelectedElement/index.js b/packages/neos-ui/src/Containers/RightSideBar/Inspector/SelectedElement/index.js
index c8ad1ab808..7a7c888deb 100644
--- a/packages/neos-ui/src/Containers/RightSideBar/Inspector/SelectedElement/index.js
+++ b/packages/neos-ui/src/Containers/RightSideBar/Inspector/SelectedElement/index.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 
 import {Headline, SelectBox} from '@neos-project/react-ui-components';
-import I18n from '@neos-project/neos-ui-i18n';
+import {translate} from '@neos-project/neos-ui-i18n';
 
 import {actions, selectors} from '@neos-project/neos-ui-redux-store';
 import {neos} from '@neos-project/neos-ui-decorators';
@@ -57,7 +57,7 @@ export default class SelectedElement extends PureComponent {
             <section className={sidebarStyle.rightSideBar__header}>
                 <Headline className={style.label}>
                     <span>
-                        <I18n id="Neos.Neos:Main:content.inspector.inspectorView.selectedElement"/>
+                        {translate('Neos.Neos:Main:content.inspector.inspectorView.selectedElement')}
                     </span>
                 </Headline>
                 <div className={style.content}>