Fix field label translation concatenates previous prefix

packages/ra-core/src/form/Form.tsx

@@ -50,7 +50,10 @@ export const Form = (props: FormProps) => {
 
     return (
         <OptionalRecordContextProvider value={record}>
-            <LabelPrefixContextProvider prefix={`resources.${resource}.fields`}>
+            <LabelPrefixContextProvider
+                prefix={`resources.${resource}.fields`}
+                concatenate={false}
+            >
                 <FormProvider {...form}>
                     <FormGroupsProvider>
                         <form

packages/ra-core/src/util/LabelPrefixContextProvider.spec.tsx

@@ -0,0 +1,34 @@
+import * as React from 'react';
+import { render, screen } from '@testing-library/react';
+import { LabelPrefixContextProvider } from './LabelPrefixContextProvider';
+import { useLabelPrefix } from './useLabelPrefix';
+
+describe('LabelPrefixContextProvider', () => {
+    it('should return the prefix', () => {
+        const Label = () => {
+            return <>{useLabelPrefix()}</>;
+        };
+        render(
+            <LabelPrefixContextProvider prefix="resource.posts.fields.title">
+                <Label />
+            </LabelPrefixContextProvider>
+        );
+        screen.getByText('resource.posts.fields.title');
+    });
+    it('should not concatenate previous prefix', () => {
+        const Label = () => {
+            return <>{useLabelPrefix()}</>;
+        };
+        render(
+            <LabelPrefixContextProvider prefix="resource.posts.fields.title">
+                <LabelPrefixContextProvider
+                    prefix="resource.comments.fields.body"
+                    concatenate={false}
+                >
+                    <Label />
+                </LabelPrefixContextProvider>
+            </LabelPrefixContextProvider>
+        );
+        screen.getByText('resource.comments.fields.body');
+    });
+});

packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.spec.tsx

@@ -14,6 +14,7 @@ import { SimpleForm } from '../../form';
 import { ArrayInput } from './ArrayInput';
 import { TextInput } from '../TextInput';
 import { SimpleFormIterator } from './SimpleFormIterator';
+import { Basic } from './SimpleFormIterator.stories';
 
 describe('<SimpleFormIterator />', () => {
     // bypass confirm leave form with unsaved changes
@@ -978,4 +979,23 @@ describe('<SimpleFormIterator />', () => {
             );
         });
     });
+
+    it('should have the correct translation keys', async () => {
+        render(<Basic />);
+        const authorsTranslationKey = screen.queryByLabelText(
+            'resources.books.fields.authors'
+        );
+
+        expect(authorsTranslationKey).toBeDefined();
+
+        const authorsNameTranslationKey = await screen.findAllByLabelText(
+            'resources.books.fields.authors.name'
+        );
+        expect(authorsNameTranslationKey).toHaveLength(2);
+
+        const authorsRoleTranslationKey = await screen.findAllByLabelText(
+            'resources.books.fields.authors.role'
+        );
+        expect(authorsRoleTranslationKey).toHaveLength(2);
+    });
 });

packages/ra-ui-materialui/src/list/filter/FilterForm.tsx

@@ -134,7 +134,10 @@ export const FilterFormBase = (props: FilterFormBaseProps) => {
     );
 
     return (
-        <LabelPrefixContextProvider prefix={`resources.${resource}.fields`}>
+        <LabelPrefixContextProvider
+            prefix={`resources.${resource}.fields`}
+            concatenate={false}
+        >
             <StyledForm
                 className={className}
                 {...sanitizeRestProps(rest)}