good_job 3.14.1 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3457088e2e7120f5660f8c1395adb27887a0aad22d7b2ec816060f7619ebec
-  data.tar.gz: a6978f42d4a988b202c891633a8390dd585edbc07cf11f35511aaca005ce67e5
+  metadata.gz: 9aa61d924db48712cf404f47b7a6f5b977f1464a29b7e97f068b21422ac8261a
+  data.tar.gz: 9701e674925f45189bb8763f31d35a11eeb8d1f02f132cd4cc7e3db1fa6221f7
 SHA512:
-  metadata.gz: b5226e5cf17704c8cf1eaa0401fd3bc384d892bb02d6538653bde412b9f627537ba333816e589a05089f590df0d602ab163e57f2cdd4452e5ba539a9c57b7ff3
-  data.tar.gz: 49529f8c59b0a62cf6fe0f91b848ef01979c6e245b23e71cc2be3939c3497a6edfe92cb66c6171722e6473ba1d2d759a427855665a6419344ad0dbff69c73783
+  metadata.gz: 8a07c81b1a23c12b26c21c8d3316bc01ee931e0313d3f51d811564fe80dacf86efd8a1d37f693be0e4d893983ce9aaeeccbb5c0e523410815fea052287b56c3b
+  data.tar.gz: 46e3e5a9fe2c7fd8e82a51494e4fac3c480f0e323db1aab57ea2291d7f7db39284f0a9da70692e5b160312894f69ec31453279f541f61cbec99bfb091012af26

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [v3.15.0](https://github.com/bensheldon/good_job/tree/v3.15.0) (2023-04-02)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.14.2...v3.15.0)
+
+**Implemented enhancements:**
+
+- Extract more Dashboard strings into localization strings [\#899](https://github.com/bensheldon/good_job/pull/899) ([patriciomacadden](https://github.com/patriciomacadden))
+
+**Closed issues:**
+
+- ActionView::Template::Error - undefined method `symbolize\_keys' [\#889](https://github.com/bensheldon/good_job/issues/889)
+
+**Merged pull requests:**
+
+- Bump benchmark-ips from 2.11.0 to 2.12.0 [\#907](https://github.com/bensheldon/good_job/pull/907) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump selenium-webdriver from 4.8.1 to 4.8.6 [\#905](https://github.com/bensheldon/good_job/pull/905) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rails from 7.0.4.2 to 7.0.4.3 [\#904](https://github.com/bensheldon/good_job/pull/904) ([dependabot[bot]](https://github.com/apps/dependabot))
+- feat: locales for de [\#903](https://github.com/bensheldon/good_job/pull/903) ([eric-christian](https://github.com/eric-christian))
+- Update README.md [\#902](https://github.com/bensheldon/good_job/pull/902) ([ain2108](https://github.com/ain2108))
+- Extract shared methods/scopes into a BaseExecution to share between Execution and Job models [\#894](https://github.com/bensheldon/good_job/pull/894) ([bensheldon](https://github.com/bensheldon))
+- Add translate\_hash to handle missing translation keys that return hashes; only show translatable/available locales in dropdown [\#891](https://github.com/bensheldon/good_job/pull/891) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.14.2](https://github.com/bensheldon/good_job/tree/v3.14.2) (2023-03-16)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.14.1...v3.14.2)
+
+**Merged pull requests:**
+
+- Bump rack from 2.2.6.3 to 2.2.6.4 [\#893](https://github.com/bensheldon/good_job/pull/893) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Remove non-ActiveRecord::Base backed association [\#892](https://github.com/bensheldon/good_job/pull/892) ([rrunyon](https://github.com/rrunyon))
+
 ## [v3.14.1](https://github.com/bensheldon/good_job/tree/v3.14.1) (2023-03-14)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.14.0...v3.14.1)

data/README.md

@@ -452,7 +452,7 @@ GoodJob's concurrency control strategy for `perform_limit` is "optimistic retry
 - "Optimistic" meaning that the implementation's performance trade-off assumes that collisions are atypical (e.g. two users enqueue the same job at the same time) rather than regular (e.g. the system enqueues thousands of colliding jobs at the same time). Depending on your concurrency requirements, you may also want to manage concurrency through the number of GoodJob threads and processes that are performing a given queue.
 - "Retry with an incremental backoff" means that when `perform_limit` is exceeded, the job will raise a `GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError` which is caught by a `retry_on` handler which re-schedules the job to execute in the near future with an incremental backoff.
 - First-in-first-out job execution order is not preserved when a job is retried with incremental back-off.
-- For pessimistic usecases that collisions are expected, use number of threads/processes (e.g., `good_job --queue "serial:1;-serial:5"`) to control concurrency. It is also a good idea to use `perform_limit` as backstop.
+- For pessimistic usecases that collisions are expected, use number of threads/processes (e.g., `good_job --queues "serial:1;-serial:5"`) to control concurrency. It is also a good idea to use `perform_limit` as backstop.
 
 ### Cron-style repeating/recurring jobs
 

data/app/controllers/good_job/application_controller.rb

@@ -47,5 +47,6 @@ module GoodJob
     def good_job_available_locales
       @_good_job_available_locales ||= GoodJob::Engine.root.join("config/locales").glob("*.yml").map { |path| File.basename(path, ".yml").to_sym }.uniq
     end
+    helper_method :good_job_available_locales
   end
 end

data/app/controllers/good_job/cron_entries_controller.rb

@@ -15,25 +15,25 @@ module GoodJob
     def enqueue
       @cron_entry = CronEntry.find(params[:cron_key])
       @cron_entry.enqueue(Time.current)
-      redirect_back(fallback_location: cron_entries_path, notice: "Cron entry has been enqueued.")
+      redirect_back(fallback_location: cron_entries_path, notice: t(".notice"))
     end
 
     def enable
       @cron_entry = CronEntry.find(params[:cron_key])
       @cron_entry.enable
-      redirect_back(fallback_location: cron_entries_path, notice: "Cron entry has been enabled.")
+      redirect_back(fallback_location: cron_entries_path, notice: t(".notice"))
     end
 
     def disable
       @cron_entry = CronEntry.find(params[:cron_key])
       @cron_entry.disable
-      redirect_back(fallback_location: cron_entries_path, notice: "Cron entry has been disabled.")
+      redirect_back(fallback_location: cron_entries_path, notice: t(".notice"))
     end
 
     private
 
     def check_settings_migration!
-      redirect_back(fallback_location: cron_entries_path, alert: "Requires pending GoodJob database migration.") unless GoodJob::Setting.migrated?
+      redirect_back(fallback_location: cron_entries_path, alert: t("good_job.cron_entries.pending_migrations")) unless GoodJob::Setting.migrated?
     end
   end
 end

data/app/controllers/good_job/jobs_controller.rb

@@ -62,25 +62,25 @@ module GoodJob
     def discard
       @job = Job.find(params[:id])
       @job.discard_job(DISCARD_MESSAGE)
-      redirect_back(fallback_location: jobs_path, notice: "Job has been discarded")
+      redirect_back(fallback_location: jobs_path, notice: t(".notice"))
     end
 
     def reschedule
       @job = Job.find(params[:id])
       @job.reschedule_job
-      redirect_back(fallback_location: jobs_path, notice: "Job has been rescheduled")
+      redirect_back(fallback_location: jobs_path, notice: t(".notice"))
     end
 
     def retry
       @job = Job.find(params[:id])
       @job.retry_job
-      redirect_back(fallback_location: jobs_path, notice: "Job has been retried")
+      redirect_back(fallback_location: jobs_path, notice: t(".notice"))
     end
 
     def destroy
       @job = Job.find(params[:id])
       @job.destroy_job
-      redirect_to jobs_path, notice: "Job has been destroyed"
+      redirect_to jobs_path, notice: t(".notice")
     end
 
     private

data/app/filters/good_job/base_filter.rb

@@ -32,7 +32,7 @@ module GoodJob
 
     def job_classes
       filtered_query(params.slice(:queue_name)).unscope(:select)
-                                               .group("serialized_params->>'job_class'").count
+                                               .group(GoodJob::BaseExecution.params_job_class).count
                                                .sort_by { |name, _count| name.to_s }
                                                .to_h
     end

data/app/helpers/good_job/application_helper.rb

@@ -19,7 +19,7 @@ module GoodJob
 
     def relative_time(timestamp, **options)
       options = options.reverse_merge({ scope: "good_job.datetime.distance_in_words" })
-      text = timestamp.future? ? "in #{time_ago_in_words(timestamp, **options)}" : "#{time_ago_in_words(timestamp, **options)} ago"
+      text = t("good_job.helpers.relative_time.#{timestamp.future? ? 'future' : 'past'}", time: time_ago_in_words(timestamp, **options))
       tag.time(text, datetime: timestamp, title: timestamp)
     end
 
@@ -42,7 +42,7 @@ module GoodJob
     }.freeze
 
     def status_badge(status)
-      content_tag :span, status_icon(status, class: "text-white") + t(status, scope: 'good_job.status'),
+      content_tag :span, status_icon(status, class: "text-white") + t(status, scope: 'good_job.status', count: 1),
                   class: "badge rounded-pill bg-#{STATUS_COLOR.fetch(status)} d-inline-flex gap-2 ps-1 pe-3 align-items-center"
     end
 
@@ -57,5 +57,14 @@ module GoodJob
       partial = lookup_context.find_template("good_job/shared/icons/#{name}", [], true)
       partial.render(self, {})
     end
+
+    def translate_hash(key, **options)
+      translation_exists?(key, **options) ? translate(key, **options) : {}
+    end
+
+    def translation_exists?(key, **options)
+      true if good_job_available_locales.include?(I18n.locale)
+      I18n.exists?(scope_key_by_partial(key), **options)
+    end
   end
 end

data/app/models/good_job/base_execution.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module GoodJob
+  # ActiveRecord model to share behavior between {Job} and {Execution} models
+  # which both read out of the same table.
+  class BaseExecution < BaseRecord
+    self.table_name = 'good_jobs'
+
+    # With a given class name
+    # @!method job_class
+    # @!scope class
+    # @param string [String] Execution class name
+    # @return [ActiveRecord::Relation]
+    scope :job_class, ->(name) { where(params_job_class.eq(name)) }
+
+    class << self
+      def json_string(json, attr)
+        Arel::Nodes::Grouping.new(Arel::Nodes::InfixOperation.new('->>', json, Arel::Nodes.build_quoted(attr)))
+      end
+
+      def params_job_class
+        json_string(arel_table['serialized_params'], 'job_class')
+      end
+
+      def params_execution_count
+        Arel::Nodes::InfixOperation.new(
+          '::',
+          json_string(arel_table['serialized_params'], 'executions'),
+          Arel.sql('integer')
+        )
+      end
+
+      def coalesce_scheduled_at_created_at
+        arel_table.coalesce(arel_table['scheduled_at'], arel_table['created_at'])
+      end
+    end
+
+    # The ActiveJob job class, as a string
+    # @return [String]
+    def job_class
+      serialized_params['job_class']
+    end
+  end
+end

data/app/models/good_job/execution.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module GoodJob
   # ActiveRecord model that represents an +ActiveJob+ job.
-  class Execution < BaseRecord
+  class Execution < BaseExecution
     include Lockable
     include Filterable
     include Reportable
@@ -70,7 +70,6 @@ module GoodJob
     end
 
     belongs_to :batch, class_name: 'GoodJob::BatchRecord', optional: true, inverse_of: :executions
-    belongs_to :batch_callback, class_name: 'GoodJob::Batch', optional: true
 
     belongs_to :job, class_name: 'GoodJob::Job', foreign_key: 'active_job_id', primary_key: 'active_job_id', optional: true, inverse_of: :executions
     after_destroy -> { self.class.active_job_id(active_job_id).delete_all }, if: -> { @_destroy_job }
@@ -83,14 +82,6 @@ module GoodJob
     # @return [ActiveRecord::Relation]
     scope :active_job_id, ->(active_job_id) { where(active_job_id: active_job_id) }
 
-    # Get executions with given class name
-    # @!method job_class
-    # @!scope class
-    # @param string [String]
-    #   Execution class name
-    # @return [ActiveRecord::Relation]
-    scope :job_class, ->(job_class) { where("serialized_params->>'job_class' = ?", job_class) }
-
     # Get executions that have not yet finished (succeeded or discarded).
     # @!method unfinished
     # @!scope class
@@ -120,7 +111,7 @@ module GoodJob
     # @!method creation_ordered
     # @!scope class
     # @return [ActiveRecord:Relation]
-    scope :creation_ordered, -> { order('created_at ASC') }
+    scope :creation_ordered, -> { order(created_at: :asc) }
 
     # Order executions for de-queueing
     # @!method dequeueing_ordered
@@ -156,7 +147,7 @@ module GoodJob
     # @!method schedule_ordered
     # @!scope class
     # @return [ActiveRecord::Relation]
-    scope :schedule_ordered, -> { order(Arel.sql('COALESCE(scheduled_at, created_at) ASC')) }
+    scope :schedule_ordered, -> { order(coalesce_scheduled_at_created_at.asc) }
 
     # Get Jobs were completed before the given timestamp. If no timestamp is
     # provided, get all jobs that have been completed. By default, GoodJob

data/app/models/good_job/job.rb

@@ -5,7 +5,7 @@ module GoodJob
   # The +good_jobs+ table is a table of individual {GoodJob::Execution}s that share the same +active_job_id+.
   # A single row from the +good_jobs+ table of executions is fetched to represent a Job.
   #
-  class Job < BaseRecord
+  class Job < BaseExecution
     include Filterable
     include Lockable
     include Reportable
@@ -23,26 +23,6 @@ module GoodJob
       def table_name=(_value)
         raise NotImplementedError, 'Assign GoodJob::Execution.table_name directly'
       end
-
-      def json_string(json, attr)
-        Arel::Nodes::Grouping.new(Arel::Nodes::InfixOperation.new('->>', json, Arel::Nodes.build_quoted(attr)))
-      end
-
-      def params_job_class
-        json_string(arel_table['serialized_params'], 'job_class')
-      end
-
-      def params_execution_count
-        Arel::Nodes::InfixOperation.new(
-          '::',
-          json_string(arel_table['serialized_params'], 'executions'),
-          Arel.sql('integer')
-        )
-      end
-
-      def coalesce_scheduled_at_created_at
-        arel_table.coalesce(arel_table['scheduled_at'], arel_table['created_at'])
-      end
     end
 
     self.primary_key = 'active_job_id'
@@ -54,13 +34,6 @@ module GoodJob
     # Only the most-recent unretried execution represents a "Job"
     default_scope { where(retried_good_job_id: nil) }
 
-    # Get Jobs with given class name
-    # @!method job_class
-    # @!scope class
-    # @param string [String] Execution class name
-    # @return [ActiveRecord::Relation]
-    scope :job_class, ->(name) { where(params_job_class.eq(name)) }
-
     # Get Jobs finished before the given timestamp.
     # @!method finished_before(timestamp)
     # @!scope class
@@ -89,12 +62,6 @@ module GoodJob
       active_job_id
     end
 
-    # The ActiveJob job class, as a string
-    # @return [String]
-    def job_class
-      serialized_params['job_class']
-    end
-
     # Override #reload to add a custom scope to ensure the reloaded record is the head execution
     # @return [Job]
     def reload(options = nil)

data/app/views/good_job/batches/_jobs.erb

@@ -2,10 +2,10 @@
     <div class="list-group list-group-flush text-nowrap table-jobs" role="table">
       <header class="list-group-item bg-light">
         <div class="row small text-muted text-uppercase align-items-center">
-          <div class="col-4">Jobs</div>
-          <div class="d-none d-lg-block col-lg-1 text-lg-center">Queue</div>
-          <div class="d-none d-lg-block col-lg-1 text-lg-end">Priority</div>
-          <div class="d-none d-lg-block col-lg-1 text-lg-end">Attempts</div>
+        <div class="col-4"><%=t "good_job.models.batch.jobs" %></div>
+          <div class="d-none d-lg-block col-lg-1 text-lg-center"><%=t "good_job.models.job.queue" %></div>
+          <div class="d-none d-lg-block col-lg-1 text-lg-end"><%=t "good_job.models.job.priority" %></div>
+          <div class="d-none d-lg-block col-lg-1 text-lg-end"><%=t "good_job.models.job.attempts" %></div>
           <div class="col text-end">
             <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                            data: { bs_toggle: "collapse", bs_target: ".job-params" },
@@ -26,15 +26,15 @@
                 <%= tag.h5 tag.code(link_to(job.job_class, job_path(job), class: "text-reset text-decoration-none")), class: "text-reset mb-0" %>
               </div>
               <div class="col-4 col-lg-1 text-lg-center">
-                <div class="d-lg-none small text-muted mt-1">Queue</div>
+                <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.job.queue" %></div>
                 <span class="badge bg-primary bg-opacity-25 text-dark font-monospace"><%= job.queue_name %></span>
               </div>
               <div class="col-4 col-lg-1 text-lg-end">
-                <div class="d-lg-none small text-muted mt-1">Priority</div>
+                <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.job.priority" %>Priority</div>
                 <span class="font-monospace fw-bold"><%= job.priority %></span>
               </div>
               <div class="col-4 col-lg-1 text-lg-end">
-                <div class="d-lg-none small text-muted mt-1">Attempts</div>
+                <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.job.attempts" %></div>
                 <% if job.executions_count > 0 && job.status != :finished %>
                   <%= tag.span job.executions_count, class: "badge rounded-pill bg-danger", data: {
                     bs_toggle: "popover",
@@ -53,33 +53,33 @@
                 <div class="dropdown float-end">
                   <button class="d-flex align-items-center btn btn-sm" type="button" id="<%= dom_id(job, :actions) %>" data-bs-toggle="dropdown" aria-expanded="false">
                     <%= render "good_job/shared/icons/dots" %>
-                    <span class="visually-hidden">Actions</span>
+                    <span class="visually-hidden"><%=t ".actions.title" %></span>
                   </button>
                   <ul class="dropdown-menu shadow" aria-labelledby="<%= dom_id(job, :actions) %>">
                     <li>
                       <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
-                      <%= link_to reschedule_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_reschedulable}", title: "Reschedule job", data: { confirm: "Confirm reschedule", disable: true } do %>
+                      <%= link_to reschedule_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_reschedulable}", title: t(".actions.reschedule"), data: { confirm: t(".actions.confirm_reschedule"), disable: true } do %>
                         <%= render "good_job/shared/icons/skip_forward" %>
-                        Reschedule
+                        <%=t "good_job.actions.reschedule" %>
                       <% end %>
                     </li>
                     <li>
                       <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
-                      <%= link_to discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_discardable}", title: "Discard job", data: { confirm: "Confirm discard", disable: true } do %>
+                      <%= link_to discard_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job_discardable}", title: t(".actions.discard"), data: { confirm: t(".actions.confirm_discard"), disable: true } do %>
                         <%= render "good_job/shared/icons/stop" %>
-                        Discard
+                        <%=t "good_job.actions.discard" %>
                       <% end %>
                     </li>
                     <li>
-                      <%= link_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: "Retry job", data: { confirm: "Confirm retry", disable: true } do %>
+                      <%= link_to retry_job_path(job.id), method: :put, class: "dropdown-item #{'disabled' unless job.status == :discarded}", title: t(".actions.retry"), data: { confirm: t(".actions.confirm_retry"), disable: true } do %>
                         <%= render "good_job/shared/icons/arrow_clockwise" %>
-                        Retry
+                        <%=t "good_job.actions.retry" %>
                       <% end %>
                     </li>
                     <li>
-                      <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.status.in? [:discarded, :finished]}", title: "Destroy job", data: { confirm: "Confirm destroy", disable: true } do %>
+                      <%= link_to job_path(job.id), method: :delete, class: "dropdown-item #{'disabled' unless job.status.in? [:discarded, :finished]}", title: t(".actions.destroy"), data: { confirm: t(".actions.confirm_destroy"), disable: true } do %>
                         <%= render_icon "trash" %>
-                        Destroy
+                        <%=t "good_job.actions.destroy" %>
                       <% end %>
                     </li>
 
@@ -89,7 +89,7 @@
                                   data: { bs_toggle: "collapse" },
                                   aria: { expanded: false, controls: dom_id(job, "params") } do %>
                         <%= render_icon "info" %>
-                        Inspect
+                        <%=t "good_job.actions.inspect" %>
                       <% end %>
                     </li>
                   </ul>
@@ -103,7 +103,7 @@
         <% end %>
       <% else %>
         <div class="list-group-item py-4 text-center text-muted">
-          No jobs found.
+          <%=t ".no_jobs_found" %>
         </div>
       <% end %>
     </div>

data/app/views/good_job/batches/_table.erb

@@ -2,18 +2,18 @@
     <div class="list-group list-group-flush text-nowrap table-batches" role="table">
       <header class="list-group-item bg-light">
         <div class="row small text-muted text-uppercase align-items-center">
-          <div class="col-4">Name</div>
-          <div class="col-lg-1 d-none d-lg-block">Created</div>
-          <div class="col-lg-1 d-none d-lg-block">Enqueued</div>
-          <div class="col-lg-1 d-none d-lg-block">Discarded</div>
-          <div class="col-lg-1 d-none d-lg-block">Finished</div>
-          <div class="col-lg-1 d-none d-lg-block">Jobs</div>
+          <div class="col-4"><%=t "good_job.models.batch.name" %></div>
+          <div class="col-lg-1 d-none d-lg-block"><%=t "good_job.models.batch.created" %></div>
+          <div class="col-lg-1 d-none d-lg-block"><%=t "good_job.models.batch.enqueued" %></div>
+          <div class="col-lg-1 d-none d-lg-block"><%=t "good_job.models.batch.discarded" %></div>
+          <div class="col-lg-1 d-none d-lg-block"><%=t "good_job.models.batch.finished" %></div>
+          <div class="col-lg-1 d-none d-lg-block"><%=t "good_job.models.batch.jobs" %></div>
           <div class="col text-end">
             <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
                            data: { bs_toggle: "collapse", bs_target: ".batch-properties" },
                            aria: { expanded: false, controls: batches.map { |batch| "##{dom_id(batch, "params")}" }.join(" ") } do %>
               <%= render_icon "info" %>
-              <span class="visually-hidden">Inspect</span>
+              <span class="visually-hidden"><%=t "good_job.actions.inspect" %></span>
             <% end %>
           </div>
         </div>
@@ -33,38 +33,38 @@
                 <% end %>
               </div>
               <div class="col-6 col-lg-1 text-wrap">
-                <div class="d-lg-none small text-muted mt-1">Created at</div>
+                <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.batch.created_at" %></div>
                 <%= relative_time(batch.created_at) %>
               </div>
               <div class="col-6 col-lg-1 text-wrap">
                 <% if batch.enqueued_at %>
-                  <div class="d-lg-none small text-muted mt-1">Enqueued at</div>
+                  <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.batch.enqueued_at" %></div>
                   <%= relative_time(batch.enqueued_at) %>
                 <% end %>
               </div>
               <div class="col-6 col-lg-1 text-wrap">
                 <% if batch.discarded_at %>
-                  <div class="d-lg-none small text-muted mt-1">Discarded at</div>
+                  <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.batch.discarded_at" %></div>
                   <%= relative_time(batch.discarded_at) %>
                 <% end %>
               </div>
               <div class="col-6 col-lg-1 text-wrap">
                 <% if batch.finished_at %>
-                  <div class="d-lg-none small text-muted mt-1">Finished at</div>
+                  <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.batch.finished_at" %></div>
                   <%= relative_time(batch.finished_at) %>
                 <% end %>
               </div>
               <div class="col-6 col-lg-1">
-                <div class="d-lg-none small text-muted mt-1">Jobs</div>
+                <div class="d-lg-none small text-muted mt-1"><%=t "good_job.models.batch.jobs" %></div>
                 <%= batch.jobs.count %>
               </div>
               <div class="col text-end">
                 <%= tag.button type: "button", class: "btn btn-sm text-muted", role: "button",
-                               title: "Inspect",
+                               title: t("good_job.actions.inspect"),
                                data: { bs_toggle: "collapse", bs_target: "##{dom_id(batch, 'properties')}" },
                                aria: { expanded: false, controls: dom_id(batch, "state") } do %>
                   <%= render_icon "info" %>
-                  <span class="visually-hidden">Inspect</span>
+                  <span class="visually-hidden"><%=t "good_job.actions.inspect" %></span>
                 <% end %>
               </div>
             </div>
@@ -75,7 +75,7 @@
         <% end %>
       <% else %>
         <div class="list-group-item py-4 text-center text-muted">
-          No batches found.
+          <%=t ".no_batches_found" %>
         </div>
       <% end %>
     </div>

data/app/views/good_job/batches/index.html.erb

@@ -1,5 +1,5 @@
 <div class="border-bottom">
-  <h2 class="pt-3 pb-2">Batches</h2>
+  <h2 class="pt-3 pb-2"><%= t ".title" %></h2>
 </div>
 
 <% if GoodJob::BatchRecord.migrated? %>
@@ -9,12 +9,12 @@
       <ul class="pagination">
         <li class="page-item">
           <%= link_to(@filter.to_params(after_created_at: @filter.last.created_at, after_id: @filter.last.id), class: "page-link") do %>
-            Older batches <span aria-hidden="true">&raquo;</span>
+            <%= t ".older_batches" %> <span aria-hidden="true">&raquo;</span>
           <% end %>
         </li>
       </ul>
     </nav>
   <% end %>
 <% else %>
-  <h3 class="text-center my-5">GoodJob has pending database migrations.</h3>
+  <h3 class="text-center my-5"><%= t ".pending_migrations" %></h3>
 <% end %>

data/app/views/good_job/batches/show.html.erb

@@ -4,7 +4,7 @@
       <div class="col">
         <nav aria-label="breadcrumb">
           <ol class="breadcrumb small mb-0">
-            <li class="breadcrumb-item"><%= link_to "Batches", batches_path %></li>
+            <li class="breadcrumb-item"><%= link_to t("good_job.batches.index.title"), batches_path %></li>
             <li class="breadcrumb-item active" aria-current="page"><%= tag.code @batch.id, class: "text-muted" %></li>
           </ol>
           <h2 class="h5 mt-2"><%= @batch.description %></h2>
@@ -15,18 +15,18 @@
 </div>
 
 <div class="my-4">
-  <h5>Attributes</h5>
+  <h5><%= t ".attributes" %></h5>
   <div class="bg-dark text-light p-3 rounded">
     <%= tag.pre JSON.pretty_generate @batch.display_attributes, class: 'text-wrap text-break' %>
   </div>
 </div>
 
 <div class="my-4">
-  <h5>Callback Jobs</h5>
+  <h5><%= t ".callback_jobs" %></h5>
   <%= render 'jobs', jobs: @batch.callback_jobs.reverse %>
 </div>
 
 <div class="my-4">
-  <h5>Batched Jobs</h5>
+  <h5><%= t ".batched_jobs" %></h5>
   <%= render 'jobs', jobs: @batch.jobs.reverse %>
 </div>