From 4b83bda306b61570fa01f25caf0aa7af29ceb29d Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Wed, 9 Oct 2019 22:24:40 -0400 Subject: [PATCH] Wrap phrase for translation and update test --- .../Project/ProjectDetail/ProjectDetail.jsx | 14 ++++++++------ .../ProjectDetail/ProjectDetail.test.jsx | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx index 14968059c3..9e6a1bec04 100644 --- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx +++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx @@ -63,9 +63,9 @@ function ProjectDetail({ project, i18n }) { let createdBy = ''; if (created) { if (summary_fields.created_by && summary_fields.created_by.username) { - createdBy = `${formatDateString(created)} ${i18n._(t`by`)} ${ - summary_fields.created_by.username - }`; + createdBy = i18n._( + t`${formatDateString(created)} by ${summary_fields.created_by.username}` + ); } else { createdBy = formatDateString(created); } @@ -74,9 +74,11 @@ function ProjectDetail({ project, i18n }) { let modifiedBy = ''; if (modified) { if (summary_fields.modified_by && summary_fields.modified_by.username) { - modifiedBy = `${formatDateString(modified)} ${i18n._(t`by`)} ${ - summary_fields.modified_by.username - }`; + modifiedBy = i18n._( + t`${formatDateString(modified)} by ${ + summary_fields.modified_by.username + }` + ); } else { modifiedBy = formatDateString(modified); } diff --git a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx index 80c31bd25b..8ec8858c67 100644 --- a/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx +++ b/awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx @@ -61,7 +61,22 @@ describe('', () => { }); test('should render Details', () => { - const wrapper = mountWithContexts(); + const wrapper = mountWithContexts(, { + context: { + linguiPublisher: { + i18n: { + _: key => { + if (key.values) { + Object.entries(key.values).forEach(([k, v]) => { + key.id = key.id.replace(new RegExp(`\\{${k}\\}`), v); + }); + } + return key.id; + }, + }, + }, + }, + }); function assertDetail(label, value) { expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label); expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);