Merge a2241da91a into 14cb5ff881

app/controllers/auth/registrations_controller.rb

@@ -130,12 +130,17 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   end
 
   def require_rules_acceptance!
-    return if @rules.empty? || (session[:accept_token].present? && params[:accept] == session[:accept_token])
+    return if @rules.empty? || validated_accept_token?
 
     @accept_token = session[:accept_token] = SecureRandom.hex
-    @invite_code  = invite_code
+    @invite_code = invite_code
+    @rule_translations = @rules.map { |rule| rule.translation_for(I18n.locale) }
 
-    set_locale { render :rules }
+    render :rules
+  end
+
+  def validated_accept_token?
+    session[:accept_token].present? && params[:accept] == session[:accept_token]
   end
 
   def is_flashing_format? # rubocop:disable Naming/PredicatePrefix

app/views/auth/registrations/rules.html.haml

@@ -17,12 +17,7 @@
     %p.lead= t('auth.rules.preamble', domain: site_hostname)
 
   %ol.rules-list
-    - @rules.each do |rule|
-      - translation = rule.translation_for(I18n.locale.to_s)
-      %li
-        %button{ type: 'button', aria: { expanded: 'false' } }
-          .rules-list__text= translation.text
-          .rules-list__hint= translation.hint
+    = render @rule_translations
 
   .stacked-actions
     - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)

app/views/auth/rule_translations/_rule_translation.html.haml

@@ -0,0 +1,4 @@
+%li
+  %button{ type: 'button', aria: { expanded: 'false' } }
+    .rules-list__text= rule_translation.text
+    .rules-list__hint= rule_translation.hint