fixing i18n messages with missing placeholder values

robertpatrick · robertpatrick · commit 0c4e452d1821 · 2022-05-26T10:55:22.000-05:00
diff --git a/webui/src/js/utils/wko-installer.js b/webui/src/js/utils/wko-installer.js
@@ -106,9 +106,10 @@ function(WkoActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val
           }
         }
 
-        busyDialogMessage = i18n.t('wko-installer-create-sa-in-progress', {operatorNamespace: operatorNamespace});
-        dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);
         const operatorServiceAccount = this.project.wko.k8sServiceAccount.value;
+        busyDialogMessage = i18n.t('wko-installer-create-sa-in-progress',
+          { operatorServiceAccount: operatorServiceAccount, operatorNamespace: operatorNamespace });
+        dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);
         if (!options.skipCreateOperatorServiceAccount) {
           const status = await this.createOperatorServiceAccount(kubectlExe, kubectlOptions, operatorNamespace,
             operatorServiceAccount, errTitle, errPrefix);
diff --git a/webui/src/js/utils/wko-updater.js b/webui/src/js/utils/wko-updater.js
@@ -105,9 +105,10 @@ function(WkoActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val
           }
         }
 
-        busyDialogMessage = i18n.t('wko-updater-create-sa-in-progress', {operatorNamespace: operatorNamespace});
-        dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);
         const operatorServiceAccount = this.project.wko.k8sServiceAccount.value;
+        busyDialogMessage = i18n.t('wko-updater-create-sa-in-progress',
+          { operatorServiceAccount: operatorServiceAccount, operatorNamespace: operatorNamespace});
+        dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);
         if (!options.skipCreateOperatorServiceAccount) {
           const status = await this.createOperatorServiceAccount(kubectlExe, kubectlOptions, operatorNamespace,
             operatorServiceAccount, errTitle, errPrefix);

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,10 @@ function(WkoActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`- busyDialogMessage = i18n.t('wko-installer-create-sa-in-progress', {operatorNamespace: operatorNamespace});`
`110`		`- dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);`
`111`	`109`	`const operatorServiceAccount = this.project.wko.k8sServiceAccount.value;`
	`110`	`+ busyDialogMessage = i18n.t('wko-installer-create-sa-in-progress',`
	`111`	`+ { operatorServiceAccount: operatorServiceAccount, operatorNamespace: operatorNamespace });`
	`112`	`+ dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);`
`112`	`113`	`if (!options.skipCreateOperatorServiceAccount) {`
`113`	`114`	`const status = await this.createOperatorServiceAccount(kubectlExe, kubectlOptions, operatorNamespace,`
`114`	`115`	`operatorServiceAccount, errTitle, errPrefix);`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,10 @@ function(WkoActionsBase, project, wktConsole, i18n, projectIo, dialogHelper, val`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- busyDialogMessage = i18n.t('wko-updater-create-sa-in-progress', {operatorNamespace: operatorNamespace});`
`109`		`- dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);`
`110`	`108`	`const operatorServiceAccount = this.project.wko.k8sServiceAccount.value;`
	`109`	`+ busyDialogMessage = i18n.t('wko-updater-create-sa-in-progress',`
	`110`	`+ { operatorServiceAccount: operatorServiceAccount, operatorNamespace: operatorNamespace});`
	`111`	`+ dialogHelper.updateBusyDialog(busyDialogMessage, 7 / totalSteps);`
`111`	`112`	`if (!options.skipCreateOperatorServiceAccount) {`
`112`	`113`	`const status = await this.createOperatorServiceAccount(kubectlExe, kubectlOptions, operatorNamespace,`
`113`	`114`	`operatorServiceAccount, errTitle, errPrefix);`