Merge remote-tracking branch 'origin/main' into ui-update

* origin/main:
  Release good_job v2.12.2
  Dashboard: added NL translations (bensheldon#568)
  Fix ru.yml filename
  Un-deprecate Adapter's `execution_mode` argument (bensheldon#567)

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [v2.12.2](https://github.com/bensheldon/good_job/tree/v2.12.2) (2022-04-18)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.1...v2.12.2)
+
+**Merged pull requests:**
+
+- Dashboard: added NL translations [\#568](https://github.com/bensheldon/good_job/pull/568) ([eelcoj](https://github.com/eelcoj))
+- Un-deprecate Adapter's `execution_mode` argument [\#567](https://github.com/bensheldon/good_job/pull/567) ([bensheldon](https://github.com/bensheldon))
+
 ## [v2.12.1](https://github.com/bensheldon/good_job/tree/v2.12.1) (2022-04-18)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.0...v2.12.1)

Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    good_job (2.12.1)
+    good_job (2.12.2)
       activejob (>= 5.2.0)
       activerecord (>= 5.2.0)
       concurrent-ruby (>= 1.0.2)

engine/config/locales/nl.yml

@@ -0,0 +1,53 @@
+---
+nl:
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: ongeveer 1 uur
+        other: ongeveer %{count} uren
+      about_x_months:
+        one: ongeveer 1 maand
+        other: ongeveer %{count} maanden
+      about_x_years:
+        one: ongeveer 1 jaar
+        other: ongeveer %{count} jaren
+      almost_x_years:
+        one: bijna 1 jaar
+        other: bijna %{count} jaren
+      half_a_minute: halve minuut
+      less_than_x_minutes:
+        one: minder dan één minuut
+        other: minder dan %{count} minuten
+      less_than_x_seconds:
+        one: minder dan 1 seconde
+        other: minder dan %{count} seconden
+      over_x_years:
+        one: meer dan 1 jaar
+        other: meer dan %{count} jaren
+      x_days:
+        one: 1 dag
+        other: "%{count} dagen"
+      x_minutes:
+        one: 1 minuut
+        other: "%{count} minuten"
+      x_months:
+        one: 1 maand
+        other: "%{count} maanden"
+      x_seconds:
+        one: 1 seconde
+        other: "%{count} seconden"
+      x_years:
+        one: 1 jaar
+        other: "%{count} jaren"
+  good_job:
+    shared:
+      footer:
+        last_update_html: Laatst bijgewerkt <time id="page-updated-at" datetime="%{time}">%{time}</time>
+        wording: 'Onthoud: jij levert ook goed werk!'
+      navbar:
+        cron_schedules: Cron Schema
+        executions: Alle Uitvoeringen
+        jobs: Alle Taken
+        live_poll: Live Poll
+        name: "GoodJob 👍"
+        processes: Processen

lib/good_job/adapter.rb

@@ -28,9 +28,9 @@ class Adapter
     # @param poll_interval [Integer, nil] sets the number of seconds between polls for jobs when +execution_mode+ is set to +:async+. You can also set this with the environment variable +GOOD_JOB_POLL_INTERVAL+. Defaults to +1+.
     # @param start_async_on_initialize [Boolean] whether to start the async scheduler when the adapter is initialized.
     def initialize(execution_mode: nil, queues: nil, max_threads: nil, poll_interval: nil, start_async_on_initialize: nil)
-      if execution_mode || queues || max_threads || poll_interval || start_async_on_initialize
+      if queues || max_threads || poll_interval || start_async_on_initialize
         ActiveSupport::Deprecation.warn(
-          "The GoodJob::Adapter's initialization parameters have been deprecated and will be removed in GoodJob v3. These options should be configured through GoodJob global configuration instead."
+          "GoodJob::Adapter's execution-related arguments (queues, max_threads, poll_interval, start_async_on_initialize) have been deprecated and will be removed in GoodJob v3. These options should be configured through GoodJob global configuration instead."
         )
       end
 

lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.12.1'
+  VERSION = '2.12.2'
 end