diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json index 522c4e5c5..15c17e2b0 100644 --- a/dashboard/public/translation/en.json +++ b/dashboard/public/translation/en.json @@ -1602,7 +1602,8 @@ "7d": "7 days", "30d": "30 days", "6h": "6 hours", - "live": "Live" + "live": "Live", + "1h": "1 hour" }, "memoryTitle": "Memory (RAM + Swap) in MB", "diskTitle": "Disk Usage", diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json index 27ab79b51..daf7d7697 100644 --- a/dashboard/public/translation/nl.json +++ b/dashboard/public/translation/nl.json @@ -680,7 +680,7 @@ } }, "branding": { - "title": "Ontwerp- en tekstaanpassingen", + "title": "Uiterlijk", "cloudronName": "Naam van deze Cloudron", "logo": "Logo", "footer": { @@ -1049,7 +1049,8 @@ "12h": "12 uur", "7d": "7 dagen", "30d": "30 dagen", - "6h": "6 uur" + "6h": "6 uur", + "live": "Live" }, "memoryTitle": "Geheugen (RAM + Swap) in MB", "diskTitle": "Schijfgebruik", @@ -1424,7 +1425,7 @@ "title": "Taal", "description": "De standaard taal van deze Cloudron kan hier ingesteld worden. Deze instelling wordt ook gebruikt voor systeem e-mails zoals gebruikersuitnodigingen en wachtwoord herstellingen. Elke gebruiker kan een eigen voorkeurstaal instellen in het Profiel." }, - "title": "Instellingen", + "title": "Systeem", "registryConfig": { "provider": "Docker Register Aanbieder", "providerOther": "Anders", @@ -1468,7 +1469,7 @@ } }, "system": { - "title": "Systeeminformatie", + "title": "Statistieken", "diskUsage": { "usageInfo": "{{ available | prettyDiskSize }} van {{ size | prettyDiskSize }} beschikbaar", "diskContent": "Deze {{ type }} schijf bevat", @@ -1501,6 +1502,9 @@ }, "graphs": { "title": "Grafieken" + }, + "locale": { + "title": "Regionale instellingen" } }, "eventlog": { diff --git a/package-lock.json b/package-lock.json index 544eb89e8..967a6e965 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "@google-cloud/storage": "^7.15.2", "@smithy/node-http-handler": "^4.0.4", "@smithy/util-retry": "^4.0.2", + "@types/node": "^22.15.21", "async": "^3.2.6", "cloudron-manifestformat": "^5.27.0", "connect": "^3.7.0", @@ -2674,11 +2675,12 @@ "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==" }, "node_modules/@types/node": { - "version": "20.12.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", - "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", + "version": "22.15.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz", + "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==", + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.21.0" } }, "node_modules/@types/node-fetch": { @@ -8145,9 +8147,10 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "license": "MIT" }, "node_modules/unpipe": { "version": "1.0.0", diff --git a/package.json b/package.json index a466bfc23..e6d76189a 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "@google-cloud/storage": "^7.15.2", "@smithy/node-http-handler": "^4.0.4", "@smithy/util-retry": "^4.0.2", + "@types/node": "^22.15.21", "async": "^3.2.6", "cloudron-manifestformat": "^5.27.0", "connect": "^3.7.0", diff --git a/src/boxerror.js b/src/boxerror.js index fb5006688..c4994e47b 100644 --- a/src/boxerror.js +++ b/src/boxerror.js @@ -19,6 +19,8 @@ function BoxError(reason, errorOrMessage, extra = {}) { this.name = this.constructor.name; this.reason = reason; this.details = {}; + this.code = extra.code; + this.sqlMessage = extra.sqlMessage; if (typeof errorOrMessage === 'string') { this.message = errorOrMessage;