1 files changed, 8 insertions, 12 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index f0e80cba753..95e1e8af9b3 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -1,4 +1,6 @@
 <script>
+/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+import { __, sprintf } from '~/locale';
 import Timeago from 'timeago.js';
 import _ from 'underscore';
 import { GlTooltipDirective } from '@gitlab/ui';
@@ -14,7 +16,6 @@ import MonitoringButtonComponent from './environment_monitoring.vue';
 import CommitComponent from '../../vue_shared/components/commit.vue';
 import eventHub from '../event_hub';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-import { CLUSTER_TYPE } from '~/clusters/constants';
 
 /**
  * Environment Item Component
@@ -80,15 +81,6 @@ export default {
     },
 
     /**
-     * Hide group cluster features which are not currently implemented.
-     *
-     * @returns {Boolean}
-     */
-    disableGroupClusterFeatures() {
-      return this.model && this.model.cluster_type === CLUSTER_TYPE.GROUP;
-    },
-
-    /**
      * Returns whether the environment can be stopped.
      *
      * @returns {Boolean}
@@ -172,7 +164,9 @@ export default {
         this.model.last_deployment.user &&
         this.model.last_deployment.user.username
       ) {
-        return `${this.model.last_deployment.user.username}'s avatar'`;
+        return sprintf(__("%{username}'s avatar"), {
+          username: this.model.last_deployment.user.username,
+        });
       }
       return '';
     },
@@ -293,6 +287,9 @@ export default {
      * @returns {Boolean|Undefined}
      */
     isLastDeployment() {
+      // name: 'last?' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
+      // Vue i18n ESLint rules issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/63560
+      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
       return this.model && this.model.last_deployment && this.model.last_deployment['last?'];
     },
 
@@ -575,7 +572,6 @@ export default {
         <terminal-button-component
           v-if="model && model.terminal_path"
           :terminal-path="model.terminal_path"
-          :disabled="disableGroupClusterFeatures"
         />
 
         <rollback-component