Merge branch 'main' into ojtjo3-codex/update-favicon-and-title-on-page-load

Author: rsmithlal

.github/workflows/brakeman.yml

@@ -1,18 +1,9 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow integrates Brakeman with GitHub's Code Scanning feature
-# Brakeman is a static analysis security vulnerability scanner for Ruby on Rails applications
-
 name: Brakeman Scan
 
 on:
   push:
     branches: [ "main" ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ "main" ]
   schedule:
     - cron: '26 3 * * 0'
@@ -22,37 +13,38 @@ permissions:
 
 jobs:
   brakeman-scan:
-    permissions:
-      contents: read # for actions/checkout to fetch code
-      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
-      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
     name: Brakeman Scan
+    # Option A: stay on latest (24.04) – requires up-to-date setup-ruby
     runs-on: ubuntu-latest
+    # Option B (fallback): force older image if you prefer
+    # runs-on: ubuntu-22.04
+
+    permissions:
+      contents: read
+      security-events: write
+      actions: read
+
     steps:
-    # Checkout the repository to the GitHub Actions runner
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    # Customize the ruby version depending on your needs
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
-      with:
-        ruby-version: '3.2'
-
-    - name: Setup Brakeman
-      env:
-        BRAKEMAN_VERSION: '4.10' # SARIF support is provided in Brakeman version 4.10+
-      run: |
-        gem install brakeman --version $BRAKEMAN_VERSION
-
-    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
-    - name: Scan
-      continue-on-error: true
-      run: |
-        brakeman -f sarif -o output.sarif.json .
-
-    # Upload the SARIF file generated in the previous step
-    - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v2
-      with:
-        sarif_file: output.sarif.json
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Ruby
+        # Use the rolling v1 tag so you get fixes for new runner images
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'   # or your exact patch, e.g. '3.2.2'
+          # bundler-cache not needed since we install brakeman directly
+
+      - name: Setup Brakeman
+        run: |
+          gem install brakeman
+
+      - name: Scan (SARIF)
+        continue-on-error: true
+        run: |
+          brakeman -f sarif -o output.sarif.json .
+
+      - name: Upload SARIF
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: output.sarif.json

.github/workflows/codeql.yml

@@ -50,7 +50,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -77,6 +77,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

Gemfile.lock

@@ -189,7 +189,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.20)
     benchmark (0.4.1)
     better_errors (2.10.1)
@@ -304,7 +304,7 @@ GEM
     erb (5.0.2)
     erubi (1.13.1)
     event_stream_parser (1.0.0)
-    excon (1.2.7)
+    excon (1.2.8)
       logger
     execjs (2.10.0)
     factory_bot (6.5.4)
@@ -325,8 +325,8 @@ GEM
     ffi (1.17.2-aarch64-linux-gnu)
     ffi (1.17.2-arm64-darwin)
     ffi (1.17.2-x86_64-linux-gnu)
-    fog-aws (3.32.0)
-      base64 (~> 0.2.0)
+    fog-aws (3.33.0)
+      base64 (>= 0.2, < 0.4)
       fog-core (~> 2.6)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -343,7 +343,7 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     font-awesome-sass (6.7.2)
       sassc (~> 2.0)
-    formatador (1.1.0)
+    formatador (1.1.1)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
     friendly_id-mobility (1.0.4)
@@ -454,7 +454,7 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0527)
+    mime-types-data (3.2025.0805)
     mini_magick (5.2.0)
       benchmark
       logger
@@ -467,7 +467,7 @@ GEM
       actiontext (>= 6.0)
       mobility (~> 1.2)
     msgpack (1.8.0)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     net-http (0.6.0)
@@ -741,7 +741,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    spring (4.3.0)
+    spring (4.4.0)
     spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
       spring (>= 4)

app/views/better_together/navigation_areas/edit.html.erb

@@ -1,7 +1,7 @@
 <!-- app/views/better_together/navigation_areas/edit.html.erb -->
 
 <div class="container">
-  <h1>Edit Navigation Area</h1>
+  <h1><%= t('better_together.navigation_areas.edit.title') %></h1>
   <%= render 'form', navigation_area: @navigation_area %>
-  <%= link_to 'Back', navigation_areas_path, class: 'btn btn-secondary' %>
+  <%= link_to t('shared.links.back'), navigation_areas_path, class: 'btn btn-secondary' %>
 </div>

app/views/better_together/navigation_areas/new.html.erb

@@ -1,7 +1,7 @@
 <!-- app/views/better_together/navigation_areas/new.html.erb -->
 
 <div class="container">
-  <h1>New Navigation Area</h1>
+  <h1><%= t('better_together.navigation_areas.new.title') %></h1>
   <%= render 'form', navigation_area: @navigation_area %>
-  <%= link_to 'Back', navigation_areas_path, class: 'btn btn-secondary' %>
+  <%= link_to t('shared.links.back'), navigation_areas_path, class: 'btn btn-secondary' %>
 </div>

app/views/better_together/navigation_items/_form.html.erb

@@ -31,7 +31,7 @@
     <%= form.hidden_field :navigation_area_id, value: @navigation_area.id %>
 
     <div class="mb-3">
-      <%= form.label :parent_id, 'Parent Item' %>
+      <%= form.label :parent_id, t('better_together.navigation_items.form.parent_item') %>
       <%= form.collection_select :parent_id, available_parent_items, :id, :select_option_title, { include_blank: true }, { class: 'form-select' + (@navigation_item.errors[:parent_id].any? ? ' is-invalid' : ''), data: { controller: "better_together--slim-select" } } %>
       <% if @navigation_item.errors[:parent_id].any? %>
         <div class="invalid-feedback">
@@ -52,7 +52,7 @@
 
     <!-- Control field for linkable_id -->
     <div id="nav-item-linkable" class="bt-mb-3" data-better_together--dependent-fields-target="dependentField" data-dependent-fields-control="navigation_item_route_name" data-show-if-control_navigation_item_route_name="*not_present*">
-      <%= form.label :linkable_id, 'Link to Page' %>
+      <%= form.label :linkable_id, t('better_together.navigation_items.form.link_to_page') %>
       <%= form.collection_select :linkable_id, @pages, :id, :select_option_title, { include_blank: true }, { id: 'navigation_item_linkable_id', class: ('form-select' + (@navigation_item.errors[:linkable_id].any? ? ' is-invalid' : '')), data: { controller: "better_together--slim-select" }, 'data-better_together--dependent-fields-target' => "controlField" } %>
       <% if @navigation_item.errors[:linkable_id].any? %>
         <div class="invalid-feedback">
@@ -64,12 +64,12 @@
     <!-- Dependent field 1 (shown when no value is present) -->
     <div id="nav-item-title" class="bt-mb-3" data-better_together--dependent-fields-target="dependentField" data-dependent-fields-control="navigation_item_linkable_id" data-show-if-control_navigation_item_linkable_id="*not_present*">
       <%= render partial: 'better_together/shared/translated_string_field', locals: { model: navigation_item, form: form, attribute: 'title' } %>
-      <small class="form-text text-muted mt-2">Enter the nav item title.</small> <!-- Help text added here -->
+      <small class="form-text text-muted mt-2"><%= t('better_together.navigation_items.form.enter_nav_item_title') %></small> <!-- Help text added here -->
     </div>
 
     <!-- Dependent field 2 (shown when no value is present) -->
     <div id="nav-item-route-name" class="bt-mb-3" data-better_together--dependent-fields-target="dependentField" data-dependent-fields-control="navigation_item_linkable_id" data-show-if-control_navigation_item_linkable_id="*not_present*">
-      <%= form.label :route_name, "Dynamic Route" %>
+      <%= form.label :route_name, t('better_together.navigation_items.form.dynamic_route') %>
       <%= form.select :route_name, route_names_for_select(@navigation_item), { include_blank: true }, { id: 'navigation_item_route_name', class: 'form-select', 'data-better_together--dependent-fields-target' => "controlField", data: { controller: "better_together--slim-select" } } %>
       <% if @navigation_item.errors[:linkable_id].any? %>
         <div class="invalid-feedback">

app/views/better_together/navigation_items/edit.html.erb

@@ -1,7 +1,7 @@
 <!-- app/views/better_together/navigation_items/edit.html.erb -->
 
 <div class="container my-3">
-  <h1>Edit Navigation Item: <%= @navigation_item.title %></h1>
+  <h1><%= t('better_together.navigation_items.edit.title', title: @navigation_item.title) %></h1>
 
   <%= render 'form', navigation_area: @navigation_area, navigation_item: @navigation_item, pages: @pages %>
 </div>

app/views/better_together/navigation_items/index.html.erb

@@ -1,12 +1,12 @@
 <!-- app/views/better_together/navigation_items/index.html.erb -->
 
 <% content_for :page_title do %>
-  Navigation Items for <%= @navigation_area.name %>
+  <%= t('better_together.navigation_items.index.title', name: @navigation_area.name) %>
 <% end %>
 
 <div class="container my-3">
-  <h1>Navigation Items for <%= @navigation_area.name %></h1>
-  <%= link_to 'New Navigation Item', new_navigation_area_navigation_item_path(@navigation_area), class: 'btn btn-primary' %>
+  <h1><%= t('better_together.navigation_items.index.title', name: @navigation_area.name) %></h1>
+  <%= link_to t('better_together.navigation_items.index.new_navigation_item'), new_navigation_area_navigation_item_path(@navigation_area), class: 'btn btn-primary' %>
 
   <%= render partial: 'navigation_items_table', locals: { navigation_items: @navigation_items } %>
 </div>

app/views/better_together/navigation_items/new.html.erb

@@ -1,7 +1,7 @@
 <!-- app/views/better_together/navigation_items/new.html.erb -->
 
 <div class="container my-3">
-  <h1>New Navigation Item for <%= @navigation_area.name %></h1>
+  <h1><%= t('better_together.navigation_items.new.title', name: @navigation_area.name) %></h1>
 
   <%= render 'form', navigation_area: @navigation_area, navigation_item: @navigation_item, page: @pages %>
 </div>

config/locales/en.yml

@@ -768,7 +768,23 @@ en:
         new_navigation_area: New navigation area
       show:
         new_navigation_item: New navigation item
+      new:
+        title: New Navigation Area
+      edit:
+        title: Edit Navigation Area
     navigation_items:
+      index:
+        title: "Navigation Items for %{name}"
+        new_navigation_item: New Navigation Item
+      new:
+        title: "New Navigation Item for %{name}"
+      edit:
+        title: "Edit Navigation Item: %{title}"
+      form:
+        parent_item: Parent Item
+        link_to_page: Link to Page
+        enter_nav_item_title: Enter the nav item title.
+        dynamic_route: Dynamic Route
       route_names:
         calendars: Calendars
         calls_for_interest: Calls for Interest