Skip to content

Bug 1980531: step 3 additionalHelpActions 'HelpMenu' ConsoleLinks not translated #9811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-ci merged 1 commit into from
Aug 18, 2021
Merged

Bug 1980531: step 3 additionalHelpActions 'HelpMenu' ConsoleLinks not translated #9811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions frontend/packages/integration-tests-cypress/tests/i18n/pseudolocalization.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@ describe('Localization', () => {
cy.visit('/dashboards?pseudolocalization=true&lng=en');
masthead.clickMastheadLink('help-dropdown-toggle');
// wait for both console help menu items and additionalHelpActions items to load
// additionalHelpActions come from ConsoleLinks 'HelpMenu' yaml and are not translated
// only test console help items which are translated
cy.get('.pf-c-app-launcher__group')
.first()
.within(() => {
cy.get('[role="menuitem"]').isPseudoLocalized();
});
cy.get('.pf-c-app-launcher__group').should('have.length', 2);
// Test that all links are translated
cy.get('.pf-c-app-launcher__group [role="menuitem"]').isPseudoLocalized();
});

it('pseudolocalizes navigation', () => {
Expand Down
23 changes: 23 additions & 0 deletions frontend/public/components/masthead-toolbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,21 @@ import { ConsoleLinkModel } from '../models';
import { languagePreferencesModal } from './modals';
import { withTelemetry, withQuickStartContext } from '@console/shared/src/hoc';

const defaultHelpLinks = [
{
// t('public~Learning Portal')
label: 'Learning Portal',
externalLink: true,
href: 'https://learn.openshift.com/?ref=webconsole',
},
{
// t('public~OpenShift Blog')
label: 'OpenShift Blog',
externalLink: true,
href: 'https://blog.openshift.com',
},
];

const SystemStatusButton = ({ statuspageData, className }) => {
const { t } = useTranslation();
return !_.isEmpty(_.get(statuspageData, 'incidents')) ? (
Expand Down Expand Up @@ -378,6 +393,14 @@ class MastheadToolbarContents_ extends React.Component {
],
});

// Add default help links to start of additional links from operator
additionalHelpActions.actions = defaultHelpLinks
.map((helpLink) => ({
...helpLink,
label: t(`public~${helpLink.label}`),
}))
.concat(additionalHelpActions.actions);

if (!_.isEmpty(additionalHelpActions.actions)) {
helpActions.push(additionalHelpActions);
}
Expand Down
2 changes: 2 additions & 0 deletions frontend/public/locales/en/public.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,8 @@
"Instance type": "Instance type",
"Machine addresses": "Machine addresses",
"by machine or node name": "by machine or node name",
"Learning Portal": "Learning Portal",
"OpenShift Blog": "OpenShift Blog",
"System status": "System status",
"Red Hat applications": "Red Hat applications",
"Quick Starts": "Quick Starts",
Expand Down