Browse Source

SONAR-7878 Update pluralization

tags/8.0
Siegfried Ehret 4 years ago
parent
commit
42246622de

+ 10
- 7
server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx View File

@@ -21,7 +21,7 @@ import * as React from 'react';
import { FormattedMessage } from 'react-intl';
import WarningIcon from 'sonar-ui-common/components/icons/WarningIcon';
import { lazyLoad } from 'sonar-ui-common/components/lazyLoad';
import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n';
import { translate } from 'sonar-ui-common/helpers/l10n';

const AnalysisWarningsModal = lazyLoad(() =>
import('../../../../components/common/AnalysisWarningsModal')
@@ -54,15 +54,18 @@ export default class ComponentNavWarnings extends React.PureComponent<Props, Sta
<div className="badge badge-focus badge-medium display-inline-flex-center js-component-analysis-warnings flex-1">
<WarningIcon className="spacer-right" />
<FormattedMessage
defaultMessage={translate('component_navigation.last_analsys_had_warnings')}
id="component_navigation.last_analsys_had_warnings"
defaultMessage={translate('component_navigation.last_analysis_had_warnings')}
id="component_navigation.last_analysis_had_warnings"
values={{
warnings: (
<a href="#" onClick={this.handleClick}>
{translateWithParameters(
'component_navigation.x_warnings',
String(this.props.warnings.length)
)}
<FormattedMessage
defaultMessage={translate('component_navigation.x_warnings')}
id="component_navigation.x_warnings"
values={{
warningsCount: this.props.warnings.length
}}
/>
</a>
)
}}

+ 11
- 3
server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/ComponentNavWarnings-test.tsx.snap View File

@@ -9,15 +9,23 @@ exports[`should render 1`] = `
className="spacer-right"
/>
<FormattedMessage
defaultMessage="component_navigation.last_analsys_had_warnings"
id="component_navigation.last_analsys_had_warnings"
defaultMessage="component_navigation.last_analysis_had_warnings"
id="component_navigation.last_analysis_had_warnings"
values={
Object {
"warnings": <a
href="#"
onClick={[Function]}
>
component_navigation.x_warnings.1
<FormattedMessage
defaultMessage="component_navigation.x_warnings"
id="component_navigation.x_warnings"
values={
Object {
"warningsCount": 1,
}
}
/>
</a>,
}
}

+ 3
- 2
sonar-core/src/main/resources/org/sonar/l10n/core.properties View File

@@ -2339,8 +2339,9 @@ component_navigation.status.in_progress=The analysis is in progress.
component_navigation.status.in_progress.admin=The analysis is in progress. More details available on the {url} page.
component_navigation.status.last_blocked_due_to_bad_license=Last analysis blocked due to an invalid license, which has since been corrected. Please reanalyze this project.

component_navigation.last_analsys_had_warnings=Last analysis had {warnings}
component_navigation.x_warnings={0} warnings
component_navigation.last_analysis_had_warnings=Last analysis had {warnings}
component_navigation.x_warnings={warningsCount} {warningsCount, plural, one {warning} other {warnings}}


background_task.status.ALL=All
background_task.status.PENDING=Pending

Loading…
Cancel
Save