Unsplit i18n strings in ILM's MinAgeInput component. (#38854) (#39006)

x-pack/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js

@@ -18,32 +18,83 @@ import {
 import {
   PHASE_ROLLOVER_MINIMUM_AGE,
   PHASE_ROLLOVER_MINIMUM_AGE_UNITS,
+  PHASE_WARM,
+  PHASE_COLD,
+  PHASE_DELETE,
 } from '../../../constants';
 import { LearnMoreLink } from '../../components';
 import { ErrableFormRow } from '../form_errors';
 
+function getTimingLabelForPhase(phase) {
+  // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
+  switch (phase) {
+    case PHASE_WARM:
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseWarm.minimumAgeLabel', {
+        defaultMessage: 'Timing for warm phase',
+      });
+
+    case PHASE_COLD:
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeLabel', {
+        defaultMessage: 'Timing for cold phase',
+      });
+
+    case PHASE_DELETE:
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeLabel', {
+        defaultMessage: 'Timing for delete phase',
+      });
+  }
+}
+
+function getUnitsAriaLabelForPhase(phase) {
+  // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
+  switch (phase) {
+    case PHASE_WARM:
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseWarm.minimumAgeUnitsAriaLabel', {
+        defaultMessage: 'Units for timing of warm phase',
+      });
+
+    case PHASE_COLD:
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeUnitsAriaLabel', {
+        defaultMessage: 'Units for timing of cold phase',
+      });
+
+    case PHASE_DELETE:
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeUnitsAriaLabel', {
+        defaultMessage: 'Units for timing of delete phase',
+      });
+  }
+}
+
 export const MinAgeInput = props => {
   const { rolloverEnabled, errors, phaseData, phase, setPhaseData, isShowingErrors } = props;
 
-  const fromMessage = rolloverEnabled
-    ? i18n.translate('xpack.indexLifecycleMgmt.editPolicy.fromRolloverMessage', {
-      defaultMessage: 'from rollover'
-    })
-    : i18n.translate('xpack.indexLifecycleMgmt.editPolicy.fromIndexCreationMessage', {
-      defaultMessage: 'from index creation'
+  let daysOptionLabel;
+  let hoursOptionLabel;
+
+  if (rolloverEnabled) {
+    daysOptionLabel = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.rolloverDaysOptionLabel', {
+      defaultMessage: 'days from rollover',
     });
 
+    hoursOptionLabel = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.rolloverHoursOptionLabel', {
+      defaultMessage: 'hours from rollover',
+    });
+  } else {
+    daysOptionLabel = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.creationDaysOptionLabel', {
+      defaultMessage: 'days from index creation',
+    });
+
+    hoursOptionLabel = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.creationHoursOptionLabel', {
+      defaultMessage: 'hours from index creation',
+    });
+  }
+
   return (
     <EuiFlexGroup>
       <EuiFlexItem style={{ maxWidth: 188 }}>
         <ErrableFormRow
           id={`${phase}-${PHASE_ROLLOVER_MINIMUM_AGE}`}
-          label={
-            i18n.translate('xpack.indexLifecycleMgmt.editPolicy.minimimAgeLabel', {
-              defaultMessage: 'Timing for {phase} phase',
-              values: { phase }
-            })
-          }
+          label={getTimingLabelForPhase(phase)}
           errorKey={PHASE_ROLLOVER_MINIMUM_AGE}
           isShowingErrors={isShowingErrors}
           errors={errors}
@@ -72,30 +123,17 @@ export const MinAgeInput = props => {
       <EuiFlexItem style={{ maxWidth: 220 }}>
         <EuiFormRow hasEmptyLabelSpace >
           <EuiSelect
-            aria-label={i18n.translate('xpack.indexLifecycleMgmt.editPolicy.minimimAgeUnitsAriaLabel', {
-              defaultMessage: '{phaseUpper} phase after units',
-              values: { phaseUpper: `${phase.charAt(0).toUpperCase()}${phase.slice(1)}` }
-            })}
+            aria-label={getUnitsAriaLabelForPhase(phase)}
             value={phaseData[PHASE_ROLLOVER_MINIMUM_AGE_UNITS]}
             onChange={e => setPhaseData(PHASE_ROLLOVER_MINIMUM_AGE_UNITS, e.target.value)}
             options={[
               {
                 value: 'd',
-                text: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.daysLabel', {
-                  defaultMessage: 'days {fromMessage}',
-                  values: {
-                    fromMessage,
-                  }
-                }),
+                text: daysOptionLabel,
               },
               {
                 value: 'h',
-                text: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.hoursLabel', {
-                  defaultMessage: 'hours {fromMessage}',
-                  values: {
-                    fromMessage,
-                  }
-                }),
+                text: hoursOptionLabel,
               },
             ]}
           />

x-pack/plugins/translations/translations/ja-JP.json

@@ -4615,7 +4615,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.coldPhase.freezeText": "凍結",
     "xpack.indexLifecycleMgmt.editPolicy.createdMessage": "作成されました",
     "xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage": "インデックスライフサイクルポリシーを作成します",
-    "xpack.indexLifecycleMgmt.editPolicy.daysLabel": "日 {fromMessage}",
     "xpack.indexLifecycleMgmt.editPolicy.deletePhase.activateWarmPhaseSwitchLabel": "削除フェーズを有効にする",
     "xpack.indexLifecycleMgmt.editPolicy.deletePhase.deletePhaseDescriptionText": "今後インデックスは必要ありません。 いつ安全に削除できるかを定義できます。",
     "xpack.indexLifecycleMgmt.editPolicy.deletePhase.deletePhaseLabel": "削除フェーズ",
@@ -4624,13 +4623,10 @@
     "xpack.indexLifecycleMgmt.editPolicy.editingExistingPolicyMessage": "既存のポリシーを編集しています",
     "xpack.indexLifecycleMgmt.editPolicy.editPolicyMessage": "インデックスライフサイクルポリシー {originalPolicyName} を編集します",
     "xpack.indexLifecycleMgmt.editPolicy.formErrorsMessage": "このページのエラーを修正してください。",
-    "xpack.indexLifecycleMgmt.editPolicy.fromIndexCreationMessage": "インデックスの作成から",
-    "xpack.indexLifecycleMgmt.editPolicy.fromRolloverMessage": "ロールオーバーから",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseDescriptionMessage": "このフェーズは必須です。アクティブにクエリを実行しインデックスに書き込んでいます。 更新を高速化するため、大きくなりすぎたり古くなりすぎたりした際にインデックスをロールオーバーできます。",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseLabel": "ホットフェーズ",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.learnAboutRolloverLinkText": "ロールオーバーの詳細をご覧ください",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.rolloverDescriptionMessage": "ロールオーバーにより作成された新規インデックスは、インデックスエイリアスに追加され、書き込みインデックスとして指定されます。",
-    "xpack.indexLifecycleMgmt.editPolicy.hoursLabel": "時間 {fromMessage}",
     "xpack.indexLifecycleMgmt.editPolicy.indexPriorityText": "インデックスの優先順位",
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexLifecycleManagementLinkText": "インデックスライフサイクルの詳細をご覧ください。",
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexTemplatesLink": "インデックステンプレートの詳細をご覧ください",
@@ -4641,8 +4637,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.maximumAgeMissingError": "最高年齢が必要です。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumDocumentsMissingError": "最高ドキュメント数が必要です。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumIndexSizeMissingError": "最大インデックスサイズが必要です。",
-    "xpack.indexLifecycleMgmt.editPolicy.minimimAgeLabel": "{phase} フェーズのタイミング",
-    "xpack.indexLifecycleMgmt.editPolicy.minimimAgeUnitsAriaLabel": "{phaseUpper} ユニット後にフェーズ",
     "xpack.indexLifecycleMgmt.editPolicy.nameLabel": "名前",
     "xpack.indexLifecycleMgmt.editPolicy.nodeAllocationLabel": "シャードの割当をコントロールするノード属性を選択",
     "xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingDescription": "ノード属性なしではシャードの割り当てをコントロールできません。",

x-pack/plugins/translations/translations/zh-CN.json

@@ -4625,7 +4625,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.coldPhase.freezeText": "冻结",
     "xpack.indexLifecycleMgmt.editPolicy.createdMessage": "创建于",
     "xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage": "创建索引生命周期策略",
-    "xpack.indexLifecycleMgmt.editPolicy.daysLabel": "天（{fromMessage}）",
     "xpack.indexLifecycleMgmt.editPolicy.deletePhase.activateWarmPhaseSwitchLabel": "激活删除阶段",
     "xpack.indexLifecycleMgmt.editPolicy.deletePhase.deletePhaseDescriptionText": "您不再需要自己的索引。 您可以定义安全删除它的时间。",
     "xpack.indexLifecycleMgmt.editPolicy.deletePhase.deletePhaseLabel": "删除阶段",
@@ -4634,13 +4633,10 @@
     "xpack.indexLifecycleMgmt.editPolicy.editingExistingPolicyMessage": "您正在编辑现有策略",
     "xpack.indexLifecycleMgmt.editPolicy.editPolicyMessage": "编辑索引生命周期策略 {originalPolicyName}",
     "xpack.indexLifecycleMgmt.editPolicy.formErrorsMessage": "请修复此页面上的错误。",
-    "xpack.indexLifecycleMgmt.editPolicy.fromIndexCreationMessage": "索引创建后",
-    "xpack.indexLifecycleMgmt.editPolicy.fromRolloverMessage": "滚动更新后",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseDescriptionMessage": "此阶段为必需。您正频繁地查询并写到您的索引。 为了获取更快的更新，在索引变得过大或过旧时，您可以滚动更新索引。",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.hotPhaseLabel": "热阶段",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.learnAboutRolloverLinkText": "了解滚动更新",
     "xpack.indexLifecycleMgmt.editPolicy.hotPhase.rolloverDescriptionMessage": "滚动更新创建的新索引将添加到索引别名，并被指定为写索引。",
-    "xpack.indexLifecycleMgmt.editPolicy.hoursLabel": "小时（{fromMessage}）",
     "xpack.indexLifecycleMgmt.editPolicy.indexPriorityText": "索引优先级",
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexLifecycleManagementLinkText": "了解索引生命周期。",
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexTemplatesLink": "了解索引模板",
@@ -4651,8 +4647,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.maximumAgeMissingError": "最大存在时间必填。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumDocumentsMissingError": "最大文档数必填。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumIndexSizeMissingError": "最大索引大小必填。",
-    "xpack.indexLifecycleMgmt.editPolicy.minimimAgeLabel": "{phase}阶段的计时",
-    "xpack.indexLifecycleMgmt.editPolicy.minimimAgeUnitsAriaLabel": "{phaseUpper}阶段 - 指定单位后",
     "xpack.indexLifecycleMgmt.editPolicy.nameLabel": "名称",
     "xpack.indexLifecycleMgmt.editPolicy.nodeAllocationLabel": "选择节点属性来控制分片分配",
     "xpack.indexLifecycleMgmt.editPolicy.nodeAttributesMissingDescription": "没有节点属性，将无法控制分片分配。",
@@ -9988,4 +9982,4 @@
     "xpack.watcher.watchActionsTitle": "满足后将执行 {watchActionsCount, plural, one{# 个操作} other {# 个操作}}",
     "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
   }
-}
+}