External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 06:29:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9861 from jakemcdermott/fix-9296

Browse Source 
Fix non-translatable template string

SUMMARY
The template string for the trademark doesn't seem like it can be used for a valid translation key. This caused the raw variable to be displayed for production builds instead of a readable string.  see: #9296 (comment)
ADDITIONAL INFORMATION
Screenshots, after applying this patch:
development environment


production build

Reviewed-by: Kersom <None>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-04-09 16:53:36 +00:00
committed by GitHub
parent c7a2a1b9f6 b75d0c1dad
commit 8a86867f69
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/components/About/About.jsx
View File

@@ -25,13 +25,15 @@ function About({ version, isOpen, onClose, i18n }) {
}; };
const speechBubble = createSpeechBubble(); const speechBubble = createSpeechBubble();
const copyright = i18n._(t`Copyright`);
const redHatInc = i18n._(t`Red Hat, Inc.`);
return ( return (
<AboutModal <AboutModal
isOpen={isOpen} isOpen={isOpen}
onClose={onClose} onClose={onClose}
productName={`Ansible ${BrandName}`} productName={`Ansible ${BrandName}`}
trademark={i18n._(t`Copyright ${new Date().getFullYear()} Red Hat, Inc.`)} trademark={`${copyright} ${new Date().getFullYear()} ${redHatInc}`}
brandImageSrc="/static/media/logo-header.svg" brandImageSrc="/static/media/logo-header.svg"
brandImageAlt={i18n._(t`Brand Image`)} brandImageAlt={i18n._(t`Brand Image`)}
> >