Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 1 deletions

diff --git a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
index 7126d69c8c6..c33b1468ca4 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue
@@ -25,6 +25,8 @@ import {
   Tracking,
   IssuableAttributeState,
   IssuableAttributeType,
+  LocalizedIssuableAttributeType,
+  IssuableAttributeTypeKeyMap,
   issuableAttributesQueries,
   noAttributeId,
   defaultEpicSort,
@@ -229,7 +231,9 @@ export default {
       return timeFor(this.currentAttribute?.dueDate);
     },
     i18n() {
-      return dropdowni18nText(this.issuableAttribute, this.issuableType);
+      const localizedAttribute =
+        LocalizedIssuableAttributeType[IssuableAttributeTypeKeyMap[this.issuableAttribute]];
+      return dropdowni18nText(localizedAttribute, this.issuableType);
     },
     isEpic() {
       // MV to EE https://gitlab.com/gitlab-org/gitlab/-/issues/345311
diff --git a/app/assets/javascripts/sidebar/constants.js b/app/assets/javascripts/sidebar/constants.js
index 60cb4cff727..6248bcb8e2d 100644
--- a/app/assets/javascripts/sidebar/constants.js
+++ b/app/assets/javascripts/sidebar/constants.js
@@ -1,3 +1,4 @@
+import { invert } from 'lodash';
 import { s__, __, sprintf } from '~/locale';
 import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
 import userSearchQuery from '~/graphql_shared/queries/users_search.query.graphql';
@@ -251,6 +252,12 @@ export const IssuableAttributeType = {
   Milestone: 'milestone',
 };
 
+export const LocalizedIssuableAttributeType = {
+  Milestone: s__('Issuable|milestone'),
+};
+
+export const IssuableAttributeTypeKeyMap = invert(IssuableAttributeType);
+
 export const IssuableAttributeState = {
   [IssuableAttributeType.Milestone]: 'active',
 };