diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-22 18:09:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-22 18:09:14 +0300 |
commit | 3a8d221b7e3dc909876fe60ac267e63d1ffffdd7 (patch) | |
tree | 413b11d1687aa52f8929dda7fbca655ff9938a0b /app/assets/javascripts/sidebar | |
parent | a27c21b5af4f60ff11706f85289065272c616a0c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r-- | app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue index 1d9233db361..1ea8ab19012 100644 --- a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue +++ b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue @@ -19,12 +19,12 @@ export default { locked: { icon: 'lock', class: 'value', - iconClass: 'is-active', + displayText: __('Locked'), }, unlocked: { class: ['no-value hide-collapsed'], icon: 'lock-open', - iconClass: '', + displayText: __('Unlocked'), }, components: { EditForm, @@ -49,8 +49,6 @@ export default { issueCapitalized: __('Issue'), mergeRequest: __('merge request'), mergeRequestCapitalized: __('Merge request'), - locked: __('Locked'), - unlocked: __('Unlocked'), lockingMergeRequest: __('Locking %{issuableDisplayName}'), unlockingMergeRequest: __('Unlocking %{issuableDisplayName}'), lockMergeRequest: __('Lock %{issuableDisplayName}'), @@ -84,10 +82,7 @@ export default { return this.getNoteableData.discussion_locked; }, lockStatus() { - return this.isLocked ? this.$options.i18n.locked : this.$options.i18n.unlocked; - }, - tooltipLabel() { - return this.isLocked ? this.$options.i18n.locked : this.$options.i18n.unlocked; + return this.isLocked ? this.$options.locked : this.$options.unlocked; }, lockToggleInProgressText() { return this.isLocked ? this.unlockingMergeRequestText : this.lockingMergeRequestText; @@ -205,7 +200,7 @@ export default { </gl-disclosure-dropdown-item> <div v-else class="block issuable-sidebar-item lock"> <div - v-gl-tooltip.left.viewport="{ title: tooltipLabel }" + v-gl-tooltip.left.viewport="{ title: lockStatus.displayText }" class="sidebar-collapsed-icon" data-testid="sidebar-collapse-icon" @click="toggleForm" @@ -239,7 +234,7 @@ export default { /> <div data-testid="lock-status" class="sidebar-item-value" :class="lockStatus.class"> - {{ lockStatus }} + {{ lockStatus.displayText }} </div> </div> </div> |