diff --git a/app/views/answerbox/_header.html.haml b/app/views/answerbox/_header.html.haml index 65db63a1..02b53f2e 100644 --- a/app/views/answerbox/_header.html.haml +++ b/app/views/answerbox/_header.html.haml @@ -7,7 +7,7 @@ .flex-grow-1 %h6.text-muted.answerbox__question-user - if a.question.author_is_anonymous - %i.fas.fa-user-secret{ title: t(".anon_hint") } + %i.fas.fa-user-secret{ title: t("voc.anon_hint") } = t(".asked_html", user: user_screen_name(a.question.user, context_user: a.user, author_identifier: a.question.author_is_anonymous ? a.question.author_identifier: nil), time: time_tooltip(a.question)) - if !a.question.author_is_anonymous && !a.question.direct · diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml index 12409502..30fb567e 100644 --- a/app/views/inbox/_entry.html.haml +++ b/app/views/inbox/_entry.html.haml @@ -8,7 +8,7 @@ .flex-grow-1 %h6.text-muted.answerbox__question-user - if i.question.author_is_anonymous - %i.fas.fa-user-secret{ title: t('.anon_hint') } + %i.fas.fa-user-secret{ title: t('voc.anon_hint') } = t(".asked_html", user: user_screen_name(i.question.user, context_user: i.user, author_identifier: i.question.author_is_anonymous ? i.question.author_identifier : nil), time: time_tooltip(i.question)) - if !i.question.author_is_anonymous && i.question.answer_count.positive? · diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml index 1cf872f3..7f8111c1 100644 --- a/app/views/navigation/_desktop.html.haml +++ b/app/views/navigation/_desktop.html.haml @@ -12,10 +12,10 @@ = nav_entry t("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: { bs_toggle: 'tooltip', bs_placement: 'bottom' }, title: t(".list") } + %li.nav-item.d-none.d-sm-block{ data: { bs_toggle: 'tooltip', bs_placement: 'bottom' }, title: t("voc.list") } %a.nav-link{ href: '#', data: { bs_target: '#modal-list-memberships', bs_toggle: :modal } } %i.fa.fa-list.hidden-xs - %span.d-none.d-sm-inline.d-md-none= t(".list") + %span.d-none.d-sm-inline.d-md-none= t("voc.list") = nav_entry t("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: { bs_toggle: :dropdown } } diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml index 909efe22..82fc61b3 100644 --- a/app/views/user/_actions.html.haml +++ b/app/views/user/_actions.html.haml @@ -18,7 +18,7 @@ .dropdown-menu %a.dropdown-item.d-block.d-sm-none{ href: '#', data: { bs_target: '#modal-list-memberships', bs_toggle: :modal } } %i.fa.fa-list.fa-fw - = t(".list") + = t("voc.list") - if current_user.blocking?(user) %a.dropdown-item{ href: '#', data: { action: :unblock, target: user.screen_name } } %i.fa.fa-minus-circle.fa-fw diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml index bf81280d..aa4009c0 100644 --- a/config/locales/views.en.yml +++ b/config/locales/views.en.yml @@ -103,7 +103,6 @@ en: dead: "Dead" answerbox: header: - anon_hint: :inbox.entry.anon_hint answers: zero: "0 answers" one: "1 answer" @@ -203,7 +202,6 @@ en: inbox: entry: asked_html: "%{user} asked %{time} ago" - anon_hint: "This question was asked anonymously." answers: one: "1 answer" other: "%{count} answers" @@ -320,7 +318,6 @@ en: features: "Feature Requests" desktop: ask_question: "Ask a question" - list: :user.actions.list notifications: index: title: "Notifications" @@ -637,7 +634,6 @@ en: privilege: "Check %{user}'s privileges" ban: "Ban Control" title: "Actions" - list: "Manage list memberships" profile: badge: admin: "Admin" diff --git a/config/locales/voc.en.yml b/config/locales/voc.en.yml index 232d5500..e1e0ddd9 100644 --- a/config/locales/voc.en.yml +++ b/config/locales/voc.en.yml @@ -1,6 +1,7 @@ en: voc: add: "Add" + anon_hint: "This question was asked anonymously." answer: "Answer" block: "Block" block_site_wide: "Block user site-wide" @@ -10,6 +11,7 @@ en: delete: "Delete" edit: "Edit" follow: "Follow" + list: "Manage list memberships" load: "Load more" login: "Sign in" logout: "Sign out"