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 / Backend (Go: vet, tests, a real ubusd and uhttpd) (push) Blocked by required conditions
CI / Package files (push) Blocked by required conditions
- **Backend rewritten in Go.** One daemon, `dawnlined`, replaces the whole ucode backend: the rpcd plugin, the agent, the CLI and the updater. The package no longer depends on ucode. - **Per-architecture builds.** The release carries the backend for arm64, ARMv7, mips, mipsle and amd64; the router fetches its own after the package is installed and checks its sha256. Dawnline does not run on other architectures (older ARM, 32-bit x86, RISC-V). - **Faster on the router.** A firewall sync takes 0.06 s instead of 0.9 s; a full apply takes about 300 ms. The portal is served by the daemon itself, without a CGI process per request. - **Live pages.** The admin and the portal follow a live stream from the router instead of re-fetching the whole state every 30 seconds. - **Admin redesigned in the portal's style.** Three sections (Overview · Log · Settings); a server is a page of its own with People, Places and Settings; a device opens as a dialog over its person. - **Changes wait for «Apply».** Every setting, and a person's access, is staged in one dock before it reaches the router. - **Configuration rollout.** After a change that makes devices fetch their configuration again, the admin shows how many have fetched it and who has not. Every setting shows beforehand (⟳N) how many devices it will touch. - **Waiting for a decision.** Overview and People put first the people who need one (access ended, limit reached, a device that does not connect), each with its one action a tap away. - **Bulk actions on people.** «Select» (or a long press on a card) picks several people to extend by a month, pause or resume at once. - **Undo.** An action done from a card or a request is undone from its toast. - **Update dialogs redesigned.** An update is one view from its question to its result; Dawnline's own update runs in it like every other, and the page reloads itself once the new version answers. Other versions are a list, each with its notes and Install on a page of its own. - **Site to site: networks behind a router.** A router connected as a device can have networks behind it (up to eight, /16 to /30): the server routes them and applies the router's access to them. A network that shares addresses with a tunnel, the router's own networks or another site is refused by name. - **Routers from the portal.** People can add a router and name its networks on their own page; the admin accepts or declines with a reason, or lets them through without asking. - **Check access and Health know the networks behind routers.** - **Usage limits reworked.** A monthly limit no longer follows the calendar. A person's month starts with their first traffic and ends a month later; the next one starts only when they connect again, so time away uses up none of it. Before, everyone's limit reset on the 1st. - Extra data lasts until that person's month ends; «Reset usage» starts the month anew. - A limit is for a month or for the whole term; the admin and the portal show when it resets. - Charts that said «this month» show the last 30 days. - After the update nobody loses what was counted: the month that was running becomes the person's first and ends on the 1st. - **Access by time of day removed.** The Hours limit is gone from the admin, the portal and the backend; saved hours are dropped. - **Expiry simplified.** An end date always stops access, with a heads-up three days before; the per-person choice is gone. - **No false disconnects from sleeping phones.** A phone or a tablet stays online through ten minutes of silence. - **Mobile Safari fixes.** Pressing a control no longer sends the page to its top; tab tracks that do not fit scroll; switches animate after a press.
13 KiB
13 KiB
Translations (admin UI, portal, backend messages)
Dawnline is written in English and translated through gettext catalogs. Russian is the first translation. Read with frontend.md (and backend-go.md for messages the router sends).
The rule
- What is added is localized in the same change. A new page, section, control, toast, error, check or log line in the admin UI, the portal or the backend comes with its strings wrapped (
_(),N_(),plural(),L_()) and translated in everyru.po. Not "later": CI refuses a catalog with an untranslated string. - What is removed leaves nothing behind. Deleting or rewording text deletes its old entries:
npm run i18ndrops every entry no code uses any more, andnpm run i18n:check(CI) fails while a catalog still holds one. No dead entries, no hand-kept leftovers, no commented-out translations: the catalogs follow the code, as the code followscode-standards.md("Delete, don't deprecate"). - Every change to visible text is checked in Russian too: the wording against the glossary below, the layout at narrow widths (Russian runs longer).
How it fits together
- Admin UI (LuCI). Every visible string goes through LuCI's globals
_()andN_(). The catalog ispackage/luci-app-dawnline/po/ru/dawnline.po; luci.mk compiles it with po2lmo into the separate packageluci-i18n-dawnline-ru(/usr/lib/lua/luci/i18n/dawnline.ru.lmo, plus the uci-defaults that adds Russian to LuCI's languages). LuCI loads it when the page language is Russian (luci.main.lang, orautowith a Russian browser). Without the package everything stays English. The LuCI menu titles (menu.d) are in the same catalog. - Portal. Not LuCI: it carries its own catalog (
web/src/portal/i18n/ru.po, made into a lookup table at build time and bundled intoportal.js), so it speaks Russian on every router, with or without the admin's package.portal/i18n.tsinstalls_()/N_()with LuCI's meaning, opens in the visitor's kept choice or the browser's language, and the language menu in the breadcrumb switches it in place. The demo's own strings are inweb/src/portal/demo/i18n/. - Shared code (
web/src/shared) runs in both and is in both catalogs. - Backend messages (refusals, health checks, endpoint verdicts, the updater's phases, the portal's answers) are English sentences in the Go code, put into the reader's language by the catalog (
i18n.Catalog.T,N) and listed inbackend/i18n/messages.js(andportal-messages.jsfor what reaches the portal's visitors): the extractor reads those two files, not Go. A sentence the backend says that is not listed there has no translation: add or change it there in the same change, thennpm run i18nand translate.L_()there marks a line of the service log (written in English, translated where it is shown). The admin page sends its language with every call (lang, added byweb/src/admin/api.ts), the updater gets it from the job's start (DAWNLINE_LANG), the portal fromAccept-Language. - Delivery. The release has
luci-i18n-dawnline-ru-<version>.{ipk,apk}next to the app.install.shadds it when LuCI is in Russian (its setting, orluci-i18n-base-ruinstalled) or with--lang ru; the updater installs it with every Dawnline update when it is installed; Components → Dawnline → Translation adds or removes it. LuCI reads a language's catalogs once per web server process, so each of these restarts uhttpd afterwards. - Collecting.
npm run i18n(inweb/) reads the code and rewrites the.pottemplates and the.pofiles: new strings are added untranslated, gone ones removed, translations kept (and reused across catalogs).npm run i18n:check(CI) fails when a catalog is out of date, a string is untranslated, or a translation lost a placeholder. After changing visible text: runnpm run i18n, translate the new entries in eachru.po, commit the catalogs with the code.
Writing strings
- Every visible string is wrapped: text, buttons, headings, toasts, errors, tooltips (
title),aria-label,placeholder,alt, the page title, confirm dialogs, CSV headers. Not wrapped: product and protocol names standing alone (Dawnline, AmneziaWG, WireGuard, OpenWrt, LuCI), ids, keys, paths, commands, package names, CSS classes, URLs, values sent to the router, log/event ids,consoleoutput. - Literals only.
_('Save'), never_(label)or_(`Hello ${name}`): the extractor cannot collect them and fails. Placeholders%s(or%d) are filled withfmt()fromshared/i18n.ts:fmt(_('Removed %s'), name). - Whole sentences. Never glue a sentence from pieces (
'Removed ' + name + ' from ' + circle, or_('ends') + ' ' + date): word order and case endings differ. One msgid per sentence with placeholders. Pieces joined by separators (PC · 10.0.0.2 · online) are separate facts and stay separate strings. - Elements inside a sentence (a link, a
<b>):fill(_('Install it in %s'), link)returns the children forE()/h(). The link text is its own_(). - Counts go through
plural(n, '%s device', '%s devices')(number formatted, both forms literals) orN_(n, 'Device', 'Devices')when the number is not in the text. Nevern === 1 ? … : …or`${n} devices`: Russian has three forms (1 устройство, 2 устройства, 5 устройств), and 21 takes the singular. Use them even where English always has the plural. - Numbers and dates in the page's language:
num(n)(2,000 / 2 000),num(v, 1)for one decimal,bytes(),fmtDay(),toLocaleDateString(locale(), …). Never a hard-coded'en-GB'ortoFixed()for shown numbers. - Text is made when it is drawn, inside functions, never at module level in the portal and the shared code (the portal changes language in place; the extractor refuses it there). A table of labels becomes a function:
kindLabel(k)inshared/format.ts. - Context when one English word means two things:
_('Off', 'state')vs_('Off', 'switch'). Use it only for real clashes. - Whitespace and line breaks are not part of a msgid: no leading/trailing spaces, no double spaces, no
\n(LuCI squeezes whitespace before the lookup; po2lmo cannot carry newlines). Put spacing in the markup or the separator. - Keep the English as it is when wrapping, except to turn a glued sentence into one with placeholders.
- Other apps' labels (the menus of AmneziaVPN, WireGuard and AmneziaWG in set-up steps) are quoted word for word, with a context of their own (
_('Create from QR code', 'WireGuard app')), and translated with the app's own Russian from its sources (English where the app has no Russian). Where they come from is noted inportal/setup.ts. - Messages from the router arrive in the page's language already (admin) or are translated with
routerText()(portal): never glue them into a sentence of the page's own; ask the backend for a whole sentence instead.
Writing backend messages
import { _, N_ } from 'dawnline.i18n';and wrap literals only:die(_('Backup not found.')),die(sprintf(_('Download failed: %s'), asset)),sprintf(N_(n, '%d device', '%d devices'), n). Placeholders%sand%donly, filled after the lookup._()inside functions only: rpcd keeps the modules loaded and the language changes with each call (the extractor refuses module-level calls).- Wrap what a person reads in LuCI or the portal; leave ids, status values, command lines and sentinels alone.
- Messages a portal visitor can get belong in
portal.ucordevices.ucand are best static sentences: the page can translate those without the package. - Service log lines (
slog()and the watchdog's problem/back/what texts) are written once, in English, by processes with no language (the agent), and read later. Mark their words withL_()instead of_():slog('awg', 'up', sprintf(L_('updated · %s → %s'), a, b), null, L_('System packages')).L_returns the English; the extractor collects it into the catalog and intoweb/src/admin/events/log-templates.ts, and the admin page matches each line against those templates and translates it (logText()inevents/model.ts), values and nested templates included. Keep a template's English when you touch it (lines already in logs match it), and give the Russian the agreement its subject needs; a translation may start with «:» to go on after the subject («Сервер Home: AmneziaWG не работает»).
Russian
Write like a careful Russian product (Telegram, Яндекс), not a word-for-word translation.
- Tone: polite and short, «вы» in lower case. Buttons and menu items are verbs in the infinitive (perfective where it fits): «Сохранить», «Удалить», «Скопировать», «Добавить устройство», «Изменить»; «Отмена» for Cancel, «Закрыть», «Готово», «Назад», «Далее».
- States in forms that fit any person: «На паузе» (not «Приостановлен/а»), «Доступ закончился», «В сети» / «Не в сети». Prefer constructions without gender; when unavoidable, masculine as the neutral form.
- Typography: «ёлочки» for quotes, «ё» where it belongs (ещё, всё, истёк), the ellipsis character «…». No em dashes (—): where a dash is needed, a plain one with spaces ( - ), or a colon or a comma (the catalog check refuses «—»). Ranges keep the en dash (1–32, 07:00–23:00). Numbers with a space before units: «1,5 ГБ», «20 Мбит/с».
- Units: Б, КБ, МБ, ГБ, ТБ; бит/с, кбит/с, Мбит/с, Гбит/с; «5 мин назад», «3 ч назад», «2 дн. назад»; «2 д 5 ч», «5 ч 12 мин», «12 мин».
- Length: Russian runs ~20–30% longer. Keep buttons, pills, tabs and segmented controls short (abbreviate or rephrase), and check the layout in the browser at narrow widths.
- Product and technical names stay as they are: Dawnline, AmneziaWG, AmneziaVPN, WireGuard, OpenWrt, LuCI, GitHub, Cloudflare, Let's Encrypt, DDNS, DNS, MTU, UDP, TCP, IPv4/IPv6, NAT, CGNAT, LAN, WAN, QR-код, opkg/apk.
Glossary
| English | Russian |
|---|---|
| server | сервер |
| person / people (the page) | человек / люди («Люди»); Add person — «Добавить человека» |
| device | устройство |
| circle | круг |
| access | доступ |
| home network | домашняя сеть |
| internet | интернет |
| home network + internet | домашняя сеть и интернет |
| LAN Bypass (a device's option) | обход локальной сети («Обход локальной сети») |
| portal, personal link, personal page | портал, личная ссылка, личная страница |
| invite (card) | приглашение (карточка приглашения) |
| disguise; Off / Balanced / Maximum | маскировка; Выкл. / Сбалансированная / Максимальная |
| data limit | лимит трафика |
| usage, traffic | трафик |
| end date; ends in 3 days | дата окончания; закончится через 3 дня |
| pause / resume; paused | приостановить / возобновить; на паузе |
| online / offline; last seen 12 min ago | в сети / не в сети; «В сети 12 мин назад» (not «Было в сети») |
| set up a device; setup | настроить устройство; настройка |
| app | приложение |
| key, public key, private key | ключ, публичный ключ, приватный ключ |
| configuration file (.conf) | файл конфигурации (.conf) |
| endpoint, public address | адрес сервера, публичный адрес |
| port, port forward | порт, проброс порта |
| tunnel | туннель |
| handshake | рукопожатие |
| router | роутер |
| firewall, zone | межсетевой экран, зона |
| interface, network | интерфейс, сеть |
| certificate | сертификат |
| Overview / Servers / People / Activity | Обзор / Серверы / Люди / События |
| Diagnostics / Health / Logs | Диагностика / Состояние / Журналы |
| Settings / Components / Updates | Настройки / Компоненты / Обновления |
| backup, restore | резервная копия, восстановить |
| check (health), fix | проверка, исправить |
| What's new | Что нового |
| Advanced | Дополнительно |
| watchdog | автовосстановление |
| places (map) | места |
| Copied | Скопировано |
| Undo | Отменить |