Move overrides to /app folder

puzzle · Sep 26, 2023 · 418c5f5 · 418c5f5
1 parent bdd6869
commit 418c5f5
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/.../decidim/translation_bar_cell_override.rb → .../decidim/translation_bar_cell_override.rb b/.../decidim/translation_bar_cell_override.rb → .../decidim/translation_bar_cell_override.rb
diff --git a/...decidim/meetings/join_meeting_override.rb → ...decidim/meetings/join_meeting_override.rb b/...decidim/meetings/join_meeting_override.rb → ...decidim/meetings/join_meeting_override.rb
diff --git a/...n/officializations_controller_override.rb → ...n/officializations_controller_override.rb b/...n/officializations_controller_override.rb → ...n/officializations_controller_override.rb
diff --git a/...auth_registrations_controller_override.rb → ...auth_registrations_controller_override.rb b/...auth_registrations_controller_override.rb → ...auth_registrations_controller_override.rb
diff --git a/...im/devise/sessions_controller_override.rb → ...im/devise/sessions_controller_override.rb b/...im/devise/sessions_controller_override.rb → ...im/devise/sessions_controller_override.rb
diff --git a/...cipatory_processes_controller_override.rb → ...cipatory_processes_controller_override.rb b/...cipatory_processes_controller_override.rb → ...cipatory_processes_controller_override.rb
diff --git a/...stem/update_organization_form_override.rb → ...stem/update_organization_form_override.rb b/...stem/update_organization_form_override.rb → ...stem/update_organization_form_override.rb
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
@@ -57,12 +57,13 @@ search:
   #  - app/
 
   ## Root directories for relative keys resolution.
-  # relative_roots:
-  #   - app/controllers
-  #   - app/helpers
-  #   - app/mailers
-  #   - app/presenters
-  #   - app/views
+  relative_roots:
+    - app/controllers
+    - app/helpers
+    - app/mailers
+    - app/presenters
+    - app/views
+    - app/overrides
 
   ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
   ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)

diff --git a/config/initializers/decidim_zuerich_customization.rb b/config/initializers/decidim_zuerich_customization.rb
@@ -27,13 +27,13 @@
   [Decidim::System::UpdateOrganization,                         DecidimZuerich::System::UpdateOrganization]
 ].each { |base, addition| base.prepend addition }
 
-override_path = Pathname.new('lib/overrides')
+override_path = Pathname.new('app/overrides')
 Rails.autoloaders.main.ignore(override_path)
 
 overrides = override_path.glob('**/*_override.rb')
 Rails.application.config.after_initialize do
   overrides.each do |override|
-    require_dependency override.expand_path.to_s
+    load override.expand_path.to_s
   end
 end
 
@@ -56,8 +56,8 @@
 # request is processed. This is done through a notification to
 # get access to the `current_*` environment variables within
 # Decidim. Taken and adapted from the term_customizer module.
-ActiveSupport::Notifications.subscribe "start_processing.action_controller" do |_name, _started, _finished, _unique_id, data|
-  DecidimZuerich::Verifications::Sms::AspsmsGateway.organization = data[:headers].env["decidim.current_organization"]
+ActiveSupport::Notifications.subscribe 'start_processing.action_controller' do |_name, _started, _finished, _unique_id, data|
+  DecidimZuerich::Verifications::Sms::AspsmsGateway.organization = data[:headers].env['decidim.current_organization']
 end
 
 # Override default for surveys