Merge pull request #122 from dew326/content-type-translate-udw

EZP-29965: Search in UDW does not show translated Content Type name
ezsystems · Dec 21, 2018 · 2980bae · 2980bae
2 parents d134076 + 92f8b53
commit 2980bae
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/Resources/public/js/MultiFileUpload.module.js b/Resources/public/js/MultiFileUpload.module.js
diff --git a/Resources/public/js/MultiFileUpload.module.js.map b/Resources/public/js/MultiFileUpload.module.js.map
diff --git a/Resources/public/js/SubItems.module.js b/Resources/public/js/SubItems.module.js
diff --git a/Resources/public/js/SubItems.module.js.map b/Resources/public/js/SubItems.module.js.map
diff --git a/Resources/public/js/UniversalDiscovery.module.js b/Resources/public/js/UniversalDiscovery.module.js
diff --git a/Resources/public/js/UniversalDiscovery.module.js.map b/Resources/public/js/UniversalDiscovery.module.js.map
diff --git a/src/modules/universal-discovery/components/content-table/content.table.item.component.js b/src/modules/universal-discovery/components/content-table/content.table.item.component.js
@@ -19,8 +19,9 @@ const ContentTableItemComponent = (props) => {
     } = props;
     const notAvailableLabel = Translator.trans(/*@Desc("N/A")*/ 'content_table.not_available.label', {}, 'universal_discovery_widget');
     const item = data.ContentInfo.Content;
-    const contentType = contentTypesMap ? contentTypesMap[item.ContentType._href] : false;
-    const contentTypeName = contentType ? contentType.names.value[0]['#text'] : notAvailableLabel;
+    const contentType = contentTypesMap ? contentTypesMap[item.ContentType._href] : null;
+    const contentTypeIdentifier = contentType ? contentType.identifier : null;
+    const contentTypeName = contentTypeIdentifier ? window.eZ.adminUiConfig.contentTypeNames[contentTypeIdentifier] : notAvailableLabel;
     const onClick = !!onItemClick ? onItemClick.bind(null, data) : null;
     const isSelectedContent = selectedContent.find((content) => content.id === data.id);
     const iconId = isSelectedContent ? 'checkmark' : 'create';