maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate and internationalize various 'contact us' prompts (#14951)

Browse source 
* Consolidate and internationalize various 'contact us' prompts

* Update spec/requests/user/user_settings_spec.rb

Co-authored-by: Michael Kohl <citizen428@forem.com>

Co-authored-by: Michael Kohl <citizen428@forem.com>
This commit is contained in:
Ben Halpern 2021-10-07 12:05:21 -04:00 • committed by GitHub
parent ce4ba84184
commit 1d62d30853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/devise/shared/_authorization_error.html.erb
View file

@ -20,6 +20,6 @@
<% end %>
If you haven't received your confirmation email yet, <a href="<%= confirm_email_path %>">click here</a> to resend it.
<br>
Contact <%= email_link %> if you continue having trouble.
<%= t("contact_prompts.if_continued_trouble_html") %>
</div>
<% end %>

2
app/views/feedback_messages/index.html.erb
View file

@ -9,7 +9,7 @@
<h2>Thank you for your report.</h2>
<h3><a href="/">Return to home page</a></h3>
<p>
Questions? Send an email to <%= email_link %>
<%= t("contact_prompts.if_any_questions_html") %>
</p>
</div>
</div>

2
app/views/mailers/notify_mailer/account_deleted_email.html.erb
View file

@ -7,7 +7,7 @@
</p>
<p>
Contact us at <%= email_link %> if there is anything more we can help with. 😊
<%= t("contact_prompts.if_we_can_help_html") %> 😊
</p>
<p>

2
app/views/mailers/notify_mailer/account_deletion_requested_email.html.erb
View file

@ -8,7 +8,7 @@
</p>
<p>
Contact us at <%= email_link %> if there is anything more we can help with. 😊
<%= t("contact_prompts.if_we_can_help_html") %> 😊
</p>
<p>

2
app/views/mailers/notify_mailer/account_deletion_requested_email.text.erb
View file

@ -1,6 +1,6 @@
Hi <%= @name %>,
Your account deletion was requested. Please, visit this page: <%= user_confirm_destroy_url(@token) %> to destroy your account. The link will expire in 12 hours.
Contact us at <%= email_link %> if there is anything more we can help with.
<%= t("contact_prompts.if_we_can_help_html") %>
Thanks,
The <%= community_name %> Team

2
app/views/mailers/notify_mailer/organization_deleted_email.html.erb
View file

@ -7,7 +7,7 @@
</p>
<p>
Contact us at <%= email_link %> if there is anything more we can help with. 😊
<%= t("contact_prompts.if_we_can_help_html") %> 😊
</p>
<p>

2
app/views/mailers/notify_mailer/organization_deleted_email.text.erb
View file

@ -2,7 +2,7 @@ Hi <%= @name %>.
Your organization <%= @org_name %> on <%= community_name %> has been successfully deleted.
Contact us at <%= email_link %> if there is anything more we can help with.
<%= t("contact_prompts.if_we_can_help_html") %>
Thanks,
The <%= community_name %> Team

2
app/views/notifications/_notifications_list.html.erb
View file

@ -10,7 +10,7 @@
<div class="align-center p-9 py-10 color-base-80 crayons-card mb-2">
<h2 class="fw-bold fs-l">An error occurred!</h2>
<p class="color-base-60 pt-2">This has been logged and we're tracking it. If you see too many of these, please report it to <%= email_link %>!</p>
<p class="color-base-60 pt-2">This has been logged and we're tracking it.</p>
</div>
<% end %>

3
app/views/notifications/_tagadjustment.html.erb
View file

@ -24,8 +24,7 @@
<p class="mb-2">Check out <a href="/tags">other popular tags</a> which may be more appropriate</p>
<% end %>
<p>
Thanks for being part of <%= community_name %>! If you feel like this mod action was a mistake, feel free to contact
<%= email_link %>. 🤗
Thanks for being part of <%= community_name %>! <%= t("contact_prompts.if_any_questions_html") %> 🤗
</p>
</div>
</div>

4
app/views/users/_account.html.erb
View file

@ -130,6 +130,8 @@
</div>
<div>
<p>Feel free to contact <%= email_link %> with any questions.</p>
<p>
<%= t("contact_prompts.if_any_questions_html") %>
</p>
</div>
</div>

4
app/views/users/_publishing_from_rss.html.erb
View file

@ -23,8 +23,8 @@
<a href="<%= publishing_from_rss_guide_path %>">guide</a>.
</p>
<p>
Your feed will be fetched every time you submit this form and updates will be automatically fetched periodically thereafter. Contact
<%= email_link %> if you encounter issues.
Your feed will be fetched every time you submit this form and updates will be automatically fetched periodically thereafter.
<%= t("contact_prompts.if_any_questions_html") %>
</p>
<p>FYI: Medium RSS feed URLs are <em>https://medium.com/feed/@your_username</em></p>
<p><em>By submitting your RSS Feed URL, you agree that you own and/or have permission to syndicate the associated content.</em></p>

2
app/views/users/confirm_destroy.html.erb
View file

@ -50,7 +50,7 @@
</p>
<p>
Feel free to contact <%= email_link %> with any questions.
<%= t("contact_prompts.if_any_questions_html") %>
</p>
</div>
</div>

4
app/views/users/edit.html.erb
View file

@ -15,8 +15,8 @@
<% if params[:state] == "previous-registration" %>
<div class="crayons-banner crayons-banner--error" role="alert">
There is an existing account authorized with that social account. Contact
<%= email_link %> if this is a mistake.
There is an existing account authorized with that social account.
<%= t("contact_prompts.if_any_questions_html") %>
</div>
<% end %>

2
app/views/videos/new.html.erb
View file

@ -33,7 +33,7 @@
<% end %>
<div style="margin:50px auto;max-width:80%;font-size:0.86em;">
<p>
<strong>Video is beta:</strong> Email <%= email_link %> if you have any problems.
<strong>Video is beta:</strong> <%= t("contact_prompts.if_any_questions_html") %>
</p>
</div>
</center>

4
config/locales/en.yml
View file

@ -39,6 +39,10 @@ en:
view: View
week: Week
year: Year
contact_prompts:
if_continued_trouble_html: <a href="/contact">Contact us</a> if you continue having trouble.
if_we_can_help_html: <a href="/contact">Contact us</a> if there is anything we can help with.
if_any_questions_html: <a href="/contact">Contact us</a> if you have any questions.
dashboard:
following_users: Following users
loading: loading...

4
config/locales/fr.yml
View file

@ -39,6 +39,10 @@ fr:
view: Vue
week: Semaine
year: Année
contact_prompts:
if_continued_trouble_html: <a href="/contact">Contactez-nous</a> si vous continuez à avoir des problèmes.
if_we_can_help_html: <a href="/contact">Contactez-nous</a> si nous pouvons vous aider.
if_any_questions_html: <a href="/contact">Contactez-nous</a> si vous avez des questions.
dashboard:
following_users: Utilisateurs suivis
loading: Chargement en cours...

5
spec/requests/user/user_settings_spec.rb
View file

@ -88,6 +88,11 @@ RSpec.describe "UserSettings", type: :request do
expect(response.body).to include(*titles)
end
it "includes contact us on RSS page properly" do
get user_settings_path(:extensions)
expect(response.body).to include(I18n.t("contact_prompts.if_any_questions_html"))
end
it "renders heads up dupe account message with proper param" do
get "/settings?state=previous-registration"