Update login message to avoid duplicate brand name

Returned brandName already contain the name brand Ansible. Update to
avoid name brand repetition.

See: https://github.com/ansible/awx/issues/9126
This commit is contained in:
nixocio 2021-05-11 16:17:12 -04:00
parent 19d000e97f
commit 1befacaf39
10 changed files with 45 additions and 17 deletions

View File

@ -5,7 +5,7 @@ import '@patternfly/react-core/dist/styles/base.css';
import App from './App';
import { BrandName } from './variables';
document.title = `Ansible ${BrandName}`;
document.title = `${BrandName}`;
ReactDOM.render(
<React.StrictMode>

View File

@ -9521,8 +9521,8 @@ msgid "Weekend day"
msgstr "Weekend day"
#: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!"
msgstr "Welcome to Ansible {brandName}!"
#~ msgid "Welcome to Ansible {brandName}!"
#~ msgstr "Welcome to Ansible {brandName}!"
#: screens/Login/Login.jsx:142
#~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@ -9536,6 +9536,10 @@ msgstr ""
"Welcome to Red Hat Ansible Automation Platform!\n"
"Please complete the steps below to activate your subscription."
#: screens/Login/Login.jsx:150
msgid "Welcome to {brandName}!"
msgstr "Welcome to {brandName}!"
#: screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid ""

View File

@ -9126,8 +9126,8 @@ msgid "Weekend day"
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!"
msgstr ""
#~ msgid "Welcome to Ansible {brandName}!"
#~ msgstr ""
#: screens/Login/Login.jsx:142
#~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@ -9139,6 +9139,10 @@ msgid ""
"Please complete the steps below to activate your subscription."
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to {brandName}!"
msgstr ""
#: screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid ""

View File

@ -9228,8 +9228,8 @@ msgid "Weekend day"
msgstr "Jour du week-end"
#: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!"
msgstr ""
#~ msgid "Welcome to Ansible {brandName}!"
#~ msgstr ""
#: screens/Login/Login.jsx:142
#~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@ -9241,6 +9241,10 @@ msgid ""
"Please complete the steps below to activate your subscription."
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to {brandName}!"
msgstr ""
#: screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid ""

View File

@ -9224,8 +9224,8 @@ msgid "Weekend day"
msgstr "週末"
#: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!"
msgstr ""
#~ msgid "Welcome to Ansible {brandName}!"
#~ msgstr ""
#: screens/Login/Login.jsx:142
#~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@ -9237,6 +9237,10 @@ msgid ""
"Please complete the steps below to activate your subscription."
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to {brandName}!"
msgstr ""
#: screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid ""

View File

@ -9126,8 +9126,8 @@ msgid "Weekend day"
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!"
msgstr ""
#~ msgid "Welcome to Ansible {brandName}!"
#~ msgstr ""
#: screens/Login/Login.jsx:142
#~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@ -9139,6 +9139,10 @@ msgid ""
"Please complete the steps below to activate your subscription."
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to {brandName}!"
msgstr ""
#: screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid ""

View File

@ -9224,8 +9224,8 @@ msgid "Weekend day"
msgstr "周末日"
#: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!"
msgstr ""
#~ msgid "Welcome to Ansible {brandName}!"
#~ msgstr ""
#: screens/Login/Login.jsx:142
#~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@ -9237,6 +9237,10 @@ msgid ""
"Please complete the steps below to activate your subscription."
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to {brandName}!"
msgstr ""
#: screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid ""

View File

@ -8900,8 +8900,8 @@ msgid "Weekend day"
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!"
msgstr ""
#~ msgid "Welcome to Ansible {brandName}!"
#~ msgstr ""
#: screens/Login/Login.jsx:142
#~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@ -8913,6 +8913,10 @@ msgid ""
"Please complete the steps below to activate your subscription."
msgstr ""
#: screens/Login/Login.jsx:150
msgid "Welcome to {brandName}!"
msgstr ""
#: screens/Inventory/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid ""

View File

@ -147,7 +147,7 @@ function AWXLogin({ alt, isAuthenticated }) {
<Login header={Header} footer={Footer}>
<LoginMainHeader
data-cy="login-header"
title={brandName ? t`Welcome to Ansible ${brandName}!` : ''}
title={brandName ? t`Welcome to ${brandName}!` : ''}
subtitle={t`Please log in`}
/>
<LoginMainBody>

View File

@ -94,7 +94,7 @@ describe('<Login />', () => {
'Please log in'
);
expect(wrapper.find('LoginMainHeader').prop('title')).toBe(
'Welcome to Ansible AWX!'
'Welcome to AWX!'
);
});