Skip to content

Bring #10 to main: setup from the app, one Drive folder per Mac, README for Homebrew - #11

Closed
mbeczynski wants to merge 21 commits into
mainfrom
i18n/english
Closed

mbeczynski wants to merge 21 commits into
mainfrom
i18n/english

Conversation

@mbeczynski

Copy link
Copy Markdown
Contributor

#10 was merged into i18n/english two minutes after #9 had already gone into main, so it never reached main.

This PR carries exactly those changes, the same 18 files (git diff main i18n/english). The older commits in the list are the ones #9 already squash-merged; they bring no new content. Merge with Squash, then delete i18n/english.

Contents are described in #10.

🤖 Generated with Claude Code

mbeczynski and others added 21 commits October 6, 2026 08:32
…system

Replaces the unused Loc.swift. `L10n.tr("English text")` returns Polish
when the first preferred system language is Polish, English otherwise;
CM_LANGUAGE overrides it and tests always run in English. Logs stay
English-only.

L10nTests enforce the rules: inline literal keys, %@ placeholders only,
a Polish entry with matching placeholders for every key, no unused entries,
and no Polish left in Sources/Tests outside the Polish tables (currently
3311 lines - the translation follows in the next commits).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Comments, CI error messages, the gdrive/ measurement notes, launchd and
Info.plist comments, the cask template comments and the example config
comments. No functional changes: keys, placeholders, shell logic and cask
stanzas are untouched.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Translate all comments in Sources/CloudMachineApp to English and route
every visible GUI string (menu bar, dashboard, AppStatus headlines,
controller messages, busy labels) through L10n.tr with Polish entries in
L10nPolish+App.swift. Action logs keep a separate English name, so the
log does not switch language with the system.

AppStatusHealthTests now expect English; headlines owned by
CloudMachineCore (UploadState, BackupHealth.formatAge) are compared with
the core's own text instead of a copied literal.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
cloudmachine-agent: abstracts, option help and printed output go through
L10n.tr with Polish entries in L10nPolish.agent (104 keys); logs are plain
English. cloudmachine-poc is a developer tool and is English only. All
comments translated; PullPlugHarnessTests expect the English summary.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Translates comments, logs and user-facing text in the image, buffer,
watchdog and upload-state code (BackupImageService, BufferGuardService,
DriveBufferService, UploadDrain, UploadState, BufferReadiness,
EdgeTriggeredLog) and their tests. Logs are plain English; text shown to
people goes through L10n.tr with Polish translations (with diacritics) in
L10nPolish.storage.

The upload-jam notification is now localized separately from its log
line. BufferGuardDecisionTests no longer asserts BackupHealth's exact
wording, which belongs to another file.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
"Attaching the image" had two Polish translations: the GUI action label
("Podpinam obraz") and the busy-lock message prefix ("Podpinanie obrazu").
One English key can only have one translation, so the lock messages now use
their own names (Image creation/attach/detach/verification). Caught by
L10nTests.testTablesDoNotDisagree after merging the app and storage tables.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…sh table

Comments and logs are now English; text shown to people goes through
L10n.tr with Polish translations in L10nPolish+System.swift (104 keys).

HealthAlert no longer deduplicates by the translated summary:
BackupHealth.Problem carries a stable `code`, and the persisted
deliveryError is a fixed English value translated only for display, so
alert state written by a Polish-language run matches an English one.
AppVersion.unknownCommit is now "unknown" (written and read only via the
constant).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Test names, comments and expected strings follow the English messages.
New tests: HealthAlert identity and persisted delivery reason do not
depend on the UI language; every BackupHealth problem has its own code.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ealth text again

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ated texts

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* feat(drive): one Drive folder per Mac, so several Macs can share an account

The folder and the image were the constant `mac-studio` on every Mac, so a
second Mac on the same Google account would have shared both. drive.file
access is per OAuth client, not per token, so two Macs with the same
credentials do see each other's files.

Each Mac now keeps its folder name in Application Support/drive-folder,
decided once by `configure-remote` (default: the machine key, or
`--folder NAME`) BEFORE the remote is created. An installation that already
has the rclone remote predates this setting and keeps `mac-studio`, where
its backup lives; with no file at all the legacy name is used too. A stored
or legacy folder can never be switched - that would start an empty backup
and orphan the old one - so such a request is refused.

`drive-status` shows the folder.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* feat(app): set up from the menu-bar app, step by step

After `brew install` the app is the first thing a person opens, but the
setup card only listed commands to copy, and the controller's install,
create and attach actions were wired to nothing. The card now shows the
next steps in order, each with a button: install rclone, install FUSE-T,
open Full Disk Access settings, install the agents, create the image (with
a size field), attach it. Two steps stay commands to copy: Google sign-in
(`configure-remote` waits for the browser in a terminal) and pointing Time
Machine at the volume (needs sudo).

Google comes before anything that mounts, because that is where this Mac's
Drive folder is chosen. State not measured yet (`nil`) never produces a
step. The plan is a pure function, covered by SetupPlanTests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* docs: README installs with Homebrew and sets up from the app

- Getting started: `brew install`, open the app, follow the setup card;
  per-Mac Drive folders; upgrading and uninstalling.
- Setting up from Terminal kept as the alternative, in an order that works:
  `install-launchd` (which mounts Drive) before `create-image`, which
  refuses without the mount. The old order failed at that step.
- Running it starts with the menu bar and the window; the CLI follows.
- Building from source, local installs, tests, releases and the harnesses
  move to docs/building.md; the README covers Homebrew only.
- Limitations: one-Mac-per-account and Polish-only are gone; unenforced
  per-machine budgets stay. The log grep looks for "backup failure", which
  is what the English logs now say.
- Cask caveats point to the app and #getting-started.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…cs/setup-cli.md

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@mbeczynski

Copy link
Copy Markdown
Contributor Author

Replaced by a conflict-free PR with the same content.

@mbeczynski mbeczynski closed this Oct 6, 2026
@mbeczynski
mbeczynski deleted the i18n/english branch October 6, 2026 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant