FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new date format in notifications

This commit is contained in:
Andreas Nedbal 2024-03-10 16:11:11 +01:00 committed by Andreas Nedbal
parent 444acaf548
commit 07cafb9b30
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/notifications/type/_answer.html.haml
View File

@ -6,8 +6,9 @@
= render AvatarComponent.new(user: notification.target.user, size: "xs") = render AvatarComponent.new(user: notification.target.user, size: "xs")
= t(".heading_html", = t(".heading_html",
user: user_screen_name(notification.target.user), user: user_screen_name(notification.target.user),
question: link_to(t(".link_text"), answer_path(username: notification.target.user.screen_name, id: notification.target.id), target: "_top"), question: link_to(t(".link_text"), answer_path(username: notification.target.user.screen_name, id: notification.target.id), target: "_top"))
time: time_tooltip(notification.target)) ·
= time_tooltip(notification.target)
.list-group .list-group
.list-group-item .list-group-item
%h6.notification__list-heading= t("activerecord.models.question.one") %h6.notification__list-heading= t("activerecord.models.question.one")

11
app/views/notifications/type/_comment.html.haml
View File

@ -10,16 +10,14 @@
answer: link_to(t(".active.link_text"), answer: link_to(t(".active.link_text"),
answer_path(username: notification.target.user.screen_name, answer_path(username: notification.target.user.screen_name,
id: notification.target.answer.id), id: notification.target.answer.id),
target: "_top"), target: "_top"))
time: time_tooltip(notification.target))
- elsif notification.target.user == notification.target.answer.user - elsif notification.target.user == notification.target.answer.user
= t(".heading_html", = t(".heading_html",
user: user_screen_name(notification.target.user), user: user_screen_name(notification.target.user),
answer: link_to(t(".passive.link_text"), answer: link_to(t(".passive.link_text"),
answer_path(username: notification.target.user.screen_name, answer_path(username: notification.target.user.screen_name,
id: notification.target.answer.id), id: notification.target.answer.id),
target: "_top"), target: "_top"))
time: time_tooltip(notification.target))
- else - else
= t(".heading_html", = t(".heading_html",
user: user_screen_name(notification.target.user), user: user_screen_name(notification.target.user),
@ -27,8 +25,9 @@
user: user_screen_name(notification.target.answer.user, url: false)), user: user_screen_name(notification.target.answer.user, url: false)),
answer_path(username: notification.target.user.screen_name, answer_path(username: notification.target.user.screen_name,
id: notification.target.answer.id), id: notification.target.answer.id),
target: "_top"), target: "_top"))
time: time_tooltip(notification.target)) ·
= time_tooltip(notification.target)
.list-group .list-group
.list-group-item .list-group-item
%h6.notification__list-heading= t("activerecord.models.answer.one") %h6.notification__list-heading= t("activerecord.models.answer.one")

8
app/views/notifications/type/_reaction.html.haml
View File

@ -10,16 +10,16 @@
type: link_to(t(".#{notification.target.parent_type.downcase}.link_text"), type: link_to(t(".#{notification.target.parent_type.downcase}.link_text"),
answer_path(username: notification.target.user.screen_name, answer_path(username: notification.target.user.screen_name,
id: notification.target.parent.id), id: notification.target.parent.id),
target: "_top"), target: "_top"))
time: time_tooltip(notification.target))
- elsif notification.target.parent_type == "Comment" - elsif notification.target.parent_type == "Comment"
= t(".heading_html", = t(".heading_html",
user: user_screen_name(notification.target.user), user: user_screen_name(notification.target.user),
type: link_to(t(".#{notification.target.parent_type.downcase}.link_text"), type: link_to(t(".#{notification.target.parent_type.downcase}.link_text"),
answer_path(username: notification.target.user.screen_name, answer_path(username: notification.target.user.screen_name,
id: notification.target.parent.answer.id), id: notification.target.parent.answer.id),
target: "_top"), target: "_top"))
time: time_tooltip(notification.target)) ·
= time_tooltip(notification.target)
.list-group .list-group
.list-group-item .list-group-item
%h6.notification__list-heading= t("activerecord.models.#{notification.target.parent_type.downcase}.one") %h6.notification__list-heading= t("activerecord.models.#{notification.target.parent_type.downcase}.one")

6
config/locales/views.en.yml
View File

@ -343,10 +343,10 @@ en:
none: "No new notifications." none: "No new notifications."
type: type:
answer: answer:
heading_html: "%{user} answered %{question} %{time} ago" heading_html: "%{user} answered %{question}"
link_text: "your question" link_text: "your question"
comment: comment:
heading_html: "%{user} commented on %{answer} %{time} ago" heading_html: "%{user} commented on %{answer}"
active: active:
link_text: "your answer" link_text: "your answer"
passive: passive:
@ -358,7 +358,7 @@ en:
text_html: "Head over to %{settings_export} to download it." text_html: "Head over to %{settings_export} to download it."
settings_export: "the settings page" settings_export: "the settings page"
reaction: reaction:
heading_html: "%{user} smiled %{type} %{time} ago" heading_html: "%{user} smiled %{type}"
answer: answer:
link_text: "your answer" link_text: "your answer"
comment: comment: