Browse Source

SONAR-14572 Update under maintenance message

tags/8.9.0.43852
Wouter Admiraal 3 years ago
parent
commit
64cf912b1c

+ 32
- 30
server/sonar-web/src/main/js/apps/maintenance/components/App.tsx View File

@@ -200,36 +200,38 @@ export default class App extends React.PureComponent<Props, State> {
<h1 className="maintenance-title">
<InstanceMessage message={translate('maintenance.is_under_maintenance')} />
</h1>
{!isSonarCloud() && (
<>
<p className="maintenance-text">
<FormattedMessage
defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.1')}
id="maintenance.sonarqube_is_under_maintenance.1"
values={{
link: (
<a href="https://redirect.sonarsource.com/doc/plugin-library.html">
{translate('maintenance.sonarqube_is_under_maintenance_link.1')}
</a>
)
}}
/>
</p>
<p className="maintenance-text">
<FormattedMessage
defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.2')}
id="maintenance.sonarqube_is_under_maintenance.2"
values={{
link: (
<a href="https://redirect.sonarsource.com/doc/upgrading.html">
{translate('maintenance.sonarqube_is_under_maintenance_link.2')}
</a>
)
}}
/>
</p>
</>
)}
<p className="maintenance-text">
<FormattedMessage
defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.1')}
id="maintenance.sonarqube_is_under_maintenance.1"
values={{
link: (
<a
href="https://www.sonarlint.org/?referrer=sonarqube-maintenance"
target="_blank"
rel="noopener noreferrer">
{translate('maintenance.sonarqube_is_under_maintenance_link.1')}
</a>
)
}}
/>
</p>
<p className="maintenance-text">
<FormattedMessage
defaultMessage={translate('maintenance.sonarqube_is_under_maintenance.2')}
id="maintenance.sonarqube_is_under_maintenance.2"
values={{
link: (
<a
href="https://redirect.sonarsource.com/doc/upgrading.html"
target="_blank"
rel="noopener noreferrer">
{translate('maintenance.sonarqube_is_under_maintenance_link.2')}
</a>
)
}}
/>
</p>
</>
)}


+ 10
- 2
server/sonar-web/src/main/js/apps/maintenance/components/__tests__/__snapshots__/App-test.tsx.snap View File

@@ -31,7 +31,9 @@ exports[`Maintenance Page should render DB_MIGRATION_NEEDED status 1`] = `
values={
Object {
"link": <a
href="https://redirect.sonarsource.com/doc/plugin-library.html"
href="https://www.sonarlint.org/?referrer=sonarqube-maintenance"
rel="noopener noreferrer"
target="_blank"
>
maintenance.sonarqube_is_under_maintenance_link.1
</a>,
@@ -49,6 +51,8 @@ exports[`Maintenance Page should render DB_MIGRATION_NEEDED status 1`] = `
Object {
"link": <a
href="https://redirect.sonarsource.com/doc/upgrading.html"
rel="noopener noreferrer"
target="_blank"
>
maintenance.sonarqube_is_under_maintenance_link.2
</a>,
@@ -92,7 +96,9 @@ exports[`Maintenance Page should render DB_MIGRATION_RUNNING status 1`] = `
values={
Object {
"link": <a
href="https://redirect.sonarsource.com/doc/plugin-library.html"
href="https://www.sonarlint.org/?referrer=sonarqube-maintenance"
rel="noopener noreferrer"
target="_blank"
>
maintenance.sonarqube_is_under_maintenance_link.1
</a>,
@@ -110,6 +116,8 @@ exports[`Maintenance Page should render DB_MIGRATION_RUNNING status 1`] = `
Object {
"link": <a
href="https://redirect.sonarsource.com/doc/upgrading.html"
rel="noopener noreferrer"
target="_blank"
>
maintenance.sonarqube_is_under_maintenance_link.2
</a>,

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

@@ -3935,8 +3935,8 @@ maintenance.is_down={instance} is down
maintenance.sonarqube_is_down.text=Something went wrong. Please contact your system administrator.
maintenance.try_again=Try Again
maintenance.is_under_maintenance={instance} is under maintenance
maintenance.sonarqube_is_under_maintenance.1=While waiting, you might want to investigate {link} to extend the current functionality.
maintenance.sonarqube_is_under_maintenance_link.1=new plugins
maintenance.sonarqube_is_under_maintenance.1=While waiting, install {link} in your IDE!
maintenance.sonarqube_is_under_maintenance_link.1=SonarLint
maintenance.sonarqube_is_under_maintenance.2=If you are an administrator and have no idea why this message is being shown, you should read the {link}.
maintenance.sonarqube_is_under_maintenance_link.2=upgrade guide
maintenance.is_starting={instance} is starting

Loading…
Cancel
Save