Dawnline 0.11.0
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
- Russian translation. The admin pages, the LuCI menu and the router's messages (errors, Health checks, update steps, the service log) come in Russian with the new luci-i18n-dawnline-ru package, released beside the app. LuCI shows it when its language is Russian, or "auto" with a Russian browser - The translation installs with install.sh when LuCI is in Russian (or with --lang ru), follows every Dawnline update and rollback, and can be added or removed in Components → Dawnline → Translation - The portal speaks the visitor's language: it opens in the system's language and switches between English and Russian in place, from the language pill beside its QR code. It carries its own translation and needs no package - Set-up steps quote the apps' own menus word for word, in Russian too: AmneziaVPN is "+ → Insert → Continue" (it has no "Add server"), and the Mac and Windows menus of WireGuard and AmneziaWG have their real names - Questions in the portal (Reconnect, Remove) read from the left edge and close with Cancel, without × - Numbers, sizes and dates follow the page's language. A server that can't start says why in one sentence; event details and service log lines read as whole sentences - README in Russian (README_ru.md). rules/i18n.md: how strings are written and translated; CI checks the catalogs (npm run i18n:check)
This commit is contained in:
1 parent
caed976e63
commit
2f2aaf6c34
173 files changed
+25645
-2823
No files matched your search
@@ -3,15 +3,15 @@
|
||||
import type { Person } from '../../shared/types';
|
||||
import { E } from '../e';
|
||||
import { icon } from '../../shared/icons';
|
||||
import { ACCESS_LABEL } from '../../shared/format';
|
||||
import { accessLabel } from '../../shared/format';
|
||||
|
||||
/** Returns the element and a getter. */
|
||||
export function accessPicker(initial: Person['access'], onChange?: (v: Person['access']) => void) {
|
||||
let value = initial;
|
||||
const opts: { v: Person['access']; ic: string; text: string }[] = [
|
||||
{ v: 'internet', ic: 'globe', text: 'Browse the internet through your router. No access to devices at home.' },
|
||||
{ v: 'lan', ic: 'home', text: 'Reach devices at home (NAS, printer, cameras). Internet stays on their own connection.' },
|
||||
{ v: 'both', ic: 'shield', text: 'Home devices and the internet, all through your router.' },
|
||||
{ v: 'internet', ic: 'globe', text: _('Browse the internet through your router. No access to devices at home.') },
|
||||
{ v: 'lan', ic: 'home', text: _('Reach devices at home (NAS, printer, cameras). Internet stays on their own connection.') },
|
||||
{ v: 'both', ic: 'shield', text: _('Home devices and the internet, all through your router.') },
|
||||
];
|
||||
const el = E(
|
||||
'div',
|
||||
@@ -29,7 +29,7 @@ export function accessPicker(initial: Person['access'], onChange?: (v: Person['a
|
||||
onChange?.(o.v);
|
||||
},
|
||||
},
|
||||
[E('span', { class: 'dl-choice-title' }, [icon(o.ic), ACCESS_LABEL[o.v]]), E('span', { class: 'dl-choice-text' }, o.text)],
|
||||
[E('span', { class: 'dl-choice-title' }, [icon(o.ic), accessLabel(o.v)]), E('span', { class: 'dl-choice-text' }, o.text)],
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -10,23 +10,32 @@ import { button, type ButtonKind } from '../ui/button';
|
||||
import { confirmDialog } from '../ui/modal';
|
||||
import { attempt } from '../ui/toast';
|
||||
import { needRow } from '../ui/layout';
|
||||
import { fmt, num } from '../../shared/i18n';
|
||||
|
||||
const FIX_LABEL: Record<string, string> = {
|
||||
apply: 'Repair',
|
||||
sync: 'Reload devices',
|
||||
restart: 'Restart service',
|
||||
netrestart: 'Restart network',
|
||||
updates: 'Open Components',
|
||||
};
|
||||
/** The button of a backend fix, by its id. */
|
||||
function fixLabel(fix: string): string {
|
||||
const labels: Record<string, string> = {
|
||||
apply: _('Repair'),
|
||||
sync: _('Reload devices'),
|
||||
restart: _('Restart service'),
|
||||
netrestart: _('Restart network'),
|
||||
updates: _('Open Components'),
|
||||
};
|
||||
return labels[fix] ?? _('Fix');
|
||||
}
|
||||
|
||||
/** Run a backend fix (a network restart asks first); the checks again, or null. */
|
||||
export async function runFix(fix: string): Promise<Health | null> {
|
||||
if (
|
||||
fix === 'netrestart' &&
|
||||
!(await confirmDialog('Restart the network?', 'Every interface restarts. Connections drop for a few seconds.', 'Restart network'))
|
||||
!(await confirmDialog(
|
||||
_('Restart the network?'),
|
||||
_('Every interface restarts. Connections drop for a few seconds.'),
|
||||
_('Restart network'),
|
||||
))
|
||||
)
|
||||
return null;
|
||||
return (await attempt(() => api.healthFix(fix), 'Done')) ?? null;
|
||||
return (await attempt(() => api.healthFix(fix), _('Done'))) ?? null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -37,10 +46,10 @@ export function fixAction(c: HealthCheck, run: (fix: string) => void, refresh: (
|
||||
const fix = c.fix;
|
||||
if (!fix) return '';
|
||||
// install:awg installs AmneziaWG itself (the build for this firmware), the rest come from the feeds.
|
||||
if (fix.startsWith('install:')) return button('Install', () => installFeature(fix.slice(8) as keyof Needs, refresh), kind);
|
||||
if (fix.startsWith('install:')) return button(_('Install'), () => installFeature(fix.slice(8) as keyof Needs, refresh), kind);
|
||||
if (fix === 'updates')
|
||||
return E('a', { class: `cbi-button cbi-button-${kind}`, href: L.url('admin/network/dawnline/updates') }, FIX_LABEL.updates);
|
||||
return button(FIX_LABEL[fix] ?? 'Fix', () => run(fix), kind);
|
||||
return E('a', { class: `cbi-button cbi-button-${kind}`, href: L.url('admin/network/dawnline/updates') }, fixLabel(fix));
|
||||
return button(fixLabel(fix), () => run(fix), kind);
|
||||
}
|
||||
|
||||
/** The icon tile of a check's notice, by what it is about. */
|
||||
@@ -69,6 +78,7 @@ export function healthNotices(checks: HealthCheck[], run: (fix: string) => void,
|
||||
return E('div', { class: 'dl-list dl-notices' }, [
|
||||
...bad
|
||||
.slice(0, max)
|
||||
// The check's problem, title and detail come from the router.
|
||||
.map((c) =>
|
||||
needRow(
|
||||
checkIcon(c.id),
|
||||
@@ -80,7 +90,7 @@ export function healthNotices(checks: HealthCheck[], run: (fix: string) => void,
|
||||
),
|
||||
rest > 0
|
||||
? E('a', { class: 'dl-row dl-notices-more', href: L.url('admin/network/dawnline/diagnostics') }, [
|
||||
`${rest} more in Diagnostics`,
|
||||
fmt(_('%s more in Diagnostics'), num(rest)),
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
'→',
|
||||
])
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import { E } from '../e';
|
||||
import { addDays, bytes, isoDay, parseDay } from '../../shared/format';
|
||||
import { attachTip } from '../ui/tooltip';
|
||||
import { locale } from '../../shared/i18n';
|
||||
|
||||
/** `today` is the router's day (YYYY-MM-DD), so the labels follow its calendar. */
|
||||
export function spark(values: number[], width = 120, height = 26, today = isoDay(new Date())): HTMLElement {
|
||||
@@ -20,10 +21,10 @@ export function spark(values: number[], width = 120, height = 26, today = isoDay
|
||||
'div',
|
||||
{ class: 'dl-tip-title' },
|
||||
back === 0
|
||||
? 'Today'
|
||||
? _('Today')
|
||||
: back === 1
|
||||
? 'Yesterday'
|
||||
: parseDay(addDays(today, -back)).toLocaleDateString('en-GB', { weekday: 'short', day: 'numeric', month: 'short' }),
|
||||
? _('Yesterday')
|
||||
: parseDay(addDays(today, -back)).toLocaleDateString(locale(), { weekday: 'short', day: 'numeric', month: 'short' }),
|
||||
),
|
||||
E('div', { class: 'dl-muted' }, bytes(v)),
|
||||
]);
|
||||
|
||||
@@ -4,10 +4,11 @@
|
||||
import type { DayUsage } from '../../shared/types';
|
||||
import { E } from '../e';
|
||||
import { bits, bytes, parseDay } from '../../shared/format';
|
||||
import { fill, fmt, locale } from '../../shared/i18n';
|
||||
import { attachTip } from '../ui/tooltip';
|
||||
import { svg } from '../ui/layout';
|
||||
|
||||
const dayLabel = (day: string) => parseDay(day).toLocaleDateString('en-GB', { day: 'numeric', month: 'short' });
|
||||
const dayLabel = (day: string) => parseDay(day).toLocaleDateString(locale(), { day: 'numeric', month: 'short' });
|
||||
|
||||
/**
|
||||
* Throughput over the last 15 minutes plus today's total. `off`: the server is
|
||||
@@ -33,7 +34,7 @@ export function speedTile(rate: [number, number, number][], now: number, today:
|
||||
`<path d="M${dl.join(' L')} L${W},${H} L0,${H}Z" class="area"/><path d="M${dl.join(' L')}" class="line"/>` +
|
||||
`<path d="M${ul.join(' L')}" class="line up"/></svg>`,
|
||||
)
|
||||
: E('div', { class: 'dl-speed-wait' }, [E('i'), off ? '' : E('span', {}, 'Collecting… 1 point a minute')]);
|
||||
: E('div', { class: 'dl-speed-wait' }, [E('i'), off ? '' : E('span', {}, _('Collecting… 1 point a minute'))]);
|
||||
const col = (label: string, ic: string, cls: string, v: number) =>
|
||||
E('div', { class: 'dl-speed-col' }, [
|
||||
E('span', { class: 'dl-sub' }, [E('span', { class: cls }, ic), ` ${label}`]),
|
||||
@@ -43,19 +44,19 @@ export function speedTile(rate: [number, number, number][], now: number, today:
|
||||
attachTip(chart, () => {
|
||||
const p = pts[pts.length - 1];
|
||||
return [
|
||||
E('div', { class: 'dl-tip-title' }, new Date(p[0] * 1000).toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' })),
|
||||
E('div', { class: 'dl-tip-title' }, new Date(p[0] * 1000).toLocaleTimeString(locale(), { hour: '2-digit', minute: '2-digit' })),
|
||||
E('div', {}, `↓ ${bits(p[2])} · ↑ ${bits(p[1])}`),
|
||||
];
|
||||
});
|
||||
return E('div', { class: 'dl-bento-tile' }, [
|
||||
E('div', { class: 'dl-bento-head' }, [
|
||||
E('span', { class: 'dl-metric-label' }, 'Speed now'),
|
||||
off ? '' : E('span', { class: 'dl-sub' }, 'last 15 min'),
|
||||
E('span', { class: 'dl-metric-label' }, _('Speed now')),
|
||||
off ? '' : E('span', { class: 'dl-sub' }, _('last 15 min')),
|
||||
]),
|
||||
E('div', { class: 'dl-speed-cols' }, [col('Download', '↓', 'dl-dn', down), col('Upload', '↑', 'dl-up', up)]),
|
||||
E('div', { class: 'dl-speed-cols' }, [col(_('Download', 'speed'), '↓', 'dl-dn', down), col(_('Upload', 'speed'), '↑', 'dl-up', up)]),
|
||||
chart,
|
||||
E('div', { class: 'dl-speed-today' }, [
|
||||
E('span', {}, ['Today ', E('b', {}, bytes(rx + tx))]),
|
||||
E('span', {}, fill(_('Today %s'), E('b', {}, bytes(rx + tx)))),
|
||||
E('span', {}, [E('span', { class: 'dl-dn' }, '↓'), ` ${bytes(tx)} `, E('span', { class: 'dl-up' }, '↑'), ` ${bytes(rx)}`]),
|
||||
]),
|
||||
]);
|
||||
@@ -75,7 +76,7 @@ export function daysTile(series: DayUsage[], note: string): HTMLElement {
|
||||
const v = vals[i];
|
||||
const bar = E('i', { class: i === days.length - 1 ? 'hi' : '', style: `height:${Math.max(4, (v / max) * 100)}%` });
|
||||
attachTip(bar, () => [
|
||||
E('div', { class: 'dl-tip-title' }, i === days.length - 1 ? `Today · ${dayLabel(d.day)}` : dayLabel(d.day)),
|
||||
E('div', { class: 'dl-tip-title' }, i === days.length - 1 ? `${_('Today')} · ${dayLabel(d.day)}` : dayLabel(d.day)),
|
||||
E('div', {}, bytes(v)),
|
||||
E('div', { class: 'dl-muted dl-mono' }, `↓ ${bytes(d.tx)} ↑ ${bytes(d.rx)}`),
|
||||
]);
|
||||
@@ -84,14 +85,14 @@ export function daysTile(series: DayUsage[], note: string): HTMLElement {
|
||||
);
|
||||
return E('div', { class: 'dl-bento-tile month' }, [
|
||||
E('div', { class: 'dl-bento-head' }, [
|
||||
E('span', {}, [E('span', { class: 'dl-metric-label' }, 'Last 30 days'), E('b', { class: 'dl-bento-total' }, bytes(total))]),
|
||||
vals[peakI] > 0 ? E('span', { class: 'dl-sub' }, `peak ${bytes(vals[peakI])} · ${dayLabel(days[peakI].day)}`) : '',
|
||||
E('span', {}, [E('span', { class: 'dl-metric-label' }, _('Last 30 days')), E('b', { class: 'dl-bento-total' }, bytes(total))]),
|
||||
vals[peakI] > 0 ? E('span', { class: 'dl-sub' }, `${fmt(_('peak %s'), bytes(vals[peakI]))} · ${dayLabel(days[peakI].day)}`) : '',
|
||||
]),
|
||||
days.length ? bars : E('p', { class: 'dl-muted' }, 'No traffic yet.'),
|
||||
days.length ? bars : E('p', { class: 'dl-muted' }, _('No traffic yet.')),
|
||||
E('div', { class: 'dl-bento-head' }, [
|
||||
E('span', { class: 'dl-sub' }, days.length ? dayLabel(days[0].day) : ''),
|
||||
E('span', { class: 'dl-sub' }, note),
|
||||
E('span', { class: 'dl-sub' }, 'today'),
|
||||
E('span', { class: 'dl-sub' }, _('today')),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
@@ -108,7 +109,7 @@ export function dayBars(series: DayUsage[]): HTMLElement {
|
||||
const bar = E('i', { class: `${vals[i] ? '' : 'zero'}${i === days.length - 1 ? ' hi' : ''}` });
|
||||
bar.style.height = `${Math.max(8, (vals[i] / max) * 100)}%`;
|
||||
attachTip(bar, () => [
|
||||
E('div', { class: 'dl-tip-title' }, i === days.length - 1 ? `Today · ${dayLabel(x.day)}` : dayLabel(x.day)),
|
||||
E('div', { class: 'dl-tip-title' }, i === days.length - 1 ? `${_('Today')} · ${dayLabel(x.day)}` : dayLabel(x.day)),
|
||||
E('div', {}, bytes(vals[i])),
|
||||
]);
|
||||
return bar;
|
||||
|
||||
Reference in new issue
Block a user