External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10179 from nixocio/ui_issue_9126_2

Browse Source 
Update login message to avoid duplicate brand name

Returned brandName already contain the name brand Ansible. Update to
avoid name brand repetition.
Also update brandName on document title.
See: #9126

Reviewed-by: Kersom <None>
Reviewed-by: Alex Corey <Alex.swansboro@gmail.com>
Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
Reviewed-by: Keith Grant <keithjgrant@gmail.com>
Reviewed-by: Tiago Góes <tiago.goes2009@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-05-14 19:04:36 +00:00
committed by GitHub
parent f1767d05b0 1befacaf39
commit a8b6db3967
10 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/index.jsx
View File

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

8
awx/ui_next/src/locales/en/messages.po
View File

@@ -9868,8 +9868,8 @@ msgid "Weekend day"
msgstr "Weekend day" msgstr "Weekend day"
#: screens/Login/Login.jsx:150 #: screens/Login/Login.jsx:150
msgid "Welcome to Ansible {brandName}!" #~ msgid "Welcome to Ansible {brandName}!"
msgstr "Welcome to Ansible {brandName}!" #~ msgstr "Welcome to Ansible {brandName}!"
#: screens/Login/Login.jsx:152 #: screens/Login/Login.jsx:152
#~ msgid "Welcome to Ansible {brandName}! Please Sign In." #~ msgid "Welcome to Ansible {brandName}! Please Sign In."
@@ -9883,6 +9883,10 @@ msgstr ""
"Welcome to Red Hat Ansible Automation Platform!\n" "Welcome to Red Hat Ansible Automation Platform!\n"
"Please complete the steps below to activate your subscription." "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/InventorySourceDetail/InventorySourceDetail.jsx:150
#: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157 #: screens/Inventory/shared/InventorySourceSubForms/SharedFields.jsx:157
msgid "" msgid ""

8
awx/ui_next/src/locales/es/messages.po
View File

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

8
awx/ui_next/src/locales/fr/messages.po
View File

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

8
awx/ui_next/src/locales/ja/messages.po
View File

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

8
awx/ui_next/src/locales/nl/messages.po
View File

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

8
awx/ui_next/src/locales/zh/messages.po
View File

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

8
awx/ui_next/src/locales/zu/messages.po
View File

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

2
awx/ui_next/src/screens/Login/Login.jsx
View File

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

2
awx/ui_next/src/screens/Login/Login.test.jsx
View File

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