diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-10-03 11:32:12 +0000 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-10-03 11:32:12 +0000 |
| commit | 8efcd1cc9a9f5a19f2cbf4bca3581d5691242250 (patch) | |
| tree | 99f393a05f3cd7a61f2da2e0f40393b6204f5b8f | |
| parent | e7e69a0e8ca5f5c17ffc05fbcb2654733685b246 (diff) | |
| download | gitlab-ce-8efcd1cc9a9f5a19f2cbf4bca3581d5691242250.tar.gz | |
Rename "Clear status" button to "Remove status"
| -rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 6 | ||||
| -rw-r--r-- | locale/gitlab.pot | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index 2534c8432ba..e8053dfd724 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -122,7 +122,7 @@ export default { this.clearEmoji(); this.hideEmojiMenu(); }, - clearStatus() { + removeStatus() { this.clearStatusInputs(); this.setStatus(); }, @@ -156,13 +156,13 @@ export default { :title="s__('SetStatusModal|Set a status')" :modal-id="modalId" :ok-title="s__('SetStatusModal|Set status')" - :cancel-title="s__('SetStatusModal|Clear status')" + :cancel-title="s__('SetStatusModal|Remove status')" ok-variant="success" class="set-user-status-modal" @shown="setupEmojiListAndAutocomplete" @hide="hideEmojiMenu" @ok="setStatus" - @cancel="clearStatus" + @cancel="removeStatus" > <div> <input diff --git a/locale/gitlab.pot b/locale/gitlab.pot index fac87592f5f..34b0a71d2b6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5399,10 +5399,10 @@ msgstr "" msgid "SetStatusModal|Clear Status" msgstr "" -msgid "SetStatusModal|Clear status" +msgid "SetStatusModal|Edit status" msgstr "" -msgid "SetStatusModal|Edit status" +msgid "SetStatusModal|Remove status" msgstr "" msgid "SetStatusModal|Set a status" |