diff --git a/components/UserProfile/CallbackFeedback.vue b/components/UserProfile/CallbackFeedback.vue index 70283c5c1..2b1746fca 100644 --- a/components/UserProfile/CallbackFeedback.vue +++ b/components/UserProfile/CallbackFeedback.vue @@ -39,7 +39,6 @@ const { keyActionType, keyUrl, keyInstallStatus, - keyInstallStatusCopy, keyType, } = storeToRefs(installKeyStore); const { @@ -56,7 +55,7 @@ const { * the modal should close instead of redirecting to the * settings page. * - * @todo figure out the difference between document.location and window.location + * @todo figure out the difference between document.location and window.location in relation to the webGUI and webGUI being iframed */ const isSettingsPage = ref(document.location.pathname === '/Settings/ManagementAccess'); @@ -108,6 +107,39 @@ const promoClick = () => { const { copy, copied, isSupported } = useClipboard({ source: keyUrl.value }); +const keyInstallStatusCopy = computed((): { text: string; } => { + let txt1 = props.t('Installing'); + let txt2 = props.t('Installed'); + let txt3 = props.t('Install'); + switch (keyInstallStatus.value) { + case 'ready': + return { + text: props.t('Ready to Install Key'), + }; + case 'installing': + if (keyActionType.value === 'trialExtend') { txt1 = props.t('Installing Extended Trial'); } + if (keyActionType.value === 'recover') { txt1 = props.t('Installing Recovered'); } + if (keyActionType.value === 'replace') { txt1 = props.t('Installing Replaced'); } + return { + text: props.t('{0} {1} Key…', [txt1, keyType.value]), + }; + case 'success': + if (keyActionType.value === 'trialExtend') { txt2 = props.t('Extension Installed'); } + if (keyActionType.value === 'recover') { txt2 = props.t('Recovered'); } + if (keyActionType.value === 'replace') { txt2 = props.t('Replaced'); } + return { + text: props.t('{1} Key {0} Successfully', [txt2, keyType.value]), + }; + case 'failed': + if (keyActionType.value === 'trialExtend') { txt3 = props.t('Install Extended'); } + if (keyActionType.value === 'recover') { txt3 = props.t('Install Recovered'); } + if (keyActionType.value === 'replace') { txt3 = props.t('Install Replaced'); } + return { + text: props.t('Failed to {0} {1} Key', [txt3, keyType.value]), + }; + } +}); + const accountActionStatusCopy = computed((): { text: string; } => { switch (accountActionStatus.value) { case 'ready': @@ -117,8 +149,8 @@ const accountActionStatusCopy = computed((): { text: string; } => { case 'updating': return { text: accountAction.value?.type === 'signIn' - ? props.t('Signing in {0}...', [accountAction.value.user?.preferred_username]) - : props.t('Signing out {0}...', [username.value]), + ? props.t('Signing in {0}…', [accountAction.value.user?.preferred_username]) + : props.t('Signing out {0}…', [username.value]), }; case 'success': return { @@ -174,7 +206,11 @@ const accountActionStatusCopy = computed((): { text: string; } => {

{{ t('Copy your Key URL: {0}', [keyUrl]) }}

-

{{ t('Then go to Tools > Registration to manually install it') }}

+

+ + {{ t('Then go to Tools > Registration to manually install it') }} + +

diff --git a/locales/en_US.json b/locales/en_US.json index e2b704f59..8b765dff7 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -189,5 +189,14 @@ "Starting your free 30 day trial": "Starting your free 30 day trial", "Trial Key Created": "Trial Key Created", "Please wait while the page reloads to install your trial key": "Please wait while the page reloads to install your trial key", - "A Trial key provides all the functionality of a Pro Registration key": "A Trial key provides all the functionality of a Pro Registration key." + "A Trial key provides all the functionality of a Pro Registration key": "A Trial key provides all the functionality of a Pro Registration key.", + "Extension Installed": "Extension Installed", + "Recovered": "Recovered", + "Replaced": "Replaced", + "Installing": "Installing", + "Installed": "Installed", + "Install": "Install", + "Install Extended": "Install Extended", + "Install Recovered": "Install Recovered", + "Install Replaced": "Install Replaced" } diff --git a/store/installKey.ts b/store/installKey.ts index da95b709b..7d667abf8 100644 --- a/store/installKey.ts +++ b/store/installKey.ts @@ -68,39 +68,6 @@ export const useInstallKeyStore = defineStore('installKey', () => { } }; - const keyInstallStatusCopy = computed((): { text: string; } => { - let txt1 = 'Installing'; - let txt2 = 'Installed'; - let txt3 = 'Install'; - switch (keyInstallStatus.value) { - case 'ready': - return { - text: 'Ready to Install Key', - }; - case 'installing': - if (keyActionType.value === 'trialExtend') { txt1 = 'Installing Extended Trial'; } - if (keyActionType.value === 'recover') { txt1 = 'Installing Recovered'; } - if (keyActionType.value === 'replace') { txt1 = 'Installing Replaced'; } - return { - text: `${txt1} ${keyType.value} Key...`, - }; - case 'success': - if (keyActionType.value === 'trialExtend') { txt2 = 'Extension Installed'; } - if (keyActionType.value === 'recover') { txt2 = 'Recovered'; } - if (keyActionType.value === 'replace') { txt2 = 'Replaced'; } - return { - text: `${keyType.value} Key ${txt2} Successfully`, - }; - case 'failed': - if (keyActionType.value === 'trialExtend') { txt3 = 'Install Extended'; } - if (keyActionType.value === 'recover') { txt3 = 'Install Recovered'; } - if (keyActionType.value === 'replace') { txt3 = 'Install Replaced'; } - return { - text: `Failed to ${txt3} ${keyType.value} Key`, - }; - } - }); - watch(keyInstallStatus, (newV, oldV) => { console.debug('[keyInstallStatus]', newV, oldV); }); @@ -110,7 +77,6 @@ export const useInstallKeyStore = defineStore('installKey', () => { keyInstallStatus, // getters keyActionType, - keyInstallStatusCopy, keyType, keyUrl, // Actions