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-6240 Use i18n-tasks to rename numbered mailer translation keys #4519

Merged
merged 5 commits into from
Jun 2, 2023
Merged

AO3-6240 Use i18n-tasks to rename numbered mailer translation keys #4519

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3970f5e
AO3-6240 Move numbered mailer translation keys
Bilka2 May 25, 2023
c5515d8
AO3-6240 Update the view files to use the moved keys
Bilka2 May 23, 2023
ed32d46
AO3-6240 Remove one last html_safe
Bilka2 May 27, 2023
2b47ce1
Merge branch 'master' into AO3-6240
Bilka2 May 27, 2023
8e519aa
AO3-6240 Change change_email text mailer to not use html safe key
Bilka2 Jun 2, 2023
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
4 changes: 2 additions & 2 deletions app/views/layouts/mailer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
<p><%= yield(:footer_note) %></p>
<% end %>

<p><%= t("mailer.general.footer.general.html.part1", support_link: style_footer_link(t("mailer.general.footer.general.html.support_link_text"), new_feedback_report_url)).html_safe %></p>
<p><%= t("mailer.general.footer.general.unwanted_email.html", support_link: style_footer_link(t("mailer.general.footer.general.html.support_link_text"), new_feedback_report_url)) %></p>

<p><%= t("mailer.general.footer.general.html.part2", donate_link: style_footer_link(t("mailer.general.footer.general.html.donate_link_text"), donate_url)).html_safe %></p>
<p><%= t("mailer.general.footer.general.about.html", donate_link: style_footer_link(t("mailer.general.footer.general.html.donate_link_text"), donate_url)) %></p>

<% if content_for?(:sent_at) %>
<p><%= t 'mailer.general.footer.sent_at', sent_at: yield(:sent_at).strip %></p>
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/mailer.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Archive of Our Own
<%= yield(:footer_note) %>

<% end %>
<%= t 'mailer.general.footer.general.text.part1', support_url: new_feedback_report_url %>
<%= t 'mailer.general.footer.general.unwanted_email.text', support_url: new_feedback_report_url %>

<%= t 'mailer.general.footer.general.text.part2', donate_url: donate_url %>
<%= t 'mailer.general.footer.general.about.text', donate_url: donate_url %>
<% if content_for?(:sent_at) %>

<%= t 'mailer.general.footer.sent_at', sent_at: yield(:sent_at).strip %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/user_mailer/admin_deleted_work_notification.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<% content_for :message do %>
<p><%= t("mailer.general.greeting.formal", name: style_bold(@user.login)).html_safe %></p>

<p><%= t('.html.part1', title: style_creation_title(@work.title)).html_safe %></p>
<p><%= t('.deleted.html', title: style_creation_title(@work.title)) %></p>

<p><%= t('.html.part2', opendoors_link: opendoors_link(t '.opendoors')).html_safe %></p>
<p><%= t('.import_project.html', opendoors_link: opendoors_link(t '.opendoors')) %></p>

<p><%= t(".html.tos_violation", contact_abuse_link: abuse_link(t(".contact_abuse"))).html_safe %></p>

Expand Down
4 changes: 2 additions & 2 deletions app/views/user_mailer/admin_deleted_work_notification.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<% content_for :message do %>
<%= t("mailer.general.greeting.formal", name: @user.login) %>

<%= t('.text.part1', title: @work.title) %>
<%= t('.deleted.text', title: @work.title) %>

<%= t('.text.part2', opendoors_link: 'http://opendoors.transformativeworks.org/contact-open-doors/') %>
<%= t('.import_project.text', opendoors_link: 'http://opendoors.transformativeworks.org/contact-open-doors/') %>

<%= t(".text.tos_violation", contact_abuse_url: new_abuse_report_url) %>

Expand Down
2 changes: 1 addition & 1 deletion app/views/user_mailer/challenge_assignment_notification.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :message do %>
<p><%= t(".html.part1", link: style_link(@collection.title, collection_url(@collection))).html_safe %></p>
<p><%= t(".assignment.html", link: style_link(@collection.title, collection_url(@collection))) %></p>

<p>
<%= style_bold(t(".recipient")) %> <%= @request.nil? ? t(".recipient_missing") : style_link(@request.pseud.byline, user_pseud_url(@request.pseud.user, @request.pseud)) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/user_mailer/change_email.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<% content_for :message do %>
<%= t('.part1', login: style_bold(@user.login), email: style_email(@user.email)).html_safe %>
<%= t('.changed.html', login: style_bold(@user.login), email: style_email(@user.email)) %>
<% end %>
2 changes: 1 addition & 1 deletion app/views/user_mailer/change_email.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<% content_for :message do %>
<%= t('.part1', login: @user.login, email: @user.email) %>
<%= t('.changed.html', login: @user.login, email: @user.email) %>
Bilka2 marked this conversation as resolved.
Show resolved Hide resolved
<% end %>
12 changes: 6 additions & 6 deletions app/views/user_mailer/delete_work_notification.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% content_for :message do %>
<p><%= t("mailer.general.greeting.formal", name: style_bold(@user.login)).html_safe %></p>
<p><%= (@work.pseuds.count > 1 && @user != User.current_user) ?
t('.html.part1_other',
t('.deleted_other.html',
title: style_creation_title(@work.title),
pseud: style_pseud_link(User.current_user.default_pseud)).html_safe :
t('.html.part1_yourself',
title: style_creation_title(@work.title)).html_safe %></p>
<p><%= t('.html.part2', support: support_link(t '.support')).html_safe %></p>
<p><%= t('.part3') %></p>
pseud: style_pseud_link(User.current_user.default_pseud)) :
t('.deleted_yourself.html',
title: style_creation_title(@work.title)) %></p>
<p><%= t('.questions.html', support: support_link(t '.support')) %></p>
<p><%= t('.attachment') %></p>
<% end %>
8 changes: 4 additions & 4 deletions app/views/user_mailer/delete_work_notification.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<%= t("mailer.general.greeting.formal", name: @user.login) %>

<%= (@work.pseuds.count > 1 && @user != User.current_user) ?
t('.text.part1_other',
t('.deleted_other.text',
title: @work.title,
pseud: text_pseud(User.current_user.default_pseud)) :
t('.text.part1_yourself',
t('.deleted_yourself.text',
title: @work.title) %>

<%= t('.text.part2', support: t('.support'), url: new_feedback_report_url) %>
<%= t('.questions.text', support: t('.support'), url: new_feedback_report_url) %>

<%= t('.part3') %>
<%= t('.attachment') %>
<% end %>

24 changes: 12 additions & 12 deletions app/views/user_mailer/invitation_to_claim.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<%= t("mailer.general.greeting.introductory") %>
</h2>

<p><%= t('.html.part1', open_doors_name_link: style_link(t('.html.open_doors_name'), "http://opendoors.transformativeworks.org"), app_short_name: ArchiveConfig.APP_SHORT_NAME, app_link: style_link(ArchiveConfig.APP_NAME, root_url)).html_safe %></p>
<p><%= t('.introduction.html', open_doors_name_link: style_link(t('.html.open_doors_name'), "http://opendoors.transformativeworks.org"), app_short_name: ArchiveConfig.APP_SHORT_NAME, app_link: style_link(ArchiveConfig.APP_NAME, root_url)) %></p>

<p><%= t('.html.part2', ao3_news_link: style_link(t('.html.ao3_news'), admin_posts_url + "?tag=18"), faq_page_link: style_link(t('.html.faq_page'), "http://opendoors.transformativeworks.org/faq"), tutorial_page_link: style_link(t('.html.tutorial_page'), "http://opendoors.transformativeworks.org/tutorials"), contact_support_link: support_link(t '.html.contact_support')).html_safe %></p>
<p><%= t('.more_info.html', ao3_news_link: style_link(t('.html.ao3_news'), admin_posts_url + "?tag=18"), faq_page_link: style_link(t('.html.faq_page'), "http://opendoors.transformativeworks.org/faq"), tutorial_page_link: style_link(t('.html.tutorial_page'), "http://opendoors.transformativeworks.org/tutorials"), contact_support_link: support_link(t '.html.contact_support')) %></p>

<p><%= t('.html.part3', contact_open_doors_link: style_link(t('.html.contact_open_doors'), 'https://opendoors.transformativeworks.org/en/contact-open-doors/')).html_safe %></p>
<p><%= t('.mistake.html', contact_open_doors_link: style_link(t('.html.contact_open_doors'), 'https://opendoors.transformativeworks.org/en/contact-open-doors/')) %></p>

<p><%= t('.html.part4', contact_support_link: support_link(t '.html.contact_support')).html_safe %></p>
<p><%= t('.access.html', contact_support_link: support_link(t '.html.contact_support')) %></p>

<p><%= style_link(t('.html.part5'), claim_url(:invitation_token => @token)) %></p>
<p><%= style_link(t('.claim_or_remove.html'), claim_url(:invitation_token => @token)) %></p>

<p><%= t '.part6' %></p>
<p><%= t '.uploaded_list' %></p>

<ul>
<% @external_author.works.each do |work| %>
Expand All @@ -22,17 +22,17 @@
<% end %>
</ul>

<p><%= t('.html.part7', contact_support_link: support_link(t '.html.contact_support')).html_safe %></p>
<p><%= t('.unwanted.html', contact_support_link: support_link(t '.html.contact_support')) %></p>

<p><%= t '.part8' %></p>
<p><%= t '.redirects' %></p>

<p><%= t('.html.part9', contact_open_doors_link: style_link(t('.html.contact_open_doors'), 'https://opendoors.transformativeworks.org/en/contact-open-doors/')).html_safe %></p>
<p><%= t('.update_redirect.html', contact_open_doors_link: style_link(t('.html.contact_open_doors'), 'https://opendoors.transformativeworks.org/en/contact-open-doors/')) %></p>

<p><%= t('.html.part10', contact_open_doors_link: style_link(t('.html.contact_open_doors'), 'https://opendoors.transformativeworks.org/en/contact-open-doors/')).html_safe %></p>
<p><%= t('.other_works.html', contact_open_doors_link: style_link(t('.html.contact_open_doors'), 'https://opendoors.transformativeworks.org/en/contact-open-doors/')) %></p>

<p><%= t('.html.part11', contact_support_link: support_link(t '.html.contact_support')).html_safe %></p>
<p><%= t('.questions.html', contact_support_link: support_link(t '.html.contact_support')) %></p>

<p><%= t '.part12' %></p>
<p><%= t '.email_tips' %></p>

<p><%= t("mailer.general.closing.informal") %><br/>
<%= style_bold(t("mailer.general.signature.open_doors")) %><br/>
Expand Down
24 changes: 12 additions & 12 deletions app/views/user_mailer/invitation_to_claim.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<% content_for :message do %>
<%= t("mailer.general.greeting.introductory") %>

<%= t '.text.part1', open_doors_link: "http://opendoors.transformativeworks.org", app_name: ArchiveConfig.APP_NAME, app_short_name: ArchiveConfig.APP_SHORT_NAME, app_url: root_url %>
<%= t '.introduction.text', open_doors_link: "http://opendoors.transformativeworks.org", app_name: ArchiveConfig.APP_NAME, app_short_name: ArchiveConfig.APP_SHORT_NAME, app_url: root_url %>

<%= t '.text.part2', news_link: admin_posts_url + "?tag=18", open_doors_faq_link: "http://opendoors.transformativeworks.org/faq", open_doors_tutorial_link: "http://opendoors.transformativeworks.org/tutorials", support_link: new_feedback_report_url %>
<%= t '.more_info.text', news_link: admin_posts_url + "?tag=18", open_doors_faq_link: "http://opendoors.transformativeworks.org/faq", open_doors_tutorial_link: "http://opendoors.transformativeworks.org/tutorials", support_link: new_feedback_report_url %>

<%= t '.text.part3', open_doors_link: "https://opendoors.transformativeworks.org/en/contact-open-doors/" %>
<%= t '.mistake.text', open_doors_link: "https://opendoors.transformativeworks.org/en/contact-open-doors/" %>

<%= t '.text.part4' %>
<%= t '.access.text' %>

<%= t '.text.part5', claim_url: claim_url(:invitation_token => @token) %>
<%= t '.claim_or_remove.text', claim_url: claim_url(:invitation_token => @token) %>

<%= t '.part6' %>
<%= t '.uploaded_list' %>
<% @external_author.works.each do |work| %>
- <%= work.title.html_safe %> <%= work_url(work) %> <%= (work.fandom_string.blank? ? "" : " (#{work.fandom_string})") %>
<% end %>

<%= t '.text.part7', support_link: new_feedback_report_url %>
<%= t '.unwanted.text', support_link: new_feedback_report_url %>

<%= t '.part8' %>
<%= t '.redirects' %>

<%= t '.text.part9', open_doors_link: "https://opendoors.transformativeworks.org/en/contact-open-doors/" %>
<%= t '.update_redirect.text', open_doors_link: "https://opendoors.transformativeworks.org/en/contact-open-doors/" %>

<%= t '.text.part10' %>
<%= t '.other_works.text' %>

<%= t '.text.part11', support_link: new_feedback_report_url %>
<%= t '.questions.text', support_link: new_feedback_report_url %>

<%= t '.part12' %>
<%= t '.email_tips' %>

<%= t("mailer.general.closing.informal") %>
<%= t("mailer.general.signature.open_doors") %>
Expand Down
10 changes: 5 additions & 5 deletions app/views/user_mailer/signup_notification.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<% content_for :message do %>
<p><%= t('.welcome',
login: style_bold(@user.login)).html_safe %></p>
<p><%= t('.html.part1',
activate_account_link: style_link(t('.activate_your_account'), activate_url(id: @user.confirmation_token))).html_safe %></p>
<p><%= t('.html.part2') %></p>
<p><%= t('.html.part3',
<p><%= t('.activate.html',
activate_account_link: style_link(t('.activate_your_account'), activate_url(id: @user.confirmation_token))) %></p>
<p><%= t('.features.html') %></p>
<p><%= t('.information.html',
faq_link: style_link(t('.faq'), archive_faqs_url),
admin_posts_link: style_link(t('.admin_posts'), admin_posts_url),
contact_support_link: support_link(t '.contact_support')).html_safe %></p>
contact_support_link: support_link(t '.contact_support')) %></p>
<p><%= t('.bye') %></p>
<% end %>
6 changes: 3 additions & 3 deletions app/views/user_mailer/signup_notification.text.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<%= t('.welcome',
login: @user.login) %>

<%= t('.text.part1',
<%= t('.activate.text',
activate_account_url: activate_url(id: @user.confirmation_token)) %>

<%= t('.text.part2') %>
<%= t('.features.text') %>

<%= t('.text.part3',
<%= t('.information.text',
faq_url: archive_faqs_url,
admin_posts_url: admin_posts_url,
contact_support_url: new_feedback_report_url) %>
Expand Down
Loading