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
@@ -1,7 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
# Build the release packages with the OpenWrt SDK in Docker (as CI does):
|
||||
# scripts/build-packages.sh [ipk|apk|all]
|
||||
# Output: dist/luci-app-dawnline-<version>.{ipk,apk} and dist/sha256sums.txt
|
||||
# Output: dist/luci-app-dawnline-<version>.{ipk,apk}, a translation package per
|
||||
# po/<lang> (dist/luci-i18n-dawnline-<lang>-<version>.{ipk,apk}) and dist/sha256sums.txt
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
@@ -25,13 +26,29 @@ build() {
|
||||
rm -rf "$OUT/.$type" && mkdir -p "$OUT/.$type"
|
||||
docker cp "$id:/builder/out/." "$OUT/.$type/"
|
||||
docker rm "$id" >/dev/null
|
||||
local f
|
||||
f="$(find "$OUT/.$type" -type f -name "*.$type" | head -n1)"
|
||||
[ -n "$f" ] || { echo "no .$type built" >&2; exit 1; }
|
||||
# ipk names use underscores (luci-app-dawnline_0.1.0-r1_all.ipk): one stable name for both.
|
||||
mv "$f" "$OUT/luci-app-dawnline-$VERSION.$type"
|
||||
local f name
|
||||
for f in "$OUT/.$type"/*."$type"; do
|
||||
[ -f "$f" ] || continue
|
||||
# ipk names use underscores (luci-app-dawnline_0.1.0-r1_all.ipk), apk names
|
||||
# dashes: one stable name per package for both, its name and the version.
|
||||
name="$(basename "$f")"
|
||||
name="${name%%[_-][0-9]*}"
|
||||
mv "$f" "$OUT/$name-$VERSION.$type"
|
||||
echo "$OUT/$name-$VERSION.$type"
|
||||
done
|
||||
rm -rf "$OUT/.$type"
|
||||
echo "$OUT/luci-app-dawnline-$VERSION.$type"
|
||||
for name in luci-app-dawnline $(i18n_packages); do
|
||||
[ -f "$OUT/$name-$VERSION.$type" ] || { echo "no $name .$type built" >&2; exit 1; }
|
||||
done
|
||||
}
|
||||
|
||||
# The translation packages luci.mk makes: one per po/<lang>.
|
||||
i18n_packages() {
|
||||
local d
|
||||
for d in "$APP"/po/*/; do
|
||||
d="$(basename "$d")"
|
||||
[ "$d" = templates ] || printf 'luci-i18n-dawnline-%s\n' "$d"
|
||||
done
|
||||
}
|
||||
|
||||
case "$WHAT" in
|
||||
@@ -43,9 +60,10 @@ esac
|
||||
|
||||
(
|
||||
cd "$OUT"
|
||||
set -- luci-app-dawnline-"$VERSION".ipk luci-app-dawnline-"$VERSION".apk
|
||||
files=""
|
||||
for f in "$@"; do [ -f "$f" ] && files="$files $f"; done
|
||||
for name in luci-app-dawnline $(i18n_packages); do
|
||||
for f in "$name-$VERSION".ipk "$name-$VERSION".apk; do [ -f "$f" ] && files="$files $f"; done
|
||||
done
|
||||
# shellcheck disable=SC2086
|
||||
if command -v sha256sum >/dev/null; then sha256sum $files; else shasum -a 256 $files; fi > sha256sums.txt
|
||||
)
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
# Build the web bundles and pack luci-app-dawnline as a filesystem overlay
|
||||
# tarball: dist/luci-app-dawnline-<version>.tar.gz (paths relative to /).
|
||||
# This is the asset the in-app updater and install.sh install.
|
||||
# tarball: dist/luci-app-dawnline-<version>.tar.gz (paths relative to /), with
|
||||
# the translations as their packages lay them out (the catalogs compiled by
|
||||
# web/i18n/lmo.ts, byte for byte po2lmo's, and the uci-defaults that adds the
|
||||
# language to LuCI). scripts/deploy.sh installs it for development; releases
|
||||
# are the .ipk/.apk packages (build-packages.sh).
|
||||
set -euo pipefail
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
@@ -19,6 +22,15 @@ grep -q "\"version\": \"$VERSION\"" "$ROOT/web/package.json" || { echo "web/pack
|
||||
mkdir -p "$STAGE/www" "$OUT"
|
||||
cp -R "$APP/root/." "$STAGE/"
|
||||
cp -R "$APP/htdocs/." "$STAGE/www/"
|
||||
for po in "$APP"/po/*/dawnline.po; do
|
||||
l="$(basename "$(dirname "$po")")"
|
||||
[ "$l" = templates ] && continue
|
||||
mkdir -p "$STAGE/usr/lib/lua/luci/i18n"
|
||||
node "$ROOT/web/i18n/lmo.ts" "$po" "$STAGE/usr/lib/lua/luci/i18n/dawnline.$l.lmo"
|
||||
# The name LuCI lists the language by (luci.mk's LUCI_LANG.<lang>).
|
||||
case "$l" in ru) name='Русский (Russian)' ;; *) name="$l" ;; esac
|
||||
printf "uci set luci.languages.%s='%s'; uci commit luci\n" "$l" "$name" > "$STAGE/etc/uci-defaults/luci-i18n-dawnline-$l"
|
||||
done
|
||||
chmod 755 "$STAGE/usr/bin/dawnline" "$STAGE/usr/libexec/dawnline/agent" "$STAGE/usr/libexec/dawnline/updater" "$STAGE/usr/libexec/dawnline/resolver" "$STAGE/usr/libexec/dawnline/postupdate" \
|
||||
"$STAGE/etc/init.d/dawnline" "$STAGE/etc/uci-defaults/90_dawnline" "$STAGE/etc/hotplug.d/iface/95-dawnline" \
|
||||
"$STAGE/usr/share/dawnline/portal/www/cgi-bin/portal" "$STAGE/usr/share/dawnline/portal/cgi.uc"
|
||||
|
||||
@@ -20,6 +20,11 @@ ls -d /root/dawnline-predeploy-* 2>/dev/null | sort | head -n -5 | xargs -r rm -
|
||||
tar -xozf /tmp/luci-app-dawnline.tar.gz -C /
|
||||
rm -f /tmp/luci-app-dawnline.tar.gz
|
||||
sh /etc/uci-defaults/90_dawnline && rm -f /etc/uci-defaults/90_dawnline
|
||||
for f in /etc/uci-defaults/luci-i18n-dawnline-*; do
|
||||
if [ -f "$f" ]; then sh "$f" && rm -f "$f"; fi
|
||||
done
|
||||
# LuCI reads a language's catalogs once per web server: the new ones need a fresh one.
|
||||
/etc/init.d/uhttpd restart
|
||||
sleep 1
|
||||
ubus list luci.dawnline >/dev/null && echo "luci.dawnline registered (backup: /root/dawnline-predeploy-$ts)"
|
||||
REMOTE
|
||||
@@ -146,7 +146,7 @@ if methods and os.path.exists(ACL):
|
||||
# Layering (rules/backend.md): util, schema → core → store → domain modules →
|
||||
# apply → entry points. A module importing one from a layer above it is
|
||||
# reported, not failed, until the existing edges are untangled.
|
||||
LAYER = {'util': 0, 'schema': 1, 'core': 2, 'store': 3, 'apply': 5}
|
||||
LAYER = {'util': 0, 'i18n': 0, 'schema': 1, 'core': 2, 'store': 3, 'apply': 5}
|
||||
LAYER_NAME = {0: 'util', 1: 'schema', 2: 'core', 3: 'store', 4: 'domain', 5: 'apply'}
|
||||
notes = 0
|
||||
for f in modules:
|
||||
|
||||
Reference in new issue
Block a user