Merge branch 'master' into PS-927-rendition-ph

Author: 4rthem

databox/api/src/Integration/Aws/Translate/TranslateAction.php

@@ -97,6 +97,11 @@ public function doHandle(RunContext $context): void
 
                 foreach ($attributesSources as $attribute) {
                     $text = $attribute->getValue();
+
+                    if (empty($text)) {
+                        continue;
+                    }
+
                     $toTranslates[] = [
                         'text' => $text,
                         'sourceLanguage' => $sourceLanguage,

databox/api/translations/messages.en.yaml

@@ -1,24 +1,23 @@
 field_type:
-  types:
-    text: Text
-    textarea: Textarea
-    json: JSON
-    ip: IP
-    code: Code
-    html: HTML
-    boolean: Boolean
-    color: Color
-    keyword: Keyword
-    number: Number
-    date: Date
-    date_time: Date & Time
-    geo_point: Geo point
-    entity: Entity
-
+    types:
+        text: Text
+        textarea: Textarea
+        json: JSON
+        ip: IP
+        code: Code
+        html: HTML
+        boolean: Boolean
+        color: Color
+        keyword: Keyword
+        number: Number
+        date: Date
+        date_time: 'Date & Time'
+        geo_point: 'Geo point'
+        entity: Entity
 privacy:
     secret: Secret
-    private_in_workspace: Private in workspace
-    public_in_workspace: Public in workspace
+    private_in_workspace: 'Private in workspace'
+    public_in_workspace: 'Public in workspace'
     private: Private
-    public_for_users: Public for users
+    public_for_users: 'Public for users'
     public: Public

databox/api/translations/messages.fr.yaml

@@ -1,17 +1,17 @@
 field_type:
   types:
-    text: Text
-    textarea: Textarea
+    text: Texte
+    textarea: Zone de texte
     json: JSON
     ip: IP
     code: Code
     html: HTML
-    boolean: Boolean
-    color: Color
-    keyword: Keyword
-    number: Number
+    boolean: Booléen
+    color: Couleur
+    keyword: Mot-clé
+    number: Nombre
     date: Date
-    date_time: Date & Time
+    date_time: Date et Heure
     geo_point: Geo point
 
     entity: Entité

databox/client/src/components/Acl/AclPermissionLabel.tsx

@@ -0,0 +1,19 @@
+import {useTranslation} from 'react-i18next';
+import {AclPermission} from './acl';
+
+export default function useAclPermissionLabels(): Record<string, string> {
+    const {t} = useTranslation();
+
+    return {
+        [AclPermission.VIEW]: t('acl.permission.view', 'VIEW'),
+        [AclPermission.SHARE]: t('acl.permission.share', 'SHARE'),
+        [AclPermission.CREATE]: t('acl.permission.create', 'CREATE'),
+        [AclPermission.EDIT]: t('acl.permission.edit', 'EDIT'),
+        [AclPermission.DELETE]: t('acl.permission.delete', 'DELETE'),
+        [AclPermission.UNDELETE]: t('acl.permission.undelete', 'UNDELETE'),
+        [AclPermission.OPERATOR]: t('acl.permission.operator', 'OPERATOR'),
+        [AclPermission.MASTER]: t('acl.permission.master', 'MASTER'),
+        [AclPermission.OWNER]: t('acl.permission.owner', 'OWNER'),
+        [AclPermission.ALL]: t('acl.permission.all', 'ALL'),
+    };
+}

databox/client/src/components/AttributeEntity/AttributeEntityFields.tsx

@@ -69,7 +69,7 @@ export default function AttributeEntityFields({
             ) : null}
             <FormRow>
                 <InputLabel>
-                    {t('form.attribute_entity.synonym.label', 'Synonyms')}
+                    {t('form.attribute_entity.synonyms.label', 'Synonyms')}
                 </InputLabel>
                 <KeyTranslationsWidget
                     renderLocale={l => {

databox/client/src/components/Form/AssetDataTemplateSelect.tsx

@@ -7,6 +7,7 @@ import {
     AsyncRSelectProps,
     SelectOption,
 } from '@alchemy/react-form';
+import {useTranslation} from 'react-i18next';
 
 const Option = (props: OptionProps<SelectOption>) => {
     return (
@@ -48,6 +49,8 @@ export default function AssetDataTemplateSelect<
             );
     };
 
+    const {t} = useTranslation();
+
     return (
         <AsyncRSelectWidget<TFieldValues, true>
             key={`${workspaceId}-${collectionId ?? ''}`}
@@ -58,6 +61,9 @@ export default function AssetDataTemplateSelect<
             isMulti={true as any}
             closeMenuOnSelect={false}
             hideSelectedOptions={false}
+            noOptionsMessage={() =>
+                t('form.asset.templates.no_options', `No template available`)
+            }
         />
     );
 }

databox/client/src/components/Form/PrivacyWidget.tsx

@@ -18,6 +18,27 @@ const choices: {[key: string]: {label: string; helper?: string}} = {
     public: {label: 'Public'},
 };
 
+function getChoicesTranslated(
+    t: (...args: any) => any,
+    key: string
+): {label: string; helper?: string} {
+    switch (key) {
+        default:
+        case 'secret':
+            return {label: t('form.privacy.choices.secret', 'Secret')};
+        case 'private':
+            return {
+                label: t('form.privacy.choices.private', 'Private'),
+                helper: t(
+                    'form.privacy.choices.helpers.private',
+                    'Users can request access'
+                ),
+            };
+        case 'public':
+            return {label: t('form.privacy.choices.public', 'Public')};
+    }
+}
+
 function getValue(value: string, workspace: boolean, auth: boolean): number {
     switch (value) {
         default:
@@ -150,6 +171,10 @@ export default function PrivacyWidget({
                     onChange={handlePChange}
                 >
                     {Object.keys(choices).map(k => {
+                        const choice = getChoicesTranslated(t, k);
+                        const label = choice.label;
+                        const helper = choice.helper;
+
                         return (
                             <MenuItem
                                 key={k}
@@ -161,8 +186,8 @@ export default function PrivacyWidget({
                                 }
                             >
                                 <ListItemText
-                                    primary={choices[k].label}
-                                    secondary={choices[k].helper}
+                                    primary={label}
+                                    secondary={helper}
                                 />
                             </MenuItem>
                         );

databox/client/src/components/Media/Asset/AssetInfoList.tsx

@@ -75,7 +75,7 @@ export default function AssetInfoList({data}: Props) {
                     label={t('asset.info.collection', `Collection`)}
                     value={
                         data.referenceCollection?.absoluteTitleTranslated ??
-                        t('asset.info.collection.none', 'None')
+                        t('asset.info.collections.none', 'None')
                     }
                     copyValue={data.referenceCollection?.id}
                     onClick={

databox/client/src/components/Media/TagFilterRule/FilterRule.tsx

@@ -161,7 +161,7 @@ export default function FilterRule({
                         <FormRow>
                             <FormGroup>
                                 <FormLabel>
-                                    <Trans key={'filter_rule.include.label'}>
+                                    <Trans i18nKey="filter_rule.include.label">
                                         Tags to <b>include</b>
                                     </Trans>
                                 </FormLabel>
@@ -191,7 +191,9 @@ export default function FilterRule({
                         <FormRow>
                             <FormGroup>
                                 <FormLabel>
-                                    <Trans key={'filter_rule.exclude.label'}>
+                                    <Trans
+                                        i18nKey={'filter_rule.exclude.label'}
+                                    >
                                         Tags to <b>exclude</b>
                                     </Trans>
                                 </FormLabel>

databox/client/src/components/Permissions/PermissionTable.tsx

@@ -6,6 +6,7 @@ import {
 import {Ace, UserType} from '../../types';
 import {useTranslation} from 'react-i18next';
 import {AclPermission, aclPermissions} from '../Acl/acl';
+import useAclPermissionLabels from '../Acl/AclPermissionLabel';
 import {Box} from '@mui/material';
 import PermissionRow from './PermissionRow';
 import type {TFunction} from '@alchemy/i18n';
@@ -23,17 +24,16 @@ type Props = {
     onMaskChange: OnMaskChange;
     onDelete: OnPermissionDelete;
     displayedPermissions?: DisplayedPermissions;
-    permissionHelper?: PermissionHelpers;
 };
 
 export default function PermissionTable({
     permissions,
     onMaskChange,
     onDelete,
     displayedPermissions,
-    permissionHelper,
 }: Props) {
     const {t} = useTranslation();
+    const permissionLabels = useAclPermissionLabels();
 
     const columns = displayedPermissions
         ? Object.keys(aclPermissions).filter(c =>
@@ -100,7 +100,7 @@ export default function PermissionTable({
                     {allColumns.map(k => {
                         return (
                             <th key={k} className={'p'}>
-                                <span>{permissionHelper?.[k]?.label ?? k}</span>
+                                <span>{permissionLabels[k]}</span>
                             </th>
                         );
                     })}