diff --git a/public/locales/en/common.json b/public/locales/en/common.json index c62f22acf..4b5059ae0 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -6,6 +6,10 @@ "delete": "Delete", "ok": "OK", "edit": "Edit", + "enabled": "Enabled", + "disabled": "Disabled", + "enableAll": "Enable all", + "disableAll": "Disable all", "version": "Version", "changePosition": "Change position", "remove": "Remove", diff --git a/public/locales/en/modules/dns-hole-controls.json b/public/locales/en/modules/dns-hole-controls.json index 4bd95585d..1215356b0 100644 --- a/public/locales/en/modules/dns-hole-controls.json +++ b/public/locales/en/modules/dns-hole-controls.json @@ -2,15 +2,5 @@ "descriptor": { "name": "DNS hole controls", "description": "Control PiHole or AdGuard from your dashboard" - }, - "card": { - "buttons": { - "enableAll": "Enable all", - "disableAll": "Disable all" - }, - "status": { - "enabled": "Enabled", - "disabled": "Disabled" - } } -} +} \ No newline at end of file diff --git a/public/locales/en/modules/dns-hole-summary.json b/public/locales/en/modules/dns-hole-summary.json index 2cdaec0f5..207d37e1f 100644 --- a/public/locales/en/modules/dns-hole-summary.json +++ b/public/locales/en/modules/dns-hole-summary.json @@ -13,7 +13,6 @@ "metrics": { "domainsOnAdlist": "Domains on adlists", "queriesToday": "Queries today", - "adsBlockedTodayPercentage": "{{percentage}}%", "queriesBlockedTodayPercentage": "blocked today", "queriesBlockedToday": "blocked today" } diff --git a/src/widgets/dnshole/DnsHoleControls.tsx b/src/widgets/dnshole/DnsHoleControls.tsx index a83866707..0da8a3178 100644 --- a/src/widgets/dnshole/DnsHoleControls.tsx +++ b/src/widgets/dnshole/DnsHoleControls.tsx @@ -31,7 +31,7 @@ interface DnsHoleControlsWidgetProps { function DnsHoleControlsWidgetTile({ widget }: DnsHoleControlsWidgetProps) { const { isInitialLoading, data, refetch } = useDnsHoleSummeryQuery(); const { mutateAsync } = useDnsHoleControlMutation(); - const { t } = useTranslation('modules/dns-hole-controls'); + const { t } = useTranslation('common'); const { config } = useConfigContext(); @@ -51,7 +51,7 @@ function DnsHoleControlsWidgetTile({ widget }: DnsHoleControlsWidgetProps) { variant="light" color="green" > - {t('card.buttons.enableAll')} + {t('enableAll')} @@ -101,18 +101,18 @@ function DnsHoleControlsWidgetTile({ widget }: DnsHoleControlsWidgetProps) { } const StatusBadge = ({ status }: { status: PiholeApiSummaryType['status'] }) => { - const { t } = useTranslation('modules/dns-hole-controls'); + const { t } = useTranslation('common'); if (status === 'enabled') { return ( - {t('card.status.enabled')} + {t('enabled')} ); } return ( - {t('card.status.disabled')} + {t('disabled')} ); }; diff --git a/src/widgets/dnshole/DnsHoleSummary.tsx b/src/widgets/dnshole/DnsHoleSummary.tsx index 71ab89041..ebd025a8a 100644 --- a/src/widgets/dnshole/DnsHoleSummary.tsx +++ b/src/widgets/dnshole/DnsHoleSummary.tsx @@ -1,6 +1,12 @@ import { useTranslation } from 'next-i18next'; import { Card, Center, Container, Stack, Text } from '@mantine/core'; -import { IconAd, IconBarrierBlock, IconPercentage, IconSearch, IconWorldWww } from '@tabler/icons-react'; +import { + IconAd, + IconBarrierBlock, + IconPercentage, + IconSearch, + IconWorldWww, +} from '@tabler/icons-react'; import { defineWidget } from '../helper'; import { WidgetLoading } from '../loading'; import { IWidget } from '../widgets'; @@ -103,12 +109,7 @@ function DnsHoleSummaryWidgetTile({ widget }: DnsHoleSummaryWidgetProps) {
-
- {(data.adsBlockedTodayPercentage * 100).toFixed(2)}% - - {t('card.metrics.queriesBlockedTodayPercentage')} - -
+ {(data.adsBlockedTodayPercentage * 100).toFixed(2)}%