Remove dynamic formatted message ids (#1622)

vivid-planet · Jan 26, 2024 · 84e3e1f · 84e3e1f
1 parent 298da50
commit 84e3e1f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/packages/admin/cms-admin/src/userPermissions/user/permissions/ContentScopeGrid.tsx b/packages/admin/cms-admin/src/userPermissions/user/permissions/ContentScopeGrid.tsx
@@ -94,8 +94,7 @@ export const ContentScopeGrid: React.FC<{
                             value={JSON.stringify(contentScope)}
                             label={Object.entries(contentScope).map(([scope, value]) => (
                                 <>
-                                    <FormattedMessage id={`contentScope.scope.${scope}`} defaultMessage={camelCaseToHumanReadable(scope)} />:{" "}
-                                    <FormattedMessage id={`contentScope.values.${value}`} defaultMessage={camelCaseToHumanReadable(value)} />
+                                    {camelCaseToHumanReadable(scope)}: {camelCaseToHumanReadable(value)}
                                     <br />
                                 </>
                             ))}

diff --git a/...ages/admin/cms-admin/src/userPermissions/user/permissions/OverrideContentScopesDialog.tsx b/...ages/admin/cms-admin/src/userPermissions/user/permissions/OverrideContentScopesDialog.tsx
@@ -114,15 +114,7 @@ export const OverrideContentScopesDialog: React.FC<FormProps> = ({ permissionId,
                                         value={JSON.stringify(contentScope)}
                                         label={Object.entries(contentScope).map(([scope, value]) => (
                                             <>
-                                                <FormattedMessage
-                                                    id={`contentScope.scope.${scope}`}
-                                                    defaultMessage={camelCaseToHumanReadable(scope)}
-                                                />
-                                                :{" "}
-                                                <FormattedMessage
-                                                    id={`contentScope.values.${value}`}
-                                                    defaultMessage={camelCaseToHumanReadable(value)}
-                                                />
+                                                {camelCaseToHumanReadable(scope)}: {camelCaseToHumanReadable(value)}
                                                 <br />
                                             </>
                                         ))}

diff --git a/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionDialog.tsx b/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionDialog.tsx
@@ -129,9 +129,7 @@ export const PermissionDialog: React.FC<FormProps> = ({ userId, permissionId, ha
                                 name="permission"
                                 component={FinalFormSelect}
                                 options={availablePermissionsData.availablePermissions}
-                                getOptionLabel={(permission: string) => (
-                                    <FormattedMessage id={`permission.${permission}`} defaultMessage={camelCaseToHumanReadable(permission)} />
-                                )}
+                                getOptionLabel={(permission: string) => camelCaseToHumanReadable(permission)}
                                 disabled={disabled}
                                 label={<FormattedMessage id="comet.userPermissions.permission" defaultMessage="Permission" />}
                             />

diff --git a/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionGrid.tsx b/packages/admin/cms-admin/src/userPermissions/user/permissions/PermissionGrid.tsx
@@ -52,13 +52,7 @@ export const PermissionGrid: React.FC<{
             flex: 1,
             pinnable: false,
             headerName: intl.formatMessage({ id: "comet.userPermissions.permission", defaultMessage: "Permission" }),
-            renderCell: ({ row }) => (
-                <>
-                    <Typography variant="h6">
-                        <FormattedMessage id={`permission.${row.permission}`} defaultMessage={camelCaseToHumanReadable(row.permission)} />
-                    </Typography>
-                </>
-            ),
+            renderCell: ({ row }) => <Typography variant="h6">{camelCaseToHumanReadable(row.permission)}</Typography>,
         },
         {
             field: "source",