Merge pull request #144 from oddbird/hotfix-translations

Hotfix translations.

locales/de/translation.json

@@ -67,7 +67,6 @@
   "Please contact an Admin within your org or use the button below to log in with a different org.": "Bitte wenden Sie sich an einen Administrator innerhalb Ihrer Organisation, oder verwenden Sie die Schaltfläche unten, um sich bei einer anderen Organisation anzumelden.",
   "Potential Issues": "Mögliche Probleme",
   "Pre-Install Validation In Progress…": "Die Überprüfung vor der Installation wird ausgeführt…",
-  "Pre-install validation": "Überprüfung vor der Installation",
   "Pre-install validation completed successfully.": "Die Überprüfung vor der Installation wurde erfolgreich abgeschlossen.",
   "Pre-install validation completed with errors.": "Die Überprüfung vor der Installation wurde mit Fehlern abgeschlossen.",
   "Pre-install validation completed with warnings.": "Die Überprüfung vor der Installation wurde mit Warnungen abgeschlossen.",
@@ -160,4 +159,4 @@
   "waiting to install": "warten auf die Installation",
   "warningMsg": "{{count}} Warnung",
   "warningMsg_plural": "{{count}} Warnungen"
-}
+}

locales/en/translation.json

@@ -68,7 +68,6 @@
   "Please contact an Admin within your org or use the button below to log in with a different org.": "Please contact an Admin within your org or use the button below to log in with a different org.",
   "Potential Issues": "Potential Issues",
   "Pre-Install Validation In Progress…": "Pre-Install Validation In Progress…",
-  "Pre-install validation": "Pre-install validation",
   "Pre-install validation completed successfully.": "Pre-install validation completed successfully.",
   "Pre-install validation completed with errors.": "Pre-install validation completed with errors.",
   "Pre-install validation completed with warnings.": "Pre-install validation completed with warnings.",

locales/es/translation.json

@@ -67,7 +67,6 @@
   "Please contact an Admin within your org or use the button below to log in with a different org.": "Póngase en contacto con un administrador dentro de su organización o utilice el botón que aparece a continuación para iniciar sesión con una organización diferente.",
   "Potential Issues": "Problemas potenciales",
   "Pre-Install Validation In Progress…": "Validación previa a la instalación en curso…",
-  "Pre-install validation": "Validación previa a la instalación",
   "Pre-install validation completed successfully.": "Validación previa a la instalación completada correctamente.",
   "Pre-install validation completed with errors.": "Validación previa a la instalación completada con errores.",
   "Pre-install validation completed with warnings.": "Validación previa a la instalación completada con advertencias.",
@@ -160,4 +159,4 @@
   "waiting to install": "esperando la instalación",
   "warningMsg": "{{count}} advertencia",
   "warningMsg_plural": "{{count}} advertencias"
-}
+}

locales/fr/translation.json

@@ -67,7 +67,6 @@
   "Please contact an Admin within your org or use the button below to log in with a different org.": "Contactez un administrateur au sein de votre organisation ou utilisez le bouton ci-dessous pour vous connecter avec une autre organisation.",
   "Potential Issues": "Problèmes potentiels",
   "Pre-Install Validation In Progress…": "Validation de pré-installation en cours...",
-  "Pre-install validation": "Validation de pré-installation",
   "Pre-install validation completed successfully.": "Validation de pré-installation terminée avec succès.",
   "Pre-install validation completed with errors.": "Validation de pré-installation terminée avec des erreurs.",
   "Pre-install validation completed with warnings.": "Validation de pré-installation terminée avec des avertissements.",
@@ -160,4 +159,4 @@
   "waiting to install": "en attente d’installation",
   "warningMsg": "{{count}} avertissement",
   "warningMsg_plural": "{{count}} avertissements"
-}
+}

locales/ja/translation.json

@@ -67,7 +67,6 @@
   "Please contact an Admin within your org or use the button below to log in with a different org.": "組織のシステム管理者に問い合わせるか、下のボタンを使用して別の組織にログインしてください。",
   "Potential Issues": "潜在的な問題",
   "Pre-Install Validation In Progress…": "インストール前検証は進行中です...",
-  "Pre-install validation": "インストール前検証",
   "Pre-install validation completed successfully.": "インストール前検証は正常に完了しました。",
   "Pre-install validation completed with errors.": "インストール前検証は完了しましたが、エラーがあります。",
   "Pre-install validation completed with warnings.": "インストール前検証は完了しましたが、警告があります。",
@@ -160,4 +159,4 @@
   "waiting to install": "インストールを待機中",
   "warningMsg": "{{count}} 件の警告",
   "warningMsg_plural": "{{count}} 件の警告"
-}
+}

locales/nl/translation.json

@@ -67,7 +67,6 @@
   "Please contact an Admin within your org or use the button below to log in with a different org.": "Neem contact op met een beheerder binnen uw organisatie of gebruik de onderstaande knop om in te loggen bij een andere organisatie.",
   "Potential Issues": "Potentiële problemen",
   "Pre-Install Validation In Progress…": "Validatie vóór installatie bezig…",
-  "Pre-install validation": "Validatie vóór installatie",
   "Pre-install validation completed successfully.": "Validatie vóór installatie met succes voltooid.",
   "Pre-install validation completed with errors.": "Validatie vóór installatie voltooid met fouten.",
   "Pre-install validation completed with warnings.": "Validatie vóór installatie voltooid met waarschuwingen.",
@@ -160,4 +159,4 @@
   "waiting to install": "wachten op installeren",
   "warningMsg": "{{count}} waarschuwing",
   "warningMsg_plural": "{{count}} waarschuwingen"
-}
+}

locales_dev/en/translation.json

@@ -37,6 +37,7 @@
   "Installation In Progress…": "Installation In Progress…",
   "Installation Progress": "Installation Progress",
   "Installation completed successfully.": "Installation completed successfully.",
+  "Installation encountered": "Installation encountered",
   "Installation was canceled.": "Installation was canceled.",
   "Installing…": "Installing…",
   "Is this the correct org? If not, please": "Is this the correct org? If not, please",
@@ -60,8 +61,8 @@
   "Please contact an Admin within your org or use the button below to log in with a different org.": "Please contact an Admin within your org or use the button below to log in with a different org.",
   "Potential Issues": "Potential Issues",
   "Pre-Install Validation In Progress…": "Pre-Install Validation In Progress…",
-  "Pre-install validation": "Pre-install validation",
   "Pre-install validation completed successfully.": "Pre-install validation completed successfully.",
+  "Pre-install validation encountered": "Pre-install validation encountered",
   "Pre-install validation has expired; please run it again.": "Pre-install validation has expired; please run it again.",
   "Product Terms of Use and Licenses": "Product Terms of Use and Licenses",
   "Production or Developer Org": "Production or Developer Org",

package.json

@@ -106,7 +106,7 @@
     "css-loader": "^3",
     "eslint": "^7.5.0",
     "eslint-config-prettier": "^6.11.0",
-    "eslint-import-resolver-typescript": "^2.2.0",
+    "eslint-import-resolver-typescript": "^1.1.1",
     "eslint-import-resolver-webpack": "^0.12.2",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-jest": "^23.18.0",

src/js/components/jobs/jobResults.tsx

@@ -21,10 +21,7 @@ const JobResults = ({
     return null;
   }
 
-  const { message } = getErrorInfo({
-    job,
-    label: i18n.t('Installation'),
-  });
+  const { message } = getErrorInfo({ job });
   if (message !== null) {
     const title = i18n.t('View Installation Error Details & Link');
     return (

src/js/components/plans/preflightResults.tsx

@@ -73,11 +73,9 @@ export const JobError = ({ err }: { err: StepResult }) => {
 export const getErrorInfo = ({
   job,
   preflight,
-  label,
 }: {
   job?: Job;
   preflight?: Preflight;
-  label: string;
 }) => {
   const currentJob = job || preflight;
   const info: { failed: boolean; message: string | null } = {
@@ -125,10 +123,14 @@ export const getErrorInfo = ({
       currentJob.status === CONSTANTS.STATUS.FAILED ||
       canceledPreflight;
     info.failed = Boolean(failed);
-    info.message =
-      preflight && !(currentJob as Preflight).is_valid && !failed
-        ? i18n.t(`${label} has expired; please run it again.`)
-        : `${i18n.t(`${label} encountered`)} ${msg}.`;
+    if (preflight) {
+      info.message =
+        !preflight.is_valid && !failed
+          ? i18n.t('Pre-install validation has expired; please run it again.')
+          : `${i18n.t('Pre-install validation encountered')} ${msg}.`;
+    } else {
+      info.message = `${i18n.t('Installation encountered')} ${msg}.`;
+    }
   }
   return info;
 };
@@ -142,10 +144,7 @@ const PreflightResults = ({ preflight }: { preflight: Preflight }) => {
     return null;
   }
 
-  const { failed, message } = getErrorInfo({
-    preflight,
-    label: i18n.t('Pre-install validation'),
-  });
+  const { failed, message } = getErrorInfo({ preflight });
   const planErrors = preflight.results?.plan;
   if (message !== null) {
     return (

yarn.lock

@@ -4260,16 +4260,14 @@ eslint-import-resolver-node@^0.3.3:
     debug "^2.6.9"
     resolve "^1.13.1"
 
-eslint-import-resolver-typescript@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.2.0.tgz#f7b261e41a38b690f3044660f6d496cc312323b0"
-  integrity sha512-/NhKEH1gbRlcb9RcaZJe5zRn5eIffGTf1qh3JAyvkEuPli3DEa5HQWWUO5OTfUjj7buUXsDq8lEsdwbbSeqywg==
+eslint-import-resolver-typescript@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-1.1.1.tgz#e6d42172b95144ef16610fe104ef38340edea591"
+  integrity sha512-jqSfumQ+H5y3FUJ6NjRkbOQSUOlbBucGTN3ELymOtcDBbPjVdm/luvJuCfCaIXGh8sEF26ma1qVdtDgl9ndhUg==
   dependencies:
-    debug "^4.1.1"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+    debug "^4.0.1"
+    resolve "^1.4.0"
+    tsconfig-paths "^3.6.0"
 
 eslint-import-resolver-webpack@^0.12.2:
   version "0.12.2"
@@ -9539,7 +9537,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2:
+resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -10790,7 +10788,7 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-tsconfig-paths@^3.9.0:
+tsconfig-paths@^3.6.0, tsconfig-paths@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
   integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==