Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 4 deletions

diff --git a/app/assets/javascripts/members/constants.js b/app/assets/javascripts/members/constants.js
index 93d113d1afe..3135ec602be 100644
--- a/app/assets/javascripts/members/constants.js
+++ b/app/assets/javascripts/members/constants.js
@@ -196,3 +196,8 @@ export const MEMBER_ACCESS_LEVEL_PROPERTY_NAME = 'access_level';
 
 export const GROUP_LINK_BASE_PROPERTY_NAME = 'group_link';
 export const GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME = 'group_access';
+
+export const I18N_USER_YOU = __("It's you");
+export const I18N_USER_BLOCKED = __('Blocked');
+export const I18N_USER_BOT = __('Bot');
+export const I188N_USER_2FA = __('2FA');
diff --git a/app/assets/javascripts/members/utils.js b/app/assets/javascripts/members/utils.js
index 7ec083646e9..0da44b7d468 100644
--- a/app/assets/javascripts/members/utils.js
+++ b/app/assets/javascripts/members/utils.js
@@ -1,28 +1,36 @@
 import { isUndefined } from 'lodash';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { getParameterByName, setUrlParams } from '~/lib/utils/url_utility';
-import { __ } from '~/locale';
 import {
   FIELDS,
   DEFAULT_SORT,
   GROUP_LINK_BASE_PROPERTY_NAME,
   GROUP_LINK_ACCESS_LEVEL_PROPERTY_NAME,
+  I18N_USER_YOU,
+  I18N_USER_BLOCKED,
+  I18N_USER_BOT,
+  I188N_USER_2FA,
 } from './constants';
 
 export const generateBadges = ({ member, isCurrentUser, canManageMembers }) => [
   {
     show: isCurrentUser,
-    text: __("It's you"),
+    text: I18N_USER_YOU,
     variant: 'success',
   },
   {
     show: member.user?.blocked,
-    text: __('Blocked'),
+    text: I18N_USER_BLOCKED,
     variant: 'danger',
   },
   {
+    show: member.user?.isBot,
+    text: I18N_USER_BOT,
+    variant: 'muted',
+  },
+  {
     show: member.user?.twoFactorEnabled && (canManageMembers || isCurrentUser),
-    text: __('2FA'),
+    text: I188N_USER_2FA,
     variant: 'info',
   },
 ];