vue translation does not support JS logic in templates

This is anyways probably for the best

dashboard/public/translation/en.json

@@ -663,7 +663,8 @@
         "restoreArchiveDialog": {
             "title": "Restore from Archive",
             "description": "This will install {{appId}} at the specified location with backup from {{creationTime}}.",
-            "restoreAction": "Restore {{ dnsOverwrite ? 'and overwrite DNS' : '' }}"
+            "restoreAction": "Restore",
+            "restoreActionOverwrite": "Restore and overwrite DNS"
         }
     },
     "branding": {
@@ -1142,7 +1143,7 @@
             "backupFailed": "Backup failed",
             "certificateRenewalFailed": "Certificate renewal failed",
             "appOutOfMemory": "App ran out of memory",
-            "appUp": "App is online",
+            "appUp": "App is back online",
             "appDown": "App is down",
             "rebootRequired": "Server reboot required",
             "cloudronUpdateFailed": "Cloudron Update Failed"

dashboard/public/translation/nl.json

@@ -1502,7 +1502,7 @@
             "backupFailed": "Backup mislukt",
             "certificateRenewalFailed": "Vernieuwen certificaten mislukt",
             "appOutOfMemory": "App had te weinig geheugen",
-            "appUp": "App is offline",
+            "appUp": "App is weer online",
             "appDown": "App werkt niet",
             "rebootRequired": "Server herstart noodzakelijk",
             "cloudronUpdateFailed": "Cloudron Update Mislukt"

dashboard/src/components/AppArchive.vue

@@ -202,6 +202,7 @@ async function onRestoreSubmit() {
     if (error.type === 'externally_exists') {
       restoreNeedsOverwrite.value = true;
     } else {
+      restoreError.value.generic = error.body ? error.body.message : 'Internal error';
       console.error(error);
     }
     restoreBusy.value = false;
@@ -242,13 +243,14 @@ onMounted(async () => {
     :title="$t('backups.restoreArchiveDialog.title')"
      reject-style="secondary"
     :reject-label="restoreBusy ? '' : $t('main.dialog.cancel')"
-    :confirm-label="$t('backups.restoreArchiveDialog.restoreAction', { dnsOverwrite: restoreNeedsOverwrite })"
+    :confirm-label="$t(restoreNeedsOverwrite ? 'backups.restoreArchiveDialog.restoreActionOverwrite' : 'backups.restoreArchiveDialog.restoreAction')"
     :confirm-busy="restoreBusy"
     :confirm-active="!restoreBusy"
     @confirm="onRestoreSubmit()"
   >
     <p v-html="$t('backups.restoreArchiveDialog.description', { appId: restoreManifest.id, fqdn: restoreFqdn, creationTime: prettyLongDate(restoreArchive.creationTime) })"></p>
 
+    <div class="text-danger" v-show="restoreError.generic">{{ restoreError.generic }}</div>
     <!-- <div ng-show="archiveRestore.error.location.fqdn === archiveRestore.subdomain + '.' + archiveRestore.domain.domain"><small>{{ archiveRestore.error.location.message }}</small></div> -->
 
     <form @submit.prevent="onRestoreSubmit()" autocomplete="off">

dashboard/src/models/ArchivesModel.js

@@ -44,7 +44,7 @@ function create() {
           };
         }));
 
-        for (const domain in allDomains) {
+        for (const domain of allDomains) {
           const [error, result] = await domainsModel.checkRecords(domain.domain, domain.subdomain);
           if (error) return [error];
 

dashboard/src/models/DomainsModel.js

@@ -107,6 +107,7 @@ function create() {
       }
 
       if (error || result.status !== 200) return [error || result];
+      return [null, result.body];
     },
   };
 }