From 0d762500d61fc55d6b28b6c30045a4593e3bd80e Mon Sep 17 00:00:00 2001
From: Chad Lavimoniere <clavimoniere@gitlab.com>
Date: Thu, 1 Feb 2024 13:47:25 -0500
Subject: [PATCH] Use clearer label for iteration report calc mode
Updates copy for clarity and adjusts translation files and tests.
Changelog: fixed
EE: true
---
.../burndown_chart/components/burn_charts.vue | 6 +++---
.../burndown_chart/components/burn_charts_spec.js | 4 ++--
locale/gitlab.pot | 9 ++++++---
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ee/app/assets/javascripts/burndown_chart/components/burn_charts.vue b/ee/app/assets/javascripts/burndown_chart/components/burn_charts.vue
index f290e7e52b2d7..32b790191ad98 100644
--- a/ee/app/assets/javascripts/burndown_chart/components/burn_charts.vue
+++ b/ee/app/assets/javascripts/burndown_chart/components/burn_charts.vue
@@ -303,7 +303,7 @@ export default {
},
},
filterByOptions: [
- { value: FILTER_BY_ISSUES, text: __('Issues'), props: { 'data-testid': 'issue-button' } },
+ { value: FILTER_BY_ISSUES, text: __('Issue count'), props: { 'data-testid': 'issue-button' } },
{
value: FILTER_BY_ISSUE_WEIGHT,
text: __('Issue weight'),
@@ -315,8 +315,8 @@ export default {
<template>
<div>
- <div class="burndown-header gl-display-flex gl-align-items-center gl-flex-wrap">
- <strong ref="filterLabel">{{ __('Filter by') }}</strong>
+ <div class="burndown-header gl-display-flex gl-align-items-center gl-flex-wrap gl-gap-2">
+ <strong ref="filterLabel">{{ __('Display by') }}</strong>
<segmented-control-button-group
:value="filterBySelectedValue"
:options="$options.filterByOptions"
diff --git a/ee/spec/frontend/burndown_chart/components/burn_charts_spec.js b/ee/spec/frontend/burndown_chart/components/burn_charts_spec.js
index c3642708dc3f1..35f74fc084a34 100644
--- a/ee/spec/frontend/burndown_chart/components/burn_charts_spec.js
+++ b/ee/spec/frontend/burndown_chart/components/burn_charts_spec.js
@@ -99,7 +99,7 @@ describe('burndown_chart', () => {
createComponent();
expect(findFilterByControl().props('options')).toEqual([
- { value: 'issues', text: 'Issues', props: { 'data-testid': 'issue-button' } },
+ { value: 'issues', text: 'Issue count', props: { 'data-testid': 'issue-button' } },
{ value: 'issue_weight', text: 'Issue weight', props: { 'data-testid': 'weight-button' } },
]);
});
@@ -129,7 +129,7 @@ describe('burndown_chart', () => {
it('sets section title and chart title correctly', () => {
createComponent();
- expect(findFilterLabel().text()).toBe('Filter by');
+ expect(findFilterLabel().text()).toBe('Display by');
expect(findBurndownChart().props().showTitle).toBe(true);
});
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index c93aafa99e7be..e6c1cc793bb81 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -18124,6 +18124,9 @@ msgstr ""
msgid "Display blame info"
msgstr ""
+msgid "Display by"
+msgstr ""
+
msgid "Display milestones"
msgstr ""
@@ -21188,9 +21191,6 @@ msgstr ""
msgid "Filter activity"
msgstr ""
-msgid "Filter by"
-msgstr ""
-
msgid "Filter by %{page_context_word} that are currently open."
msgstr ""
@@ -26893,6 +26893,9 @@ msgstr ""
msgid "Issue cannot be found."
msgstr ""
+msgid "Issue count"
+msgstr ""
+
msgid "Issue created from vulnerability %{vulnerability_link}"
msgstr ""
--
GitLab