I have added the before_destroy callback to the Crop model to destroy all CropCompanion records where the crop is crop_b. (#4266)

I have added a new test to `spec/models/crop_spec.rb` to verify that deleting a crop also destroys the associated `CropCompanion` records.

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>

.devcontainer/docker-compose.yml

@@ -27,7 +27,7 @@ services:
     command: sleep infinity
 
   db:
-    image: postgres:latest
+    image: postgres:17
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data

.github/workflows/ci-features-admin.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-comments.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-conversations.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-crops.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-gardens.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-harvests.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-home.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-members.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-places.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-plantings.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-posts.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-seeds.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-timeline.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -74,7 +74,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 
@@ -112,7 +112,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   contributors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install ruby version specified in .ruby-version
         uses: ruby/setup-ruby@v1
         with:
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Configure sysctl limits
         run: |
@@ -89,7 +89,7 @@ jobs:
           sudo apt-get -y install libpq-dev google-chrome-stable
 
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '12'
 

Gemfile

@@ -125,7 +125,6 @@ gem 'mailboxer', '>= 0.15.1'
 gem 'faraday'
 
 gem 'rack-cors'
-gem 'rails-i18n'
 
 gem 'icalendar'
 

Gemfile.lock

@@ -33,47 +33,49 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actioncable (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailbox (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailer (7.2.3)
+      actionpack (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activesupport (= 7.2.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionpack (7.2.3)
+      actionview (= 7.2.3)
+      activesupport (= 7.2.3)
+      cgi
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4, < 3.3)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actiontext (7.2.3)
+      actionpack (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionview (7.2.3)
+      activesupport (= 7.2.3)
       builder (~> 3.1)
+      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
@@ -87,22 +89,22 @@ GEM
     active_utils (3.6.0)
       activesupport (>= 4.2)
       i18n
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activejob (7.2.3)
+      activesupport (= 7.2.3)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.2)
-      activesupport (= 7.2.2.2)
-    activerecord (7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activemodel (7.2.3)
+      activesupport (= 7.2.3)
+    activerecord (7.2.3)
+      activemodel (= 7.2.3)
+      activesupport (= 7.2.3)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activestorage (7.2.3)
+      actionpack (= 7.2.3)
+      activejob (= 7.2.3)
+      activerecord (= 7.2.3)
+      activesupport (= 7.2.3)
       marcel (~> 1.0)
-    activesupport (7.2.2.2)
+    activesupport (7.2.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -119,15 +121,15 @@ GEM
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    axe-core-api (4.10.3)
+    axe-core-api (4.11.0)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.10.3)
-      axe-core-api (= 4.10.3)
+    axe-core-capybara (4.11.0)
+      axe-core-api (= 4.11.0)
       dumb_delegator
-    axe-core-rspec (4.10.3)
-      axe-core-api (= 4.10.3)
+    axe-core-rspec (4.11.0)
+      axe-core-api (= 4.11.0)
       dumb_delegator
       ostruct
       virtus
@@ -137,12 +139,12 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.4.1)
+    benchmark (0.5.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.3.0)
+    bigdecimal (3.3.1)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -156,7 +158,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.0.8)
+    bullet (8.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (12.0.0)
@@ -183,7 +185,8 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    chartkick (5.2.0)
+    cgi (0.5.0)
+    chartkick (5.2.1)
     childprocess (5.0.0)
     coderay (1.1.3)
     coercible (1.0.0)
@@ -198,7 +201,7 @@ GEM
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    connection_pool (2.5.5)
     crass (1.0.6)
     crowdin-api (1.12.0)
       open-uri (>= 0.1.0, < 0.2.0)
@@ -219,7 +222,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (4.9.4)
@@ -251,7 +254,7 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (5.0.2)
+    erb (6.0.0)
     erubi (1.13.1)
     erubis (2.7.0)
     excon (1.2.5)
@@ -285,12 +288,12 @@ GEM
       multi_json (>= 1.9.0)
     gli (2.22.2)
       ostruct
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    haml (6.3.0)
+    haml (7.0.2)
       temple (>= 0.8.2)
       thor
       tilt
@@ -299,7 +302,7 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.66.0)
+    haml_lint (0.67.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -324,20 +327,21 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.15)
+    i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
-      highline (>= 2.0.0)
+      highline (>= 3.0.0)
       i18n
       parser (>= 3.2.2.1)
+      prism
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
     i18n_data (1.1.0)
       simple_po_parser (~> 1.1)
-    icalendar (2.12.0)
+    icalendar (2.12.1)
       base64
       ice_cube (~> 0.16)
       logger
@@ -348,17 +352,18 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.1)
-    irb (1.15.2)
+    irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jquery-rails (4.6.0)
+    jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.13.2)
-    json-schema (5.1.0)
+    json (2.16.0)
+    json-schema (6.0.0)
       addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     jsonapi-resources (0.10.7)
       activerecord (>= 4.1)
       concurrent-ruby
@@ -384,7 +389,8 @@ GEM
     loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -411,7 +417,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.0)
+    minitest (5.26.2)
     moneta (1.0.0)
     msgpack (1.8.0)
     multi_json (1.15.0)
@@ -419,7 +425,7 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.9)
+    net-imap (0.5.12)
       date
       net-protocol
     net-pop (0.1.2)
@@ -429,14 +435,14 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
-    nio4r (2.7.4)
+    nio4r (2.7.5)
     nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.11)
+    oj (3.16.12)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -452,7 +458,7 @@ GEM
     orm_adapter (0.5.0)
     ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
@@ -464,22 +470,22 @@ GEM
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
     popper_js (2.11.8)
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.6.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
-    puma (7.0.4)
+    public_suffix (6.0.2)
+    puma (7.1.0)
       nio4r (~> 2.0)
-    query_diet (0.7.2)
+    query_diet (0.7.3)
     racc (1.8.1)
-    rack (2.2.19)
+    rack (2.2.21)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -492,20 +498,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.2.2)
-      actioncable (= 7.2.2.2)
-      actionmailbox (= 7.2.2.2)
-      actionmailer (= 7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actiontext (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    rails (7.2.3)
+      actioncable (= 7.2.3)
+      actionmailbox (= 7.2.3)
+      actionmailer (= 7.2.3)
+      actionpack (= 7.2.3)
+      actiontext (= 7.2.3)
+      actionview (= 7.2.3)
+      activejob (= 7.2.3)
+      activemodel (= 7.2.3)
+      activerecord (= 7.2.3)
+      activestorage (= 7.2.3)
+      activesupport (= 7.2.3)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
+      railties (= 7.2.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -525,33 +531,36 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    railties (7.2.3)
+      actionpack (= 7.2.3)
+      activesupport (= 7.2.3)
+      cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.3.0)
+    rake (13.3.1)
     rate_throttle_client (0.1.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.14.2)
+    rdoc (6.16.1)
       erb
       psych (>= 4.0.0)
+      tsort
     recaptcha (5.21.1)
     redis-client (0.23.2)
       connection_pool
     regexp_parser (2.11.3)
-    reline (0.6.2)
+    reline (0.6.3)
       io-console (~> 0.5)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
+    responders (3.2.0)
+      actionpack (>= 7.0)
+      railties (>= 7.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -567,7 +576,7 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.13.5)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -585,23 +594,23 @@ GEM
       rspec-support (~> 3.13)
     rspec-rebound (0.2.1)
       rspec-core (~> 3.3)
-    rspec-support (3.13.4)
+    rspec-support (3.13.6)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
       rspec (~> 3.10)
-    rswag-api (2.16.0)
-      activesupport (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
-    rswag-specs (2.16.0)
-      activesupport (>= 5.2, < 8.1)
-      json-schema (>= 2.2, < 6.0)
-      railties (>= 5.2, < 8.1)
+    rswag-api (2.17.0)
+      activesupport (>= 5.2, < 8.2)
+      railties (>= 5.2, < 8.2)
+    rswag-specs (2.17.0)
+      activesupport (>= 5.2, < 8.2)
+      json-schema (>= 2.2, < 7.0)
+      railties (>= 5.2, < 8.2)
       rspec-core (>= 2.14)
-    rswag-ui (2.16.0)
-      actionpack (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
-    rubocop (1.81.1)
+    rswag-ui (2.17.0)
+      actionpack (>= 5.2, < 8.2)
+      railties (>= 5.2, < 8.2)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -612,16 +621,16 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-factory_bot (2.27.1)
+    rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.33.4)
+    rubocop-rails (2.34.1)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -630,10 +639,10 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.7.0)
+    rubocop-rspec (3.8.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec_rails (2.31.0)
+      rubocop (~> 1.81)
+    rubocop-rspec_rails (2.32.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
@@ -641,7 +650,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.1.1)
+    rubyzip (3.2.1)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -655,17 +664,15 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (5.7.1)
+    scout_apm (5.8.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.36.0)
+    selenium-webdriver (4.38.0)
       base64 (~> 0.2)
-      json (<= 2.13.2)
       logger (~> 1.4)
-      prism (~> 1.0, < 1.5)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
@@ -685,7 +692,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.7)
+    stringio (3.1.8)
     sysexits (1.2.0)
     temple (0.10.4)
     terminal-table (4.0.0)
@@ -696,7 +703,8 @@ GEM
     thread_safe (0.3.6)
     tilt (2.6.1)
     timecop (0.9.10)
-    timeout (0.4.3)
+    timeout (0.4.4)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
@@ -705,7 +713,7 @@ GEM
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.17.0)
+    uniform_notifier (1.18.0)
     uri (1.0.3)
     useragent (0.16.11)
     validate_url (1.0.15)
@@ -723,7 +731,7 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    webrick (1.9.1)
+    webrick (1.9.2)
     websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
@@ -816,7 +824,6 @@ DEPENDENCIES
   rails (~> 7.2.0)
   rails-assets-leaflet.markercluster!
   rails-controller-testing
-  rails-i18n
   rails_12factor
   rake (>= 10.0.0)
   recaptcha

app/controllers/crops_controller.rb

@@ -188,10 +188,11 @@ class CropsController < ApplicationController
 
   def crop_params
     params.require(:crop).permit(
-      :name, :en_wikipedia_url,
+      :name, :en_wikipedia_url, :en_youtube_url,
       :parent_id, :perennial,
       :request_notes, :reason_for_rejection,
       :rejection_notes,
+      :description,
       :row_spacing, :spread, :height,
       :sowing_method, :sun_requirements, :growing_degree_days,
       scientific_names_attributes: %i(scientific_name _destroy id)

app/helpers/crops_helper.rb

@@ -17,4 +17,12 @@ module CropsHelper
   def crop_ebay_seeds_url(crop)
     "https://www.ebay.com/sch/i.html?_nkw=#{CGI.escape crop.name}"
   end
+
+  def youtube_video_id(url)
+    return unless url
+
+    regex = %r{(?:youtube(?:-nocookie)?\.com/(?:[^/\n\s]+/\S+/|(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)([a-zA-Z0-9_-]{11})}
+    match = url.match(regex)
+    match[1] if match
+  end
 end

app/models/concerns/open_farm_data.rb

@@ -19,10 +19,6 @@ module OpenFarmData
       fetch_attr('tags_array')
     end
 
-    def description
-      fetch_attr('description')
-    end
-
     def common_names
       fetch_attr('common_names')
     end

app/models/crop.rb

@@ -55,6 +55,12 @@ class Crop < ApplicationRecord
               message: 'is not a valid English Wikipedia URL'
             },
             if:     :approved?
+  validates :en_youtube_url,
+            format: {
+              with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
+              message: 'is not a valid YouTube URL'
+            },
+            allow_blank: true
   validates :name, uniqueness: { scope: :approval_status }, if: :pending?
 
   def to_s
@@ -159,8 +165,14 @@ class Crop < ApplicationRecord
     (companions + parent.companions).uniq
   end
 
+  before_destroy :destroy_reverse_companionships
+
   private
 
+  def destroy_reverse_companionships
+    CropCompanion.where(crop_b: self).destroy_all
+  end
+
   def count_uses_of_property(col_name)
     plantings.unscoped
       .where(crop_id: id)

app/views/admin/index.html.haml

@@ -17,7 +17,7 @@
           %li= link_to "Roles", admin_roles_path, class: 'nav-link'
           %li= link_to "Forums", forums_path, class: 'nav-link'
           %li= link_to "CMS", comfy_admin_cms_path, class: 'nav-link'
-          %li= link_to t('layouts.header.garden_types'), garden_types_path, class: 'nav-link'
+          %li= link_to t('.garden_types'), garden_types_path, class: 'nav-link'
 
   .col-md-4
     .card

app/views/admin/roles/index.html.haml

@@ -23,7 +23,7 @@
         - if can? :edit, role
           = link_to edit_admin_role_path(role), class: 'btn btn-default btn-xs' do 
             = edit_icon
-            = t('buttons.edit')
+            = t('.edit')
         - if can?(:destroy, role) && ! role.members.any?
           = link_to admin_role_path(role), method: :delete, data: { confirm: t(:are_you_sure?) }, class: 'btn btn-default btn-xs text-danger' do
             = delete_icon

app/views/crops/_alternate_names.html.haml

@@ -10,11 +10,11 @@
             - if can? :edit, an
               = link_to edit_alternate_name_path(an), class: 'dropdown-item' do
                 = edit_icon
-                = t('buttons.edit')
+                = t('.edit')
             - if can? :destroy, an
               = link_to an, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item' do
                 = delete_icon
-                = t('buttons.delete')
+                = t('.delete')
       - else
         .badge= "#{an.name} (#{an.language})"
 

app/views/crops/_form.html.haml

@@ -42,6 +42,7 @@
         %span.help-block Living more than two years
 
       %h2 OpenFarm Data
+      = f.text_area :description, label: 'Description'
       = f.number_field :row_spacing, label: 'Row Spacing (cm)', min: 0
       = f.number_field :spread, label: 'Spread (cm)', min: 0
       = f.number_field :height, label: 'Height (cm)', min: 0
@@ -54,6 +55,9 @@
       = f.url_field :en_wikipedia_url, id: "en_wikipedia_url", label: 'Wikipedia URL'
       %span.help-block
         Link to the crop's page on the English language Wikipedia (required).
+      = f.url_field :en_youtube_url, label: 'YouTube URL'
+      %span.help-block
+        Link to a YouTube video about the crop in English.
 
       -# Only crop wranglers see the crop hierarchy (for now)
       - if can? :wrangle, @crop

app/views/crops/_scientific_names.html.haml

@@ -10,11 +10,11 @@
           .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "planting-actions-button"}
             = link_to edit_scientific_name_path(sn), class: 'dropdown-item' do
               = edit_icon
-              = t('buttons.edit')
+              = t('.edit')
             .dropdown-divider
             = link_to sn, method: :delete, data: { confirm: 'Are you sure?' }, class: 'dropdown-item text-danger' do
               = delete_icon
-              = t('buttons.delete')
+              = t('.delete')
       - else
         - if sn.gbif_key
           = link_to sn.name, "https://www.gbif.org/species/#{sn.gbif_key}",

app/views/crops/_wrangle.html.haml

@@ -8,7 +8,7 @@
       .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-button"}
         = link_to edit_crop_path(crop), class: 'dropdown-item' do
           = edit_icon
-          = t('buttons.edit')
+          = t('.edit')
 
         = link_to crop_gbif_path(crop), method: :post, class: 'dropdown-item' do
           = icon 'far', 'update'

app/views/crops/show.html.haml

@@ -30,6 +30,12 @@
         - @crop.all_companions.each do |companion|
           = render 'crops/tiny', crop: companion
 
+    - if @crop.en_youtube_url.present?
+      %section.youtube
+        %h2 Video
+        .embed-responsive.embed-responsive-16by9
+          %iframe.embed-responsive-item{ src: "https://www.youtube.com/embed/#{youtube_video_id(@crop.en_youtube_url)}", allowfullscreen: true }
+
     %section.photos
       = cute_icon
       = render 'crops/photos', crop: @crop
@@ -157,3 +163,10 @@
             = icon 'fas', 'external-link-alt'
             Wikihow instructions
 
+        %li.list-group-item
+          = link_to "https://www.youtube.com/results?search_query=#{CGI.escape "growing #{@crop.name}"}",
+                    target: "_blank",
+                    class: 'card-link',
+                    rel: "noopener noreferrer" do
+            = icon 'fab', 'youtube'
+            YouTube

app/views/layouts/_menu.haml

@@ -35,25 +35,25 @@
           = t('.crops')
         .dropdown-menu
           = link_to crops_path, class: 'dropdown-item' do
-            = t('layouts.header.browse_crops')
+            = t('.browse_crops')
           = link_to seeds_path, class: 'dropdown-item' do
             = seed_icon
-            = t('layouts.header.seeds')
+            = t('.seeds')
           = link_to plantings_path, class: 'dropdown-item' do
             = planting_icon
-            = t('layouts.header.plantings')
+            = t('.plantings')
           = link_to harvests_path, class: 'dropdown-item' do
             = harvest_icon
-            = t('layouts.header.harvests')
+            = t('.harvests')
       %li.nav-item.dropdown
         %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
           %span
           = t('.community')
         .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
-          = link_to t('layouts.header.community_map'), places_path, class: 'dropdown-item'
-          = link_to t('layouts.header.browse_members'), members_path, class: 'dropdown-item'
-          = link_to Post.model_name.human(count: 2).titleize, posts_path, class: 'dropdown-item'
-          = link_to t('layouts.header.forums'), forums_path, class: 'dropdown-item'
+          = link_to t('.community_map'), places_path, class: 'dropdown-item'
+          = link_to t('.browse_members'), members_path, class: 'dropdown-item'
+          = link_to t('.posts'), posts_path, class: 'dropdown-item'
+          = link_to t('.forums'), forums_path, class: 'dropdown-item'
 
     - if member_signed_in?
       - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
@@ -63,9 +63,9 @@
             = t('.admin')
           .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
             - if current_member.role?(:crop_wrangler)
-              = link_to t('layouts.header.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
+              = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
             - if current_member.role?(:admin)
-              = link_to t('layouts.header.admin'), admin_path, class: 'dropdown-item'
+              = link_to t('.admin'), admin_path, class: 'dropdown-item'
 
       %li.nav-item.dropdown
         %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
@@ -79,23 +79,23 @@
           = link_to member_activities_path(current_member), class: 'dropdown-item' do
             = t('.activities')
           = link_to member_gardens_path(current_member), class: 'dropdown-item' do
-            = Garden.model_name.human(count: 2).titleize
+            = t('.gardens')
           = link_to member_plantings_path(current_member), class: 'dropdown-item' do
-            = Planting.model_name.human(count: 2).titleize
+            = t('.plantings')
           = link_to member_harvests_path(current_member), class: 'dropdown-item' do
-            = Harvest.model_name.human(count: 2).titleize
+            = t('.harvest')
           = link_to member_seeds_path(current_member), class: 'dropdown-item' do
-            = Seed.model_name.human(count: 2).titleize
-          = link_to Post.model_name.human(count: 2).titleize, member_posts_path(current_member), class: 'dropdown-item'
+            = t('.seeds')
+          = link_to t('.posts'), member_posts_path(current_member), class: 'dropdown-item'
 
           - if current_member.unread_count.positive?
             .dropdown-divider
             %strong
               = link_to(conversations_path, class: 'dropdown-item') do
-                = t('layouts.header.inbox')
+                = t('.inbox')
                 %span.badge.badge-info= current_member.unread_count
           - else
-            = link_to t('layouts.header.inbox'), conversations_path, class: 'dropdown-item'
+            = link_to t('.inbox'), conversations_path, class: 'dropdown-item'
           .dropdown-divider
           = link_to t('.sign_out'), destroy_member_session_path, method: :delete, class: 'dropdown-item'
 

config/i18n-tasks.yml

@@ -47,8 +47,7 @@ search:
 
   ## Paths to search in, passed to File.find
   paths:
-    - app/views/
-    - app/controllers/
+    - app/
 
   ## Root for resolving relative keys (default)
   # relative_roots:

config/locales/en.yml

@@ -1,7 +1,75 @@
 ---
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# The following keys must be escaped otherwise they will not be retrieved by
+# the default I18n backend:
+#
+# true, false, on, off, yes, no
+#
+# Instead, surround them with single quotes.
+#
+# en:
+#   'true': 'foo'
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
 en:
+  activerecord:
+    models:
+      comment:
+        one: comment
+        other: comments
+      crop:
+        one: crop
+        other: crops
+      follow:
+        one: follow
+        other: follows
+      garden:
+        one: garden
+        other: gardens
+      harvest:
+        one: harvest
+        other: harvests
+      member:
+        one: member
+        other: members
+      photo:
+        one: photo
+        other: photos
+      planting:
+        one: planting
+        other: plantings
+      post:
+        one: post
+        other: posts
+      seed:
+        one: seed
+        other: seeds
+  application_helper:
+    title:
+      title:
+        default: Default
   are_you_sure: Are you sure?
   buttons:
+    add: Add
     add_photo: Add photo
     add_seed_to_stash: Add %{crop_name} seeds to stash
     copy: Copy
@@ -30,28 +98,17 @@ en:
     unlike: Remove like
     total_likes: Total likes
   crops:
+    search: Search crops
     index:
+      subtitle: "%{crops_size} total"
       title: Browse Crops
     requested:
+      link: You have %{number_crops} crops awaiting approval
       subtitle: Pending approval
       title: Requested crops
-  date:
-    abbr_month_names:
-      - Jan
-      - Feb
-      - Mar
-      - Apr
-      - May
-      - Jun
-      - Jul
-      - Aug
-      - Sep
-      - Oct
-      - Nov
-      - Dec
-  errors:
-    messages:
-      not_saved: Not saved
+  edit_crop: Edit crop
+  forms:
+    optional: "(Optional)"
   forums:
     index:
       title: Forums
@@ -60,12 +117,26 @@ en:
     deleted: Garden was successfully deleted.
     form:
       location_helper: If you have a location set in your profile, it will be used when you create a new garden.
+    location: "%{owner}'s %{garden}"
+    overview:
+      gardensactions: gardens/actions
+      gardensphoto: gardens/photo
+      no_plantings: no plantings
+      plantingsthumbnail: plantings/thumbnail
     updated: Garden was successfully updated.
     confirm_delete: All plantings associated with this garden will also be deleted. Are you sure?
     confirm_deactivate: All plantings associated with this garden will be marked as finished. Are you sure?
     created_prompt_html: "Garden was successfully created. Would you like to <a href=\"%{link}\">plan to weed this garden bed in two weeks</a>?"
   harvests:
+    created: Harvest was successfully created.
     harvest_something: Harvest something
+    index:
+      title:
+        crop_harvests: Everyone's %{crop} harvests
+        default: Everyone's harvests
+        owner_harvests: "%{owner}'s harvests"
+        planting_harvests: Harvests from %{planting}
+    updated: Harvest was successfully updated.
   home:
     blurb:
       already_html: Or %{sign_in} if you already have an account
@@ -79,15 +150,23 @@ en:
       view_all: View all activities
     crops:
       our_crops: Some of our crops
+      recently_added: Recently added crops
+      recently_planted: Recently Planted
       view_all: View all crops
     discuss:
+      discussion: Discussion
+      forums: Forums
       view_all: View all posts
-    harvests:
-      recently_harvested: Recently Harvested
-      view_all: View all harvests
     index:
+      add_seeds: Add seeds
+      edit_profile: Edit profile
+      harvest: Harvest
+      plant: Plant
+      post: Post
       recently_added: Recently Added
       welcome: Welcome to %{site_name}, %{member_name}
+    harvests:
+      view_all: View all harvests
     members:
       title: Some of our members
       view_all: View all members
@@ -120,7 +199,14 @@ en:
       recently_planted: Recently Planted
       view_all: View all plantings
     seeds:
+      crop: Crop
+      description: Description
+      details: Details
+      from: From location
+      owner: Owner
       title: Seeds available to trade
+      trade_to: Will trade to
+      unspecified: unspecified
       view_all: View all seeds
     stats:
       member_linktext: "%{count} members"
@@ -134,12 +220,13 @@ en:
     pwa_ios_title: For iOS (iPhone/iPad)
     pwa_title: Want to install Growstuff on your phone?
   label:
-    data: 'The data on this page is available in the following formats:'
-    harvesting_now: harvesting now
+    days_until_harvest: "%{number} days"
     weeks_until_harvest: "%{number} weeks until harvest"
+    days_until_finished: "%{number} days"
+    weeks_until_finished: "%{number} weeks"
+    harvesting_now: harvesting now
+    data: 'The data on this page is available in the following formats:'
   layouts:
-    application:
-      skip: Skip
     header:
       activities: Activities
       account: Account
@@ -148,19 +235,33 @@ en:
       browse_members: Browse Members
       community: Community
       community_map: Community Map
-      crop_wrangling: Crop Wrangling
-      forums: Forums
+      garden_type: Garden Type
       garden_types: Garden Types
+      crop_wrangling: Crop Wrangling
+      crops: Crops
+      current_memberlogin_name: "%{current_memberlogin_name}"
+      forums: Forums
+      gardens: Gardens
+      harvest: Harvest
       harvests: Harvests
+      record: Record
       inbox: Inbox
+      inbox_unread: Inbox (%{unread_count})
       plantings: Plantings
       posts: Posts
       profile: Profile/Timeline
       seeds: Seeds
+      skip: Skip navigation menu
+      support_growstuff: Support Growstuff
+      toggle_navigation: Toggle Navigation
+      your_stuff: Your Stuff
     menu:
       sign_in: Sign in
       sign_out: Sign out
       sign_up: Sign up
+  links:
+    my_gardens: My gardens
+
   members:
     edit_profile: Edit profile
     index:
@@ -204,8 +305,13 @@ en:
         no longer possible.
   plantings:
     badges:
+      days_until_finished: days until finished
+      days_until_harvest: days until harvest
+      harvesting_now: harvesting now
       late_finishing: late finishing
+      sharedbuttonsfinish_planting: shared/buttons/finish_planting
       super_late: super late
+    plant_something: Plant something
     form:
       finish_helper: >
         A planting is finished when you've harvested all of the crop, or it dies, or it's otherwise
@@ -222,18 +328,35 @@ en:
     progress:
       progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
   posts:
+    write_blog_post: Write blog post
     index:
       title:
         author_posts: "%{author} posts"
         default: Everyone's posts
-    write_blog_post: Write blog post
   seeds:
     form:
+      trade_help: >
+        Are you interested in trading or swapping seeds with other %{site_name} members?  If you list
+        your seeds as available for trade, other members can contact you to request seeds.  You can
+        list any conditions or other information in the description, above.
       finish_helper: >
         Seeds are finished when you've planted them all, or you've traded them all away.
-      trade_help: >
-        Are you interested in trading or swapping seeds with other %{site_name} members?
-        If you list your seeds as available for trade, other members can contact you to request seeds.
-        You can list any conditions or other information in the description, above.
+    index:
+      title:
+        crop_seeds: Everyone's %{crop} seeds
+        default: Everyone's seeds
+        owner_seeds: "%{owner} seeds"
     save_seeds: Save seeds
-  view: View
+    string: "%{crop} seeds belonging to %{owner}"
+  unauthorized:
+    create:
+      all: Please sign in or sign up to create a %{subject}.
+      notification: Please sign in to send a message.
+      planting: Please sign in or sign up to plant something.
+      post: Please sign in or sign up to post.
+      seed: Please sign in or sign up to add seeds.
+      garden_type: Not authorized. Only admins can create garden types.
+    manage:
+      all: Not authorized to %{action} %{subject}.
+    read:
+      notification: You must be signed in to view notifications.

config/locales/ja.yml

@@ -0,0 +1,5 @@
+---
+ja:
+  home:
+    blurb:
+      intro: "%{site_name}はガーデナーのコミュニティです。"

db/migrate/20251128193317_add_en_youtube_url_to_crops.rb

@@ -0,0 +1,5 @@
+class AddEnYoutubeUrlToCrops < ActiveRecord::Migration[7.2]
+  def change
+    add_column :crops, :en_youtube_url, :string
+  end
+end

db/migrate/20251128200506_add_description_to_crops.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddDescriptionToCrops < ActiveRecord::Migration[7.2]
+  # Temporary model to avoid validation issues
+  class Crop < ApplicationRecord
+  end
+
+  def up
+    add_column :crops, :description, :text
+
+    # Ensure the new column is available to the temporary model
+    Crop.reset_column_information
+
+    Crop.find_each do |crop|
+      next if crop.openfarm_data.blank?
+
+      description = crop.openfarm_data.dig('attributes', 'description')
+      crop.update_column(:description, description) if description.present?
+    end
+  end
+
+  def down
+    remove_column :crops, :description
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_09_01_144900) do
+ActiveRecord::Schema[7.2].define(version: 2025_11_28_200506) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -259,6 +259,8 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_144900) do
     t.string "sowing_method"
     t.string "sun_requirements"
     t.integer "growing_degree_days"
+    t.string "en_youtube_url"
+    t.text "description"
     t.index ["creator_id"], name: "index_crops_on_creator_id"
     t.index ["name"], name: "index_crops_on_name"
     t.index ["parent_id"], name: "index_crops_on_parent_id"
@@ -583,7 +585,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_09_01_144900) do
     t.integer "harvests_count", default: 0
     t.integer "likes_count", default: 0
     t.boolean "failed", default: false, null: false
-    t.boolean "from_other_source"
     t.integer "overall_rating"
     t.index ["crop_id"], name: "index_plantings_on_crop_id"
     t.index ["garden_id"], name: "index_plantings_on_garden_id"

spec/controllers/crops_controller_spec.rb

@@ -101,7 +101,7 @@ describe CropsController do
       it { expect { subject }.to change(AlternateName, :count).by(2) }
       it { expect { subject }.to change(ScientificName, :count).by(1) }
 
-      context 'with openfarm data' do
+      context 'with data' do
         let(:crop_params) do
           {
             crop:     {
@@ -110,16 +110,18 @@ describe CropsController do
               row_spacing:         10,
               spread:              20,
               height:              30,
+              description:         'hello',
               sowing_method:       'direct',
               sun_requirements:    'full sun',
-              growing_degree_days: 100
+              growing_degree_days: 100,
+              en_youtube_url:      'https://www.youtube.com/watch?v=INZybkX8tLI'
             },
             alt_name: { '1': "egg plant", '2': "purple apple" },
             sci_name: { '1': "fancy sci name", '2': "" }
           }
         end
 
-        it 'saves openfarm data' do
+        it 'saves data' do
           subject
           crop = Crop.last
           expect(crop.row_spacing).to eq(10)
@@ -128,6 +130,8 @@ describe CropsController do
           expect(crop.sowing_method).to eq('direct')
           expect(crop.sun_requirements).to eq('full sun')
           expect(crop.growing_degree_days).to eq(100)
+          expect(crop.description).to eq 'hello'
+          expect(crop.en_youtube_url).to eq 'https://www.youtube.com/watch?v=INZybkX8tLI'
         end
       end
     end

spec/models/crop_spec.rb

@@ -544,6 +544,20 @@ describe Crop do
     end
   end
 
+  context "destroying a crop" do
+    let!(:crop_a) { FactoryBot.create(:crop) }
+    let!(:crop_b) { FactoryBot.create(:crop) }
+
+    before do
+      CropCompanion.create(crop_a: crop_a, crop_b: crop_b)
+      CropCompanion.create(crop_a: crop_b, crop_b: crop_a)
+    end
+
+    it "destroys companion links" do
+      expect { crop_a.destroy }.to change { CropCompanion.count }.from(2).to(0)
+    end
+  end
+
   context "crop rejections" do
     let!(:rejected_reason) do
       FactoryBot.create(:crop, name:                 'tomato',

spec/views/i18n_spec.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-require 'i18n/tasks'
-
-RSpec.describe I18n do
-  let(:i18n) { I18n::Tasks::BaseTask.new }
-  let(:missing_keys) { i18n.missing_keys }
-  let(:unused_keys) { i18n.unused_keys }
-  let(:inconsistent_interpolations) { i18n.inconsistent_interpolations }
-
-  it 'does not have missing keys' do
-    expect(missing_keys).to be_empty,
-                            "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
-  end
-
-  it 'does not have unused keys' do
-    expect(unused_keys).to be_empty,
-                           "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
-  end
-
-  xit 'files are normalized' do
-    non_normalized = i18n.non_normalized_paths
-    error_message = "The following files need to be normalized:\n" \
-                    "#{non_normalized.map { |path| "  #{path}" }.join("\n")}\n" \
-                    "Please run `i18n-tasks normalize' to fix"
-    expect(non_normalized).to be_empty, error_message
-  end
-
-  it 'does not have inconsistent interpolations' do
-    error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
-                    "Run `i18n-tasks check-consistent-interpolations' to show them"
-    expect(inconsistent_interpolations).to be_empty, error_message
-  end
-end

yarn.lock

@@ -1006,9 +1006,9 @@ js-tokens@^4.0.0:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.0:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
+  integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"