diff --git a/README.md b/README.md index afa7ea20ce..d6f1a30cb0 100644 --- a/README.md +++ b/README.md @@ -316,7 +316,7 @@ Report vulnerabilities through [SECURITY.md](SECURITY.md). Thanks to everyone using REA, reporting bugs, requesting features, testing builds, and contributing fixes. - REA contributors + REA contributors diff --git a/docs/readme/README_ar.md b/docs/readme/README_ar.md index adc06da3ba..ccd218e360 100644 --- a/docs/readme/README_ar.md +++ b/docs/readme/README_ar.md @@ -275,7 +275,7 @@ npx rea-agents@latest setup شكرًا لكل من يستخدم REA، ويبلّغ عن الأخطاء، ويقترح ميزات، ويختبر إصدارات البناء، ويساهم بالإصلاحات. - المساهمون في REA + المساهمون في REA diff --git a/docs/readme/README_bg.md b/docs/readme/README_bg.md index 650c0c5da0..d5b74e7f5f 100644 --- a/docs/readme/README_bg.md +++ b/docs/readme/README_bg.md @@ -328,7 +328,7 @@ npx rea-agents@latest setup Благодарим на всички, които използват REA, съобщават за грешки, предлагат нови функции, тестват версии и допринасят с поправки. - Участници в проекта REA + Участници в проекта REA diff --git a/docs/readme/README_de.md b/docs/readme/README_de.md index 40d97ebe1d..7a7b6f86e0 100644 --- a/docs/readme/README_de.md +++ b/docs/readme/README_de.md @@ -273,7 +273,7 @@ Melde Sicherheitslücken gemäß [SECURITY.md](../../SECURITY.md). Danke an alle, die REA nutzen, Fehler melden, Funktionswünsche äußern, Builds testen und Fehlerbehebungen beitragen. - Mitwirkende an REA + Mitwirkende an REA diff --git a/docs/readme/README_el.md b/docs/readme/README_el.md index 69b2974909..9ccd94ef51 100644 --- a/docs/readme/README_el.md +++ b/docs/readme/README_el.md @@ -275,7 +275,7 @@ npx rea-agents@latest setup Ευχαριστούμε όλους όσοι χρησιμοποιούν το REA, αναφέρουν σφάλματα, ζητούν νέες λειτουργίες, δοκιμάζουν builds και συνεισφέρουν διορθώσεις. - Όσοι συνεισφέρουν στο REA + Όσοι συνεισφέρουν στο REA diff --git a/docs/readme/README_es.md b/docs/readme/README_es.md index d1150629a2..8ccf8b7b10 100644 --- a/docs/readme/README_es.md +++ b/docs/readme/README_es.md @@ -273,7 +273,7 @@ Informa de vulnerabilidades siguiendo [SECURITY.md](../../SECURITY.md). Gracias a quienes usan REA, informan de errores, solicitan funciones, prueban compilaciones y contribuyen con correcciones. - Colaboradores de REA + Colaboradores de REA diff --git a/docs/readme/README_fa.md b/docs/readme/README_fa.md index 5ca83d7dbb..6695050f60 100644 --- a/docs/readme/README_fa.md +++ b/docs/readme/README_fa.md @@ -258,7 +258,7 @@ npx rea-agents@latest setup از همهٔ کسانی که از REA استفاده می‌کنند، خطاها را گزارش می‌دهند، قابلیت‌های جدید پیشنهاد می‌کنند، buildها را آزمایش می‌کنند و در بهبود پروژه مشارکت دارند سپاسگزاریم. - مشارکت‌کنندگان REA + مشارکت‌کنندگان REA تاریخچهٔ ستاره‌های GitHub پروژهٔ REA diff --git a/docs/readme/README_fr.md b/docs/readme/README_fr.md index 9bcd958845..e683d28141 100644 --- a/docs/readme/README_fr.md +++ b/docs/readme/README_fr.md @@ -274,7 +274,7 @@ Signalez les vulnérabilités via [SECURITY.md](../../SECURITY.md). Merci à toutes les personnes qui utilisent REA, signalent des bugs, proposent des fonctionnalités, testent les builds et contribuent des correctifs. - Personnes ayant contribué à REA + Personnes ayant contribué à REA diff --git a/docs/readme/README_id.md b/docs/readme/README_id.md index bad8a06eac..a2cb0affcd 100644 --- a/docs/readme/README_id.md +++ b/docs/readme/README_id.md @@ -285,7 +285,7 @@ Laporkan kerentanan melalui [SECURITY.md](../../SECURITY.md). Terima kasih kepada semua orang yang menggunakan REA, melaporkan bug, meminta fitur, menguji build, dan berkontribusi dalam perbaikan. - Kontributor REA + Kontributor REA diff --git a/docs/readme/README_it.md b/docs/readme/README_it.md index d791099259..483c6ec0f6 100644 --- a/docs/readme/README_it.md +++ b/docs/readme/README_it.md @@ -274,7 +274,7 @@ Segnala vulnerabilità tramite [SECURITY.md](../../SECURITY.md). Grazie a tutti coloro che usano REA, segnalano bug, propongono funzionalità, testano le build e contribuiscono con correzioni. - Chi contribuisce a REA + Chi contribuisce a REA diff --git a/docs/readme/README_ja.md b/docs/readme/README_ja.md index 7d3c4a1747..9b84b4d4ae 100644 --- a/docs/readme/README_ja.md +++ b/docs/readme/README_ja.md @@ -275,7 +275,7 @@ npx rea-agents@latest setup REA の利用、バグ報告、機能の要望、ビルドのテスト、修正への貢献に感謝します。 - REA のコントリビューター + REA のコントリビューター diff --git a/docs/readme/README_ko.md b/docs/readme/README_ko.md index 35f108fba0..db4807391f 100644 --- a/docs/readme/README_ko.md +++ b/docs/readme/README_ko.md @@ -275,7 +275,7 @@ npx rea-agents@latest setup REA를 사용하고, 버그를 보고하고, 기능을 요청하고, 빌드를 테스트하고, 수정에 기여해 주신 모든 분께 감사드립니다. - REA 기여자 + REA 기여자 diff --git a/docs/readme/README_ml.md b/docs/readme/README_ml.md index 7d7cf6e2ef..04511b0f05 100644 --- a/docs/readme/README_ml.md +++ b/docs/readme/README_ml.md @@ -278,7 +278,7 @@ npx rea-agents@latest setup REA ഉപയോഗിക്കുന്നവർക്കും, bugs റിപ്പോർട്ട് ചെയ്യുന്നവർക്കും, features ആവശ്യപ്പെടുന്നവർക്കും, builds പരിശോധിക്കുന്നവർക്കും, fixes സംഭാവന ചെയ്യുന്നവർക്കും നന്ദി. - REA പദ്ധതിയിൽ സംഭാവന നൽകിയവർ + REA പദ്ധതിയിൽ സംഭാവന നൽകിയവർ diff --git a/docs/readme/README_pl.md b/docs/readme/README_pl.md index 8a6951eb26..2d2b7dbb84 100644 --- a/docs/readme/README_pl.md +++ b/docs/readme/README_pl.md @@ -273,7 +273,7 @@ Zgłaszaj podatności zgodnie z [SECURITY.md](../../SECURITY.md). Dziękujemy wszystkim, którzy używają REA, zgłaszają błędy, proponują nowe funkcje, testują kompilacje i przesyłają poprawki. - Współtwórcy REA + Współtwórcy REA diff --git a/docs/readme/README_pt-BR.md b/docs/readme/README_pt-BR.md index b804aef3e9..e4d6842ccc 100644 --- a/docs/readme/README_pt-BR.md +++ b/docs/readme/README_pt-BR.md @@ -273,7 +273,7 @@ Relate vulnerabilidades conforme [SECURITY.md](../../SECURITY.md). Obrigado a todos que usam o REA, relatam bugs, sugerem funcionalidades, testam builds e contribuem com correções. - Colaboradores do REA + Colaboradores do REA diff --git a/docs/readme/README_ro.md b/docs/readme/README_ro.md index d20f9ddd01..8e5ab9cd91 100644 --- a/docs/readme/README_ro.md +++ b/docs/readme/README_ro.md @@ -316,7 +316,7 @@ Mulțumim tuturor celor care folosesc REA, raportează erori, propun funcțional testează versiuni și contribuie cu remedieri. - Colaboratorii REA + Colaboratorii REA diff --git a/docs/readme/README_ru.md b/docs/readme/README_ru.md index ef5c768e8e..4c708feaf2 100644 --- a/docs/readme/README_ru.md +++ b/docs/readme/README_ru.md @@ -273,7 +273,7 @@ npx rea-agents@latest setup Спасибо всем, кто использует REA, сообщает об ошибках, предлагает новые функции, тестирует сборки и помогает с исправлениями. - Участники проекта REA + Участники проекта REA diff --git a/docs/readme/README_th.md b/docs/readme/README_th.md index b386b1bce6..fa99431853 100644 --- a/docs/readme/README_th.md +++ b/docs/readme/README_th.md @@ -273,7 +273,7 @@ npx rea-agents@latest setup ขอบคุณทุกคนที่ใช้ REA รายงานบั๊ก เสนอฟีเจอร์ ทดสอบบิลด์ และช่วยแก้ไข - ผู้ร่วมพัฒนา REA + ผู้ร่วมพัฒนา REA diff --git a/docs/readme/README_tr.md b/docs/readme/README_tr.md index 6fe2cdb6cc..35c7a6bd44 100644 --- a/docs/readme/README_tr.md +++ b/docs/readme/README_tr.md @@ -273,7 +273,7 @@ Güvenlik açıklarını [SECURITY.md](../../SECURITY.md) üzerinden bildirin. REA'yı kullanan, hata bildiren, özellik talep eden, derlemeleri test eden ve düzeltmelere katkıda bulunan herkese teşekkürler. - REA’ya katkıda bulunanlar + REA’ya katkıda bulunanlar diff --git a/docs/readme/README_uk.md b/docs/readme/README_uk.md index 5c5126dee5..037f576c07 100644 --- a/docs/readme/README_uk.md +++ b/docs/readme/README_uk.md @@ -273,7 +273,7 @@ npx rea-agents@latest setup Дякуємо всім, хто використовує REA, повідомляє про помилки, пропонує нові функції, тестує збірки й допомагає з виправленнями. - Учасники проєкту REA + Учасники проєкту REA diff --git a/docs/readme/README_ur-Latn.md b/docs/readme/README_ur-Latn.md index b1e9f4a1de..5940e5cc42 100644 --- a/docs/readme/README_ur-Latn.md +++ b/docs/readme/README_ur-Latn.md @@ -320,7 +320,7 @@ REA use karne, bugs report karne, features suggest karne, builds test karne aur fixes contribute karne wale sab logon ka shukriya. - REA mein hissa lene wale + REA mein hissa lene wale diff --git a/docs/readme/README_vi.md b/docs/readme/README_vi.md index 15298845e7..21402f0c61 100644 --- a/docs/readme/README_vi.md +++ b/docs/readme/README_vi.md @@ -273,7 +273,7 @@ Báo cáo lỗ hổng theo [SECURITY.md](../../SECURITY.md). Cảm ơn mọi người đã sử dụng REA, báo lỗi, đề xuất tính năng, kiểm thử bản dựng và đóng góp bản sửa lỗi. - Những người đóng góp cho REA + Những người đóng góp cho REA diff --git a/docs/readme/README_zh-TW.md b/docs/readme/README_zh-TW.md index 4f84ddc2d0..94f6e9b462 100644 --- a/docs/readme/README_zh-TW.md +++ b/docs/readme/README_zh-TW.md @@ -275,7 +275,7 @@ npx rea-agents@latest setup 感謝每一位使用 REA、報告錯誤、提出功能需求、測試建置和貢獻修復的朋友。 - REA 貢獻者 + REA 貢獻者 diff --git a/docs/readme/README_zh.md b/docs/readme/README_zh.md index 9e2e993786..18308e05d9 100644 --- a/docs/readme/README_zh.md +++ b/docs/readme/README_zh.md @@ -275,7 +275,7 @@ npx rea-agents@latest setup 感谢每一位使用 REA、报告错误、提出功能需求、测试构建和贡献修复的朋友。 - REA 贡献者 + REA 贡献者 diff --git a/scripts/test-website.py b/scripts/test-website.py index 778b35bfee..e4a2b74838 100644 --- a/scripts/test-website.py +++ b/scripts/test-website.py @@ -1,7 +1,6 @@ """Exercise automatic route discovery and mistakes that break search metadata.""" import contextlib -import errno from html import unescape import importlib.util import io @@ -392,7 +391,9 @@ class WebsiteMaintenanceChecks(unittest.TestCase): snapshot = root / "website/public/contributors/people.json" data = json.loads(snapshot.read_text()) people = data["contributors"][:3] - data["contributors"] = list(reversed(people)) + for person, name, commits in zip(people, ("Zulu", "beta", "Amber"), (1, 4, 4)): + person.update(login=name, html_url=f"https://github.com/{name}", commits=commits) + data["contributors"] = people data["updated"] = "2026-10-15" snapshot.write_text(json.dumps(data)) original = page.read_text() @@ -403,79 +404,66 @@ class WebsiteMaintenanceChecks(unittest.TestCase): source = page.read_text() doc = Document(source) cards = [node for node in doc.nodes if "data-contributor" in node.attrs] - self.assertEqual([node.attrs["data-contributor"] for node in cards], sorted( - (person["login"] for person in people), key=str.casefold, - )) + self.assertEqual([node.attrs["data-contributor"] for node in cards], ["Amber", "beta", "Zulu"]) links = [node.attrs["href"] for node in doc.nodes if node.attrs.get("class") == "contributor-card"] self.assertCountEqual(links, [person["html_url"] for person in people]) - self.assertIn('', source) self.assertEqual(WEBSITE.sync_pages(root), []) translated_units = [unit[1] for unit in prose_units(source, "contributors/index.html")] for person in people: self.assertFalse(any(person["login"] in unit for unit in translated_units)) - def test_contributor_refresh_collects_all_pages_and_preserves_snapshot_on_failure(self): + def test_commit_authors_from_both_sources_are_credited_once_per_commit(self): + people = json.loads((ROOT / "website/public/contributors/people.json").read_text())["contributors"][:3] + a, b, c = ({k: v for k, v in person.items() if k != "commits"} for person in people) + revision = "a" * 40 + primary = [{"sha": "first", "author": a}, {"sha": "second", "author": c}] + commits = subprocess.CompletedProcess([], 0, stdout="\n".join(map(json.dumps, primary))) + + def page(sha, authors): + commit = {"oid": sha, "authors": {"totalCount": len(authors), "nodes": [{"user": p} for p in authors]}} + return {"data": {"repository": {"object": {"history": {"nodes": [commit]}}}}} + + pages = [page("first", [a, b]), page("second", [None, b])] + with patch.object(WEBSITE, "github_json", side_effect=[{"object": {"sha": revision}}, pages]), \ + patch.object(WEBSITE.subprocess, "run", return_value=commits): + data = WEBSITE.collect_contributors() + self.assertEqual(data["revision"], revision) + self.assertEqual({p["id"]: p["commits"] for p in data["contributors"]}, { + a["id"]: 1, b["id"]: 2, c["id"]: 1, + }) + with patch.object(WEBSITE, "github_json", side_effect=[{"object": {"sha": revision}}, pages[:1]]), \ + patch.object(WEBSITE.subprocess, "run", return_value=commits): + with self.assertRaisesRegex(ValueError, "Incomplete GitHub commit history"): + WEBSITE.collect_contributors() + + def test_failed_refresh_preserves_the_directory_and_readme_grid(self): + data = json.loads((ROOT / "website/public/contributors/people.json").read_text()) with tempfile.TemporaryDirectory() as directory: root = Path(directory) snapshot = root / "website/public/contributors/people.json" snapshot.parent.mkdir(parents=True) - original = (ROOT / "website/public/contributors/people.json").read_text() - snapshot.write_text(original) - people = json.loads(original)["contributors"][:3] - response = WEBSITE.subprocess.CompletedProcess([], 0, stdout=json.dumps(people[:2]) + "\n" + json.dumps(people[2:])) - with patch.object(WEBSITE.subprocess, "run", return_value=response) as api: - WEBSITE.refresh_contributors(root) - self.assertIn("--paginate", api.call_args.args[0]) - self.assertEqual(json.loads(snapshot.read_text())["contributors"], people) - self.assertEqual(set(snapshot.parent.iterdir()), {snapshot}) - good = snapshot.read_text() - for output in (json.dumps(people) + "\n[", json.dumps(people + people), "[]", '{"message":"API error"}'): - with self.subTest(output=output), patch.object(WEBSITE.subprocess, "run", return_value=WEBSITE.subprocess.CompletedProcess([], 0, stdout=output)): - with self.assertRaises(ValueError): - WEBSITE.refresh_contributors(root) - self.assertEqual(snapshot.read_text(), good) - with patch.object(WEBSITE.subprocess, "run", side_effect=WEBSITE.subprocess.CalledProcessError(1, ["gh"])): - with self.assertRaises(WEBSITE.subprocess.CalledProcessError): + grid = snapshot.with_name("avatars.png") + snapshot.write_bytes(b"old snapshot") + grid.write_bytes(b"old grid") + replace = Path.replace + + def fail_snapshot(source, dest): + if dest == snapshot: + raise PermissionError("snapshot unavailable") + return replace(source, dest) + + with patch.object(WEBSITE, "collect_contributors", return_value=data), \ + patch("website_contributor_grid.write_avatar_grid", side_effect=lambda people, path: path.write_bytes(b"new grid")), \ + patch.object(Path, "replace", fail_snapshot): + with self.assertRaises(PermissionError): WEBSITE.refresh_contributors(root) - self.assertEqual(snapshot.read_text(), good) - - def test_contributor_refresh_preserves_snapshot_and_cleans_staging_on_save_failure(self): - people = json.loads((ROOT / "website/public/contributors/people.json").read_text())["contributors"][:2] - response = WEBSITE.subprocess.CompletedProcess([], 0, stdout=json.dumps(people)) - write_text = Path.write_text - - def partial_write(path, text, *args, **kwargs): - write_text(path, text[:20], *args, **kwargs) - raise OSError(errno.ENOSPC, "injected partial write", str(path)) - - failures = ( - ("partial write", patch.object( - Path, "write_text", autospec=True, side_effect=partial_write, - )), - ("replace", patch.object( - Path, "replace", autospec=True, - side_effect=PermissionError(errno.EACCES, "injected replace failure"), - )), - ) - for name, failure in failures: - with self.subTest(failure=name), tempfile.TemporaryDirectory() as directory: - root = Path(directory) - snapshot = root / "website/public/contributors/people.json" - snapshot.parent.mkdir(parents=True) - snapshot.write_bytes(json.dumps({ - "repository": "morluto/rea", "updated": "2026-10-14", "contributors": people[:1], - }).encode("utf-8")) - before = snapshot.read_bytes() - with patch.object(WEBSITE.subprocess, "run", return_value=response), failure as save: - with self.assertRaises(OSError): - WEBSITE.refresh_contributors(root) - self.assertEqual(save.call_count, 1) - self.assertEqual(snapshot.read_bytes(), before) - self.assertEqual(set(snapshot.parent.iterdir()), {snapshot}) + self.assertEqual(snapshot.read_bytes(), b"old snapshot") + self.assertEqual(grid.read_bytes(), b"old grid") + self.assertEqual(set(snapshot.parent.iterdir()), {snapshot, grid}) def test_contributor_snapshot_rejects_malformed_identity_and_unsafe_links(self): original = json.loads((ROOT / "website/public/contributors/people.json").read_text()) - for field, value in (("id", True), ("id", 0), ("login", ""), ("type", "unknown"), + for field, value in (("commits", 0), ("id", True), ("id", 0), ("login", ""), ("type", "unknown"), ("html_url", "javascript:alert(1)"), ("html_url", "https://github.com.evil.test/person"), ("avatar_url", "https://token@avatars.githubusercontent.com/u/1")): with self.subTest(field=field, value=value): diff --git a/scripts/verify-website.py b/scripts/verify-website.py index 496ca45e1c..33d7f5a9cd 100644 --- a/scripts/verify-website.py +++ b/scripts/verify-website.py @@ -2,6 +2,7 @@ from html.parser import HTMLParser from pathlib import Path +import json import re import struct import sys @@ -10,7 +11,7 @@ from urllib.parse import unquote import xml.etree.ElementTree as ET from zipfile import BadZipFile, ZipFile -from website import NOTES_FIXTURES, SITE_ORIGIN, authored_markdown, page_url, sync_pages +from website import NOTES_FIXTURES, SITE_ORIGIN, authored_markdown, page_url, ranked_contributors, sync_pages from website_i18n import is_language_code from website_references import markdown_references, split_reference @@ -448,6 +449,12 @@ def main(): errors.extend(check_repository_links(root)) try: sync_pages(root, check=True) + from PIL import Image + directory = root / "website/_site/contributors" + people = ranked_contributors(json.loads((directory / "people.json").read_text())) + with Image.open(directory / "avatars.png") as grid: + if grid.info.get("contributor_ids") != ",".join(str(p["id"]) for p in people): + errors.append("Contributor grid differs from the directory; refresh contributors.") except (OSError, ValueError, KeyError) as error: errors.append(str(error)) if errors: diff --git a/scripts/website.py b/scripts/website.py index ecf0ac39c5..c9e2af2322 100644 --- a/scripts/website.py +++ b/scripts/website.py @@ -7,6 +7,8 @@ from html import escape from html.parser import HTMLParser from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer import json +import re +import shutil from pathlib import Path, PurePosixPath from string import Template import subprocess @@ -33,6 +35,8 @@ def checked_contributors(data): if not isinstance(data.get("updated"), str): raise ValueError("Contributors need an ISO update date") date.fromisoformat(data["updated"]) + if not re.fullmatch(r"[0-9a-f]{40}", str(data.get("revision", ""))): + raise ValueError("Contributors need the source commit SHA") people = data.get("contributors") if not isinstance(people, list) or not people: raise ValueError("Contributors must be a nonempty list") @@ -45,6 +49,8 @@ def checked_contributors(data): raise ValueError("Contributor IDs must be unique positive integers") if not isinstance(login, str) or not login.strip() or login.casefold() in logins: raise ValueError("Contributor usernames must be nonempty and unique") + if type(person.get("commits")) is not int or person["commits"] < 1: + raise ValueError(f"Invalid commit count: {login}") if person.get("type") not in ("User", "Bot"): raise ValueError(f"Unknown contributor type: {login}") for key, host in (("html_url", "github.com"), ("avatar_url", "avatars.githubusercontent.com")): @@ -59,12 +65,16 @@ def checked_contributors(data): return data +def ranked_contributors(data): + return sorted(data["contributors"], key=lambda person: (-person["commits"], person["login"].casefold())) + + def contributor_block(root): """Render equal-sized profile links from the checked GitHub snapshot.""" path = root / "website/public/contributors/people.json" data = checked_contributors(json.loads(path.read_text(encoding="utf-8"))) cards = [] - for person in sorted(data["contributors"], key=lambda item: item["login"].casefold()): + for person in ranked_contributors(data): login = escape(person["login"], quote=True) profile = escape(person["html_url"], quote=True) avatar = escape(person["avatar_url"], quote=True) @@ -76,33 +86,92 @@ def contributor_block(root): ) template = root / "website/templates/contributors.html.tmpl" return indent(Template(template.read_text(encoding="utf-8")).substitute( - cards="\n".join(cards), updated=escape(data["updated"], quote=True), + cards="\n".join(cards), ), " ") -def refresh_contributors(root): - """Validate every GitHub page, then atomically replace the offline snapshot.""" - result = subprocess.run( - ["gh", "api", "--paginate", "repos/morluto/rea/contributors?per_page=100", "--jq", - "[.[] | {login,id,type,avatar_url,html_url}]"], +def github_json(*arguments): + result = subprocess.run(["gh", "api", *arguments], capture_output=True, text=True, check=True) + return json.loads(result.stdout) + + +def collect_contributors(): + """Count each GitHub profile once per commit on a fixed revision of main.""" + revision = github_json("repos/morluto/rea/git/ref/heads/main")["object"]["sha"] + commits = subprocess.run( + ["gh", "api", "--paginate", f"repos/morluto/rea/commits?sha={revision}&per_page=100", + "--jq", ".[] | {sha, author: (.author | if . then {id,login,type,html_url,avatar_url} else null end)} | @json"], capture_output=True, text=True, check=True, ) - decoder, remaining, people = json.JSONDecoder(), result.stdout.strip(), [] - while remaining: - page, end = decoder.raw_decode(remaining) - if not isinstance(page, list): - raise ValueError("GitHub returned an invalid contributors page") - people.extend(page) - remaining = remaining[end:].lstrip() + primary = {} + for line in commits.stdout.splitlines(): + commit = json.loads(line) + if commit["sha"] in primary: + raise ValueError("Duplicate commit in GitHub commit history") + primary[commit["sha"]] = commit["author"] + + query = """query($revision: GitObjectID!, $endCursor: String) { + repository(owner: "morluto", name: "rea") { + object(oid: $revision) { ... on Commit { + history(first: 100, after: $endCursor) { + pageInfo { hasNextPage endCursor } + nodes { oid authors(first: 100) { totalCount nodes { + user { id: databaseId login type: __typename html_url: url avatar_url: avatarUrl } + } } } + } + } } + } + }""" + pages = github_json("graphql", "--paginate", "--slurp", "-F", f"revision={revision}", "-f", f"query={query}") + people = {} + for page in pages: + for commit in page["data"]["repository"]["object"]["history"]["nodes"]: + sha, authors = commit["oid"], commit["authors"] + if sha not in primary or authors["totalCount"] != len(authors["nodes"]): + raise ValueError(f"Incomplete GitHub commit attribution at {sha}") + profiles = {node["user"]["id"]: node["user"] for node in authors["nodes"] if node["user"]} + author = primary.pop(sha) + if author: + profiles[author["id"]] = author + for identity, profile in profiles.items(): + person = people.setdefault(identity, {**profile, "commits": 0}) + if author and identity == author["id"]: + person["type"] = author["type"] + person["commits"] += 1 + if primary: + raise ValueError("Incomplete GitHub commit history") data = checked_contributors({ - "repository": "morluto/rea", "updated": date.today().isoformat(), "contributors": people, + "repository": "morluto/rea", "revision": revision, "updated": date.today().isoformat(), + "contributors": list(people.values()), }) + data["contributors"] = ranked_contributors(data) + return data + + +def refresh_contributors(root): + """Replace the snapshot only after both sources have been collected and checked.""" + data = collect_contributors() path = root / "website/public/contributors/people.json" with tempfile.TemporaryDirectory(dir=path.parent, prefix=f".{path.name}-") as directory: staged = Path(directory) / path.name staged.write_text(json.dumps(data, ensure_ascii=False, indent=2) + "\n", encoding="utf-8") - staged.replace(path) - print(f"Refreshed {len(people)} contributors. Run sync, translations extract and check.") + from website_contributor_grid import write_avatar_grid + grid = Path(directory) / "avatars.png" + write_avatar_grid(data["contributors"], grid) + destination = path.with_name(grid.name) + previous = Path(directory) / "previous.png" + if destination.exists(): + shutil.copyfile(destination, previous) + grid.replace(destination) + try: + staged.replace(path) + except OSError: + if previous.exists(): + previous.replace(destination) + else: + destination.unlink() + raise + print(f"Refreshed {len(data['contributors'])} contributors.") def authored_markdown(root): @@ -347,6 +416,8 @@ def main(): print(str(error), file=sys.stderr) return 1 except subprocess.CalledProcessError as error: + if error.stderr: + print(error.stderr, file=sys.stderr) return error.returncode except KeyboardInterrupt: return 0 diff --git a/scripts/website_contributor_grid.py b/scripts/website_contributor_grid.py new file mode 100644 index 0000000000..8f06b46fe9 --- /dev/null +++ b/scripts/website_contributor_grid.py @@ -0,0 +1,32 @@ +"""Build the README avatar grid from the same ordered profiles as the website.""" + +from concurrent.futures import ThreadPoolExecutor +from io import BytesIO +from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit +from urllib.request import urlopen + +from PIL import Image, ImageDraw, ImageOps +from PIL.PngImagePlugin import PngInfo + + +def avatar(person): + url = urlsplit(person["avatar_url"]) + query = dict(parse_qsl(url.query)) + query["s"] = "64" + address = urlunsplit(url._replace(query=urlencode(query))) + with urlopen(address, timeout=30) as response, Image.open(BytesIO(response.read())) as image: + return ImageOps.fit(image.convert("RGBA"), (40, 40), method=Image.Resampling.LANCZOS) + + +def write_avatar_grid(people, path): + columns, step = 30, 42 + rows = (len(people) + columns - 1) // columns + grid = Image.new("RGBA", (min(len(people), columns) * step, rows * step)) + mask = Image.new("L", (40, 40)) + ImageDraw.Draw(mask).ellipse((0, 0, 39, 39), fill=255) + with ThreadPoolExecutor(max_workers=8) as pool: + for index, image in enumerate(pool.map(avatar, people)): + grid.paste(image, (index % columns * step, index // columns * step), mask) + metadata = PngInfo() + metadata.add_text("contributor_ids", ",".join(str(person["id"]) for person in people)) + grid.save(path, format="PNG", pnginfo=metadata, optimize=True) diff --git a/website/README.md b/website/README.md index d5a1c09e82..f2ed9cd73d 100644 --- a/website/README.md +++ b/website/README.md @@ -184,7 +184,7 @@ describe its recorded investigation; update them only when repeating that work. - `public/showcase/ctf/index.html`: DownUnderCTF's masked-squares flag checker, extracted equations and real process captures. - `public/get-started/index.html`: agent setup, first CLI result and provider guides. - `public/faq/index.html`: concise answers about setup, updates, analysis and troubleshooting. -- `public/contributors/index.html`: one searchable, alphabetical grid of GitHub contributors, with profile links and contribution guidance. +- `public/contributors/index.html`: one searchable, commit-ranked grid of GitHub contributors, with profile links and contribution guidance. - `public/guides/`: a guide hub and native, JavaScript/Electron and browser examples. - `public/guides/rl-environments/index.html`: recording a web app, exporting a runnable environment, and adding tasks and reward checks. - `public/examples/`: downloadable Electron source and an interactive Notes browser app. @@ -196,11 +196,9 @@ root and a GitHub Pages project path such as `/rea/`. ### Update contributors `public/contributors/people.json` is a dated snapshot of the repository's public -GitHub contributor list, including accounts GitHub identifies as bots. Every -profile has the same presentation; there are no team tiers or contribution -rankings. The page links the source list and shows the snapshot date. Avatars -load from GitHub; usernames and profile links remain usable without images or -JavaScript. Search is a small progressive enhancement. +commit authors and co-authors on `main`. Profiles appear in descending commit +order, with ties sorted by username. The website and README avatar grid use the +same snapshot. Usernames and profile links work without images or JavaScript. Refresh the snapshot with GitHub CLI available, then regenerate the marked `website:contributors` region from `templates/contributors.html.tmpl`: @@ -212,9 +210,11 @@ python3 scripts/website.py translations extract python3 scripts/website.py check ``` -Refresh fetches every API page and validates the complete result before replacing -the snapshot. Review and commit the JSON, rendered page and catalog updates -together. Builds and offline checks use that snapshot, not the live API. +Refresh pins the branch revision and joins GitHub’s paginated REST commit +authors and GraphQL commit authors by SHA. It counts a linked account once per +commit and fetches its public avatar for `public/contributors/avatars.png`. +Review and commit the JSON, PNG, rendered page, and catalog updates together. +Builds and offline checks use the saved snapshot. ## Search and sharing metadata diff --git a/website/locales/ar/messages.po b/website/locales/ar/messages.po index e4423d59f7..983d2b66e7 100644 --- a/website/locales/ar/messages.po +++ b/website/locales/ar/messages.po @@ -14621,15 +14621,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "البحث عن مساهم" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "من {ph0}قائمة المساهمين على GitHub{ph1} · آخر تحديث: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17191,3 +17182,8 @@ msgstr "" #~ "على Windows x64، يتوفر دعم تجريبي للقراءة فقط لتطبيقات PE ومكتبات DLL " #~ "الأصلية بمعمارية x86 وx64 على أقراص NTFS المحلية الثابتة. استخدم نسخة مثبتة " #~ "من Ghidra 12.1.x وJDK بمعمارية 64 بت وإصدار 21 أو أحدث:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "من {ph0}قائمة المساهمين على GitHub{ph1} · آخر تحديث: {ph2}." diff --git a/website/locales/bg/messages.po b/website/locales/bg/messages.po index 58a7579900..37e7476449 100644 --- a/website/locales/bg/messages.po +++ b/website/locales/bg/messages.po @@ -2832,15 +2832,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1116 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" - #: website/public/contributors/index.html:1121 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -13981,3 +13972,8 @@ msgstr "" #~ "applications and DLLs on fixed local NTFS drives. Use an existing Ghidra " #~ "12.1.x installation and a 64-bit JDK 21 or newer:" #~ msgstr "" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" diff --git a/website/locales/de/messages.po b/website/locales/de/messages.po index 80df1b15bf..3d7fc18fe4 100644 --- a/website/locales/de/messages.po +++ b/website/locales/de/messages.po @@ -15231,16 +15231,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Mitwirkende finden" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" -"Aus der {ph0}Mitwirkendenliste auf GitHub{ph1} · Aktualisiert am {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17885,3 +17875,9 @@ msgstr "" #~ " x86- und x64-PE-Anwendungen und DLLs auf festen lokalen NTFS-Laufwerken. " #~ "Verwenden Sie einen vorhandenen Ghidra 12.1.x-Installation und ein 64-Bit-" #~ "JDK 21 oder neuer:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" +#~ "Aus der {ph0}Mitwirkendenliste auf GitHub{ph1} · Aktualisiert am {ph2}." diff --git a/website/locales/el/messages.po b/website/locales/el/messages.po index e65bf120e6..0e7062d5f3 100644 --- a/website/locales/el/messages.po +++ b/website/locales/el/messages.po @@ -15186,15 +15186,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Βρείτε έναν συνεισφέροντα" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "Από τη {ph0}λίστα συνεισφερόντων του GitHub{ph1} · Ενημερώθηκε {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -16903,3 +16894,8 @@ msgstr "" #~ "PE και DLL εγγενούς κώδικα x86 και x64 σε σταθερούς τοπικούς δίσκους NTFS. " #~ "Χρησιμοποιήστε μια υπάρχουσα εγκατάσταση Ghidra 12.1.x και JDK 21 ή νεότερο," #~ " 64 bit:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "Από τη {ph0}λίστα συνεισφερόντων του GitHub{ph1} · Ενημερώθηκε {ph2}." diff --git a/website/locales/es/messages.po b/website/locales/es/messages.po index 8bea42ed22..fdeea9a037 100644 --- a/website/locales/es/messages.po +++ b/website/locales/es/messages.po @@ -15115,16 +15115,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Buscar colaboradores" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" -"De la {ph0}lista de colaboradores de GitHub{ph1} · Actualizada el {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17875,3 +17865,9 @@ msgstr "" #~ "Windows x64 tiene soporte experimental de solo lectura para aplicaciones y " #~ "DLL nativas x86 y x64 PE en unidades NTFS locales fijas. Usa una instalación" #~ " existente de Ghidra 12.1.x y un JDK de 64 bits, versión 21 o posterior:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" +#~ "De la {ph0}lista de colaboradores de GitHub{ph1} · Actualizada el {ph2}." diff --git a/website/locales/fa/messages.po b/website/locales/fa/messages.po index 83ca0fab83..b4316c049a 100644 --- a/website/locales/fa/messages.po +++ b/website/locales/fa/messages.po @@ -14771,15 +14771,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "جستجوی مشارکت‌کننده" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "از {ph0}فهرست مشارکت‌کنندگان GitHub{ph1} · به‌روزرسانی: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17369,3 +17360,8 @@ msgstr "" #~ "Windows x64 پشتیبانی آزمایشی و فقط‌خواندنی از برنامه‌ها و DLLهای بومی x86 " #~ "وx64 با قالب PE روی درایوهای ثابت محلی NTFS دارد. از نصب موجود Ghidra 12.1.x" #~ " وJDK ‏64 بیتی نسخهٔ 21 یا جدیدتر استفاده کنید:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "از {ph0}فهرست مشارکت‌کنندگان GitHub{ph1} · به‌روزرسانی: {ph2}." diff --git a/website/locales/fr/messages.po b/website/locales/fr/messages.po index b14f860480..edcd841956 100644 --- a/website/locales/fr/messages.po +++ b/website/locales/fr/messages.po @@ -15159,17 +15159,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Rechercher un contributeur" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" -"D’après la {ph0}liste des contributeurs sur GitHub{ph1} · Mise à jour le " -"{ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17822,3 +17811,10 @@ msgstr "" #~ "applications et DLL natives x86 et x64 au format PE sur des disques NTFS " #~ "locaux fixes. Utilisez une installation existante de Ghidra 12.1.x et un JDK" #~ " 64 bits, version 21 ou ultérieure :" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" +#~ "D’après la {ph0}liste des contributeurs sur GitHub{ph1} · Mise à jour le " +#~ "{ph2}." diff --git a/website/locales/id/messages.po b/website/locales/id/messages.po index 0296bf6ac1..2580d9235a 100644 --- a/website/locales/id/messages.po +++ b/website/locales/id/messages.po @@ -14999,15 +14999,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Cari kontributor" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "Dari {ph0}daftar kontributor GitHub{ph1} · Diperbarui pada {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17621,3 +17612,8 @@ msgstr "" #~ "DLL native x86 dan x64 berformat PE pada drive NTFS lokal tetap. Gunakan " #~ "instalasi Ghidra 12.1.x yang sudah ada dan JDK 64-bit versi 21 atau lebih " #~ "baru:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "Dari {ph0}daftar kontributor GitHub{ph1} · Diperbarui pada {ph2}." diff --git a/website/locales/it/messages.po b/website/locales/it/messages.po index c39f21f4c4..85cd6c5b6e 100644 --- a/website/locales/it/messages.po +++ b/website/locales/it/messages.po @@ -15064,16 +15064,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Trova un collaboratore" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" -"Dall’{ph0}elenco dei collaboratori su GitHub{ph1} · Aggiornato il {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17705,3 +17695,9 @@ msgstr "" #~ "DLL native x86 e x64 in formato PE su unità NTFS locali fisse. Usa " #~ "un'installazione esistente di Ghidra 12.1.x e un JDK a 64 bit, versione 21 o" #~ " successiva:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" +#~ "Dall’{ph0}elenco dei collaboratori su GitHub{ph1} · Aggiornato il {ph2}." diff --git a/website/locales/ja/messages.po b/website/locales/ja/messages.po index f3215c1c99..17286c2c72 100644 --- a/website/locales/ja/messages.po +++ b/website/locales/ja/messages.po @@ -13917,15 +13917,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "貢献者を探す" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "{ph0}GitHub の貢献者一覧{ph1}より · 更新日:{ph2}。" - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -16393,3 +16384,8 @@ msgstr "" #~ msgstr "" #~ "Windows x64では、固定ローカルNTFSドライブ上のネイティブx86/x64 " #~ "PEアプリとDLLに実験的な読み取り専用対応があります。既存のGhidra 12.1.xと64ビットのJDK 21以降を使ってください。" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "{ph0}GitHub の貢献者一覧{ph1}より · 更新日:{ph2}。" diff --git a/website/locales/ko/messages.po b/website/locales/ko/messages.po index a71a577256..986dbdf094 100644 --- a/website/locales/ko/messages.po +++ b/website/locales/ko/messages.po @@ -13986,15 +13986,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "기여자 찾기" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "{ph0}GitHub 기여자 목록{ph1} 기준 · 업데이트: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -16458,3 +16449,8 @@ msgstr "" #~ msgstr "" #~ "Windows x64에서는 고정 로컬 NTFS 드라이브의 네이티브 x86 및 x64 PE 앱과 DLL을 실험적으로 읽기 전용 분석할 수 " #~ "있습니다. 기존 Ghidra 12.1.x 설치와 64비트 JDK 21 이상을 사용하세요." + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "{ph0}GitHub 기여자 목록{ph1} 기준 · 업데이트: {ph2}." diff --git a/website/locales/messages.pot b/website/locales/messages.pot index 6b41a5a3c2..96316b3ad6 100644 --- a/website/locales/messages.pot +++ b/website/locales/messages.pot @@ -165,7 +165,7 @@ msgstr "" #: website/public/blog/index.html:246 #: website/public/blog/reverse-engineering-models/index.html:885 #: website/public/blog/touhou-reconstruction/index.html:1082 -#: website/public/contributors/index.html:1133 +#: website/public/contributors/index.html:2250 #: website/public/examples/dino-lab/index.html:477 website/public/faq/index.html:575 #: website/public/first-investigation/index.html:536 #: website/public/get-started/index.html:1853 @@ -185,7 +185,7 @@ msgstr "" #: website/public/blog/index.html:247 #: website/public/blog/reverse-engineering-models/index.html:886 #: website/public/blog/touhou-reconstruction/index.html:1083 -#: website/public/contributors/index.html:1134 +#: website/public/contributors/index.html:2251 #: website/public/examples/dino-lab/index.html:478 website/public/faq/index.html:576 #: website/public/first-investigation/index.html:537 #: website/public/get-started/index.html:1854 @@ -205,7 +205,7 @@ msgstr "" #: website/public/blog/index.html:248 #: website/public/blog/reverse-engineering-models/index.html:887 #: website/public/blog/touhou-reconstruction/index.html:1084 -#: website/public/contributors/index.html:1135 +#: website/public/contributors/index.html:2252 #: website/public/examples/dino-lab/index.html:479 website/public/faq/index.html:577 #: website/public/first-investigation/index.html:538 #: website/public/get-started/index.html:1855 @@ -225,7 +225,7 @@ msgstr "" #: website/public/blog/index.html:249 #: website/public/blog/reverse-engineering-models/index.html:888 #: website/public/blog/touhou-reconstruction/index.html:1085 -#: website/public/contributors/index.html:1136 +#: website/public/contributors/index.html:2253 #: website/public/examples/dino-lab/index.html:480 website/public/faq/index.html:578 #: website/public/first-investigation/index.html:539 #: website/public/get-started/index.html:1856 @@ -245,7 +245,7 @@ msgstr "" #: website/public/blog/index.html:250 #: website/public/blog/reverse-engineering-models/index.html:889 #: website/public/blog/touhou-reconstruction/index.html:1086 -#: website/public/contributors/index.html:1137 +#: website/public/contributors/index.html:2254 #: website/public/examples/dino-lab/index.html:481 website/public/faq/index.html:579 #: website/public/first-investigation/index.html:540 #: website/public/get-started/index.html:1857 @@ -267,7 +267,7 @@ msgstr "" #: website/public/blog/index.html:255 #: website/public/blog/reverse-engineering-models/index.html:894 #: website/public/blog/touhou-reconstruction/index.html:1091 -#: website/public/contributors/index.html:1142 +#: website/public/contributors/index.html:2259 #: website/public/examples/dino-lab/index.html:486 website/public/faq/index.html:584 #: website/public/first-investigation/index.html:545 #: website/public/get-started/index.html:1862 @@ -2703,16 +2703,7 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1116 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" - -#: website/public/contributors/index.html:1121 +#: website/public/contributors/index.html:2238 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." msgstr "" @@ -2732,7 +2723,7 @@ msgctxt "page:contributors/index.html" msgid "GitHub username" msgstr "" -#: website/public/contributors/index.html:1142 +#: website/public/contributors/index.html:2259 msgctxt "page:contributors/index.html" msgid "Back to top" msgstr "" diff --git a/website/locales/ml/messages.po b/website/locales/ml/messages.po index 7fef07a8dd..9f4193e61e 100644 --- a/website/locales/ml/messages.po +++ b/website/locales/ml/messages.po @@ -2791,15 +2791,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -14168,3 +14159,8 @@ msgstr "" #~ "applications and DLLs on fixed local NTFS drives. Use an existing Ghidra " #~ "12.1.x installation and a 64-bit JDK 21 or newer:" #~ msgstr "" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" diff --git a/website/locales/pl/messages.po b/website/locales/pl/messages.po index f6bcddf44a..c063024cec 100644 --- a/website/locales/pl/messages.po +++ b/website/locales/pl/messages.po @@ -14956,16 +14956,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Znajdź współtwórcę" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" -"Na podstawie {ph0}listy współtwórców na GitHubie{ph1} · Aktualizacja: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17577,3 +17567,9 @@ msgstr "" #~ "Windows x64 ma eksperymentalną obsługę tylko do odczytu dla natywnych " #~ "aplikacji x86 i x64 PE oraz bibliotek DLL na stałych lokalnych dyskach NTFS." #~ " Użyj istniejącego Ghidra 12.1.instalacja x i 64-bitowy JDK 21 lub nowszy:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" +#~ "Na podstawie {ph0}listy współtwórców na GitHubie{ph1} · Aktualizacja: {ph2}." diff --git a/website/locales/pt-BR/messages.po b/website/locales/pt-BR/messages.po index 9afc86af1a..4e8c552825 100644 --- a/website/locales/pt-BR/messages.po +++ b/website/locales/pt-BR/messages.po @@ -15035,15 +15035,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Encontrar colaboradores" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "Da {ph0}lista de colaboradores do GitHub{ph1} · Atualizada em {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17666,3 +17657,8 @@ msgstr "" #~ "O Windows x64 tem suporte experimental somente leitura para aplicativos e " #~ "DLLs nativos x86 e x64 PE em unidades NTFS locais fixas. Use uma instalação " #~ "existente do Ghidra 12.1.x e um JDK de 64 bits, versão 21 ou posterior:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "Da {ph0}lista de colaboradores do GitHub{ph1} · Atualizada em {ph2}." diff --git a/website/locales/ro/messages.po b/website/locales/ro/messages.po index 7e710d29b4..00ff41f765 100644 --- a/website/locales/ro/messages.po +++ b/website/locales/ro/messages.po @@ -2791,15 +2791,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -14171,3 +14162,8 @@ msgstr "" #~ "applications and DLLs on fixed local NTFS drives. Use an existing Ghidra " #~ "12.1.x installation and a 64-bit JDK 21 or newer:" #~ msgstr "" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" diff --git a/website/locales/ru/messages.po b/website/locales/ru/messages.po index d5d8dc9e47..9cabd22f55 100644 --- a/website/locales/ru/messages.po +++ b/website/locales/ru/messages.po @@ -15069,15 +15069,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Найти участника" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "По {ph0}списку участников на GitHub{ph1} · Обновлено: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17703,3 +17694,8 @@ msgstr "" #~ "приложений x86 и x64 PE и библиотек DLL на фиксированных локальных дисках " #~ "NTFS. Используйте существующую установку Ghidra 12.1.x и 64-разрядную версию" #~ " JDK 21 или новее:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "По {ph0}списку участников на GitHub{ph1} · Обновлено: {ph2}." diff --git a/website/locales/th/messages.po b/website/locales/th/messages.po index 8aef8a514b..5444537870 100644 --- a/website/locales/th/messages.po +++ b/website/locales/th/messages.po @@ -14673,15 +14673,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "ค้นหาผู้มีส่วนร่วม" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "จาก {ph0}รายชื่อผู้มีส่วนร่วมบน GitHub{ph1} · อัปเดตเมื่อ {ph2}" - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17245,3 +17236,8 @@ msgstr "" #~ "Windows x64 รองรับการวิเคราะห์แบบทดลองและอ่านอย่างเดียวสำหรับแอป PE และ DLL " #~ "เนทีฟ x86 และ x64 บนไดรฟ์ NTFS ภายในเครื่องแบบคงที่ ใช้ Ghidra 12.1.x " #~ "ที่ติดตั้งไว้แล้วและ JDK 21 ขึ้นไปแบบ 64 บิต:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "จาก {ph0}รายชื่อผู้มีส่วนร่วมบน GitHub{ph1} · อัปเดตเมื่อ {ph2}" diff --git a/website/locales/tr/messages.po b/website/locales/tr/messages.po index ed31c0026b..05f2dd8bc5 100644 --- a/website/locales/tr/messages.po +++ b/website/locales/tr/messages.po @@ -14937,15 +14937,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Katkıda bulunan birini bul" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "{ph0}GitHub katkıda bulunanlar listesi{ph1} · Güncelleme: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17551,3 +17542,8 @@ msgstr "" #~ "uygulamaları ve DLL'ler için deneysel, salt okunur desteğe sahiptir. Mevcut " #~ "bir Ghidra 12.1.x kurulumu ve 64 bit JDK 21 veya daha yeni bir sürüm " #~ "kullanın:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "{ph0}GitHub katkıda bulunanlar listesi{ph1} · Güncelleme: {ph2}." diff --git a/website/locales/uk/messages.po b/website/locales/uk/messages.po index 9d9d2cc7b0..0c62715950 100644 --- a/website/locales/uk/messages.po +++ b/website/locales/uk/messages.po @@ -15015,15 +15015,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Знайти учасника" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "За {ph0}списком учасників на GitHub{ph1} · Оновлено: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17649,3 +17640,8 @@ msgstr "" #~ "x86 та x64 PE та бібліотек DLL на фіксованих локальних дисках NTFS. " #~ "Використовуйте існуючу установку Ghidra 12.1.x і 64-розрядну версію JDK 21 " #~ "або новіше:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "За {ph0}списком учасників на GitHub{ph1} · Оновлено: {ph2}." diff --git a/website/locales/ur-Latn/messages.po b/website/locales/ur-Latn/messages.po index d8d1827c26..b7116a8610 100644 --- a/website/locales/ur-Latn/messages.po +++ b/website/locales/ur-Latn/messages.po @@ -2791,15 +2791,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "" - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -14164,3 +14155,8 @@ msgstr "" #~ "applications and DLLs on fixed local NTFS drives. Use an existing Ghidra " #~ "12.1.x installation and a 64-bit JDK 21 or newer:" #~ msgstr "" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "" diff --git a/website/locales/vi/messages.po b/website/locales/vi/messages.po index 167a5ddb6a..f0621e90bc 100644 --- a/website/locales/vi/messages.po +++ b/website/locales/vi/messages.po @@ -14908,15 +14908,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "Tìm người đóng góp" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "Từ {ph0}danh sách người đóng góp trên GitHub{ph1} · Cập nhật: {ph2}." - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -17517,3 +17508,8 @@ msgstr "" #~ "Windows x64 có hỗ trợ thử nghiệm, chỉ đọc cho các ứng dụng VÀ Dll X86 và x64" #~ " pe gốc trên các ổ đĩa ntfs cục bộ cố định. Sử DỤNG Ghidra 12.1 hiện có.x " #~ "cài đặt VÀ 64-bit JDK 21 hoặc mới hơn:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "Từ {ph0}danh sách người đóng góp trên GitHub{ph1} · Cập nhật: {ph2}." diff --git a/website/locales/zh-CN/messages.po b/website/locales/zh-CN/messages.po index 21ab8fc8ef..f3e050e23e 100644 --- a/website/locales/zh-CN/messages.po +++ b/website/locales/zh-CN/messages.po @@ -13604,15 +13604,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "查找贡献者" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "来自 {ph0}GitHub 贡献者列表{ph1} · 更新于 {ph2}。" - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -16078,3 +16069,8 @@ msgstr "" #~ msgstr "" #~ "Windows x64 提供实验性的只读支持:分析固定本地 NTFS 驱动器上的原生 x86、x64 PE 应用和 DLL。使用已有的 Ghidra " #~ "12.1.x 和 64 位 JDK 21 或更新版本:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "来自 {ph0}GitHub 贡献者列表{ph1} · 更新于 {ph2}。" diff --git a/website/locales/zh-TW/messages.po b/website/locales/zh-TW/messages.po index 1d359bfe31..da58c65bed 100644 --- a/website/locales/zh-TW/messages.po +++ b/website/locales/zh-TW/messages.po @@ -13621,15 +13621,6 @@ msgctxt "page:contributors/index.html" msgid "Find a contributor" msgstr "尋找貢獻者" -#. {ph0}: -#. {ph1}: -#. {ph2}: -#: website/public/contributors/index.html:1114 -#, python-brace-format -msgctxt "page:contributors/index.html" -msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." -msgstr "來自 {ph0}GitHub 貢獻者名單{ph1} · 更新於 {ph2}。" - #: website/public/contributors/index.html:1119 msgctxt "page:contributors/index.html" msgid "No matching contributors. Try another username." @@ -16067,3 +16058,8 @@ msgstr "" #~ msgstr "" #~ "Windows x64 提供實驗性的只讀支援:分析固定本地 NTFS 驅動器上的原生 x86、x64 PE 應用和 DLL。使用已有的 Ghidra " #~ "12.1.x 和 64 位 JDK 21 或更新版本:" + +#, python-brace-format +#~ msgctxt "page:contributors/index.html" +#~ msgid "From {ph0}GitHub’s contributor list{ph1} · Updated {ph2}." +#~ msgstr "來自 {ph0}GitHub 貢獻者名單{ph1} · 更新於 {ph2}。" diff --git a/website/public/assets/styles.css b/website/public/assets/styles.css index e2c66c3bcf..2e520f97d9 100644 --- a/website/public/assets/styles.css +++ b/website/public/assets/styles.css @@ -849,9 +849,6 @@ pre code { max-width: 100%; overflow-wrap: anywhere; } -.contributors-source { - margin-block: 1.5rem 0; -} .article-layout { display: grid; diff --git a/website/public/contributors/avatars.png b/website/public/contributors/avatars.png new file mode 100644 index 0000000000..f93da9447e Binary files /dev/null and b/website/public/contributors/avatars.png differ diff --git a/website/public/contributors/index.html b/website/public/contributors/index.html index 0935a761d0..ff7c0335b2 100644 --- a/website/public/contributors/index.html +++ b/website/public/contributors/index.html @@ -248,161 +248,721 @@ -

- From GitHub’s contributor list · Updated . -

-

- From GitHub’s contributor list · Updated . -