foreman-tasks 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52b001e513de0c0d5f488f10c6d8189947322374
-  data.tar.gz: c706e8621d354642f59ab9eab53b01fadc1f4e60
+  metadata.gz: 540901d45b40d16fded94918dcf5e85a6837366c
+  data.tar.gz: c170dac55f4b345385ff53bb29985535634816ff
 SHA512:
-  metadata.gz: 422cb384a3bcfb144f5c845b4fe31a3aa4bfebaf3b58143900d4a1ce26891a4c5bd0af9804a94c3547d0c8d9564e9cc43062435809d8d5103250d9594df5aa9d
-  data.tar.gz: bf86c24e79a38c54011b3fe9bb0852ebb5cac94071af659be497dc6f2f096607a1fa906fc35a73a507d7b7aa561308e74ee45efe8e52c4515200261a96ad50e3
+  metadata.gz: 8126d89fc3a5fd2c579ffbae50baf44bdedf93986e052079db70dc683a80f255946014e741a075aa271617befa62347bad2c12cebd59520570891aed24706f4d
+  data.tar.gz: 392ae556aab5d96b791d09a1929b439beaf21524981c48e97097a96336b5010082a3eb46b8fc30121cb99d66bbb70f85ad57d0483582aa7c2a05bd2147fd15dd

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -86,7 +86,7 @@ module ForemanTasks
 
       api :POST, '/tasks/bulk_resume', N_('Resume all paused error tasks')
       param :search, String, :desc => N_('Resume tasks matching search string')
-      param :task_ids, Array, :desc => N_('Resume specific tasks by id')
+      param :task_ids, Array, :desc => N_('Resume specific tasks by ID')
       def bulk_resume
         scope = resource_scope
         scope = scope.search_for(params[:search]) if params[:search]
@@ -125,7 +125,7 @@ module ForemanTasks
       param :search, String, :desc => N_("Search string")
       param :page, :number, :desc => N_("Page number, starting at 1")
       param :per_page,  :number, :desc => N_("Number of results per page to return")
-      param :order, String, :desc => N_("Sort field and order, eg. 'name DESC'")
+      param :order, String, :desc => N_("Sort field and order, e.g. 'name DESC'")
       param :sort, Hash, :desc => N_("Hash version of 'order' param") do
         param :by, String, :desc => N_("Field to sort the results on")
         param :order, String, :desc => N_("How to order the sorted results (e.g. ASC for ascending)")
@@ -164,7 +164,7 @@ module ForemanTasks
       api :POST, '/tasks/callback', N_("Send data to the task from external executor (such as smart_proxy_dynflow)")
       param :callback, Hash do
         param :task_id, :identifier, :desc => N_("UUID of the task")
-        param :step_id, String, :desc => N_("The id of the step inside the execution plan to send the event to ")
+        param :step_id, String, :desc => N_("The ID of the step inside the execution plan to send the event to")
       end
       param :data, Hash, :desc => N_("Data to be sent to the action")
       def callback
@@ -213,7 +213,7 @@ module ForemanTasks
           end
           scope.where(id: search_params[:task_id])
         else
-          raise BadRequest, _("Search_Params %s not supported") % search_params[:type]
+          raise BadRequest, _("Type %s for search_params is not supported") % search_params[:type]
         end
       end
 

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -31,7 +31,7 @@ module ForemanTasks
       if task.cancel
         flash[:notice] = _('Trying to cancel the task')
       else
-        flash[:warning] = _('The task is not cancellable at the moment.')
+        flash[:warning] = _('The task cannot be cancelled at the moment.')
       end
       redirect_to :back
     end

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -25,7 +25,7 @@ module ForemanTasks
 
     def recurring_logic_next_occurrence(recurring_logic)
       if %w(finished cancelled).include? recurring_logic.state
-        N_('-')
+        '-'
       else
         recurring_logic.next_occurrence_time
       end
@@ -87,15 +87,20 @@ module ForemanTasks
 
     def cronline_fieldset(f, triggering)
       options = [
+        # TRANSLATORS: this translation is referring to an option which is a time interval
         _('is minute (range: 0-59)'),
+        # TRANSLATORS: this translation is referring to an option which is a time interval
         _('is hour (range: 0-23)'),
+        # TRANSLATORS: this translation is referring to an option which is a time interval
         _('is day of month (range: 1-31)'),
+        # TRANSLATORS: this translation is referring to an option which is a time interval
         _('is month (range: 1-12)'),
+        # TRANSLATORS: this translation is referring to an option which is a time interval
         _('is day of week (range: 0-6)')
       ].map { |opt| content_tag(:li, opt) }.join
       help = content_tag(:span, nil, :class => 'help-inline') do
         popover(_('Explanation'),
-                _("Cron line format 'a b c d e', where:<br><ol type=\"a\">#{options}</ol>"))
+                _("Cron line format 'a b c d e', where: %s") % ("<br><ol type=\"a\">#{options}</ol>"))
       end
       content_tag(:fieldset, nil, :class => "input_type_form #{'hidden' unless triggering.input_type == :cronline}", :id => "input_type_cronline") do
         text_f f, :cronline, :label => _('Cron line'), :placeholder => '* * * * *', :help_inline => help
@@ -128,11 +133,13 @@ module ForemanTasks
     def time_picker_fieldset(f, triggering)
       tags = []
       tags << content_tag(:fieldset, nil, :id => 'time_picker', :class => "input_type_form #{'hidden' if triggering.input_type == :cronline}") do
+        # TRANSLATORS: Time widget for when a task should start
         time_f(f, :time, { :label => _("At"), :id => 'something' }, { :time_separator => '' })
       end
       tags << number_f(f, :max_iteration, :label => _('Repeat N times'), :min => 1, :placeholder => 'N')
       tags << field(f, :end_time_limit_select, :label => _("Ends"), :control_group_id => "end_time_limit_select") do
         radio_button_f(f, :end_time_limited, :value => false, :checked=> true, :text => _("Never"), :class => 'end_time_limit_selector') +
+        # TRANSLATORS: Button text for saying when a task should end
         radio_button_f(f, :end_time_limited, :value => true, :text => _("On"), :class => 'end_time_limit_selector')
       end
       tags << content_tag(:fieldset, nil, :id => 'end_time_limit_form', :class => "input_type_form #{'hidden' unless triggering.end_time_limited}") do

data/app/lib/actions/action_with_sub_plans.rb

@@ -12,7 +12,7 @@ module Actions
 
     def humanized_output
       return unless counts_set?
-      _("%{total} tasks, %{success} success, %{failed} fail") %
+      _("%{total} task(s), %{success} success, %{failed} fail") %
           { total:   output[:total_count],
             success: output[:success_count],
             failed:  output[:failed_count] }

data/app/lib/actions/foreman/puppetclass/import.rb

@@ -15,7 +15,7 @@ module Actions
         end
 
         def humanized_name
-          _("Import puppetclasses")
+          _("Import Puppet classes")
         end
 
         # default value for cleaning up the tasks, it can be overriden by settings
@@ -25,4 +25,4 @@ module Actions
       end
     end
   end
-end
+end

data/app/lib/actions/proxy_action.rb

@@ -57,7 +57,7 @@ module Actions
         response = proxy.status_of_task(output[:proxy_task_id])
         if %w(stopped paused).include? response['state']
           if response['result'] == 'error'
-            raise ::Foreman::Exception, _("The smart proxy task '#{output[:proxy_task_id]}' failed.")
+            raise ::Foreman::Exception, _("The smart proxy task %s failed.") % (output[:proxy_task_id])
           else
             on_data(response['actions'].find { |block_action| block_action['class'] == proxy_action_name }['output'])
           end

data/app/models/foreman_tasks/triggering.rb

@@ -96,7 +96,7 @@ module ForemanTasks
     def correct_cronline
       ForemanTasks::RecurringLogic.new_from_cronline(cronline).next_occurrence_time
     rescue ArgumentError => _
-      self.errors.add(:cronline, _("#{cronline} is not valid format of cronline"))
+      self.errors.add(:cronline, _("%s is not valid format of cron line")) % (cronline)
     end
   end
 end

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

@@ -3,7 +3,7 @@
 
 <table class="table table-fixed table-bordered table-striped table-condensed">
   <thead>
-    <th><%= N_("Cronline") %></th>
+    <th><%= N_("Cron line") %></th>
     <th><%= N_("Task count") %></th>
     <th><%= N_("Action") %></th>
     <th><%= N_("Last occurrence") %></th>
@@ -19,7 +19,7 @@
       <td><%= link_to(recurring_logic.cron_line, foreman_tasks_recurring_logic_path(recurring_logic)) %></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, true) %></td>
-      <td><%= recurring_logic.tasks.order(:started_at).where('started_at IS NOT NULL').last.try(:started_at) || N_("-") %></td>
+      <td><%= recurring_logic.tasks.order(:started_at).where('started_at IS NOT NULL').last.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/app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb

@@ -5,7 +5,7 @@
     <td><%= link_to(recurring_logic.id, recurring_logic) %></td>
   </tr>
   <tr>
-    <th><%= N_("Cronline") %></th>
+    <th><%= N_("Cron line") %></th>
     <td><%= recurring_logic.cron_line %></td>
   </tr>
   <tr>
@@ -14,7 +14,7 @@
   </tr>
   <tr>
     <th><%= N_("Last occurrence") %></th>
-    <td><%= recurring_logic.tasks.order(:started_at).where('started_at IS NOT NULL').last.try(:started_at) || N_('-') %></td>
+    <td><%= recurring_logic.tasks.order(:started_at).where('started_at IS NOT NULL').last.try(:started_at) || '-' %></td>
   </tr>
   <tr>
     <th><%= N_("Next occurrence") %></th>

data/app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb

@@ -1,4 +1,4 @@
-<h4><%= link_to _("Latest Warning/Error Tasks "), foreman_tasks_tasks_path(:order=>'started_at DESC') %></h4>
+<h4><%= link_to _("Latest Warning/Error Tasks"), foreman_tasks_tasks_path(:order=>'started_at DESC') %></h4>
 <table class="table table-striped">
   <tr>
     <th><%= _("Name") %></th>

data/lib/foreman_tasks/dynflow.rb

@@ -41,8 +41,6 @@ module ForemanTasks
         @world = world
 
         unless config.remote?
-          at_exit { world.terminate.wait }
-
           # don't try to do any rescuing until the tables are properly migrated
           if !Foreman.in_rake?('db:migrate') && (ForemanTasks::Task.table_exists? rescue(false))
             world.auto_execute

data/lib/foreman_tasks/engine.rb

@@ -1,3 +1,6 @@
+require 'fast_gettext'
+require 'gettext_i18n_rails'
+
 module ForemanTasks
   class Engine < ::Rails::Engine
     engine_name "foreman_tasks"
@@ -24,19 +27,28 @@ 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('../../..', __FILE__), 'locale')
+      locale_domain = 'foreman_tasks'
+
+      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
+    end
+
     initializer 'foreman_tasks.register_plugin', :after => :finisher_hook do |app|
       Foreman::Plugin.register :"foreman-tasks" do
         requires_foreman '>= 1.9.0'
-        divider :top_menu, :parent => :monitor_menu, :after => :audits
+        divider :top_menu, :parent => :monitor_menu, :last => true
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },
              :caption  => N_('Tasks'),
-             :parent   => :monitor_menu
+             :parent   => :monitor_menu,
+             :last     => true
 
-        menu :top_menu, :recurring_logics, :after => :tasks,
+        menu :top_menu, :recurring_logics,
              :url_hash => { :controller => 'foreman_tasks/recurring_logics', :action => :index },
              :caption  => N_('Recurring logics'),
-             :parent   => :monitor_menu
+             :parent   => :monitor_menu,
+             :last     => true
 
         security_block :foreman_tasks do |map|
           permission :view_foreman_tasks, {:'foreman_tasks/tasks' => [:auto_complete_search, :sub_tasks, :index, :show],

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.12"
+  VERSION = "0.7.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow