Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

πŸ› Fixes Nextcloud widgets passing English words into translations (#2410)

Alicia Sykes6ff594f96e83
diff --git a/src/components/Widgets/NextcloudStats.vue b/src/components/Widgets/NextcloudStats.vue
index bb371e4d..d365b0a0 100644
--- a/src/components/Widgets/NextcloudStats.vue
+++ b/src/components/Widgets/NextcloudStats.vue
@@ -21,8 +21,7 @@
<span v-if="apps.num_updates_available" class="nc-updates">
<i class="fal fa-download"></i><em>{{ apps.num_updates_available }}</em>
<strong>
- {{ tt('updates-available',
- {plural: apps.num_updates_available > 1 ? 's' : ''}) }}
+ {{ tt('updates-available', apps.num_updates_available) }}
</strong>
</span>
<small v-else data-nc-updates class="disabled">{{ tt('no-pending-updates') }}</small>
@@ -31,9 +30,9 @@
<!-- server info: storage -->
<p v-tooltip="storagesTooltip()">
<i class="fal fa-file"></i><em v-html="safeHtmlFormatNumber(storage.num_files)"></em>
- <strong>{{ tt('files', { plural: storage.num_files > 1 ? 's' : '' }) }}</strong>&nbsp;
+ <strong>{{ tt('files', storage.num_files) }}</strong>&nbsp;
<small>{{ tt('in') }}</small><em>{{ storage.num_storages }}</em>
- <strong>{{ tt('storages', { plural: storage.num_storages > 1 ? 's' : '' }) }}</strong>
+ <strong>{{ tt('storages', storage.num_storages) }}</strong>
&nbsp;β€’&nbsp;<strong v-html="safeHtmlConvertBytes(system.freespace)"></strong>&nbsp;
<small>{{ tt('free') }}</small>
</p>
diff --git a/src/components/Widgets/NextcloudUser.vue b/src/components/Widgets/NextcloudUser.vue
index 0fe16964..3fd1792b 100644
--- a/src/components/Widgets/NextcloudUser.vue
+++ b/src/components/Widgets/NextcloudUser.vue
@@ -122,7 +122,7 @@ export default {
/* Tooltip generators */
quotaTooltip() {
const quotaEnabled = this.user.quota.quota > 0;
- const content = `${this.tt('quota-enabled', { not: quotaEnabled ? '' : 'not ' })}`
+ const content = `${this.tt(quotaEnabled ? 'quota-enabled' : 'quota-disabled')}`
+ `<br><br>${this.safeHtmlConvertBytes(this.user.quota.used)} ${this.tt('used')}<br>`
+ `${this.safeHtmlConvertBytes(this.user.quota.free)} ${this.tt('free')}<br>`
+ `${this.safeHtmlConvertBytes(this.user.quota.total)} ${this.tt('total')}`;