Skip to content
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.

Sign up for GitHub

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-4308 Update claim email text with t's suggestion #4796

Merged
merged 3 commits into from
Apr 23, 2024
Merged

AO3-4308 Update claim email text with t's suggestion #4796

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e202941
AO3-4308 Update claim email text with t's suggestion
brianjaustin Apr 22, 2024
912257e
Group text/html under 1 parent
brianjaustin Apr 22, 2024
41d6f8d
Match T's suggested keys
brianjaustin Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/user_mailer/claim_notification.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<% end %>
</ul>

<p><%= t(".redirects") %></p>
<p><%= t(".redirects_html") %></p>
Copy link
Contributor

@Bilka2 Bilka2 Apr 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to have the locale keys be redirects.html and redirects.text for consistency with other mailer keys. See also #4519 (comment).

Copy link
Contributor

@Bilka2 Bilka2 Apr 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: This is a nitpick. If getting this merged is very high priority, the rest of the commit looks good and this could be merged as is.


<p><%= t(".update_redirect.html", contact_open_doors_link: opendoors_link(t(".update_redirect.contact_open_doors"))) %></p>

Expand Down
3 changes: 2 additions & 1 deletion config/locales/mailers/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ en:
contact_support: contact AO3 Support
html: For other inquiries, please %{contact_support_link}.
text: For other inquiries, please contact AO3 Support at %{support_url}.
redirects: To preserve rec lists and bookmarks, the imported archive's web addresses may redirect to the imported copy of these works for a limited time (check the announcement post for your archive to be sure). If you've already uploaded a copy of these works and you did NOT use the import from URL feature, there will be two copies of the same work on the archive.
redirects: To preserve rec lists and bookmarks, the imported archive's web addresses may redirect to the imported copy of these works for a limited time (check the announcement post for your archive to be sure). If you've already uploaded a copy of these works and you did NOT use the import from URL feature, there will be two copies of the same work on the AO3.
redirects_html: To preserve rec lists and bookmarks, the imported archive's web addresses may redirect to the imported copy of these works for a limited time (check the announcement post for your archive to be sure). If you've already uploaded a copy of these works and you did <strong>NOT</strong> use the import from URL feature, there will be two copies of the same work on the AO3.
subject: "[%{app_name}] Works uploaded"
update_redirect:
contact_open_doors: contact Open Doors
Expand Down
6 changes: 6 additions & 0 deletions test/mailers/previews/user_mailer_preview.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ def feedback_response
UserMailer.feedback(feedback.id)
end

def claim_notification_registered
work = create(:work)
creator_id = work.pseuds.first.user.id
UserMailer.claim_notification(creator_id, [work.id], true)
end

private

def creatorship_notification_data
Expand Down
Loading