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
@@ -98,7 +98,12 @@ export function linkRow(url: string): HTMLElement {
|
||||
h('span', { class: 'mono' }, url.replace(/^https?:\/\//, '')),
|
||||
h(
|
||||
'button',
|
||||
{ type: 'button', class: 'knob', 'aria-label': 'Copy the link', onclick: (ev: Event) => copy(url, 'Link copied', ev.currentTarget) },
|
||||
{
|
||||
type: 'button',
|
||||
class: 'knob',
|
||||
'aria-label': _('Copy the link'),
|
||||
onclick: (ev: Event) => copy(url, _('Link copied'), ev.currentTarget),
|
||||
},
|
||||
ic('copy'),
|
||||
),
|
||||
share
|
||||
@@ -107,7 +112,7 @@ export function linkRow(url: string): HTMLElement {
|
||||
{
|
||||
type: 'button',
|
||||
class: 'knob',
|
||||
'aria-label': 'Share the link',
|
||||
'aria-label': _('Share the link'),
|
||||
onclick: () => navigator.share({ url, title: placeName() }).catch(() => undefined),
|
||||
},
|
||||
ic('share'),
|
||||
|
||||
@@ -43,7 +43,9 @@ export function toast(msg: string, bad = false) {
|
||||
|
||||
/**
|
||||
* The control that copied says so for a moment: its icon turns into a check
|
||||
* and a "Copy…" label (`.lbl`, a badge's main line) into "Copied".
|
||||
* and its "Copy…" label (`.lbl`, a badge's main line) into "Copied". Every
|
||||
* control that copies with a label says "Copy…" (in any language), so the
|
||||
* label is not read for the word.
|
||||
*/
|
||||
function copied(from: Element) {
|
||||
if (from.classList.contains('copied')) return;
|
||||
@@ -67,16 +69,16 @@ function copied(from: Element) {
|
||||
},
|
||||
);
|
||||
}
|
||||
if (label && /^Copy/.test(was)) morphText(label, 'Copied');
|
||||
if (label) morphText(label, _('Copied'));
|
||||
setTimeout(() => {
|
||||
if (check && icon) check.replaceWith(icon);
|
||||
if (label && /^Copy/.test(was)) morphText(label, was);
|
||||
if (label) morphText(label, was);
|
||||
from.classList.remove('copied');
|
||||
}, 1600);
|
||||
}
|
||||
|
||||
/** `from`: the control that copied, which then shows a check for a moment. */
|
||||
export async function copy(text: string, what = 'Copied', from?: EventTarget | null) {
|
||||
export async function copy(text: string, what = _('Copied'), from?: EventTarget | null) {
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
} catch {
|
||||
@@ -85,7 +87,7 @@ export async function copy(text: string, what = 'Copied', from?: EventTarget | n
|
||||
ta.select();
|
||||
const ok = document.execCommand('copy');
|
||||
ta.remove();
|
||||
if (!ok) return toast('Copying is blocked here. Select the text and copy it by hand.', true);
|
||||
if (!ok) return toast(_('Copying is blocked here. Select the text and copy it by hand.'), true);
|
||||
}
|
||||
if (from instanceof Element) copied(from);
|
||||
toast(what);
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
// The ⋯ menu: a small panel under (or over) its button, items with an icon,
|
||||
// a highlight that glides after the pointer and takes the item's colour
|
||||
// (orange for Reconnect, red for Remove). One at a time; it closes on a press
|
||||
// outside, on scroll, on Escape and when its button is pressed again.
|
||||
// (orange for Reconnect, red for Remove). A choice among options (the
|
||||
// language) marks the current one with a check instead of icons. One at a
|
||||
// time; it closes on a press outside, on scroll, on Escape and when its button
|
||||
// is pressed again.
|
||||
|
||||
import { h, ic } from '../dom';
|
||||
import { EASE_IN, POP, play } from '../motion';
|
||||
|
||||
export interface MenuItem {
|
||||
label: string;
|
||||
icon: string;
|
||||
/** An action's icon; an option (`checked` set) shows a check in its place, on the current one only. */
|
||||
icon?: string;
|
||||
checked?: boolean;
|
||||
tone?: 'warn' | 'bad';
|
||||
run: () => unknown;
|
||||
}
|
||||
@@ -53,14 +57,15 @@ export function openMenu(anchor: HTMLElement, all: (MenuItem | null)[]) {
|
||||
'button',
|
||||
{
|
||||
type: 'button',
|
||||
role: 'menuitem',
|
||||
role: it.checked === undefined ? 'menuitem' : 'menuitemradio',
|
||||
'aria-checked': it.checked === undefined ? null : String(it.checked),
|
||||
class: `mi ${it.tone ?? ''}`,
|
||||
onclick: () => {
|
||||
closeMenu();
|
||||
it.run();
|
||||
},
|
||||
},
|
||||
ic(it.icon),
|
||||
it.checked === undefined ? ic(it.icon ?? '') : ic('check', it.checked ? 'i' : 'i off'),
|
||||
h('span', {}, it.label),
|
||||
);
|
||||
// The highlight comes in where the pointer is, then glides from item to item.
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
// "iPad connected"), and a menu path for another app or the other phone system
|
||||
// (`menuLine`: where the app scans, iOS "Create", Android "Scan").
|
||||
|
||||
import { fmt } from '../../shared/i18n';
|
||||
import { h, ic, markup, put, type Kid } from '../dom';
|
||||
import { EASE_IN, EASE_OUT, POP, SMOOTH, calm, play } from '../motion';
|
||||
|
||||
@@ -229,8 +230,8 @@ export function morphText(el: HTMLElement, next: string, from = textOf(el), o: M
|
||||
easing: SMOOTH.easing,
|
||||
});
|
||||
});
|
||||
const out = was.filter((_, i) => !stays.has(i));
|
||||
const inn = now.filter((_, j) => !comes.has(j));
|
||||
const out = was.filter((_x, i) => !stays.has(i));
|
||||
const inn = now.filter((_x, j) => !comes.has(j));
|
||||
// A long text keeps the same overall sweep: the steps shorten instead.
|
||||
const so = Math.min(12, 160 / Math.max(1, out.length));
|
||||
const si = Math.min(22, 260 / Math.max(1, inn.length));
|
||||
@@ -521,7 +522,7 @@ export function menuLine(ios: string, android: string): MenuLine {
|
||||
);
|
||||
|
||||
const set = (i: string, a: string) => {
|
||||
el.setAttribute('aria-label', (i === a ? i : `${i} (Android: ${a.split(' → ').pop()})`).replace(/ → /g, ' › '));
|
||||
el.setAttribute('aria-label', (i === a ? i : fmt(_('%s (Android: %s)'), i, a.split(' → ').pop())).replace(/ → /g, ' › '));
|
||||
const I = i.split(' → ');
|
||||
const A = a.split(' → ');
|
||||
const next = I.map((s, n) => cut(s, A[n] ?? s));
|
||||
|
||||
@@ -14,7 +14,7 @@ export interface View {
|
||||
el: HTMLElement;
|
||||
/** The sheet's accessible name while this view shows (its title). */
|
||||
label: string;
|
||||
/** A question (Remove, Reconnect): an alert dialog. */
|
||||
/** A question (Remove, Reconnect): an alert dialog, closed by its Cancel (no ×). */
|
||||
asks?: boolean;
|
||||
/** Its own buttons, pinned beside × while it shows. */
|
||||
acts?: HTMLElement | null;
|
||||
@@ -108,7 +108,7 @@ export function startWidth(p: WidthPlan | null) {
|
||||
/* ---------- the drawer ---------- */
|
||||
|
||||
function build() {
|
||||
closeBtn = h('button', { type: 'button', class: 'knob x', 'aria-label': 'Close', onclick: () => closeSheet() }, ic('x'));
|
||||
closeBtn = h('button', { type: 'button', class: 'knob x', onclick: () => closeSheet() }, ic('x'));
|
||||
actsEl = h('div', { class: 'sheet-acts' });
|
||||
vp = h('div', { class: 'vp' });
|
||||
scroller = h('div', { class: 'sheet-scroll' }, vp);
|
||||
@@ -122,7 +122,10 @@ function build() {
|
||||
|
||||
function label(v: View) {
|
||||
sheetEl.setAttribute('aria-label', v.label);
|
||||
// Built once, named each time: the language may have changed since.
|
||||
closeBtn.setAttribute('aria-label', _('Close'));
|
||||
sheetEl.setAttribute('role', v.asks ? 'alertdialog' : 'dialog');
|
||||
sheetEl.classList.toggle('asks', !!v.asks);
|
||||
}
|
||||
|
||||
/** The view being left (a new one, or the sheet closing) lets go of what it holds. */
|
||||
@@ -466,7 +469,7 @@ export function head(title: string, o: { back?: boolean; acts?: boolean } = {}):
|
||||
return h(
|
||||
'div',
|
||||
{ class: `vhead${o.back ? ' center' : ''}${o.acts ? ' with-acts' : ''}` },
|
||||
o.back ? h('button', { type: 'button', class: 'knob back', 'aria-label': 'Back', onclick: back }, ic('chevron')) : null,
|
||||
o.back ? h('button', { type: 'button', class: 'knob back', 'aria-label': _('Back'), onclick: back }, ic('chevron')) : null,
|
||||
h('h2', {}, title),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user