Thore Cimbal
88c4e155ce
The repo had no upstream ancestry: a whole tree arrived in one commit in May, so
every update meant re-applying our patches by hand onto a fresh checkout, and a file
Element moved would take our lines with it silently.
The real base was found by measuring tree distance across develop rather than trusting
the changelog: deadd548, not the v1.12.17 tag. With that set as a temporary graft, this
merge computed as a proper three-way merge - 32 conflicts instead of 1757.
Resolutions, each decided rather than defaulted:
- 24 GitHub workflows stay deleted; we build on GitLab CI.
- MImageBody.tsx is gone upstream, migrated to MVVM. Our ClamAV error label moved into
ImageBodyViewModel.computeErrorLabel, ahead of the DecryptError branch, matching what
VideoBodyViewModel and FileBodyViewModel already do.
- Upstream extracted the room list item body into RoomListItemContent. Our call
participants list and its getInitials helper moved there; both sides' CSS classes and
both sides' props are kept.
- matrix-js-sdk follows upstream at 42.2.0 - our git ref pin was a workaround for a
stale ref, and following upstream is the point of this merge.
- Element Call stays ours. Checked before deciding: @element-hq/element-call-embedded
is referenced nowhere in the tree, while webpack.config.ts needs
@sorb/threadnet-call-embedded, so taking upstream's line would have deleted the noise
suppression from #0054 without a word.
The lockfile was regenerated with pnpm 11.20.0, which upstream now requires through
devEngines. CI already runs corepack enable, and onFail: download makes it fetch that
version by itself.
Not yet accepted: this needs a build and the ClamAV functional test - send an encrypted
file, receive a rejected one - before it goes near main.
89 lines
2.6 KiB
JavaScript
89 lines
2.6 KiB
JavaScript
#!/usr/bin/env node
|
|
|
|
/*
|
|
Copyright 2026 Element Creations Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
// copies resources into the lib directory.
|
|
|
|
import parseArgs from "minimist";
|
|
import * as chokidar from "chokidar";
|
|
import path from "node:path";
|
|
import * as fs from "node:fs";
|
|
|
|
const argv = parseArgs(process.argv.slice(2), {});
|
|
|
|
const watch = argv.w;
|
|
const verbose = argv.v;
|
|
|
|
function errCheck(err: unknown): void {
|
|
if (err) {
|
|
console.error(err instanceof Error ? err.message : err);
|
|
process.exit(1);
|
|
}
|
|
}
|
|
|
|
const I18N_BASE_PATH = "src/i18n/strings/";
|
|
const INCLUDE_LANGS = fs.readdirSync(I18N_BASE_PATH).filter((fn) => fn.endsWith(".json"));
|
|
|
|
// Ensure lib, lib/i18n and lib/i18n/strings all exist
|
|
fs.mkdirSync("lib/i18n/strings", { recursive: true });
|
|
|
|
type Translations = Record<string, Record<string, string> | string>;
|
|
|
|
function genLangFile(file: string, dest: string): void {
|
|
const translations: Translations = {};
|
|
[file].forEach(function (f) {
|
|
if (fs.existsSync(f)) {
|
|
try {
|
|
Object.assign(translations, JSON.parse(fs.readFileSync(f).toString()));
|
|
} catch (e) {
|
|
console.error("Failed: " + f, e);
|
|
throw e;
|
|
}
|
|
}
|
|
});
|
|
|
|
const json = JSON.stringify(translations, null, 4);
|
|
const filename = path.basename(file);
|
|
|
|
fs.writeFileSync(dest + filename, json);
|
|
if (verbose) {
|
|
console.log("Generated language file: " + filename);
|
|
}
|
|
}
|
|
|
|
/*
|
|
watch the input files for a given language,
|
|
regenerate the file, and regenerating languages.json with the new filename
|
|
*/
|
|
function watchLanguage(file: string, dest: string): void {
|
|
// XXX: Use a debounce because for some reason if we read the language
|
|
// file immediately after the FS event is received, the file contents
|
|
// appears empty. Possibly https://github.com/nodejs/node/issues/6112
|
|
let makeLangDebouncer: NodeJS.Timeout | undefined;
|
|
const makeLang = (): void => {
|
|
if (makeLangDebouncer) {
|
|
clearTimeout(makeLangDebouncer);
|
|
}
|
|
makeLangDebouncer = setTimeout(() => {
|
|
genLangFile(file, dest);
|
|
}, 500);
|
|
};
|
|
|
|
chokidar.watch(file).on("add", makeLang).on("change", makeLang).on("error", errCheck);
|
|
}
|
|
|
|
// language resources
|
|
const I18N_DEST = "lib/i18n/strings/";
|
|
INCLUDE_LANGS.forEach((file): void => {
|
|
genLangFile(I18N_BASE_PATH + file, I18N_DEST);
|
|
}, {});
|
|
|
|
if (watch) {
|
|
INCLUDE_LANGS.forEach((file) => watchLanguage(I18N_BASE_PATH + file, I18N_DEST));
|
|
}
|