Merge branch 'main' into enhancement/accessibility-testing

Author: rsmithlal

app/controllers/better_together/application_controller.rb

@@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base
 
     protect_from_forgery with: :exception
     before_action :check_platform_setup
+    before_action :set_locale
 
     rescue_from ActiveRecord::RecordNotFound, with: :render_404 # rubocop:todo Naming/VariableNumber
     rescue_from ActionController::RoutingError, with: :render_404 # rubocop:todo Naming/VariableNumber
@@ -54,6 +55,10 @@ def handle_error(exception)
       end
     end
 
+    def set_locale
+      I18n.locale = params[:locale] || I18n.default_locale
+    end
+
     protected
 
     def error_reporting(exception); end

config/routes.rb

@@ -1,96 +1,97 @@
 # frozen_string_literal: true
 
 BetterTogether::Engine.routes.draw do # rubocop:todo Metrics/BlockLength
-  # bt base path
-  scope path: 'bt' do # rubocop:todo Metrics/BlockLength
-    devise_for :users,
-               class_name: BetterTogether.user_class.to_s,
-               module: 'devise',
-               skip: %i[unlocks omniauth_callbacks],
-               path: 'users',
-               path_names: {
-                 sign_in: 'sign-in',
-                 sign_out: 'sign-out',
-                 sign_up: 'sign-up'
-               },
-               defaults: { format: :html }
-
-    scope path: 'host' do
-      # Add route for the host dashboard
-      get '/', to: 'host_dashboard#index', as: 'host_dashboard'
-
-      resources :communities do
+  scope '(:locale)', locale: /en|fr|es/ do # rubocop:todo Metrics/BlockLength
+    # bt base path
+    scope path: 'bt' do # rubocop:todo Metrics/BlockLength
+      devise_for :users,
+                 class_name: BetterTogether.user_class.to_s,
+                 module: 'devise',
+                 skip: %i[unlocks omniauth_callbacks],
+                 path: 'users',
+                 path_names: {
+                   sign_in: 'sign-in',
+                   sign_out: 'sign-out',
+                   sign_up: 'sign-up'
+                 },
+                 defaults: { format: :html }
+
+      scope path: 'host' do
+        # Add route for the host dashboard
+        get '/', to: 'host_dashboard#index', as: 'host_dashboard'
+
+        resources :communities do
+          resources :person_community_memberships
+        end
+
+        resources :navigation_areas do
+          resources :navigation_items
+        end
+
+        resources :resource_permissions
+        resources :roles
+
+        resources :pages
+        resources :people
         resources :person_community_memberships
+        resources :platforms
+
+        namespace :geography do
+          resources :continents, except: %i[new create destroy]
+          resources :countries
+          resources :regions
+          resources :region_settlements
+          resources :settlements
+          resources :states
+        end
       end
 
-      resources :navigation_areas do
-        resources :navigation_items
+      resources :people, only: %i[update show edit], path: :p do
+        get 'me', to: 'people#show', as: 'my_profile'
+        get 'me/edit', to: 'people#edit', as: 'edit_my_profile'
       end
 
-      resources :resource_permissions
-      resources :roles
-
-      resources :pages
-      resources :people
-      resources :person_community_memberships
-      resources :platforms
-
-      namespace :geography do
-        resources :continents, except: %i[new create destroy]
-        resources :countries
-        resources :regions
-        resources :region_settlements
-        resources :settlements
-        resources :states
+      resources :wizards, only: [:show] do
+        # Custom route for wizard steps
+        get ':wizard_step_definition_id', to: 'wizard_steps#show', as: :step
+        patch ':wizard_step_definition_id', to: 'wizard_steps#update'
+        # Add other HTTP methbetter-together/community-engine-rails/app/controllers/better_together/bt
       end
-    end
 
-    resources :people, only: %i[update show edit], path: :p do
-      get 'me', to: 'people#show', as: 'my_profile'
-      get 'me/edit', to: 'people#edit', as: 'edit_my_profile'
+      scope path: :w do
+        scope path: :setup_wizard do
+          get '/', to: 'setup_wizard#show', defaults: { wizard_id: 'host_setup' }, as: :setup_wizard
+          get '/platform_details', to: 'setup_wizard_steps#platform_details',
+                                   defaults: { wizard_id: 'host_setup', wizard_step_definition_id: :platform_details },
+                                   as: :setup_wizard_step_platform_details
+          post 'create_host_platform', to: 'setup_wizard_steps#create_host_platform',
+                                       defaults: {
+                                         wizard_id: 'host_setup',
+                                         wizard_step_definition_id: :platform_details
+                                       },
+                                       as: :setup_wizard_step_create_host_platform
+          get 'admin_creation', to: 'setup_wizard_steps#admin_creation',
+                                defaults: { wizard_id: 'host_setup', wizard_step_definition_id: :admin_creation },
+                                as: :setup_wizard_step_admin_creation
+          post 'create_admin', to: 'setup_wizard_steps#create_admin',
+                               defaults: { wizard_id: 'host_setup', wizard_step_definition_id: :admin_creation },
+                               as: :setup_wizard_step_create_admin
+        end
+      end
     end
 
-    resources :wizards, only: [:show] do
-      # Custom route for wizard steps
-      get ':wizard_step_definition_id', to: 'wizard_steps#show', as: :step
-      patch ':wizard_step_definition_id', to: 'wizard_steps#update'
-      # Add other HTTP methbetter-together/community-engine-rails/app/controllers/better_together/bt
+    if Rails.env.development?
+      get '/404', to: 'application#render_404'
+      get '/500', to: 'application#render_500'
     end
 
-    scope path: :w do
-      scope path: :setup_wizard do
-        get '/', to: 'setup_wizard#show', defaults: { wizard_id: 'host_setup' }, as: :setup_wizard
-        get '/platform_details', to: 'setup_wizard_steps#platform_details',
-                                 defaults: { wizard_id: 'host_setup', wizard_step_definition_id: :platform_details },
-                                 as: :setup_wizard_step_platform_details
-        post 'create_host_platform', to: 'setup_wizard_steps#create_host_platform',
-                                     defaults: {
-                                       wizard_id: 'host_setup',
-                                       wizard_step_definition_id: :platform_details
-                                     },
-                                     as: :setup_wizard_step_create_host_platform
-        get 'admin_creation', to: 'setup_wizard_steps#admin_creation',
-                              defaults: { wizard_id: 'host_setup', wizard_step_definition_id: :admin_creation },
-                              as: :setup_wizard_step_admin_creation
-        post 'create_admin', to: 'setup_wizard_steps#create_admin',
-                             defaults: { wizard_id: 'host_setup', wizard_step_definition_id: :admin_creation },
-                             as: :setup_wizard_step_create_admin
-      end
-    end
-  end
+    # Catch-all route
+    get '*path', to: 'pages#show', as: 'render_page', constraints: lambda { |req|
+      !req.xhr? && req.format.html?
+    }
 
-  if Rails.env.development?
-    get '/404', to: 'application#render_404'
-    get '/500', to: 'application#render_500'
+    get '/bt' => 'static_pages#community_engine'
   end
-
-  # Catch-all route
-  get '*path', to: 'pages#show', as: 'render_page', constraints: lambda { |req|
-    !req.xhr? && req.format.html?
-  }
-
-  get '/bt' => 'static_pages#community_engine'
-
   # TODO: Re-enable the API routes when the API is in full use and actively being maintained to prevent security issues.
   # namespace :bt do
   #   namespace :api, defaults: { format: :json } do

lib/better_together/engine.rb

@@ -77,6 +77,11 @@ class Engine < ::Rails::Engine
       app.config.log_tags = %i[request_id remote_ip]
     end
 
+    # Exclude postgis tables from database dumper
+    initializer 'better_together.spatial_tables' do
+      ::ActiveRecord::SchemaDumper.ignore_tables = %w[spatial_ref_sys] + ::ActiveRecord::SchemaDumper.ignore_tables
+    end
+
     rake_tasks do
       load 'tasks/better_together_tasks.rake'
 

spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_05_22_204901) do
+ActiveRecord::Schema[7.1].define(version: 2024_06_12_113954) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"