External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 09:57:33 -02:30
Code Issues Packages Projects Releases Wiki Activity

Wrap phrase for translation and update test

Browse Source
This commit is contained in:
Marliana Lara
2019-10-09 22:24:40 -04:00
parent 7fc4e8d20a
commit 4b83bda306
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.jsx
View File

@@ -63,9 +63,9 @@ function ProjectDetail({ project, i18n }) {
let createdBy = ''; let createdBy = '';
if (created) { if (created) {
if (summary_fields.created_by && summary_fields.created_by.username) { if (summary_fields.created_by && summary_fields.created_by.username) {
createdBy = `${formatDateString(created)} ${i18n._(t`by`)} ${ createdBy = i18n._(
summary_fields.created_by.username t`${formatDateString(created)} by ${summary_fields.created_by.username}`
}`; );
} else { } else {
createdBy = formatDateString(created); createdBy = formatDateString(created);
} }
@@ -74,9 +74,11 @@ function ProjectDetail({ project, i18n }) {
let modifiedBy = ''; let modifiedBy = '';
if (modified) { if (modified) {
if (summary_fields.modified_by && summary_fields.modified_by.username) { if (summary_fields.modified_by && summary_fields.modified_by.username) {
modifiedBy = `${formatDateString(modified)} ${i18n._(t`by`)} ${ modifiedBy = i18n._(
summary_fields.modified_by.username t`${formatDateString(modified)} by ${
}`; summary_fields.modified_by.username
}`
);
} else { } else {
modifiedBy = formatDateString(modified); modifiedBy = formatDateString(modified);
} }

17
awx/ui_next/src/screens/Project/ProjectDetail/ProjectDetail.test.jsx
View File

@@ -61,7 +61,22 @@ describe('<ProjectDetail />', () => {
}); });
test('should render Details', () => { test('should render Details', () => {
const wrapper = mountWithContexts(<ProjectDetail project={mockProject} />); const wrapper = mountWithContexts(<ProjectDetail project={mockProject} />, {
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) { function assertDetail(label, value) {
expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label); expect(wrapper.find(`Detail[label="${label}"] dt`).text()).toBe(label);
expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value); expect(wrapper.find(`Detail[label="${label}"] dd`).text()).toBe(value);