Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/analytics/shared/components/daterange.vue

@@ -104,7 +104,7 @@ export default {
       class="daterange-indicator d-flex flex-row flex-lg-row align-items-flex-start align-items-lg-center"
     >
       <span class="number-of-days pl-2 pr-1">
-        <gl-sprintf :message="n__('1 day', '%d days', numberOfDays)">
+        <gl-sprintf :message="n__('1 day selected', '%d days selected', numberOfDays)">
           <template #numberOfDays>{{ numberOfDays }}</template>
         </gl-sprintf>
       </span>

locale/gitlab.pot

@@ -1223,6 +1223,11 @@ msgid_plural "%d days remaining"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "1 day selected"
+msgid_plural "%d days selected"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "1 deploy key"
 msgid_plural "%d deploy keys"
 msgstr[0] ""

spec/frontend/analytics/shared/components/daterange_spec.js

@@ -76,7 +76,7 @@ describe('Daterange component', () => {
       });
 
       it('displays the correct number of selected days in the indicator', () => {
-        expect(findDateRangeIndicator().find('span').text()).toBe('10 days');
+        expect(findDateRangeIndicator().find('span').text()).toBe('10 days selected');
       });
 
       it('displays a tooltip', () => {