aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrégoire Aubert <gregoire.aubert@sonarsource.com>2017-07-12 13:19:21 +0200
committerGrégoire Aubert <gregoire.aubert@sonarsource.com>2017-07-13 14:34:17 +0200
commited219dcef705cbe16fdb8e6e9f4b993112e9444d (patch)
treeec49d25037e6786beb38fae508f5708b15a4374d
parenta1da96383b98ae9fb0986d8e8323482ffebfe277 (diff)
downloadsonarqube-ed219dcef705cbe16fdb8e6e9f4b993112e9444d.tar.gz
sonarqube-ed219dcef705cbe16fdb8e6e9f4b993112e9444d.zip
SONAR-9410 Make more obvious that the reset button will only reset the date on the project activity page
-rw-r--r--server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.js2
-rw-r--r--server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.js2
-rw-r--r--server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap2
-rw-r--r--server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityPageHeader-test.js.snap2
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties1
5 files changed, 5 insertions, 4 deletions
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.js b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.js
index 82aa95a96c2..3a0212037ac 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.js
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.js
@@ -64,7 +64,7 @@ export default class ProjectActivityDateInput extends React.PureComponent {
className="spacer-left"
onClick={this.handleResetClick}
disabled={this.props.from == null && this.props.to == null}>
- {translate('reset_verb')}
+ {translate('project_activity.reset_dates')}
</button>
</div>
);
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.js b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.js
index ebbce83df7c..2f468c7c776 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.js
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.js
@@ -53,7 +53,7 @@ export default class ProjectActivityPageHeader extends React.PureComponent {
return (
<header className="page-header">
<Select
- className="input-medium pull-left spacer-right"
+ className="input-medium pull-left big-spacer-right"
placeholder={translate('project_activity.filter_events') + '...'}
clearable={true}
searchable={false}
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap
index 438df209b7f..bc15b05c60e 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityDateInput-test.js.snap
@@ -24,7 +24,7 @@ exports[`should render correctly the date inputs 1`] = `
disabled={false}
onClick={[Function]}
>
- reset_verb
+ project_activity.reset_dates
</button>
</div>
`;
diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityPageHeader-test.js.snap b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityPageHeader-test.js.snap
index a185ef12c0c..42faa3e8acd 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityPageHeader-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/__snapshots__/ProjectActivityPageHeader-test.js.snap
@@ -10,7 +10,7 @@ exports[`should render correctly the list of series 1`] = `
autosize={true}
backspaceRemoves={true}
backspaceToRemoveMessage="Press backspace to remove {label}"
- className="input-medium pull-left spacer-right"
+ className="input-medium pull-left big-spacer-right"
clearAllText="Clear all"
clearValueText="Clear value"
clearable={true}
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 45bc006fd30..c190942d7ed 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1280,6 +1280,7 @@ project_activity.add_custom_event=Create Custom Event
project_activity.change_custom_event=Change Event
project_activity.remove_custom_event=Delete Event
project_activity.remove_custom_event.question=Are you sure you want to delete this event?
+project_activity.reset_dates=Reset dates
project_activity.delete_analysis=Delete Analysis
project_activity.delete_analysis.question=Are you sure you want to delete this analysis from the project history?
project_activity.filter_events=Filter events