diff --git a/app/controllers/feedback_messages_controller.rb b/app/controllers/feedback_messages_controller.rb index f397003bd..6a5e3dc45 100644 --- a/app/controllers/feedback_messages_controller.rb +++ b/app/controllers/feedback_messages_controller.rb @@ -24,7 +24,7 @@ class FeedbackMessagesController < ApplicationController @previous_message = feedback_message_params[:message] flash[:notice] = "Make sure the forms are filled 🤖" - render "pages/report-abuse" + render "pages/report_abuse" end end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index ad7bacd0f..c7543a273 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -64,7 +64,7 @@ class PagesController < ApplicationController @feedback_message = FeedbackMessage.new( reported_url: reported_url&.chomp("?i=i"), ) - render "pages/report-abuse" + render "pages/report_abuse" end def robots diff --git a/app/views/pages/_terms_text.html.erb b/app/views/pages/_terms_text.html.erb index c28c0afa0..44baa8aab 100644 --- a/app/views/pages/_terms_text.html.erb +++ b/app/views/pages/_terms_text.html.erb @@ -42,7 +42,8 @@
  1. - The materials on <%= community_name %>'s web site are provided "as is". <%= community_name %> makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties, including without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights. Further, <%= community_name %> does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its Internet web site or otherwise relating to such materials or on any sites linked to this site. + The materials on <%= community_name %>'s web site are provided "as is". <%= community_name %> makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties, including without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights. + Further, <%= community_name %> does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its Internet web site or otherwise relating to such materials or on any sites linked to this site.
@@ -51,7 +52,8 @@

- In no event shall <%= community_name %> or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the materials on <%= community_name %>'s Internet site, even if <%= community_name %> or an authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you. + In no event shall <%= community_name %> or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the materials on <%= community_name %>'s Internet site, + even if <%= community_name %> or an authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.

@@ -59,7 +61,8 @@

- The materials appearing on <%= community_name %>'s web site could include technical, typographical, or photographic errors. <%= community_name %> does not warrant that any of the materials on its web site are accurate, complete, or current. <%= community_name %> may make changes to the materials contained on its web site at any time without notice. <%= community_name %> does not, however, make any commitment to update the materials. + The materials appearing on <%= community_name %>'s web site could include technical, typographical, or photographic errors. <%= community_name %> does not warrant that any of the materials on its web site are accurate, complete, or current. + <%= community_name %> may make changes to the materials contained on its web site at any time without notice. <%= community_name %> does not, however, make any commitment to update the materials.

- All uses of the <%= community_name %> logo, <%= community_name %> badges, brand slogans, iconography, and the like, may only be used with express permission from <%= community_name %>. <%= community_name %> reserves all rights, even if certain assets are included in <%= community_name %> open source projects. Please contact <%= email_link %> with any questions or to request permission. + All uses of the <%= community_name %> logo, <%= community_name %> badges, brand slogans, iconography, and the like, may only be used with express permission from <%= community_name %>. + <%= community_name %> reserves all rights, even if certain assets are included in <%= community_name %> open source projects. Please contact <%= email_link %> with any questions or to request permission.

diff --git a/app/views/pages/generator.html.erb b/app/views/pages/generator.html.erb index 460232300..b5f7e6398 100644 --- a/app/views/pages/generator.html.erb +++ b/app/views/pages/generator.html.erb @@ -113,7 +113,7 @@

If you have any feedback, you can direct message - " >@<%= SiteConfig.social_media_handles["twitter"] %> any time!

+ ">@<%= SiteConfig.social_media_handles["twitter"] %> any time!

Add to Slack diff --git a/app/views/pages/report-abuse.html.erb b/app/views/pages/report_abuse.html.erb similarity index 100% rename from app/views/pages/report-abuse.html.erb rename to app/views/pages/report_abuse.html.erb diff --git a/app/views/pages/rlyweb.html.erb b/app/views/pages/rlyweb.html.erb index f111d331d..32f8fa95d 100644 --- a/app/views/pages/rlyweb.html.erb +++ b/app/views/pages/rlyweb.html.erb @@ -124,7 +124,7 @@
16
-

But don't thank ">@<%= SiteConfig.social_media_handles["twitter"] %> for this one +

But don't thank ">@<%= SiteConfig.social_media_handles["twitter"] %> for this one

This tool was created with love by Charles Berlin (@AModelEngineer)