Use US spelling in the Secure Boot ledger - #1453
Merged
Merged
Conversation
This work shipped 147 UK spellings, almost all of them "enrolment". The project's own identifiers have always been US -- hostSbEnrolled, hostSbEnrollVia, hostSbEnrollCert, fog.enrollsb, sbEnrollDb -- so the prose was disagreeing with the columns it described, and two methods coined here carried it into the API surface: isEnrolmentTarget() -> isEnrollmentTarget() enrolmentFreshness() -> enrollmentFreshness() Also recognised/recognise/recognisably, normaliser, canonicalise and colour. Three user-visible strings change with it, including "Setup Mode (unattended enrollment)" and the refusal text, so the .pot and .po files move too -- the pre-commit hook regenerates those from source rather than them being edited here. SCOPED BY THE DIFF, NOT BY THE WORD. 160 files in this repo carried UK spellings before any of this landed, docs/adr/0008-secure-boot-enrolment- task-type.md among them, in its filename. Rewriting those is a separate pass that would dominate any diff it rode in, and the convention here is to leave surrounding text alone. So only lines this branch added were touched, which does leave a mixture inside Route.php, IpxeBootMenu.php, schema.php, fogconfigurationpage.page.php and functions.sh -- deliberately, and noted here rather than quietly. No behaviour change. The stored column values are untouched: 'db', 'trusted', 'mok', 'mok-pending' and 'manual' were already US and are what service/secureboot.report.php writes and the host form whitelists, so no data migration and no schema bump. Co-Authored-By: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The Secure Boot ledger (#1451) shipped 147 UK spellings, almost all of them
enrolment.The project's own identifiers have always been US —
hostSbEnrolled,hostSbEnrollVia,hostSbEnrollCert,fog.enrollsb,sbEnrollDb— so the prose was disagreeing with the columns it described. Two methods coined in that PR carried it into the API surface:isEnrolmentTarget()isEnrollmentTarget()enrolmentFreshness()enrollmentFreshness()Also
recognised/recognise/recognisably,normaliser,canonicaliseandcolour.Three user-visible strings change with it — "Setup Mode (unattended enrollment)", the enrollment-task refusal text, and the stale-certificate warning — so the
.potand.pofiles move too. Those are regenerated by the pre-commit hook from source rather than hand-edited.Scoped by the diff, not by the word
160 files in this repo carried UK spellings before any of this landed, including
docs/adr/0008-secure-boot-enrolment-task-type.md— in its filename. Rewriting those is a separate pass that would dominate any diff it rode in, and the house convention is to leave surrounding text alone.So only lines #1451 added were rewritten. That does leave a mixture inside
Route.php,IpxeBootMenu.php,schema.php,fogconfigurationpage.page.phpandlib/common/functions.sh(82 pre-existing hits in that last one) — deliberately, and called out here rather than left to be discovered.No behavior change
The stored column values are untouched.
db,trusted,mok,mok-pendingandmanualwere already US, and are whatservice/secureboot.report.phpwrites and the host form whitelists. No data migration, no schema bump, noFOG_SCHEMAchange.Verification
tests/run-all.sh— 185 passed, 0 failedvendor/bin/phpstan analyse— no errorsvendor/bin/phpstan analyse -c phpstan-tests.neon— no errorsCompanion: FOGProject/fos#167, which does the same for
sbReportand renamestests/checks/secureboot-enrolment-report.sh.🤖 Generated with Claude Code
https://claude.ai/code/session_01C2gFRQ3Khhx24FNYMZhW6N