Merge branch 'jivanvl-update-date-units' into 'master'

Change date time picker units

See merge request gitlab-org/gitlab!38232

app/assets/javascripts/vue_shared/constants.js

@@ -41,13 +41,13 @@ export const timeRanges = [
     interval: INTERVALS.hour,
   },
   {
-    label: __('1 week'),
+    label: __('7 days'),
     duration: { seconds: 60 * 60 * 24 * 7 * 1 },
     name: 'oneWeek',
     interval: INTERVALS.day,
   },
   {
-    label: __('1 month'),
+    label: __('30 days'),
     duration: { seconds: 60 * 60 * 24 * 30 },
     name: 'oneMonth',
     interval: INTERVALS.day,

changelogs/unreleased/jivanvl-update-date-units.yml

+---
+title: Change date time picker units
+merge_request: 38232
+author:
+type: changed

locale/gitlab.pot

@@ -957,9 +957,6 @@ msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "1 month"
-msgstr ""
-
 msgid "1 open issue"
 msgid_plural "%{issues} open issues"
 msgstr[0] ""
@@ -985,9 +982,6 @@ msgid_plural "%{num} users"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "1 week"
-msgstr ""
-
 msgid "1-9 contributions"
 msgstr ""
 
@@ -1012,6 +1006,9 @@ msgstr ""
 msgid "3 hours"
 msgstr ""
 
+msgid "30 days"
+msgstr ""
+
 msgid "30 minutes"
 msgstr ""
 
@@ -1033,6 +1030,9 @@ msgstr ""
 msgid "404|Please contact your GitLab administrator if you think this is a mistake."
 msgstr ""
 
+msgid "7 days"
+msgstr ""
+
 msgid "8 hours"
 msgstr ""