foreman-tasks 7.2.0 → 8.0.0

data/locale/ka/foreman_tasks.po

@@ -18,9 +18,6 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr "ავტომატური ჩატვირთვის ${taskReload ? 'გაჩერება' : 'გაშვება'}"
-
 msgid "%(last)s Last %(time)s"
 msgstr "%(last)s ბოლო %(time)-ჯერ"
 
@@ -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 "ამ პრობლემის გადასაწყვეტა
 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 "State"
 msgid "Step Canceled"
 msgstr "ბიჯი გაუქმებულია"
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr "მონიშნული გაჩერებადი ამოცანების გაჩერება"
 
@@ -846,9 +846,6 @@ msgstr "ამოცანა გაუქმებადი უნდა იყ
 msgid "task has to be resumable"
 msgstr "ამოცანა გაგრძელებადი უნდა იყოს"
 
-msgid "tasks."
-msgstr "ამოცანა."
-
 msgid "time"
 msgstr "დრო"
 

data/locale/ko/foreman_tasks.po

@@ -16,9 +16,6 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr ""
-
 msgid "%(last)s Last %(time)s"
 msgstr ""
 
@@ -70,7 +67,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"
@@ -161,10 +158,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"
@@ -546,8 +540,8 @@ msgstr ""
 msgid "Select Action"
 msgstr "작업 선택 "
 
-msgid "Select All"
-msgstr "모두 선택 "
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr ""
@@ -567,6 +561,9 @@ msgstr "반복 로직 정보 표시"
 msgid "Start at"
 msgstr "시작 일시"
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr "다음 시간 전에 시작"
 
@@ -582,6 +579,9 @@ msgstr "상태 "
 msgid "Step Canceled"
 msgstr ""
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr ""
 
@@ -844,9 +844,6 @@ msgstr ""
 msgid "task has to be resumable"
 msgstr ""
 
-msgid "tasks."
-msgstr ""
-
 msgid "time"
 msgstr ""
 

data/locale/pt_BR/foreman_tasks.po

@@ -20,9 +20,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-recarregamento"
-
 msgid "%(last)s Last %(time)s"
 msgstr "%(last)s Último %(time)s"
 
@@ -74,8 +71,8 @@ msgstr "Filtros ativos:"
 msgid "Active or disabled recurring logic with purpose %s already exists"
 msgstr "Lógica recorrente ativa ou desativada com finalidade %s já existe"
 
-msgid "All %s tasks are selected. "
-msgstr "Todas as tarefas %s são selecionadas. "
+msgid "All %s tasks are selected."
+msgstr ""
 
 msgid "All proxies with the required feature are unavailable at the moment"
 msgstr "Todos os proxies com o recurso exigido estão indisponíveis no momento"
@@ -165,11 +162,8 @@ msgstr "Conflitos com tarefas:"
 msgid "Could not cancel step."
 msgstr "Não foi possível cancelar a etapa."
 
-msgid "Could not receive data: ${APIerror && APIerror.message}"
-msgstr "Não foi possível receber dados: ${APIerror && APIerror.message}"
-
-msgid "Could not receive data: ${error && error.message}"
-msgstr "Não foi possível receber dados: ${error && error.message}"
+msgid "Could not receive data: %s"
+msgstr ""
 
 msgid "Cron line"
 msgstr "Cron line"
@@ -550,8 +544,8 @@ msgstr "Veja %{link} para mais detalhes sobre como resolver a questão"
 msgid "Select Action"
 msgstr "Selecionar Ação"
 
-msgid "Select All"
-msgstr "Selecionar tudo"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr "Selecionar linha"
@@ -571,6 +565,9 @@ msgstr "Exibir detalhes de lógica recorrente "
 msgid "Start at"
 msgstr "Iniciar em "
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr "Iniciar antes "
 
@@ -586,6 +583,9 @@ msgstr "Estado"
 msgid "Step Canceled"
 msgstr "Etapa cancelada"
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr "Parar tarefas paradas selecionadas"
 
@@ -849,9 +849,6 @@ msgstr "a tarefa tem de ser cancelável"
 msgid "task has to be resumable"
 msgstr "a tarefa tem de ser retomável"
 
-msgid "tasks."
-msgstr "tarefas."
-
 msgid "time"
 msgstr "tempo"
 

data/locale/ru/foreman_tasks.po

@@ -20,9 +20,6 @@ msgstr ""
 "4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=1"
 "1 && n%100<=14)? 2 : 3);\n"
 
-msgid "${taskReload ? 'Stop' : 'Start'}  auto-reloading"
-msgstr ""
-
 msgid "%(last)s Last %(time)s"
 msgstr ""
 
@@ -74,7 +71,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"
@@ -165,10 +162,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"
@@ -550,8 +544,8 @@ msgstr ""
 msgid "Select Action"
 msgstr "Действия"
 
-msgid "Select All"
-msgstr "Выбрать все"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr ""
@@ -571,6 +565,9 @@ msgstr "Показать параметры периодического вып
 msgid "Start at"
 msgstr "Время запуска"
 
+msgid "Start auto-reloading"
+msgstr ""
+
 msgid "Start before"
 msgstr "Не позже чем"
 
@@ -586,6 +583,9 @@ msgstr "Состояние"
 msgid "Step Canceled"
 msgstr ""
 
+msgid "Stop auto-reloading"
+msgstr ""
+
 msgid "Stop selected stoppable tasks"
 msgstr ""
 
@@ -848,9 +848,6 @@ msgstr ""
 msgid "task has to be resumable"
 msgstr ""
 
-msgid "tasks."
-msgstr ""
-
 msgid "time"
 msgstr ""
 

data/locale/zh_CN/foreman_tasks.po

@@ -17,9 +17,6 @@ msgstr ""
 "Language: zh_CN\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 "%(last)s 最后 %(time)s"
 
@@ -71,8 +68,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 "具备所需功能的所有代理暂时都不可用"
@@ -162,11 +159,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 行"
@@ -547,8 +541,8 @@ msgstr "有关如何解决此问题的更多详细信息，请参见%{link}"
 msgid "Select Action"
 msgstr "选择操作"
 
-msgid "Select All"
-msgstr "选择所有"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr "选择行"
@@ -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 "停止所选的可停止的任务"
 
@@ -844,9 +844,6 @@ msgstr "任务必须可取消"
 msgid "task has to be resumable"
 msgstr "任务必须是可恢复的"
 
-msgid "tasks."
-msgstr "任务。"
-
 msgid "time"
 msgstr "时间"
 

data/locale/zh_TW/foreman_tasks.po

@@ -17,9 +17,6 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\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,8 +541,8 @@ msgstr ""
 msgid "Select Action"
 msgstr "選擇動作"
 
-msgid "Select All"
-msgstr "全部選擇"
+msgid "Select all {count} tasks"
+msgstr ""
 
 msgid "Select row"
 msgstr ""
@@ -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/package.json

@@ -23,18 +23,18 @@
     "url": "http://projects.theforeman.org/projects/foreman-tasks/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^10.1.0"
+    "@theforeman/vendor": ">= 10.1.0"
   },
   "dependencies": {
     "c3": "^0.4.11"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^10.1.0",
-    "@theforeman/eslint-plugin-foreman": "^10.1.0",
-    "@theforeman/stories": "^10.1.0",
-    "@theforeman/test": "^10.1.0",
-    "@theforeman/vendor-dev": "^10.1.0",
+    "@theforeman/builder": ">= 10.1.0",
+    "@theforeman/eslint-plugin-foreman": ">= 10.1.0",
+    "@theforeman/stories": ">= 10.1.0",
+    "@theforeman/test": ">= 10.1.0",
+    "@theforeman/vendor-dev": ">= 10.1.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "jed": "^1.1.1",

data/webpack/ForemanTasks/Components/TaskDetails/Components/TaskButtons.js

@@ -48,7 +48,7 @@ export const TaskButtons = ({
         <span
           className={`glyphicon glyphicon-refresh ${taskReload ? 'spin' : ''}`}
         />
-        {__(`${taskReload ? 'Stop' : 'Start'}  auto-reloading`)}
+        {taskReload ? __('Stop auto-reloading') : __('Start auto-reloading')}
       </Button>
       <Button
         className="dynflow-button"

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskButtons.test.js.snap

@@ -19,7 +19,7 @@ exports[`Task rendering render with minimal Props 1`] = `
     <span
       className="glyphicon glyphicon-refresh "
     />
-    Start  auto-reloading
+    Start auto-reloading
   </Button>
   <Button
     active={false}
@@ -118,7 +118,7 @@ exports[`Task rendering render with some Props 1`] = `
     <span
       className="glyphicon glyphicon-refresh spin"
     />
-    Stop  auto-reloading
+    Stop auto-reloading
   </Button>
   <Button
     active={false}

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Tab, Tabs } from 'patternfly-react';
-import { translate as __ } from 'foremanReact/common/I18n';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import MessageBox from 'foremanReact/components/common/MessageBox';
 import Task from './Components/Task';
@@ -49,7 +49,7 @@ const TaskDetails = ({
       <MessageBox
         key="task-details-error"
         icontype="error-circle-o"
-        msg={__(`Could not receive data: ${APIerror && APIerror.message}`)}
+        msg={sprintf(__('Could not receive data: %s'), APIerror?.message)}
       />
     );
   }

data/webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js

@@ -1,3 +1,4 @@
+import { FormattedMessage } from 'react-intl';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Alert, Button } from 'patternfly-react';
@@ -17,14 +18,19 @@ export const SelectAllAlert = ({
         Math.min(itemCount, perPage)
       )}
       <Button bsStyle="link" onClick={selectAllRows}>
-        {__('Select All')}
-        <b> {itemCount} </b> {__('tasks.')}
+        <FormattedMessage
+          id="select-all-tasks"
+          values={{
+            count: <b>{itemCount}</b>,
+          }}
+          defaultMessage={__('Select all {count} tasks')}
+        />
       </Button>
     </React.Fragment>
   );
   const undoSelectText = (
     <React.Fragment>
-      {sprintf(__(`All %s tasks are selected. `), itemCount)}
+      {sprintf(__('All %s tasks are selected.'), itemCount)}
       <Button bsStyle="link" onClick={unselectAllRows}>
         {__('Undo selection')}
       </Button>

data/webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/SelectAllAlert.test.js.snap

@@ -6,7 +6,7 @@ exports[`SelectAllAlert renders SelectAllAlert with all rows selected 1`] = `
   onDismiss={null}
   type="info"
 >
-  All 7 tasks are selected. 
+  All 7 tasks are selected.
   <Button
     active={false}
     block={false}
@@ -35,14 +35,17 @@ exports[`SelectAllAlert renders SelectAllAlert with perPage > itemCout 1`] = `
     disabled={false}
     onClick={[MockFunction]}
   >
-    Select All
-    <b>
-       
-      7
-       
-    </b>
-     
-    tasks.
+    <FormattedMessage
+      defaultMessage="Select all {count} tasks"
+      id="select-all-tasks"
+      values={
+        Object {
+          "count": <b>
+            7
+          </b>,
+        }
+      }
+    />
   </Button>
 </Alert>
 `;
@@ -62,14 +65,17 @@ exports[`SelectAllAlert renders SelectAllAlert without all rows selected 1`] = `
     disabled={false}
     onClick={[MockFunction]}
   >
-    Select All
-    <b>
-       
-      7
-       
-    </b>
-     
-    tasks.
+    <FormattedMessage
+      defaultMessage="Select all {count} tasks"
+      id="select-all-tasks"
+      values={
+        Object {
+          "count": <b>
+            7
+          </b>,
+        }
+      }
+    />
   </Button>
 </Alert>
 `;

data/webpack/ForemanTasks/Components/TasksTable/TasksBulkActions.js

@@ -53,7 +53,7 @@ const handleErrorResume = (error, dispatch) => {
   dispatch({ type: TASKS_RESUME_FAILURE, error });
   dispatch(
     addToast(
-      errorToastData(`${__(`Cannot resume tasks at the moment`)} ${error}`)
+      errorToastData(`${__('Cannot resume tasks at the moment')} ${error}`)
     )
   );
 };
@@ -112,7 +112,7 @@ const handleErrorCancel = (error, dispatch) => {
   dispatch({ type: TASKS_CANCEL_FAILURE, error });
   dispatch(
     addToast(
-      errorToastData(`${__(`Cannot cancel tasks at the moment`)} ${error}`)
+      errorToastData(`${__('Cannot cancel tasks at the moment')} ${error}`)
     )
   );
 };
@@ -175,7 +175,7 @@ const handleErrorForceCancel = (error, dispatch) => {
   dispatch(
     addToast(
       errorToastData(
-        `${__(`Cannot force cancel tasks at the moment`)} ${error}`
+        `${__('Cannot force cancel tasks at the moment')} ${error}`
       )
     )
   );

data/webpack/ForemanTasks/Components/TasksTable/TasksTable.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Table } from 'foremanReact/components/common/table';
 import { STATUS } from 'foremanReact/constants';
 import MessageBox from 'foremanReact/components/common/MessageBox';
-import { translate as __ } from 'foremanReact/common/I18n';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import Pagination from 'foremanReact/components/Pagination';
 import { getURIQuery } from 'foremanReact/common/helpers';
 import createTasksTableSchema from './TasksTableSchema';
@@ -68,7 +68,7 @@ const TasksTable = ({
       <MessageBox
         key="tasks-table-error"
         icontype="error-circle-o"
-        msg={__(`Could not receive data: ${error && error.message}`)}
+        msg={sprintf(__('Could not receive data: %s'), error?.message)}
       />
     );
   }

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTable.test.js.snap

@@ -4,7 +4,7 @@ exports[`TasksTable rendering render with error Props 1`] = `
 <MessageBox
   icontype="error-circle-o"
   key="tasks-table-error"
-  msg="Could not receive data: null"
+  msg="Could not receive data: "
 />
 `;