-
Notifications
You must be signed in to change notification settings - Fork 529
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
AO3-5610 notify users when a bookmark or series they have created is hidden #4760
base: master
Are you sure you want to change the base?
Changes from 14 commits
29bf722
a7130a0
ecd02f8
c64d3b8
611b27d
8d7fe01
bc5800f
9974615
1fbd9eb
787407d
87af757
a67f8c5
0518c97
34558af
65899ff
305d684
5c300ea
1224b15
208da7d
a079f72
2de2360
7251c16
695a6ca
6b0784a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<% content_for :message do %> | ||
<p><%= t("mailer.general.greeting.formal_html", name: style_bold(@user.login)) %></p> | ||
|
||
<p><%= t(".hidden.html", bookmark_url: style_creation_link("bookmark", @bookmark)) %></p> | ||
walshyb marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
<p><%= t(".access") %></p> | ||
|
||
<p><%= t(".check_email") %></p> | ||
|
||
<p><%= t(".tos_violation.html", tos_link: tos_link(t(".tos"))) %></p> | ||
|
||
<p><%= t(".help.html", contact_abuse_link: abuse_link(t(".contact_abuse"))) %></p> | ||
<% end %> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<% content_for :message do %> | ||
<%= t("mailer.general.greeting.formal_html", name: @user.login) %> | ||
|
||
<%= t(".hidden.text", bookmark_url: bookmark_url(@bookmark)) %> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The text here should be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I did the same thing that I did for the series mailer. Is this new change good? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The text is good now, but the variable name is incorrect. I left a comment on the line in the yml file. |
||
|
||
<%= t(".access") %> | ||
|
||
<%= t(".check_email") %> | ||
|
||
<%= t(".tos_violation.text", tos_url: tos_url) %> | ||
|
||
<%= t(".help.text", contact_abuse_url: new_abuse_report_url) %> | ||
<% end %> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<% content_for :message do %> | ||
<p><%= t("mailer.general.greeting.formal_html", name: style_bold(@user.login)) %></p> | ||
|
||
<p><%= t(".hidden.html", title: style_creation_link(@series.title, @series)) %></p> | ||
|
||
<p><%= t(".access") %></p> | ||
|
||
<p><%= t(".check_email") %></p> | ||
|
||
<p><%= t(".tos_violation.html", tos_link: tos_link(t(".tos"))) %></p> | ||
|
||
<p><%= t(".help.html", contact_abuse_link: abuse_link(t(".contact_abuse"))) %></p> | ||
<% end %> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<% content_for :message do %> | ||
<%= t("mailer.general.greeting.formal_html", name: @user.login) %> | ||
|
||
<%= t(".hidden.text", title: @series.title, series_url: series_url(@series)) %> | ||
|
||
<%= t(".access") %> | ||
|
||
<%= t(".check_email") %> | ||
|
||
<%= t(".tos_violation.text", tos_url: tos_url) %> | ||
|
||
<%= t(".help.text", contact_abuse_url: new_abuse_report_url) %> | ||
<% end %> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be in the model where
admin_hidden_bookmark_notification
is called and surround that call there, to make the locale selector in the preview work.Same for the other mail.