[Uptime] TLS and TLS legacy alert translation mismatch (#116113) (#11…

…6246) Co-authored-by: Shahzad <shahzad.muhammad@elastic.co>
elastic · Oct 26, 2021 · 9b2a9c2 · 9b2a9c2
1 parent ce26356
commit 9b2a9c2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -25721,7 +25721,6 @@
     "xpack.uptime.alerts.tls.criteriaExpression.ariaLabel": "このアラートで監視されるモニターの条件を示す式",
     "xpack.uptime.alerts.tls.criteriaExpression.description": "タイミング",
     "xpack.uptime.alerts.tls.criteriaExpression.value": "任意のモニター",
-    "xpack.uptime.alerts.tls.defaultActionMessage": "期限切れになるか古くなりすぎた{count} TLS個のTLS証明書証明書を検知しました。\n{expiringConditionalOpen}\n期限切れになる証明書数：{expiringCount}\n期限切れになる証明書：{expiringCommonNameAndDate}\n{expiringConditionalClose}\n{agingConditionalOpen}\n古い証明書数：{agingCount}\n古い証明書：{agingCommonNameAndDate}\n{agingConditionalClose}\n",
     "xpack.uptime.alerts.tls.description": "アップタイム監視の TLS 証明書の有効期限が近いときにアラートを発行します。",
     "xpack.uptime.alerts.tls.expirationExpression.ariaLabel": "証明書有効期限の TLS アラートをトリガーするしきい値を示す式",
     "xpack.uptime.alerts.tls.expirationExpression.description": "証明書が",
@@ -25730,7 +25729,6 @@
     "xpack.uptime.alerts.tls.expiringLabel": "まもなく期限切れ",
     "xpack.uptime.alerts.tls.invalidLabel": "無効",
     "xpack.uptime.alerts.tls.legacy.clientName": "アップタイムTLS（レガシー）",
-    "xpack.uptime.alerts.tls.legacy.defaultActionMessage": "発行者{issuer}の検出されたTLS証明書{commonName}は{status}です。証明書{summary}\n",
     "xpack.uptime.alerts.tls.legacy.description": "アップタイム監視の TLS 証明書の有効期限が近いときにアラートを発行します。このアラートは将来のバージョンで廃止予定です。",
     "xpack.uptime.alerts.tls.settingsPageNav.text": "これらのしきい値は{settingsPageLink}で編集できます。",
     "xpack.uptime.alerts.tls.validAfterExpiredString": "{relativeDate}日前、{date}に期限切れになりました。",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -26154,7 +26154,6 @@
     "xpack.uptime.alerts.tls.criteriaExpression.ariaLabel": "显示此告警监视的监测条件的表达式",
     "xpack.uptime.alerts.tls.criteriaExpression.description": "当",
     "xpack.uptime.alerts.tls.criteriaExpression.value": "任意监测",
-    "xpack.uptime.alerts.tls.defaultActionMessage": "已检测到 {count} 个即将过期或即将过时的 TLS 证书。\n{expiringConditionalOpen}\n即将过期的证书计数：{expiringCount}\n即将过期的证书：{expiringCommonNameAndDate}\n{expiringConditionalClose}\n{agingConditionalOpen}\n过时的证书计数：{agingCount}\n过时的证书：{agingCommonNameAndDate}\n{agingConditionalClose}\n",
     "xpack.uptime.alerts.tls.description": "运行时间监测的 TLS 证书即将过期时告警。",
     "xpack.uptime.alerts.tls.expirationExpression.ariaLabel": "显示将触发证书过期 TLS 告警的阈值的表达式",
     "xpack.uptime.alerts.tls.expirationExpression.description": "具有将在",
@@ -26163,7 +26162,6 @@
     "xpack.uptime.alerts.tls.expiringLabel": "将到期",
     "xpack.uptime.alerts.tls.invalidLabel": "无效",
     "xpack.uptime.alerts.tls.legacy.clientName": "Uptime TLS（旧版）",
-    "xpack.uptime.alerts.tls.legacy.defaultActionMessage": "检测到来自颁发者 {issuer} 的 TLS 证书 {commonName} 的状态为 {status}。证书 {summary}\n",
     "xpack.uptime.alerts.tls.legacy.description": "运行时间监测的 TLS 证书即将过期时告警。未来的版本将弃用此告警。",
     "xpack.uptime.alerts.tls.settingsPageNav.text": "可以在 {settingsPageLink}上编辑这些阈值。",
     "xpack.uptime.alerts.tls.validAfterExpiredString": "已于 {relativeDate} 天前，即 {date}到期。",

diff --git a/x-pack/plugins/uptime/common/translations.ts b/x-pack/plugins/uptime/common/translations.ts
@@ -39,7 +39,7 @@ export const MonitorStatusTranslations = {
 };
 
 export const TlsTranslations = {
-  defaultActionMessage: i18n.translate('xpack.uptime.alerts.tls.legacy.defaultActionMessage', {
+  defaultActionMessage: i18n.translate('xpack.uptime.alerts.tls.defaultActionMessage', {
     defaultMessage: `Detected TLS certificate {commonName} from issuer {issuer} is {status}. Certificate {summary}
 `,
     values: {
@@ -49,17 +49,16 @@ export const TlsTranslations = {
       status: '{{state.status}}',
     },
   }),
-  name: i18n.translate('xpack.uptime.alerts.tls.legacy.clientName', {
-    defaultMessage: 'Uptime TLS (Legacy)',
+  name: i18n.translate('xpack.uptime.alerts.tls.clientName', {
+    defaultMessage: 'Uptime TLS',
   }),
-  description: i18n.translate('xpack.uptime.alerts.tls.legacy.description', {
-    defaultMessage:
-      'Alert when the TLS certificate of an Uptime monitor is about to expire. This alert will be deprecated in a future version.',
+  description: i18n.translate('xpack.uptime.alerts.tls.description', {
+    defaultMessage: 'Alert when the TLS certificate of an Uptime monitor is about to expire.',
   }),
 };
 
 export const TlsTranslationsLegacy = {
-  defaultActionMessage: i18n.translate('xpack.uptime.alerts.tls.defaultActionMessage', {
+  defaultActionMessage: i18n.translate('xpack.uptime.alerts.tls.legacy.defaultActionMessage', {
     defaultMessage: `Detected {count} TLS certificates expiring or becoming too old.
 {expiringConditionalOpen}
 Expiring cert count: {expiringCount}
@@ -82,11 +81,12 @@ Aging Certificates: {agingCommonNameAndDate}
       agingConditionalClose: '{{/state.hasAging}}',
     },
   }),
-  name: i18n.translate('xpack.uptime.alerts.tls.clientName', {
-    defaultMessage: 'Uptime TLS',
+  name: i18n.translate('xpack.uptime.alerts.tls.legacy.clientName', {
+    defaultMessage: 'Uptime TLS (Legacy)',
   }),
-  description: i18n.translate('xpack.uptime.alerts.tls.description', {
-    defaultMessage: 'Alert when the TLS certificate of an Uptime monitor is about to expire.',
+  description: i18n.translate('xpack.uptime.alerts.tls.legacy.description', {
+    defaultMessage:
+      'Alert when the TLS certificate of an Uptime monitor is about to expire. This alert will be deprecated in a future version.',
   }),
 };
 
@@ -109,6 +109,6 @@ Response times as high as {slowestAnomalyResponse} have been detected from locat
     defaultMessage: 'Uptime Duration Anomaly',
   }),
   description: i18n.translate('xpack.uptime.alerts.durationAnomaly.description', {
-    defaultMessage: 'Alert when the Uptime monitor duration is anaomalous.',
+    defaultMessage: 'Alert when the Uptime monitor duration is anomalous.',
   }),
 };