From 55cb43c8769e24136c8091a6384757fed5aed780 Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Sat, 30 Jul 2022 20:14:02 +0200 Subject: [PATCH] Move "Manage list memberships" user action title --- app/views/navigation/_desktop.haml | 4 ++-- app/views/user/_actions.haml | 2 +- config/locales/views.en.yml | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/navigation/_desktop.haml b/app/views/navigation/_desktop.haml index 3f7fb00e..b49f8f38 100644 --- a/app/views/navigation/_desktop.haml +++ b/app/views/navigation/_desktop.haml @@ -9,10 +9,10 @@ = nav_entry t('views.navigation.discover'), discover_path, icon: 'compass' %ul.nav.navbar-nav - if @user.present? && @user != current_user - %li.nav-item.d-none.d-sm-block{ data: { toggle: 'tooltip', placement: 'bottom' }, title: t('views.actions.list') } + %li.nav-item.d-none.d-sm-block{ data: { toggle: 'tooltip', placement: 'bottom' }, title: t(".list") } %a.nav-link{ href: '#', data: { target: '#modal-list-memberships', toggle: :modal } } %i.fa.fa-list.hidden-xs - %span.d-none.d-sm-inline.d-md-none= t('views.actions.list') + %span.d-none.d-sm-inline.d-md-none= t(".list") = nav_entry t('views.navigation.notifications'), notifications_path, badge: notification_count, class: 'd-block d-sm-none' %li.nav-item.dropdown.d-none.d-sm-block %a.nav-link.dropdown-toggle{ href: '#', data: { toggle: :dropdown } } diff --git a/app/views/user/_actions.haml b/app/views/user/_actions.haml index ab7869ba..124695b2 100644 --- a/app/views/user/_actions.haml +++ b/app/views/user/_actions.haml @@ -16,7 +16,7 @@ .dropdown-menu %a.dropdown-item.d-block.d-sm-none{ href: '#', data: { target: '#modal-list-memberships', toggle: :modal } } %i.fa.fa-list - = t 'views.actions.list' + = t(".list") - if current_user.blocking?(user) %a.dropdown-item{ href: '#', data: { action: :unblock, target: user.screen_name } } %i.fa.fa-minus-circle diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml index 8fa69403..a06c84fe 100644 --- a/config/locales/views.en.yml +++ b/config/locales/views.en.yml @@ -249,6 +249,7 @@ en: new: "Show all new notifications" desktop: ask_question: "Ask a question" + list: :user.actions.list notifications: index: title: "Notifications" @@ -494,3 +495,4 @@ en: privilege: "Check %{user}'s privileges" ban: "Ban Control" title: "Actions" + list: "Manage list memberships"