Skip to content
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.

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

Fix some translation bugs #1407

Merged
merged 5 commits into from May 16, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -49,6 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Cleanup get_report function in gsad [#1263](https://github.com/greenbone/gsa/pull/1263)

### Fixed
- Fix some translation bugs (statusbar, about page, table header tooltips)[#1407](https://github.com/greenbone/gsa/pull/1407)
- Fix checking if an entity is in use [#1406](https://github.com/greenbone/gsa/pull/1406)
- Fix "Invalid date" string for scan times [#1405](https://github.com/greenbone/gsa/pull/1405)
- Fix missing "Applied filter" message for "NVTs by Family" chart [#1404](https://github.com/greenbone/gsa/pull/1404)
@@ -3872,7 +3872,7 @@ msgstr "Tag {{name}} bearbeiten"

#: gsa/src/web/pages/help/about.js:74
msgid "Version {{version}}"
msgstr "Version ({{count}})"
msgstr "Version ({{version}})"

#: gsa/src/web/pages/reports/triggeralertdialog.js:87
msgid "Trigger Alert for Scan Report"
@@ -51,7 +51,7 @@ const StatusBar = ({status = 'Unknown', progress = '0'}) => {
}

if (status === TASK_STATUS.stopped || status === TASK_STATUS.interrupted) {
text = _('{{status}} at {{progress}} %', {status, progress});
text = _('{{status}} at {{progress}} %', {status: text, progress});
} else if (status === TASK_STATUS.running) {
text = _('{{progress}} %', {progress});
}
@@ -23,7 +23,6 @@ import styled from 'styled-components';
import _ from 'gmp/locale';

import {isDefined} from 'gmp/utils/identity';
import {capitalizeFirstLetter} from 'gmp/utils/string';

import PropTypes from 'web/utils/proptypes';
import Theme from 'web/utils/theme';
@@ -52,7 +51,7 @@ const TableHead = ({
sortSymbol = ( // triangle pointing down
<span
title={_('Sorted In Descending Order By {{sortBy}}', {
sortBy: capitalizeFirstLetter(sortBy),
sortBy: `${title}`,
})}
>
&nbsp;&#9660;
@@ -62,15 +61,15 @@ const TableHead = ({
sortSymbol = ( // triangle pointing up
<span
title={_('Sorted In Ascending Order By {{sortBy}}', {
sortBy: capitalizeFirstLetter(sortBy),
sortBy: `${title}`,
})}
>
&nbsp;&#9650;
</span>
);
}
}
if (isDefined(title)) {
if (isDefined(title) && !isDefined(children)) {
children = `${title}`;
}
return (
@@ -127,9 +127,8 @@ export const createEntitiesHeader = (columns, actions_column, options = {}) => {
currentSortDir={currentSortDir}
sortBy={sort ? name : false}
onSortChange={onSortChange}
>
{`${displayName}`}
</TableHead>
title={`${displayName}`}
/>
);
})}
{actionsColumn}
@@ -51,45 +51,40 @@ const Header = ({
currentSortBy={currentSortBy}
sortBy={sort ? 'name' : false}
onSortChange={onSortChange}
>
{_('Name')}
</TableHead>
title={_('Name')}
/>
<TableHead
width="70%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'title' : false}
onSortChange={onSortChange}
>
{_('Title')}
</TableHead>
title={_('Title')}
/>
<TableHead
width="10%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'created' : false}
onSortChange={onSortChange}
>
{_('Created')}
</TableHead>
title={_('Created')}
/>
<TableHead
width="2%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'cves' : false}
onSortChange={onSortChange}
>
{_('CVEs')}
</TableHead>
title={_('CVEs')}
/>
<TableHead
width="8%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'severity' : false}
onSortChange={onSortChange}
>
{_('Severity')}
</TableHead>
title={_('Severity')}
/>
{actionsColumn}
</TableRow>
</TableHeader>
@@ -51,45 +51,40 @@ const Header = ({
currentSortBy={currentSortBy}
sortBy={sort ? 'name' : false}
onSortChange={onSortChange}
>
{_('Name')}
</TableHead>
title={_('Name')}
/>
<TableHead
width="40%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'title' : false}
onSortChange={onSortChange}
>
{_('Title')}
</TableHead>
title={_('Title')}
/>
<TableHead
width="15%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'modified' : false}
onSortChange={onSortChange}
>
{_('Modified')}
</TableHead>
title={_('Modified')}
/>
<TableHead
width="2%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'cves' : false}
onSortChange={onSortChange}
>
{_('CVEs')}
</TableHead>
title={_('CVEs')}
/>
<TableHead
width="8%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'severity' : false}
onSortChange={onSortChange}
>
{_('Severity')}
</TableHead>
title={_('Severity')}
/>
{actionsColumn}
</TableRow>
</TableHeader>
@@ -51,81 +51,72 @@ const Header = ({
currentSortBy={currentSortBy}
sortBy={sort ? 'name' : false}
onSortChange={onSortChange}
>
{_('Name')}
</TableHead>
title={_('Name')}
/>
<TableHead
width="11%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'vector' : false}
onSortChange={onSortChange}
>
{_('Vector')}
</TableHead>
title={_('Vector')}
/>
<TableHead
width="11%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'complexity' : false}
onSortChange={onSortChange}
>
{_('Complexity')}
</TableHead>
title={_('Complexity')}
/>
<TableHead
width="11%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'authentication' : false}
onSortChange={onSortChange}
>
{_('Authentication')}
</TableHead>
title={_('Authentication')}
/>
<TableHead
width="11%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'confidentiality_impact' : false}
onSortChange={onSortChange}
>
{_('Confidentiality Impact')}
</TableHead>
title={_('Confidentiality Impact')}
/>
<TableHead
width="11%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'integrity_impact' : false}
onSortChange={onSortChange}
>
{_('Integrity Impact')}
</TableHead>
title={_('Integrity Impact')}
/>
<TableHead
width="11%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'availability_impact' : false}
onSortChange={onSortChange}
>
{_('Availability Impact')}
</TableHead>
title={_('Availability Impact')}
/>
<TableHead
width="11%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'published' : false}
onSortChange={onSortChange}
>
{_('Published')}
</TableHead>
title={_('Published')}
/>
<TableHead
width="8%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'severity' : false}
onSortChange={onSortChange}
>
{_('Severity')}
</TableHead>
title={_('Severity')}
/>
{actionsColumn}
</TableRow>
</TableHeader>
@@ -51,45 +51,40 @@ const Header = ({
currentSortBy={currentSortBy}
sortBy={sort ? 'name' : false}
onSortChange={onSortChange}
>
{_('Name')}
</TableHead>
title={_('Name')}
/>
<TableHead
width="62%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'title' : false}
onSortChange={onSortChange}
>
{_('Title')}
</TableHead>
title={_('Title')}
/>
<TableHead
width="15%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'created' : false}
onSortChange={onSortChange}
>
{_('Created')}
</TableHead>
title={_('Created')}
/>
<TableHead
width="2%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'cves' : false}
onSortChange={onSortChange}
>
{_('CVEs')}
</TableHead>
title={_('CVEs')}
/>
<TableHead
width="8%"
currentSortDir={currentSortDir}
currentSortBy={currentSortBy}
sortBy={sort ? 'severity' : false}
onSortChange={onSortChange}
>
{_('Severity')}
</TableHead>
title={_('Severity')}
/>
{actionsColumn}
</TableRow>
</TableHeader>
@@ -46,9 +46,8 @@ const Header = ({
currentSortBy={currentSortBy}
sortBy={sort ? 'name' : false}
onSortChange={onSortChange}
>
{_('Name')}
</TableHead>
title={_('Name')}
/>
{actionsColumn}
</TableRow>
</TableHeader>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.