diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-10-03 11:51:59 +0000 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-10-03 15:56:12 +0000 |
| commit | 0a196e855e8439b640820c8040122c336f51e65c (patch) | |
| tree | dfac38a51b5031353c87fa0495952d524e4a5f01 | |
| parent | 51c24d9c2d465954eb9207698bda78b33c40aa58 (diff) | |
| download | gitlab-ce-0a196e855e8439b640820c8040122c336f51e65c.tar.gz | |
Use sentence casing for tooltip on "x" button to clear inputs
| -rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 | ||||
| -rw-r--r-- | spec/features/profiles/user_edit_profile_spec.rb | 4 |
3 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 e8053dfd724..cb0c42cb9dc 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 @@ -224,8 +224,8 @@ export default { > <button v-gl-tooltip.bottom - :title="s__('SetStatusModal|Clear Status')" - :aria-label="s__('SetStatusModal|Clear Status')" + :title="s__('SetStatusModal|Clear status')" + :aria-label="s__('SetStatusModal|Clear status')" name="button" type="button" class="js-clear-user-status-button clear-user-status btn" diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 34b0a71d2b6..ed70fca664a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5396,7 +5396,7 @@ msgstr "" msgid "SetStatusModal|Add status emoji" msgstr "" -msgid "SetStatusModal|Clear Status" +msgid "SetStatusModal|Clear status" msgstr "" msgid "SetStatusModal|Edit status" diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb index e1561444e0e..94f1c9fa744 100644 --- a/spec/features/profiles/user_edit_profile_spec.rb +++ b/spec/features/profiles/user_edit_profile_spec.rb @@ -252,7 +252,7 @@ describe 'User edit profile' do expect(page).not_to have_selector '.cover-status' end - it 'clears the user status with the "Clear status" button' do + it 'clears the user status with the "Remove status" button' do user_status = create(:user_status, user: user, message: 'Eating bread', emoji: 'stuffed_flatbread') visit user_path(user) @@ -268,7 +268,7 @@ describe 'User edit profile' do end page.within "#set-user-status-modal" do - click_button 'Clear status' + click_button 'Remove status' end visit user_path(user) |