studio-engine 0.84.0 → 0.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440b221a14bf9d80f6e58358f49d7b84f6495361e8d8a1a68e00b3980e02f024
-  data.tar.gz: 1efda067ddfb1277ceb5cfd6b399195689081c3d02b077489e75ff0c756aaf19
+  metadata.gz: 0b6007443c9eeb21b16c521e76c956e5c05755ff0c264bbbf0f387f04ee79bd8
+  data.tar.gz: 1c6dd57eaf48aa3900de531b440766c8cb69281172f6c8a1aeb0daae45b7ca1b
 SHA512:
-  metadata.gz: bde626a90189833853f31e49c8767d72fe48f82f99b06a3c7b3c282a790b55dc8479fcf066c12d7fe5324e7f84e6aa1c2f22536fa2af98908cb6c7cf237f30b2
-  data.tar.gz: 5e5034bebe474a62d7821e9e8cc3efd23f23a2daad1ac709a335bc88f52c8c816e37c121ae710ddc0643d5fad26a0912297dd47c6451835b7af23f0bd294fa14
+  metadata.gz: 9fe2eb18d609180eeaaf03be1cf497bfc1b57407266565b8328757de5dd7f7c0633d5c5a81ab244cb39e4be9a211080a903c2d0490e181cfa07e89aca4838f97
+  data.tar.gz: 997135fe0ac9f3aea6d0da57c0d8af31b95e49320464fda777f441479250edf81af4bdbd4e93043a971d406e1779f819a7490707e733621e156ad95432c1c204

data/CHANGELOG.md

@@ -4,6 +4,102 @@ The format is [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). This pro
 
 ## Unreleased
 
+## 0.86.0 — 2026-10-03
+
+### Added
+
+- **Footer-only consumers: an app with no ActiveRecord can take the site
+  footer alone, with no workarounds.** When `ActiveRecord::Railtie` is not
+  loaded (`Studio.active_record?` reads false) the engine requires the
+  ActiveSupport core extensions it calls at load time, skips the user-contract
+  check, keeps every `app/` root but `app/helpers` (the two `concerns` roots
+  included) out of eager loading, and answers
+  `studio_engine:install:migrations` with a no-op that exits 0 and writes
+  nothing. A host with ActiveRecord is unchanged. docs/SITE_FOOTER.md, *An app
+  with no database*, has the recipe; rantly can drop its four workarounds
+  (`require "active_support/core_ext/integer/time"`,
+  `Studio.validate_user_contract = false`, its `do_not_eager_load` loop, and its
+  replacement rake task).
+- **docs/SITE_FOOTER.md and docs/BOOKING.md ship in the gem**, so a consumer's
+  citation of them resolves in the installed copy.
+
+### Changed
+
+- **Footer links are painted at full opacity in `--ftr-link-ink`**, which
+  defaults to `--color-text-secondary`, instead of the inherited body colour at
+  78% opacity. On the default theme the links clear WCAG AA on the band in both
+  themes; an app that maps the tokens onto its own palette sets
+  `--color-text-secondary` (or `--ftr-link-ink`) to an ink that clears 4.5:1 on
+  its `--color-surface-alt` (docs/SITE_FOOTER.md, *Colours*). A refused href's
+  label (`.ftr-link-plain`) takes the same ink.
+- **A footer with no address names no Leaflet.** The map's styles and mount
+  script moved from `studio/site_footer/_assets` to a new
+  `studio/site_footer/_map_assets`, rendered only with a map
+  (`studio_footer_map_assets`).
+
+### Fixed
+
+- **`/signup` honours `Studio.auth_methods`, as `/login` already did.** The
+  engine's `registrations/new` rendered Password, Confirm Password and "Sign up
+  with Google" whatever the app configured, while the passwordless
+  `RegistrationsController#create` reads the email alone. It now renders the
+  password form only when `Studio.password_login_available?`, otherwise the
+  email-only form (button "Send sign-in link", wording from
+  `Studio.sign_in_label`) when `:magic_link` is enabled, and the Google button and
+  its divider only with `:google`. The Name field renders only on the password
+  path, the one path that stores it; a passwordless signup discarded the name, so
+  it no longer asks. `#create` now branches on the same predicate the view does
+  (`password_login_available?` rather than `auth_method?(:password)`); for every
+  app that boots, the two agree. A password app renders exactly as before.
+  Consumers that wrote a host `app/views/registrations/new.html.erb` to hide the
+  password fields (McRitchie Industries) may delete it after the bump; the hub
+  and Turf Monster override it for their unified auth card and keep theirs.
+
+## 0.85.0 — 2026-10-02
+
+### Changed
+
+- **`Studio::S3.delete` now moves the object to `trash/` instead of deleting
+  it.** The object is copied to `trash/<UTC date>/<epoch ms>/<key>` in the same
+  bucket, then deleted; a failed copy raises and never deletes. It returns the
+  trash key (nil when nothing was there) rather than the S3 response. The
+  bucket's lifecycle rule must expire `trash/` after three days, or trash never
+  expires: set it up before upgrading (README, *Trash and restore*). The
+  `/admin/emails` banner and logo replace and revert paths go through this
+  delete.
+- **`Studio::S3.list` leaves `trash/` keys out.** Pass `include_trash: true` to
+  keep them. The filter runs after `max_keys`, so a page can come back short.
+- **The engine's auth pages speak `Studio.sign_in_label`.** 0.80.0 put the label
+  on the navbar's signed-out buttons only, so an app that set `"Sign in"` still
+  showed "Log in to continue", a "Log In" button and a "Log in" link on its
+  `/login` and `/signup` pages. Those words, the magic-link button, the SSO
+  divider, the magic-link confirm page's button and the link-sent notice now
+  derive from the label (`lib/studio/auth_labels.rb`; README, *Navbar
+  identity*). An app that leaves the label at its default renders those pages
+  byte-identical to before. No routes change.
+
+### Added
+
+- **`Studio::S3.purge!(key:)`**, the hard delete, for objects with no value
+  after deletion.
+- **A production-bucket guard.** `Studio::S3.delete`, `purge!`, and the trash
+  service's `delete` and `delete_prefixed` raise
+  `Studio::S3::Trash::ProductionBucketRefused` before any request when the
+  bucket ends in `-production` and the process is not production (`QA_ENV`
+  first, then `Rails.env`).
+- **`ActiveStorage::Service::StudioTrashS3Service`** (`service: StudioTrashS3`
+  in `config/storage.yml`): Active Storage's S3 service whose `delete` trashes
+  the blob's object, recording the content type, byte size, checksum and
+  filename it can read off the object so a blob row can be rebuilt.
+  `delete_prefixed` (variants) stays a hard delete. Opt-in per app.
+- **`rake studio:trash:list[KEY]` and `studio:trash:restore[TRASH_KEY]`**: find
+  a key's trash copies, and copy one back to its original key (`FORCE=1` to
+  overwrite, `SERVICE=<name>` for an Active Storage bucket). A restore prints the
+  `ActiveStorage::Blob.create!` that re-creates the blob row.
+- **`Studio::S3::Trash`**, the shared copy-then-delete, key mapping, listing and
+  restore. A single CopyObject moves at most 5 GiB, so a larger object raises
+  `TooLarge` and is left in place.
+
 ## 0.84.0 — 2026-10-01
 
 ### Changed

data/README.md

@@ -73,6 +73,14 @@ Studio.configure do |config|
 end
 ```
 
+`auth_methods` draws both auth pages. `/login` and `/signup` render the password
+form only when `:password` is enabled and the User has `authenticate`
+(`Studio.password_login_available?`); otherwise they render the email-only
+sign-in-link form when `:magic_link` is enabled, and the Google button only with
+`:google`. A passwordless signup stores nothing from the form: it mails a link,
+and using the link creates the account. So `registration_params`' `:name` shows a
+Name field only on a password app.
+
 ### Local log rotation (automatic — nothing to configure)
 
 The engine caps the host app's **development** log at 16 MB and its **test** log
@@ -629,7 +637,8 @@ Studio.configure do |config|
   config.navbar_user_name = :player_name                        # a method on the user
   # config.navbar_user_name = ->(user, view) { user.player_name } # or a callable
 
-  # The signed-out button in layouts/_navbar and components/_user_nav.
+  # The signed-out button in layouts/_navbar and components/_user_nav, and the
+  # sign-in wording on the engine's own auth pages (below).
   config.sign_in_label = "Sign in"                              # default "Log in"
 end
 ```
@@ -646,6 +655,24 @@ end
 - The engine has no I18n catalogue, so the label is plain config, not a locale
   key. A blank or non-String label, or a `navbar_user_name` of any other type,
   raises `Studio::NavbarIdentity::InvalidConfig` at assignment.
+- The label also sets the sign-in words on the engine's own auth pages, so the
+  navbar and `/login` never disagree. Rules: `lib/studio/auth_labels.rb`.
+
+  | Where | `"Log in"` (default) | `"Sign in"` |
+  |-------|----------------------|-------------|
+  | `/login` prompt | Log in to continue | Sign in to continue |
+  | `/login` password button | Log In | Sign In |
+  | `/login` magic-link button | Send sign-in link | Send sign-in link |
+  | `/login` SSO divider | or sign in below | or sign in below |
+  | `/signup` link back to `/login` | Log in | Sign in |
+  | Magic-link confirm page button | Sign in to *App* | Sign in to *App* |
+  | Link-sent notice | …emailed you a sign-in link. | …emailed you a sign-in link. |
+
+  The default reproduces the pages' earlier wording byte for byte, including the
+  four places that already said "sign in". Any other label derives every form:
+  `"Log on"` gives *Log On*, *Log on to continue*, *or log on below* and
+  *log-on link*. The "Sign in with Google" and "Sign up" buttons are not
+  sign-in labels and do not change.
 
 ### User nav slots
 
@@ -920,6 +947,9 @@ set as a pair. R2 serves nothing anonymously from its S3 endpoint, so with an
 endpoint and no `s3_public_url`, `Studio::S3.url` raises `NotConfigured` and
 `upload` writes but returns `nil`; serve private objects with `signed_url`.
 
+`Studio::S3.delete` moves the object to `trash/` for three days rather than
+deleting it; see [Trash and restore](#trash-and-restore).
+
 An app with **no** bucket configured does not error — `/admin/emails` renders
 read-only, showing the inherited defaults it is genuinely sending and naming the
 one setting that turns uploads on.
@@ -932,6 +962,137 @@ Add it to the app's admin sidebar section:
 { label: "Emails", href: admin_emails_path, emoji: "✉️", desc: "Transactional email banners" }
 ```
 
+## Trash and restore
+
+A delete through the engine is recoverable for three days. R2 has no object
+versioning, so instead of deleting, the engine **moves** the object under
+`trash/` in the same bucket, and a lifecycle rule on the bucket expires
+`trash/` after three days:
+
+```text
+avatars/abc.png  ->  trash/2026-10-01/1759302000123/avatars/abc.png
+                     trash/<UTC date>/<epoch ms>/<original key>
+```
+
+The copy goes first and the delete second. A copy that fails raises and the
+delete is never sent, so a failure leaves the original in place. The trash copy
+keeps the object's content type, cache headers and metadata, and adds
+`original-key`, `deleted-at`, `deleted-env`, and what an Active Storage blob row
+needs to be rebuilt (`blob-content-type`, `blob-byte-size`, `blob-checksum`
+from a single-part ETag, and `blob-filename` when the upload carried a
+Content-Disposition). A single CopyObject moves at most 5 GiB, so a larger
+object raises `Studio::S3::Trash::TooLarge` and stays where it is.
+
+`trash/` always sits at the bucket **root**, even for an app under a
+`s3_key_prefix` in a shared bucket, so one lifecycle rule and one Cloudflare
+rule cover every app in the bucket.
+
+### What deletes, and what purges
+
+| Call | Effect |
+|------|--------|
+| `Studio::S3.delete(key:)` | Moves to trash; returns the trash key (nil if nothing was there) |
+| `Studio::S3.purge!(key:)` | Hard delete, gone at once |
+| `Studio::S3.list` | Leaves `trash/` keys out; `include_trash: true` keeps them |
+| Active Storage `service: StudioTrashS3`, `delete` | Moves the blob's object to trash (`Blob#purge`, a replaced attachment) |
+| Active Storage `service: StudioTrashS3`, `delete_prefixed` | Hard delete: Active Storage calls it for `variants/<key>/`, which regenerate from the original |
+
+**The production guard.** All four destructive paths refuse a bucket whose name
+ends in `-production` when the process is not production, by `Studio::S3`'s own
+resolution (`QA_ENV` first, so a QA app running Rails as production is NOT
+production, then `Rails.env`). They raise
+`Studio::S3::Trash::ProductionBucketRefused` before sending any request. The
+guard reads the bucket NAME, so it protects only buckets that follow the
+`<app>-production` convention.
+
+### Set up the bucket (once per bucket, before an app adopts)
+
+Without the lifecycle rule, trash never expires. In the Cloudflare dashboard:
+R2 → the bucket → Settings → Object lifecycle rules → add a rule for prefix
+`trash/` that deletes objects 3 days after upload. A trash copy is a new object,
+so "uploaded" is the moment it was deleted. The same rule as S3 lifecycle JSON
+(R2's S3 API and AWS both take it). `aws s3api
+put-bucket-lifecycle-configuration` REPLACES the bucket's whole lifecycle
+configuration, R2's default abort-incomplete-multipart rule included, so read
+the current rules first (`get-bucket-lifecycle-configuration`) and send them
+together with this one, or use the dashboard:
+
+```json
+{
+  "Rules": [
+    {
+      "ID": "expire-trash-3d",
+      "Status": "Enabled",
+      "Filter": { "Prefix": "trash/" },
+      "Expiration": { "Days": 3 }
+    }
+  ]
+}
+```
+
+A public bucket also serves `trash/` from its custom domain unless it is
+blocked, which would keep a "deleted" profile picture reachable by URL for three
+days. Add a Cloudflare WAF custom rule on the zone, action **Block**:
+
+```text
+(http.host in {"assets.example.com"} and starts_with(http.request.uri.path, "/trash/"))
+```
+
+Name every `assets.<domain>` host the bucket answers on. If the bucket has the
+`r2.dev` public URL enabled, turn it off; a WAF rule cannot cover it.
+
+### Adopt it in an app
+
+Active Storage: change the R2 service in `config/storage.yml` from `service: S3`
+to `service: StudioTrashS3`. Every other key stays as it is:
+
+```yaml
+r2:
+  service: StudioTrashS3
+  bucket: my-app-production
+  endpoint: <%= ENV["R2_ENDPOINT"] %>
+  region: auto
+  access_key_id: <%= ENV["R2_ACCESS_KEY_ID"] %>
+  secret_access_key: <%= ENV["R2_SECRET_ACCESS_KEY"] %>
+```
+
+An app with its own S3 service subclass (turf-monster's
+`ActiveStorage::Service::R2PublicService`) inherits from the trash service
+instead:
+
+```ruby
+require "active_storage/service/studio_trash_s3_service"
+
+module ActiveStorage
+  class Service::R2PublicService < Service::StudioTrashS3Service
+    # ...
+  end
+end
+```
+
+`Studio::S3` callers need no change: `delete` trashes from this release on. Call
+`purge!` where an object truly has no value after deletion.
+
+### Find and restore a deleted object
+
+```bash
+bin/rails "studio:trash:list"                      # everything in trash
+bin/rails "studio:trash:list[avatars/abc.png]"     # one key's trash copies
+bin/rails "studio:trash:restore[trash/2026-10-01/1759302000123/avatars/abc.png]"
+```
+
+Both read `Studio::S3`'s bucket. `SERVICE=<storage.yml service name>` reads an
+Active Storage service's bucket instead, e.g. `SERVICE=r2`. A restore copies the
+object back to its original key and leaves the trash copy for the lifecycle rule
+to expire. It refuses to overwrite an object already at the original key unless
+`FORCE=1`.
+
+Restoring an Active Storage object restores its **bytes only**. The blob row was
+destroyed before the object was trashed, so the task prints the
+`ActiveStorage::Blob.create!(...)` to run, filled from the trash copy's metadata,
+and the record must be re-attached by hand. `filename` is known only when the
+upload carried a Content-Disposition; supply it otherwise.
+
 ## Overriding Views
 
 This is a non-isolated engine -- app views at the same path automatically override engine views. For example, placing `app/views/sessions/new.html.erb` in the consuming app replaces the engine's login page.

data/app/controllers/magic_links_controller.rb

@@ -28,7 +28,7 @@ class MagicLinksController < ApplicationController
     end
     respond_to do |format|
       format.json { render json: { success: true } }
-      format.html { redirect_to login_path, notice: "Check your inbox — we just emailed you a sign-in link." }
+      format.html { redirect_to login_path, notice: "Check your inbox — we just emailed you a #{Studio::AuthLabels.link_noun(Studio.sign_in_label)}." }
     end
   end
 

data/app/controllers/registrations_controller.rb

@@ -12,13 +12,15 @@ class RegistrationsController < ApplicationController
     # straight from a signup POST would skip proof of email ownership, so we
     # treat "sign up" as a magic-link request — the create-or-login link (which
     # only fires after the recipient clicks it) does the account creation.
-    unless Studio.auth_method?(:password)
+    # Gated on the same predicate registrations/new renders the password form on,
+    # so the form a visitor sees is always the form this action reads.
+    unless Studio.password_login_available?
       email = (params.dig(:user, :email) || params[:email]).to_s.strip.downcase
       if email.match?(URI::MailTo::EMAIL_REGEXP)
         token = issue_magic_link(email, nil)
         Studio::Email.deliver(UserMailer, :magic_link, email, token, to: email)
       end
-      return redirect_to login_path, notice: "Check your inbox — we just emailed you a sign-in link."
+      return redirect_to login_path, notice: "Check your inbox — we just emailed you a #{Studio::AuthLabels.link_noun(Studio.sign_in_label)}."
     end
 
     @user = User.new(user_params)

data/app/helpers/studio/site_footer_helper.rb

@@ -155,6 +155,15 @@ module Studio
       render "studio/site_footer/assets"
     end
 
+    # The map's styles and mount script, once per page. Only the map partial
+    # asks, so a page with no map names no Leaflet.
+    def studio_footer_map_assets
+      return if @_studio_footer_map_assets_rendered
+
+      @_studio_footer_map_assets_rendered = true
+      render "studio/site_footer/map_assets"
+    end
+
     def studio_booking_assets
       return if @_studio_booking_assets_rendered
 

data/app/views/registrations/new.html.erb

@@ -3,6 +3,15 @@
   words = Studio.app_name.split
   last_word = words.pop
   prefix = words.join(" ")
+  # /signup renders from the app's configured auth_methods, exactly as /login does
+  # (sessions/new.html.erb): the PASSWORD form only when passwords are available
+  # (Studio.password_login_available?), otherwise the passwordless email form when
+  # :magic_link is enabled, and the Google button only when :google is. The passwordless
+  # POST (RegistrationsController#create) reads the email alone and mails a sign-in link,
+  # so that form asks for no password and no name: neither would be stored.
+  password_signup = Studio.password_login_available?
+  email_signup = password_signup || Studio.auth_method?(:magic_link)
+  ask_name = password_signup && Studio.registration_params.include?(:name)
 %>
 
 <div class="min-h-[70vh] flex items-center justify-center">
@@ -24,56 +33,70 @@
         </div>
       <% end %>
 
-      <%= form_with model: @user, url: signup_path, method: :post do |f| %>
-        <% if Studio.registration_params.include?(:name) %>
+      <% if email_signup %>
+        <%= form_with model: @user, url: signup_path, method: :post do |f| %>
+          <% if ask_name %>
+            <div class="mb-5">
+              <label for="user_name" class="block text-sm text-secondary mb-2 font-medium">Name</label>
+              <%= f.text_field :name, id: "user_name", autofocus: true,
+                class: "input-field",
+                placeholder: "Your name" %>
+            </div>
+          <% end %>
+
           <div class="mb-5">
-            <label for="user_name" class="block text-sm text-secondary mb-2 font-medium">Name</label>
-            <%= f.text_field :name, id: "user_name", autofocus: true,
+            <label for="user_email" class="block text-sm text-secondary mb-2 font-medium">Email</label>
+            <%= f.email_field :email, id: "user_email", autofocus: !ask_name,
               class: "input-field",
-              placeholder: "Your name" %>
+              placeholder: "you@example.com" %>
           </div>
-        <% end %>
 
-        <div class="mb-5">
-          <label for="user_email" class="block text-sm text-secondary mb-2 font-medium">Email</label>
-          <%= f.email_field :email, id: "user_email", autofocus: !Studio.registration_params.include?(:name),
-            class: "input-field",
-            placeholder: "you@example.com" %>
-        </div>
+          <% if password_signup %>
+            <div class="mb-5">
+              <label for="user_password" class="block text-sm text-secondary mb-2 font-medium">Password</label>
+              <%= f.password_field :password, id: "user_password",
+                class: "input-field",
+                placeholder: "Choose a password" %>
+            </div>
 
-        <div class="mb-5">
-          <label for="user_password" class="block text-sm text-secondary mb-2 font-medium">Password</label>
-          <%= f.password_field :password, id: "user_password",
-            class: "input-field",
-            placeholder: "Choose a password" %>
-        </div>
+            <div class="mb-6">
+              <label for="user_password_confirmation" class="block text-sm text-secondary mb-2 font-medium">Confirm Password</label>
+              <%= f.password_field :password_confirmation, id: "user_password_confirmation",
+                class: "input-field",
+                placeholder: "Confirm your password" %>
+            </div>
 
-        <div class="mb-6">
-          <label for="user_password_confirmation" class="block text-sm text-secondary mb-2 font-medium">Confirm Password</label>
-          <%= f.password_field :password_confirmation, id: "user_password_confirmation",
-            class: "input-field",
-            placeholder: "Confirm your password" %>
-        </div>
+            <button type="submit" class="btn btn-primary btn-lg w-full">
+              Sign Up
+            </button>
+          <% else %>
+            <button type="submit" class="btn btn-primary btn-lg w-full">
+              Send <%= Studio::AuthLabels.link_noun(Studio.sign_in_label) %>
+            </button>
 
-        <button type="submit" class="btn btn-primary btn-lg w-full">
-          Sign Up
-        </button>
+            <p class="text-center text-secondary text-sm mt-4">We will email you a link that signs you in and creates your account.</p>
+          <% end %>
+        <% end %>
       <% end %>
 
-      <div class="relative my-6">
-        <div class="absolute inset-0 flex items-center"><div class="w-full border-t border-subtle"></div></div>
-        <div class="relative flex justify-center text-sm"><span class="bg-surface px-3 text-secondary">or</span></div>
-      </div>
+      <% if Studio.auth_method?(:google) %>
+        <% if email_signup %>
+          <div class="relative my-6">
+            <div class="absolute inset-0 flex items-center"><div class="w-full border-t border-subtle"></div></div>
+            <div class="relative flex justify-center text-sm"><span class="bg-surface px-3 text-secondary">or</span></div>
+          </div>
+        <% end %>
 
-      <%= button_to "/auth/google_oauth2", method: :post, data: { turbo: false },
-        class: "btn btn-google btn-lg w-full gap-3" do %>
-        <%= render "components/google_logo" %>
-        Sign up with Google
+        <%= button_to "/auth/google_oauth2", method: :post, data: { turbo: false },
+          class: "btn btn-google btn-lg w-full gap-3" do %>
+          <%= render "components/google_logo" %>
+          Sign up with Google
+        <% end %>
       <% end %>
 
       <p class="text-center text-secondary text-sm mt-6">
         Already have an account?
-        <%= link_to "Log in", login_path, class: "text-primary hover:text-primary-300 font-medium underline underline-offset-2" %>
+        <%= link_to Studio::AuthLabels.link(Studio.sign_in_label), login_path, class: "text-primary hover:text-primary-300 font-medium underline underline-offset-2" %>
       </p>
     </div>
   </div>

data/app/views/sessions/_sso_continue.html.erb

@@ -11,7 +11,7 @@
 
     <div class="flex items-center gap-3 mt-5">
       <div class="flex-1 h-px border-t border-subtle"></div>
-      <span class="text-muted text-xs uppercase tracking-wider">or sign in below</span>
+      <span class="text-muted text-xs uppercase tracking-wider"><%= Studio::AuthLabels.or_below(Studio.sign_in_label) %></span>
       <div class="flex-1 h-px border-t border-subtle"></div>
     </div>
   </div>

data/app/views/sessions/new.html.erb

@@ -4,6 +4,9 @@
   words = Studio.app_name.split
   last_word = words.pop
   prefix = words.join(" ")
+  # The sign-in wording follows Studio.sign_in_label, as the navbar does
+  # (lib/studio/auth_labels.rb); the default label prints the wording these pages always had.
+  sign_in_label = Studio.sign_in_label
 %>
 
 <div class="min-h-[70vh] flex items-center justify-center">
@@ -13,7 +16,7 @@
         <img src="<%= logo_path %>" alt="<%= Studio.app_name %>" class="w-20 h-20 rounded-full shadow-lg mx-auto mb-4">
       <% end %>
       <h1 class="text-3xl font-extrabold text-heading tracking-tight"><%= prefix %> <span class="text-primary"><%= last_word %></span></h1>
-      <p class="text-secondary mt-2">Log in to continue</p>
+      <p class="text-secondary mt-2"><%= Studio::AuthLabels.prompt(sign_in_label) %></p>
     </div>
 
     <% if has_sso %>
@@ -57,7 +60,7 @@
           </div>
 
           <button type="submit" class="btn btn-primary btn-lg w-full">
-            Log In
+            <%= Studio::AuthLabels.button(sign_in_label) %>
           </button>
         <% end %>
       <% elsif Studio.auth_method?(:magic_link) %>
@@ -71,7 +74,7 @@
           </div>
 
           <button type="submit" class="btn btn-primary btn-lg w-full">
-            Send sign-in link
+            Send <%= Studio::AuthLabels.link_noun(sign_in_label) %>
           </button>
         <% end %>
       <% end %>

data/app/views/studio/_confirm_interstitial.html.erb

@@ -75,7 +75,7 @@
               method: :post,
               form: { id: "magic-consume-form", data: { turbo: "false" } },
               class: "magic-submit" do %>
-          Sign in to <%= Studio.app_name %>
+          <%= Studio::AuthLabels.to_app(Studio.sign_in_label, Studio.app_name) %>
         <% end %>
       </div>
     </main>