AO3-6911: prefer lazy loaded locale, fix route

otwcode · Feb 24, 2025 · 69978a8 · 69978a8
1 parent 3f2d882
commit 69978a8
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -28,7 +28,7 @@ def raise_not_found
   rescue_from Rack::Timeout::RequestTimeoutException, with: :raise_timeout
 
   def raise_timeout
-    redirect_to "/timeout"
+    redirect_to timeout_error_path
   end
 
   helper :all # include all helpers, all the time

diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
@@ -6,10 +6,10 @@ class ErrorsController < ApplicationController
   end
 
   def auth_error
-    @page_subtitle = "Auth Error"
+    @page_subtitle = t(".subtitle")
   end
 
   def timeout_error
-    @page_subtitle = "Timeout Error"
+    @page_subtitle = t(".subtitle")
   end
 end
diff --git a/app/views/errors/timeout.html.erb b/app/views/errors/timeout.html.erb
diff --git a/app/views/errors/timeout_error.html.erb b/app/views/errors/timeout_error.html.erb
@@ -0,0 +1,3 @@
+<h2 class="heading"><%= t(".title") %></h2>
+<h3 class="heading"><%= t(".subtitle") %></h3>
+<p><%= t(".html", contact_support_link: link_to(t(".contact_support"), new_feedback_report_path)) %></p>
diff --git a/config/locales/controllers/en.yml b/config/locales/controllers/en.yml
@@ -90,6 +90,11 @@ en:
       error: Sorry, that comment could not be unhidden.
       permission_denied: Sorry, you don't have permission to unhide that comment.
       success: Comment successfully unhidden!
+  errors:
+    timeout:
+      subtitle: "Timeout Error"
+    auth:
+      subtitle: "Authentication Error"
   external_works:
     update:
       successfully_updated: External work was successfully updated.

diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
@@ -612,7 +612,7 @@ en:
         revealed_html: A translation of %{work_link} by %{creator_link}
         unrevealed: A translation of a work in an unrevealed collection
   errors:
-    timeout:
+    timeout_error:
       title: Timeout
       subtitle: The page was responding too slowly. Please try again after a few minutes.
       html: If you still get this error after a few tries, please %{contact_support_link}.

diff --git a/config/routes.rb b/config/routes.rb
@@ -53,7 +53,7 @@
   get '/422', to: 'errors#422'
   get '/500', to: 'errors#500'
   get '/auth_error', to: 'errors#auth_error'
-  get "/timeout", to: "errors#timeout"
+  get "/timeout_error", to: "errors#timeout_error"
 
   #### DOWNLOADS ####
 

diff --git a/spec/controllers/errors_controller_spec.rb b/spec/controllers/errors_controller_spec.rb
@@ -29,7 +29,7 @@
     end
   end
 
-  describe "auth_error" do
+  describe "GET #auth_error" do
     it "returns an HTML auth error page" do
       get :auth_error
       expect(response.status).to eq(200)