foreman-tasks 7.2.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d611523d1262879b33177bf9c1f4c394142fee8433c2fda798cb4063b60f99
-  data.tar.gz: 1e7974c6fde725d0fe46dcffd6793c7f4b078c3c6e2e3429dce42180e61e4044
+  metadata.gz: 963f9bf0926c9f8a71b9aef3ace2e25e2b156210c3e4c7567e4282c44eb5632b
+  data.tar.gz: 8b5596eab3ccc039c32f9a23278b54f526aac63546e546f8965314b80afcc7be
 SHA512:
-  metadata.gz: 6f358b767cf2c8f2f6d31a43aa6c1fca27a6db053311d4540cea15d11c7c76758db192d5b39ecef17fcfc9d89e9e99a233c6b3d14fadd41efcca709aea37704b
-  data.tar.gz: 9c08bf19e2f8bdc05add76a9b8e9b783407b03ba99f0c47325454468a4654e44296f8dafd87e40a5d58ed771edb58900c0ac41738202efce5043193b5580a50c
+  metadata.gz: 48072148a700c91b935f54983371ad5d47d31ead77429def7acde35e847e3a94c31a3d76930aa5540e8e00563285ae611c37c3a58d2a23b3eef5ee8de3d621fb
+  data.tar.gz: 11861d32d797ecf6c1c44f2374cb81758d93c838f546014160c55d4f6d0606de69a5cb06e538d9c65cfd266838f1b976c2404ba1267d0fb07504ef9d9868feff

data/.github/workflows/ruby_tests.yml

@@ -5,6 +5,9 @@ env:
   DATABASE_URL: postgresql://postgres:@localhost/test
   DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
   BUNDLE_WITHOUT: "journald:development:console:mysql2:sqlite:libvirt"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   rubocop:
     runs-on: ubuntu-latest
@@ -20,6 +23,7 @@ jobs:
   test_ruby:
     runs-on: ubuntu-latest
     needs: rubocop
+    timeout-minutes: 15
     services:
       postgres:
         image: postgres:12.1

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -52,8 +52,8 @@ module ForemanTasks
       default = '-'
       return default if recurring_logic.done? || recurring_logic.disabled?
 
-      last_task = recurring_logic.tasks.order(:start_at).last
-      last_task ? last_task.start_at : default
+      upcoming_task = recurring_logic.next_task
+      upcoming_task ? upcoming_task.start_at : default
     end
 
     def time_f(f, attr, field_options = {}, time_options = {}, html_options = {})

data/app/lib/actions/middleware/watch_delegated_proxy_sub_tasks.rb

@@ -51,7 +51,7 @@ module Actions
 
       def notify(event, tasks)
         tasks.each do |task|
-          action.plan_event(event, execution_plan_id: task.execution_plan_id, step_id: task.step_id)
+          action.plan_event(event, execution_plan_id: task.execution_plan_id, step_id: task.step_id, optional: true)
         end
       end
 

data/app/models/foreman_tasks/recurring_logic.rb

@@ -1,5 +1,5 @@
 module ForemanTasks
-  require 'parse-cron'
+  require 'fugit'
 
   class RecurringLogic < ApplicationRecord
     include Authorizable
@@ -29,6 +29,14 @@ module ForemanTasks
       %w[active disabled finished cancelled failed]
     end
 
+    def last_task
+      tasks.order(:started_at).where.not(started_at: nil).last
+    end
+
+    def next_task
+      tasks.order(:start_at).where(started_at: nil).last
+    end
+
     def enabled=(value)
       task = tasks.find_by(:state => :scheduled)
       if task
@@ -88,11 +96,11 @@ module ForemanTasks
     end
 
     def next_occurrence_time(time = Time.zone.now)
-      @parser ||= CronParser.new(cron_line, Time.zone)
+      @parser ||= Fugit.parse_cron(cron_line)
       # @parser.next(start_time) is not inclusive of the start_time hence stepping back one run to include checking start_time for the first run.
-      before_next = @parser.next(@parser.last(time.in_time_zone))
-      return before_next if before_next >= time && tasks.count == 0
-      @parser.next(time)
+      before_next = @parser.next_time(@parser.previous_time(time.iso8601))
+      return before_next.utc.localtime if before_next >= time && tasks.count == 0
+      @parser.next_time(time).utc.localtime
     end
 
     def generate_delay_options(time = Time.zone.now, options = {})

data/app/views/foreman_tasks/api/recurring_logics/base.json.rabl

@@ -1,4 +1,9 @@
 object @recurring_logic
 
 attributes :id, :cron_line, :end_time, :iteration, :task_group_id, :state,
-           :max_iteration
+           :max_iteration, :purpose
+
+node(:task_count) { |rl| rl.tasks.count }
+node(:action) { |rl| rl.tasks.first.try(:action) }
+node(:last_occurence) { |rl| rl.last_task&.started_at }
+node(:next_occurence) { |rl| rl.next_task&.start_at }

data/app/views/foreman_tasks/recurring_logics/index.html.erb

@@ -56,7 +56,7 @@
       <td><%= recurring_logic.cron_line %></td>
       <td><%= link_to(recurring_logic.tasks.count, foreman_tasks_tasks_url(:search => "task_group.id = #{recurring_logic.task_group.id}")) %></td>
       <td><%= format_task_input(recurring_logic.tasks.first) %></td>
-      <td><%= recurring_logic.tasks.order(:started_at).where('started_at IS NOT NULL').last.try(:started_at) || "-" %></td>
+      <td><%= recurring_logic.last_task.try(:started_at) || "-" %></td>
       <td><%= recurring_logic_next_occurrence recurring_logic %></td>
       <td><%= recurring_logic.iteration %></td>
       <td><%= format_recurring_logic_limit recurring_logic.max_iteration %></td>

data/config/routes.rb

@@ -72,7 +72,6 @@ Foreman::Application.routes.draw do
         require 'sidekiq/web'
         redis_url = ENV['DYNFLOW_REDIS_URL'] || SETTINGS.dig(:dynflow, :redis_url)
         Sidekiq.redis = { url: redis_url }
-        Sidekiq::Web.set :sessions, false
         mount Sidekiq::Web => '/sidekiq', :constraints => ForemanTasks::Dynflow::SidekiqConsoleConstraint.new
       end
     end

data/db/migrate/20211123170430_tasks_settings_to_dsl_category.rb

@@ -1,5 +1,5 @@
 class TasksSettingsToDslCategory < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::ForemanTasks').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::ForemanTasks').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/foreman-tasks.gemspec

@@ -20,15 +20,15 @@ same resource. It also optionally provides Dynflow infrastructure for using it f
   DESC
 
   s.files = `git ls-files`.split("\n").reject do |file|
-    file.end_with?("test.rake")
+    file.end_with?("test.rake") || file == '.packit.yaml'
   end
 
   s.test_files = `git ls-files test`.split("\n")
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency "dynflow", '>= 1.6.0'
+  s.add_dependency 'fugit', '~> 1.8'
   s.add_dependency "get_process_mem" # for memory polling
-  s.add_dependency "parse-cron", '~> 0.1.4'
   s.add_dependency "sinatra" # for Dynflow web console
 
   s.add_development_dependency 'factory_bot_rails', '~> 4.8.0'

data/lib/foreman_tasks/engine.rb

@@ -16,16 +16,9 @@ module ForemanTasks
       SETTINGS[:foreman_tasks] = { :assets => { :precompile => assets_to_precompile } }
     end
 
-    initializer 'foreman_tasks.register_gettext', :after => :load_config_initializers do
-      locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
-      locale_domain = 'foreman_tasks'
-
-      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
-    end
-
     initializer 'foreman_tasks.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '>= 3.3.0'
+        requires_foreman '>= 3.7.0'
         divider :top_menu, :parent => :monitor_menu, :last => true, :caption => N_('Foreman Tasks')
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },
@@ -129,6 +122,8 @@ module ForemanTasks
         widget 'foreman_tasks/tasks/dashboard/tasks_status', :sizex => 6, :sizey => 1, :name => N_('Task Status')
         widget 'foreman_tasks/tasks/dashboard/latest_tasks_in_error_warning', :sizex => 6, :sizey => 1, :name => N_('Latest Warning/Error Tasks')
 
+        register_gettext domain: "foreman_tasks"
+
         ForemanTasks.dynflow.eager_load_actions!
         extend_observable_events(::Dynflow::Action.descendants.select { |klass| klass <= ::Actions::ObservableAction }.map(&:namespaced_event_names))
       end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '7.2.0'.freeze
+  VERSION = '8.0.0'.freeze
 end

data/lib/tasks/gettext.rake

@@ -17,7 +17,7 @@ if gettext_find_task
                  .uniq
                  .map { |n| %[_("#{n}")] }
                  .sort
-                 .join("\n")
+                 .join("\n") + "\n"
     end
   end
 

data/locale/de/foreman_tasks.po

@@ -20,9 +20,6 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr "${taskReload ? 'Stop': 'Start'} automatisches Nachladen"
-
 msgid "%(last)s Last %(time)s"
 msgstr "%(last)s Zuletzt %(time)s"
 
@@ -74,8 +71,8 @@ msgstr "Aktive Filter:"
 msgid "Active or disabled recurring logic with purpose %s already exists"
 msgstr ""
 
-msgid "All %s tasks are selected. "
-msgstr "Alle %s Aufgaben sind ausgewählt."
+msgid "All %s tasks are selected."
+msgstr ""
 
 msgid "All proxies with the required feature are unavailable at the moment"
 msgstr "Alle Proxys mit dem genannten Feature sind nicht verfügbar "
@@ -165,11 +162,8 @@ msgstr "Konflikt mit Aufgaben:"
 msgid "Could not cancel step."
 msgstr "Schritt konnte nicht abgebrochen werden."
 
-msgid "Could not receive data: ${APIerror && APIerror.message}"
-msgstr "Daten konnten nicht empfangen werden: ${APIerror && APIerror.message}"
-
-msgid "Could not receive data: ${error && error.message}"
-msgstr "Konnte Daten nicht erhalten: ${error && error.message}"
+msgid "Could not receive data: %s"
+msgstr ""
 
 msgid "Cron line"
 msgstr "Cron-Zeile"
@@ -550,8 +544,8 @@ msgstr "Weitere Informationen zur Behebung des Problems finden Sie unter %{link}
 msgid "Select Action"
 msgstr "Aktion auswählen"
 
-msgid "Select All"
-msgstr "Alle auswählen"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr "Zeile auswählen"
@@ -571,6 +565,9 @@ msgstr "Details der Wiederholungslogik anzeigen"
 msgid "Start at"
 msgstr "Startet um "
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr "Startet vor"
 
@@ -586,6 +583,9 @@ msgstr "Status"
 msgid "Step Canceled"
 msgstr "Schritt abgebrochen"
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr "Ausgewählte stoppbare Aufgaben stoppen"
 
@@ -848,9 +848,6 @@ msgstr "Aufgabe muss stornierbar sein"
 msgid "task has to be resumable"
 msgstr "Aufgabe muss wiederaufsetzbar sein"
 
-msgid "tasks."
-msgstr "Aufgaben."
-
 msgid "time"
 msgstr "Zeit"
 

data/locale/en/foreman_tasks.po

@@ -17,9 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr ""
-
 msgid "%(last)s Last %(time)s"
 msgstr ""
 
@@ -71,7 +68,7 @@ msgstr ""
 msgid "Active or disabled recurring logic with purpose %s already exists"
 msgstr ""
 
-msgid "All %s tasks are selected. "
+msgid "All %s tasks are selected."
 msgstr ""
 
 msgid "All proxies with the required feature are unavailable at the moment"
@@ -162,10 +159,7 @@ msgstr ""
 msgid "Could not cancel step."
 msgstr ""
 
-msgid "Could not receive data: ${APIerror && APIerror.message}"
-msgstr ""
-
-msgid "Could not receive data: ${error && error.message}"
+msgid "Could not receive data: %s"
 msgstr ""
 
 msgid "Cron line"
@@ -547,7 +541,7 @@ msgstr ""
 msgid "Select Action"
 msgstr ""
 
-msgid "Select All"
+msgid "Select all {count} tasks"
 msgstr ""
 
 msgid "Select row"
@@ -568,6 +562,9 @@ msgstr ""
 msgid "Start at"
 msgstr ""
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr ""
 
@@ -583,6 +580,9 @@ msgstr ""
 msgid "Step Canceled"
 msgstr ""
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr ""
 
@@ -845,9 +845,6 @@ msgstr ""
 msgid "task has to be resumable"
 msgstr ""
 
-msgid "tasks."
-msgstr ""
-
 msgid "time"
 msgstr ""
 

data/locale/es/foreman_tasks.po

@@ -20,9 +20,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
 " 2;\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr "${taskReload ? 'Stop' : 'Start'} auto-recarga"
-
 msgid "%(last)s Last %(time)s"
 msgstr "%(last)s Última %(time)s"
 
@@ -74,8 +71,8 @@ msgstr "Filtros activos:"
 msgid "Active or disabled recurring logic with purpose %s already exists"
 msgstr "Lógica recurrente activa o desactivada con el propósito %s ya existe"
 
-msgid "All %s tasks are selected. "
-msgstr "Se seleccionan todas las tareas de %s. "
+msgid "All %s tasks are selected."
+msgstr ""
 
 msgid "All proxies with the required feature are unavailable at the moment"
 msgstr "Ningún proxy con función obligatoria está disponible en este momento"
@@ -165,11 +162,8 @@ msgstr "Conflictos con las tareas:"
 msgid "Could not cancel step."
 msgstr "No se pudo cancelar el paso."
 
-msgid "Could not receive data: ${APIerror && APIerror.message}"
-msgstr "No se han podido recibir datos: ${APIerror && APIerror.message}"
-
-msgid "Could not receive data: ${error && error.message}"
-msgstr "No se han podido recibir datos: ${error && error.message}"
+msgid "Could not receive data: %s"
+msgstr ""
 
 msgid "Cron line"
 msgstr "Línea Cron"
@@ -550,8 +544,8 @@ msgstr "Consulte %{link} para obtener más detalles sobre cómo resolver el prob
 msgid "Select Action"
 msgstr "Seleccionar una acción"
 
-msgid "Select All"
-msgstr "Seleccionar todo"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr "Seleccionar fila"
@@ -571,6 +565,9 @@ msgstr "Mostrar detalles de lógica recurrente"
 msgid "Start at"
 msgstr "Iniciar en"
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr "Iniciar antes"
 
@@ -586,6 +583,9 @@ msgstr "Estado"
 msgid "Step Canceled"
 msgstr "Paso cancelado"
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr "Detener las tareas detenibles seleccionadas"
 
@@ -849,9 +849,6 @@ msgstr "la tarea se debe poder cancelar"
 msgid "task has to be resumable"
 msgstr "la tarea se debe poder reanudar"
 
-msgid "tasks."
-msgstr "tareas."
-
 msgid "time"
 msgstr "hora"
 

data/locale/foreman_tasks.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_tasks 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-16 14:29+0100\n"
-"PO-Revision-Date: 2022-12-16 14:29+0100\n"
+"POT-Creation-Date: 2023-02-15 19:50+0100\n"
+"PO-Revision-Date: 2023-02-15 19:50+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -424,24 +424,24 @@ msgstr ""
 msgid "Conflicts with tasks:"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:141
+#: ../app/models/foreman_tasks/recurring_logic.rb:149
 msgid "Active"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:143
+#: ../app/models/foreman_tasks/recurring_logic.rb:151
 msgid "Cancelled"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:145
+#: ../app/models/foreman_tasks/recurring_logic.rb:153
 msgid "Finished"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:147
+#: ../app/models/foreman_tasks/recurring_logic.rb:155
 #: ../webpack/ForemanTasks/Components/TasksTable/TasksTableSelectors.js:39
 msgid "Disabled"
 msgstr ""
 
-#: ../app/models/foreman_tasks/recurring_logic.rb:149
+#: ../app/models/foreman_tasks/recurring_logic.rb:157
 #: ../app/models/foreman_tasks/task.rb:130
 #: ../app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb:14
 #: ../app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb:14
@@ -919,7 +919,11 @@ msgid "Setting is off"
 msgstr ""
 
 #: ../webpack/ForemanTasks/Components/TaskDetails/Components/TaskButtons.js:51
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
+msgid "Stop auto-reloading"
+msgstr ""
+
+#: ../webpack/ForemanTasks/Components/TaskDetails/Components/TaskButtons.js:51
+msgid "Start auto-reloading"
 msgstr ""
 
 #: ../webpack/ForemanTasks/Components/TaskDetails/Components/TaskButtons.js:62
@@ -956,7 +960,8 @@ msgid "Errors:"
 msgstr ""
 
 #: ../webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js:52
-msgid "Could not receive data: ${APIerror && APIerror.message}"
+#: ../webpack/ForemanTasks/Components/TasksTable/TasksTable.js:71
+msgid "Could not receive data: %s"
 msgstr ""
 
 #: ../webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js:61
@@ -1196,22 +1201,17 @@ msgid "Yes"
 msgstr ""
 
 #:
-#: ../webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js:20
-msgid "Select All"
+#: ../webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js:26
+msgid "Select all {count} tasks"
 msgstr ""
 
 #:
-#: ../webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js:21
-msgid "tasks."
+#: ../webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js:33
+msgid "All %s tasks are selected."
 msgstr ""
 
 #:
-#: ../webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js:27
-msgid "All %s tasks are selected. "
-msgstr ""
-
-#:
-#: ../webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js:29
+#: ../webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js:35
 msgid "Undo selection"
 msgstr ""
 
@@ -1256,10 +1256,6 @@ msgstr ""
 msgid "Canceling with force selected tasks, this might take a while"
 msgstr ""
 
-#: ../webpack/ForemanTasks/Components/TasksTable/TasksTable.js:71
-msgid "Could not receive data: ${error && error.message}"
-msgstr ""
-
 #: ../webpack/ForemanTasks/Components/TasksTable/TasksTable.js:81
 msgid "No Tasks"
 msgstr ""

data/locale/fr/foreman_tasks.po

@@ -19,9 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 100000"
 "0 == 0 ? 1 : 2;\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-
 msgid "%(last)s Last %(time)s"
 msgstr "%(last)s Dernier %(time)s"
 
@@ -73,8 +70,8 @@ msgstr "Filtres actifs :"
 msgid "Active or disabled recurring logic with purpose %s already exists"
 msgstr "La logique récurrente active ou désactivée avec l'objectif %s existe déjà."
 
-msgid "All %s tasks are selected. "
-msgstr "Toutes les tâches %s sont sélectionnées. "
+msgid "All %s tasks are selected."
+msgstr ""
 
 msgid "All proxies with the required feature are unavailable at the moment"
 msgstr "Les proxys possédant les fonctionnalités demandées ne sont pas disponibles actuellement"
@@ -164,11 +161,8 @@ msgstr "Conflits avec les tâches :"
 msgid "Could not cancel step."
 msgstr "N’a pas pu annuler l'étape."
 
-msgid "Could not receive data: ${APIerror && APIerror.message}"
-msgstr "Impossible de recevoir les données : ${APIerror&& APIerror.message}"
-
-msgid "Could not receive data: ${error && error.message}"
-msgstr "Impossible de recevoir les données : ${error && error.message}"
+msgid "Could not receive data: %s"
+msgstr ""
 
 msgid "Cron line"
 msgstr "Ligne Cron"
@@ -549,8 +543,8 @@ msgstr "Voir %{link} pour plus de détails sur la manière de résoudre le probl
 msgid "Select Action"
 msgstr "Choisir l'action"
 
-msgid "Select All"
-msgstr "Tout sélectionner"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr "Sélectionner une ligne"
@@ -570,6 +564,9 @@ msgstr "Afficher les détails des logiques récurrentes"
 msgid "Start at"
 msgstr "Démarre à"
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr "Démarre avant"
 
@@ -585,6 +582,9 @@ msgstr "État"
 msgid "Step Canceled"
 msgstr "Étape annulée"
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr "Arrêter les tâches sélectionnées pouvant être arrêtées"
 
@@ -848,9 +848,6 @@ msgstr "la tâche doit pouvoir être annulée"
 msgid "task has to be resumable"
 msgstr "la tâche doit pouvoir être reprise"
 
-msgid "tasks."
-msgstr "tâches."
-
 msgid "time"
 msgstr "heure"
 

data/locale/ja/foreman_tasks.po

@@ -18,9 +18,6 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr "${taskReload ? 'Stop' : 'Start'}  自動再読み込み"
-
 msgid "%(last)s Last %(time)s"
 msgstr "過去 %(time)s で %(last)s 件"
 
@@ -72,8 +69,8 @@ msgstr "アクティブなフィルター:"
 msgid "Active or disabled recurring logic with purpose %s already exists"
 msgstr "目的が %s のアクティブまたは無効な再帰論理がすでに存在します"
 
-msgid "All %s tasks are selected. "
-msgstr "%s の全タスクを選択します。 "
+msgid "All %s tasks are selected."
+msgstr ""
 
 msgid "All proxies with the required feature are unavailable at the moment"
 msgstr "現在、必要な機能があるすべてのプロキシーが利用できません"
@@ -163,11 +160,8 @@ msgstr "タスクとの競合:"
 msgid "Could not cancel step."
 msgstr "ステップをキャンセルできませんでした。"
 
-msgid "Could not receive data: ${APIerror && APIerror.message}"
-msgstr "データを受信できませんでした: ${APIerror && APIerror.message}"
-
-msgid "Could not receive data: ${error && error.message}"
-msgstr "データを受信できませんでした: ${error && error.message}"
+msgid "Could not receive data: %s"
+msgstr ""
 
 msgid "Cron line"
 msgstr "cron 行"
@@ -548,8 +542,8 @@ msgstr "問題解決の詳細については、%{link} を参照してくださ
 msgid "Select Action"
 msgstr "アクションの選択"
 
-msgid "Select All"
-msgstr "すべてを選択"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr "行の選択"
@@ -569,6 +563,9 @@ msgstr "再帰論理の詳細表示"
 msgid "Start at"
 msgstr "開始時刻"
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr "次の時刻よりも前に開始"
 
@@ -584,6 +581,9 @@ msgstr "状態"
 msgid "Step Canceled"
 msgstr "ステップがキャンセルされました"
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr "選択した停止可能なタスクを停止"
 
@@ -845,9 +845,6 @@ msgstr "タスクはキャンセル可能でなければなりません"
 msgid "task has to be resumable"
 msgstr "タスクは再開可能でなければなりません"
 
-msgid "tasks."
-msgstr "タスク。"
-
 msgid "time"
 msgstr "時間"