From 89ed0a76f9e437e36ad509c20e6a1935aa33a41e Mon Sep 17 00:00:00 2001 From: Rick Barrette Date: Fri, 13 Nov 2026 22:08:20 -0500 Subject: [PATCH] Move all user-facing text into config/locales/en.yml for localization - Views use lazy t(".key") lookups; sentences with values or links stay whole (interpolation, _html keys); counts use one/other plurals - Stored-value labels (statuses, types, priorities...) are LabelSets read from labels: in the current locale; field names and validation messages under activerecord:; flash and activity text under flash: - Services, models, helpers, mailer subjects, the logbook PDF, procedures templates, records package README and transcription warnings localized; the PDF reuses LogbookEntry#certification_statement instead of a copy - Scripts read js: strings from a JSON tag via app/javascript/i18n.js - Dates through I18n.l (app, weekday, month_year, long formats); html lang follows the locale - APP_LOCALE picks the language (falls back to English); missing translations raise in development and tests - README: Translating section and APP_LOCALE Co-Authored-By: Claude Opus 5.5 --- README.md | 13 + app/controllers/ad_alerts_controller.rb | 14 +- app/controllers/ad_compliances_controller.rb | 12 +- app/controllers/ad_imports_controller.rb | 8 +- app/controllers/admin/about_controller.rb | 20 +- app/controllers/admin/airports_controller.rb | 10 +- app/controllers/admin/audits_controller.rb | 2 +- .../admin/component_types_controller.rb | 6 +- .../admin/logbook_templates_controller.rb | 8 +- .../admin/offsite_backups_controller.rb | 18 +- .../admin/procedures_controller.rb | 10 +- app/controllers/admin/settings_controller.rb | 2 +- app/controllers/admin/users_controller.rb | 22 +- .../air_trail_connections_controller.rb | 12 +- app/controllers/aircraft_controller.rb | 12 +- .../aircraft_exports_controller.rb | 2 +- .../aircraft_imports_controller.rb | 6 +- app/controllers/aircraft_roles_controller.rb | 20 +- app/controllers/airport_codes_controller.rb | 2 +- .../airworthiness_directives_controller.rb | 16 +- app/controllers/application_controller.rb | 2 +- app/controllers/calendar_feeds_controller.rb | 8 +- app/controllers/calendar_tokens_controller.rb | 2 +- app/controllers/components_controller.rb | 16 +- app/controllers/concerns/aircraft_scoped.rb | 2 +- app/controllers/concerns/entry_signing.rb | 6 +- app/controllers/concerns/stored_upload.rb | 6 +- .../consumable_records_controller.rb | 12 +- app/controllers/direct_uploads_controller.rb | 4 +- .../document_collections_controller.rb | 12 +- app/controllers/documents_controller.rb | 30 +- .../entry_signatures_controller.rb | 2 +- app/controllers/flight_imports_controller.rb | 8 +- app/controllers/flight_logs_controller.rb | 20 +- .../inspection_records_controller.rb | 12 +- .../inspection_types_controller.rb | 18 +- .../invited_signings_controller.rb | 8 +- app/controllers/loading_setups_controller.rb | 4 +- app/controllers/logbook_entries_controller.rb | 22 +- app/controllers/logbook_imports_controller.rb | 4 +- app/controllers/logbook_prints_controller.rb | 4 +- .../maintenance_reports_controller.rb | 2 +- app/controllers/major_records_controller.rb | 12 +- app/controllers/notes_controller.rb | 12 +- app/controllers/oil_analyses_controller.rb | 24 +- app/controllers/passwords_controller.rb | 12 +- app/controllers/profiles_controller.rb | 6 +- app/controllers/record_versions_controller.rb | 6 +- .../records_packages_controller.rb | 2 +- app/controllers/searches_controller.rb | 2 +- app/controllers/sessions_controller.rb | 19 +- app/controllers/setup_controller.rb | 2 +- app/controllers/share_tokens_controller.rb | 8 +- app/controllers/sign_in_links_controller.rb | 14 +- .../signing_invitations_controller.rb | 10 +- app/controllers/squawks_controller.rb | 32 +- app/controllers/sso_controller.rb | 24 +- .../standard_inspections_controller.rb | 6 +- app/controllers/two_factors_controller.rb | 12 +- .../user_certificates_controller.rb | 10 +- .../weight_balance_records_controller.rb | 12 +- app/form_builders/app_form_builder.rb | 8 +- app/helpers/aircraft_helper.rb | 32 +- app/helpers/application_helper.rb | 30 +- app/helpers/flight_logs_helper.rb | 10 +- app/helpers/oil_analyses_helper.rb | 4 +- .../airport_autocomplete_controller.js | 3 +- .../controllers/bulk_upload_controller.js | 21 +- .../controllers/engine_chart_controller.js | 3 +- .../controllers/entry_template_controller.js | 3 +- .../controllers/insert_text_controller.js | 3 +- .../controllers/markdown_editor_controller.js | 5 +- .../controllers/next_due_controller.js | 7 +- .../controllers/offline_flight_controller.js | 5 +- .../controllers/offline_sync_controller.js | 11 +- .../controllers/theme_controller.js | 4 +- .../controllers/wb_calculator_controller.js | 11 +- app/javascript/i18n.js | 22 + app/javascript/next_due.js | 8 +- app/jobs/logbook_transcription_job.rb | 29 +- app/mailers/admin_mailer.rb | 6 +- app/mailers/passwords_mailer.rb | 2 +- app/mailers/reminder_mailer.rb | 4 +- app/mailers/sessions_mailer.rb | 4 +- app/mailers/signature_mailer.rb | 2 +- app/mailers/signing_invitation_mailer.rb | 2 +- app/models/ad_compliance.rb | 12 +- app/models/aircraft.rb | 13 +- app/models/aircraft_event.rb | 8 +- app/models/aircraft_import.rb | 2 +- app/models/aircraft_role.rb | 2 +- app/models/airport.rb | 2 +- app/models/airport_update.rb | 2 +- app/models/airworthiness_directive.rb | 11 +- app/models/component.rb | 10 +- app/models/concerns/calendar_interval.rb | 6 +- app/models/concerns/upload_validation.rb | 4 +- app/models/consumable_record.rb | 2 +- app/models/document.rb | 8 +- app/models/document_collection.rb | 2 +- app/models/entry_signature.rb | 7 +- app/models/inspection_record.rb | 2 +- app/models/inspection_type.rb | 24 +- app/models/label_set.rb | 30 + app/models/loading_setup.rb | 12 +- app/models/logbook_entry.rb | 69 +- app/models/mail_settings.rb | 11 +- app/models/major_record.rb | 2 +- app/models/oil_analysis.rb | 62 +- app/models/recordkeeping_policy.rb | 7 +- app/models/setting.rb | 13 +- app/models/share_token.rb | 4 +- app/models/squawk.rb | 19 +- app/models/system_info.rb | 31 +- app/models/user.rb | 2 +- app/models/user_certificate.rb | 3 +- app/models/weight_balance_record.rb | 2 +- app/services/ad_import.rb | 56 +- app/services/ad_watch.rb | 4 +- app/services/air_trail_client.rb | 2 +- app/services/air_trail_export.rb | 6 +- app/services/air_trail_flight_data.rb | 2 +- app/services/air_trail_syncer.rb | 4 +- app/services/aircraft_archive/importer.rb | 40 +- app/services/aircraft_grounded_error.rb | 2 +- app/services/airport_code_standardizer.rb | 2 +- app/services/airworthiness.rb | 66 +- app/services/database_backup.rb | 2 +- app/services/due_list.rb | 12 +- app/services/engine_data_parser.rb | 6 +- app/services/entry_signer.rb | 8 +- app/services/flight_import.rb | 40 +- app/services/flight_stats.rb | 12 +- app/services/google_drive_client.rb | 20 +- app/services/hours_service.rb | 13 +- app/services/logbook_entry_pdf.rb | 78 +- app/services/logbook_transcriber.rb | 14 +- app/services/offsite_backup.rb | 12 +- app/services/oil_report_parser.rb | 4 +- app/services/oil_report_parser/avlab.rb | 4 +- app/services/oil_report_parser/blackstone.rb | 4 +- app/services/procedures_templates.rb | 58 +- app/services/records_audit.rb | 44 +- app/services/records_integrity.rb | 10 +- app/services/records_package.rb | 51 +- app/services/site_search.rb | 13 +- app/services/track_parser.rb | 8 +- app/views/ad_compliances/_form.html.erb | 30 +- app/views/ad_imports/new.html.erb | 20 +- app/views/ad_imports/show.html.erb | 32 +- app/views/admin/about/show.html.erb | 85 +- app/views/admin/airports/_form.html.erb | 16 +- app/views/admin/airports/edit.html.erb | 2 +- app/views/admin/airports/index.html.erb | 46 +- app/views/admin/airports/new.html.erb | 2 +- app/views/admin/audits/index.html.erb | 12 +- app/views/admin/audits/new.html.erb | 28 +- app/views/admin/audits/show.html.erb | 12 +- .../admin/component_types/_form.html.erb | 6 +- app/views/admin/component_types/edit.html.erb | 2 +- .../admin/component_types/index.html.erb | 10 +- app/views/admin/component_types/new.html.erb | 2 +- .../admin/logbook_templates/_form.html.erb | 20 +- .../admin/logbook_templates/edit.html.erb | 4 +- .../admin/logbook_templates/index.html.erb | 14 +- .../admin/logbook_templates/new.html.erb | 4 +- app/views/admin/offsite_backups/show.html.erb | 62 +- app/views/admin/procedures/_document.html.erb | 122 +- app/views/admin/procedures/show.html.erb | 64 +- app/views/admin/settings/edit.html.erb | 34 +- app/views/admin/users/_form.html.erb | 10 +- app/views/admin/users/edit.html.erb | 2 +- app/views/admin/users/index.html.erb | 20 +- app/views/admin/users/new.html.erb | 2 +- app/views/admin_mailer/offsite_alert.html.erb | 4 +- app/views/admin_mailer/offsite_alert.text.erb | 6 +- app/views/admin_mailer/records_alert.html.erb | 8 +- app/views/admin_mailer/records_alert.text.erb | 8 +- app/views/admin_mailer/test_email.html.erb | 4 +- app/views/admin_mailer/test_email.text.erb | 4 +- app/views/air_trail_connections/show.html.erb | 60 +- app/views/air_trail_exports/new.html.erb | 36 +- app/views/aircraft/_form.html.erb | 29 +- app/views/aircraft/_last_flight.html.erb | 22 +- app/views/aircraft/edit.html.erb | 10 +- app/views/aircraft/index.html.erb | 18 +- app/views/aircraft/new.html.erb | 4 +- app/views/aircraft/show.html.erb | 60 +- app/views/aircraft_imports/new.html.erb | 25 +- app/views/aircraft_imports/show.html.erb | 24 +- app/views/aircraft_roles/index.html.erb | 48 +- app/views/airport_codes/show.html.erb | 28 +- .../airworthiness_directives/_form.html.erb | 30 +- .../airworthiness_directives/index.html.erb | 86 +- app/views/components/_form.html.erb | 62 +- app/views/components/edit.html.erb | 2 +- app/views/components/index.html.erb | 26 +- app/views/components/new.html.erb | 2 +- app/views/components/show.html.erb | 58 +- app/views/consumable_records/_form.html.erb | 16 +- .../consumable_records/_records.html.erb | 8 +- app/views/consumable_records/index.html.erb | 18 +- app/views/document_collections/_form.html.erb | 8 +- app/views/documents/_doc_row.html.erb | 8 +- app/views/documents/_form.html.erb | 30 +- app/views/documents/_viewer.html.erb | 10 +- app/views/documents/bulk_new.html.erb | 34 +- app/views/documents/index.html.erb | 18 +- app/views/documents/show.html.erb | 2 +- app/views/entry_signatures/_form.html.erb | 26 +- app/views/entry_signatures/new.html.erb | 2 +- app/views/errors/not_found.html.erb | 6 +- app/views/events/_list.html.erb | 4 +- app/views/events/index.html.erb | 8 +- app/views/flight_imports/new.html.erb | 36 +- app/views/flight_imports/show.html.erb | 44 +- app/views/flight_logs/_days.html.erb | 24 +- app/views/flight_logs/_engine_data.html.erb | 64 +- app/views/flight_logs/_stats.html.erb | 36 +- app/views/flight_logs/index.html.erb | 14 +- app/views/flight_logs/new.html.erb | 44 +- app/views/flight_logs/show.html.erb | 28 +- app/views/help/show.html.erb | 6 +- app/views/inspection_records/_form.html.erb | 12 +- app/views/inspection_types/_form.html.erb | 30 +- app/views/inspections/index.html.erb | 24 +- app/views/invited_signings/expired.html.erb | 6 +- app/views/invited_signings/new.html.erb | 12 +- app/views/invited_signings/signed.html.erb | 4 +- app/views/invited_signings/welcome.html.erb | 20 +- .../invited_signings/wrong_account.html.erb | 8 +- app/views/layouts/application.html.erb | 43 +- app/views/layouts/mailer.html.erb | 2 +- app/views/layouts/public.html.erb | 9 +- app/views/layouts/report.html.erb | 4 +- app/views/loading_setups/edit.html.erb | 40 +- .../_component_fields.html.erb | 24 +- app/views/logbook_entries/_content.html.erb | 18 +- app/views/logbook_entries/_form.html.erb | 46 +- app/views/logbook_entries/_signature.html.erb | 10 +- app/views/logbook_entries/index.html.erb | 30 +- app/views/logbook_entries/show.html.erb | 42 +- app/views/logbook_imports/new.html.erb | 42 +- app/views/logbook_imports/show.html.erb | 25 +- app/views/logbook_prints/new.html.erb | 18 +- app/views/maintenance_reports/show.html.erb | 88 +- app/views/major_records/_form.html.erb | 22 +- app/views/major_records/index.html.erb | 12 +- app/views/major_records/show.html.erb | 34 +- app/views/notes/_form.html.erb | 16 +- app/views/notes/index.html.erb | 14 +- .../oil_analyses/_element_input.html.erb | 4 +- app/views/oil_analyses/_form.html.erb | 40 +- app/views/oil_analyses/_import.html.erb | 4 +- app/views/oil_analyses/edit.html.erb | 2 +- app/views/oil_analyses/index.html.erb | 38 +- app/views/oil_analyses/new.html.erb | 6 +- app/views/oil_analyses/show.html.erb | 48 +- app/views/passwords/edit.html.erb | 8 +- app/views/passwords/new.html.erb | 6 +- app/views/passwords_mailer/reset.html.erb | 3 +- app/views/passwords_mailer/reset.text.erb | 3 +- app/views/profiles/edit.html.erb | 92 +- app/views/record_versions/_list.html.erb | 4 +- app/views/record_versions/index.html.erb | 10 +- app/views/reminder_mailer/weekly.html.erb | 20 +- app/views/reminder_mailer/weekly.text.erb | 18 +- app/views/searches/show.html.erb | 20 +- app/views/sessions/new.html.erb | 16 +- app/views/sessions/two_factor.html.erb | 12 +- app/views/sessions_mailer/locked.html.erb | 4 +- app/views/sessions_mailer/locked.text.erb | 4 +- .../sessions_mailer/sign_in_link.html.erb | 6 +- .../sessions_mailer/sign_in_link.text.erb | 4 +- app/views/setup/new.html.erb | 12 +- app/views/shared/_aircraft_header.html.erb | 24 +- .../shared/_applicability_fields.html.erb | 6 +- app/views/shared/_disclaimer_footer.html.erb | 4 +- app/views/shared/_oil_subnav.html.erb | 4 +- app/views/shared/_sign_as.html.erb | 6 +- app/views/shared/_theme_toggle.html.erb | 2 +- app/views/shared/show.html.erb | 56 +- app/views/sign_in_links/new.html.erb | 12 +- app/views/sign_in_links/show.html.erb | 10 +- app/views/signature_mailer/signed.html.erb | 16 +- app/views/signature_mailer/signed.text.erb | 16 +- .../signing_invitation_mailer/invite.html.erb | 6 +- .../signing_invitation_mailer/invite.text.erb | 6 +- app/views/signing_invitations/new.html.erb | 14 +- app/views/squawks/_attachments.html.erb | 20 +- app/views/squawks/_form.html.erb | 18 +- app/views/squawks/_table.html.erb | 12 +- app/views/squawks/deferral.html.erb | 26 +- app/views/squawks/edit.html.erb | 2 +- app/views/squawks/index.html.erb | 18 +- app/views/squawks/new.html.erb | 2 +- app/views/squawks/resolution.html.erb | 30 +- app/views/standard_inspections/new.html.erb | 16 +- app/views/two_factors/codes.html.erb | 8 +- app/views/two_factors/new.html.erb | 20 +- .../_calculator.html.erb | 16 +- .../weight_balance_records/_form.html.erb | 20 +- .../weight_balance_records/edit.html.erb | 2 +- .../weight_balance_records/index.html.erb | 40 +- app/views/weight_balance_records/new.html.erb | 2 +- config/application.rb | 6 + config/brakeman.ignore | 12 +- config/environments/development.rb | 2 +- config/environments/production.rb | 1 - config/environments/test.rb | 2 +- config/importmap.rb | 1 + config/locales/en.yml | 3856 ++++++++++++++++- test/integration/document_bulk_upload_test.rb | 2 +- 313 files changed, 6387 insertions(+), 2653 deletions(-) create mode 100644 app/javascript/i18n.js create mode 100644 app/models/label_set.rb diff --git a/README.md b/README.md index a5e7aa0..eb8f40e 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ The app is a standard Rails app. Run `bin/rails db:prepare && bin/thrust bin/rai | `APP_HOST` | Host name the app is reached at, used in email links (password resets, sign-in links, signing invitations, reminders). | | `SMTP_ADDRESS`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `MAIL_FROM` | Optional. They enable email: password resets and **Email me a sign-in link**. Without them an admin resets passwords from **Users**. Check the setup with **Admin → About → Send test email**. | | `SMTP_TLS` | `true` for servers that use TLS from the start. That's the default on port 465; other ports upgrade with STARTTLS. | +| `APP_LOCALE` | Optional. The app's language, e.g. `es` for `config/locales/es.yml` (see [Translating](#translating)). Default `en`. | | `ANTHROPIC_API_KEY` | Optional. Lets Claude transcribe scanned logbook pages into entries (**Logbook → Import scans**). Without it, scans are only uploaded. | | `LOGBOOK_AI_MODEL`, `LOGBOOK_AI_EFFORT` | Optional. The Claude model and effort used for transcription (default `claude-opus-5-5`, `high`). | | `APP_URL` | Optional public base URL, e.g. `https://aircraft.example.com` (default `https://APP_HOST`). Used for the SSO and Google Drive redirect URIs. | @@ -198,6 +199,18 @@ The MCP server for AI agents, invitation codes, per-aircraft feature switches, t AirTrail sync and export, an airport database, FAA DRS AD import, spreadsheet flight import, engine monitor data (CGR-30P/C) with interactive charts, AvLab and Blackstone oil analysis import with trends, multiple squawk attachments with a photo viewer, AI logbook transcription with Claude (images and PDFs), printable logbook entries, electronic signatures and recordkeeping along the lines of AC 120-78B (record history, nightly integrity checks, records package, procedures and audits), off-site backup to Google Drive, a user guide, and an installable PWA. +## Translating + +Every piece of text the app shows (pages, emails, messages, labels, printed logbook entries, the procedures and records-package text, and the scripts' messages) is in [`config/locales/en.yml`](config/locales/en.yml). To translate the app: + +1. Copy `en.yml` to `.yml` (for example `es.yml`), change the top key from `en:` to `es:`, and translate the values. Keep the `%{name}` placeholders and any HTML tags in keys ending in `_html`. Keys with `one:` / `other:` are counted forms. +2. For month and day names in dates, also add that language's standard Rails translations (for example from the [rails-i18n](https://github.com/svenfuchs/rails-i18n) project). +3. Set `APP_LOCALE=es` and restart. Anything not yet translated shows in English. + +Where the text lives in `en.yml`: `labels:` are the names of stored values (statuses, types, priorities); `activerecord:` holds field names and validation messages; `flash:` holds the messages shown after an action; `services:`, `models:` and `helpers:` hold text built in Ruby; `js:` holds the scripts' text; the rest are keyed by page (`..`). The user guide under Help is Markdown in `docs/guide` and is translated separately. + +In development and tests a missing translation raises an error, so a page that uses a key not in `en.yml` fails its test. + ## Disclaimer Simple Aircraft Manager is provided **as is**, without warranty of any kind, express or implied. It is not approved, certified or endorsed by the FAA or any other aviation authority. diff --git a/app/controllers/ad_alerts_controller.rb b/app/controllers/ad_alerts_controller.rb index 86311e9..94c9da3 100644 --- a/app/controllers/ad_alerts_controller.rb +++ b/app/controllers/ad_alerts_controller.rb @@ -4,31 +4,31 @@ class AdAlertsController < ApplicationController include AircraftScoped before_action :require_owner! before_action :set_alert, only: %i[track dismiss] - rate_limit to: 5, within: 1.minute, only: :check, with: -> { redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: "Try again in a minute." } + rate_limit to: 5, within: 1.minute, only: :check, with: -> { redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: t("flash.ad_alerts.try_again_in_a") } def check found = AdWatch.new(@aircraft).check! redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), - notice: found.any? ? "Found #{helpers.pluralize(found.size, 'newly published AD')} to review." : "No new ADs found for #{AdWatch.new(@aircraft).terms.map(&:label).uniq.to_sentence}." + notice: found.any? ? t("flash.ad_alerts.found", count: found.size) : t("flash.ad_alerts.none_found", terms: AdWatch.new(@aircraft).terms.map(&:label).uniq.to_sentence) rescue AdWatch::Error => e - redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: "Couldn't check for new ADs: #{e.message}." + redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: t("flash.ad_alerts.couldn_t_check_for", message: e.message) end def track ad = @alert.track! - log_event("ad", "AD tracked from the Federal Register: #{ad.name}") + log_event("ad", t("flash.ad_alerts.ad_tracked_from_the", name: ad.name)) redirect_to edit_aircraft_airworthiness_directive_path(@aircraft, ad), - notice: "#{ad.name} is now tracked. Set its applicability and recurrence from the AD's text, then record compliance or mark it not applicable." + notice: t("flash.ad_alerts.is_now_tracked_set", name: ad.name) end def dismiss @alert.dismiss! - redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: "Dismissed." + redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: t("flash.ad_alerts.dismissed") end def terms @aircraft.update!(ad_watch_terms: params[:ad_watch_terms].to_s.strip.first(500).presence) - redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: "Search terms saved." + redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: t("flash.ad_alerts.search_terms_saved") end private diff --git a/app/controllers/ad_compliances_controller.rb b/app/controllers/ad_compliances_controller.rb index 0afaab0..52df3df 100644 --- a/app/controllers/ad_compliances_controller.rb +++ b/app/controllers/ad_compliances_controller.rb @@ -9,7 +9,7 @@ class AdCompliancesController < ApplicationController aircraft_hours_at_compliance: @aircraft.current_hours, compliance_method: params[:not_applicable] == "1" ? "not_applicable" : "inspection") @compliance.apply_method - @compliance.compliance_notes = "Not applicable: " if @compliance.not_applicable? + @compliance.compliance_notes = t("flash.ad_compliances.not_applicable_prefix") if @compliance.not_applicable? @compliance.fill_next_due end @@ -17,7 +17,7 @@ class AdCompliancesController < ApplicationController @compliance = AdCompliance.new(compliance_params.merge(aircraft: @aircraft)) if @compliance.save log_event("ad", "#{@compliance.not_applicable? ? "Marked N/A" : "Compliance recorded"}: #{@compliance.airworthiness_directive.name}") - redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "Compliance recorded." + redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.ad_compliances.compliance_recorded") else render :new, status: :unprocessable_entity end @@ -27,8 +27,8 @@ class AdCompliancesController < ApplicationController def update if @compliance.update(compliance_params) - log_event("ad", "Compliance updated: #{@compliance.airworthiness_directive.name}") - redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "Compliance updated." + log_event("ad", t("flash.ad_compliances.compliance_updated_2", name: @compliance.airworthiness_directive.name)) + redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.ad_compliances.compliance_updated") else render :edit, status: :unprocessable_entity end @@ -36,8 +36,8 @@ class AdCompliancesController < ApplicationController def destroy @compliance.destroy! - log_event("ad", "Compliance deleted: #{@compliance.airworthiness_directive.name}") - redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "Compliance record deleted." + log_event("ad", t("flash.ad_compliances.compliance_deleted", name: @compliance.airworthiness_directive.name)) + redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.ad_compliances.compliance_record_deleted") end private diff --git a/app/controllers/ad_imports_controller.rb b/app/controllers/ad_imports_controller.rb index b716bba..aa70adb 100644 --- a/app/controllers/ad_imports_controller.rb +++ b/app/controllers/ad_imports_controller.rb @@ -14,7 +14,7 @@ class AdImportsController < ApplicationController def show @token = params[:token].to_s - return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(@token) + return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(@token) @filename = params[:filename].to_s @import = AdImport.new(@aircraft, path: stored_path(@token), filename: @filename) @import.rows @@ -24,7 +24,7 @@ class AdImportsController < ApplicationController def confirm token = params[:token].to_s - return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(token) + return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(token) import = AdImport.new(@aircraft, path: stored_path(token), filename: params[:filename]) # Only AD numbers present in the uploaded file; values are checked against AdImport::ACTIONS. decisions = params.fetch(:decisions, {}).permit(*import.rows.map(&:number)).to_h @@ -34,8 +34,8 @@ class AdImportsController < ApplicationController models_covered: DrsImport.covered(@aircraft, import.rows.flat_map(&:models))) discard_upload(token) redirect_to aircraft_airworthiness_directives_path(@aircraft), - notice: "Imported #{result[:tracked]} ADs to track and #{result[:not_applicable]} marked N/A; " \ - "#{result[:updated]} existing ADs updated, #{result[:skipped]} skipped." + notice: t("flash.ad_imports.imported_ads_to_track", tracked: result[:tracked], not_applicable: result[:not_applicable], + updated: result[:updated], skipped: result[:skipped]) rescue AdImport::Error => e redirect_to_upload(e.message) end diff --git a/app/controllers/admin/about_controller.rb b/app/controllers/admin/about_controller.rb index 90d7bff..7bdacc1 100644 --- a/app/controllers/admin/about_controller.rb +++ b/app/controllers/admin/about_controller.rb @@ -1,6 +1,6 @@ class Admin::AboutController < ApplicationController before_action :require_admin! - rate_limit to: 5, within: 1.minute, only: %i[test_email test_reminder check_records], with: -> { redirect_to admin_about_path, alert: "Try again in a minute." } + rate_limit to: 5, within: 1.minute, only: %i[test_email test_reminder check_records], with: -> { redirect_to admin_about_path, alert: t("flash.admin_about.try_again_in_a") } def show @info = SystemInfo.new @@ -11,33 +11,33 @@ class Admin::AboutController < ApplicationController backup = DatabaseBackup.run! check = RecordsIntegrity.check! if backup.ok && check.ok - redirect_to admin_about_path(anchor: "records"), notice: "Backed up and checked: no problems found." + redirect_to admin_about_path(anchor: "records"), notice: t("flash.admin_about.backed_up_and_checked") else - redirect_to admin_about_path(anchor: "records"), alert: "The records check found problems; see Records below." + redirect_to admin_about_path(anchor: "records"), alert: t("flash.admin_about.the_records_check_found") end end # This week's reminder for the current admin, now. def test_reminder - return redirect_to(admin_about_path, alert: "Email isn't set up yet.") unless MailSettings.configured? + return redirect_to(admin_about_path, alert: t("flash.admin_about.email_isn_t_set")) unless MailSettings.configured? unless ReminderMailer.anything_for?(current_user) - return redirect_to admin_about_path, notice: "Nothing needs attention on the aircraft you own or your certificates, so there's no reminder to send." + return redirect_to admin_about_path, notice: t("flash.admin_about.nothing_needs_attention_on") end ReminderMailer.weekly(current_user).deliver_now - redirect_to admin_about_path, notice: "Reminder sent to #{current_user.email_address}." + redirect_to admin_about_path, notice: t("flash.admin_about.reminder_sent_to", email_address: current_user.email_address) rescue StandardError => e - redirect_to admin_about_path, alert: "Sending failed: #{e.class.name.demodulize}: #{e.message.to_s.squish.truncate(240)}" + redirect_to admin_about_path, alert: t("flash.admin_about.sending_failed", error: e.class.name.demodulize, message: e.message.to_s.squish.truncate(240)) end # Sends right away (not via the job queue) so problems show up here. def test_email unless MailSettings.configured? - return redirect_to admin_about_path, alert: "Email isn't set up yet: set SMTP_ADDRESS (and SMTP_PORT, SMTP_USERNAME, SMTP_PASSWORD, MAIL_FROM)." + return redirect_to admin_about_path, alert: t("flash.admin_about.email_isn_t_set_2") end AdminMailer.test_email(current_user).deliver_now - redirect_to admin_about_path, notice: "Test email sent to #{current_user.email_address}. If it doesn't arrive, check the spam folder." + redirect_to admin_about_path, notice: t("flash.admin_about.test_email_sent_to", email_address: current_user.email_address) rescue StandardError => e # SMTP, DNS, TLS and timeout errors alike Rails.logger.warn("[test email] #{e.class}: #{e.message}") - redirect_to admin_about_path, alert: "Sending failed: #{e.class.name.demodulize}: #{e.message.to_s.squish.truncate(240)}" + redirect_to admin_about_path, alert: t("flash.admin_about.sending_failed_2", error: e.class.name.demodulize, message: e.message.to_s.squish.truncate(240)) end end diff --git a/app/controllers/admin/airports_controller.rb b/app/controllers/admin/airports_controller.rb index 8f86268..d3879c9 100644 --- a/app/controllers/admin/airports_controller.rb +++ b/app/controllers/admin/airports_controller.rb @@ -16,11 +16,11 @@ class Admin::AirportsController < ApplicationController # Queue a download + sync from OurAirports. def refresh if AirportUpdate.in_progress.exists? - redirect_to admin_airports_path, alert: "An update is already running." + redirect_to admin_airports_path, alert: t("flash.admin_airports.an_update_is_already") else update = AirportUpdate.create!(source_url: AirportData::SOURCE_URL, requested_by: current_user) AirportUpdateJob.perform_later(update.id) - redirect_to admin_airports_path, notice: "Airport update started. Refresh this page in a minute or two." + redirect_to admin_airports_path, notice: t("flash.admin_airports.airport_update_started_refresh") end end @@ -31,7 +31,7 @@ class Admin::AirportsController < ApplicationController def create @airport = Airport.new(airport_params.merge(custom: true)) if @airport.save - redirect_to admin_airports_path, notice: "Custom airport #{@airport.ident} added." + redirect_to admin_airports_path, notice: t("flash.admin_airports.custom_airport_added", ident: @airport.ident) else render :new, status: :unprocessable_entity end @@ -41,7 +41,7 @@ class Admin::AirportsController < ApplicationController def update if @airport.update(airport_params) - redirect_to admin_airports_path, notice: "#{@airport.ident} updated." + redirect_to admin_airports_path, notice: t("flash.admin_airports.updated", ident: @airport.ident) else render :edit, status: :unprocessable_entity end @@ -49,7 +49,7 @@ class Admin::AirportsController < ApplicationController def destroy @airport.destroy! - redirect_to admin_airports_path, notice: "#{@airport.ident} removed." + redirect_to admin_airports_path, notice: t("flash.admin_airports.removed", ident: @airport.ident) end private diff --git a/app/controllers/admin/audits_controller.rb b/app/controllers/admin/audits_controller.rb index bd18c18..7bcb4c9 100644 --- a/app/controllers/admin/audits_controller.rb +++ b/app/controllers/admin/audits_controller.rb @@ -12,7 +12,7 @@ class Admin::AuditsController < ApplicationController def create answers = params.fetch(:answers, {}).permit(RecordsAudit::MANUAL.keys.index_with { %i[passed note] }).to_h run = RecordsAudit.new.record!(user: current_user, answers: answers, notes: params[:notes], sample_ids: Array(params[:sample_ids]).map(&:to_i)) - redirect_to admin_audit_path(run), notice: run.passed ? "Audit recorded: everything passed." : "Audit recorded, with items that didn't pass. Note what's being done about them." + redirect_to admin_audit_path(run), notice: run.passed ? t("flash.admin_audits.passed") : t("flash.admin_audits.not_passed") end def show diff --git a/app/controllers/admin/component_types_controller.rb b/app/controllers/admin/component_types_controller.rb index 8d9cfc7..ceb2219 100644 --- a/app/controllers/admin/component_types_controller.rb +++ b/app/controllers/admin/component_types_controller.rb @@ -13,7 +13,7 @@ class Admin::ComponentTypesController < ApplicationController def create @component_type = ComponentType.new(type_params) if @component_type.save - redirect_to admin_component_types_path, notice: "Component type created." + redirect_to admin_component_types_path, notice: t("flash.admin_component_types.component_type_created") else render :new, status: :unprocessable_entity end @@ -23,7 +23,7 @@ class Admin::ComponentTypesController < ApplicationController def update if @component_type.update(type_params) - redirect_to admin_component_types_path, notice: "Component type updated." + redirect_to admin_component_types_path, notice: t("flash.admin_component_types.component_type_updated") else render :edit, status: :unprocessable_entity end @@ -31,7 +31,7 @@ class Admin::ComponentTypesController < ApplicationController def destroy if @component_type.destroy - redirect_to admin_component_types_path, notice: "Component type deleted." + redirect_to admin_component_types_path, notice: t("flash.admin_component_types.component_type_deleted") else redirect_to admin_component_types_path, alert: @component_type.errors.full_messages.to_sentence end diff --git a/app/controllers/admin/logbook_templates_controller.rb b/app/controllers/admin/logbook_templates_controller.rb index a90b1d2..adea896 100644 --- a/app/controllers/admin/logbook_templates_controller.rb +++ b/app/controllers/admin/logbook_templates_controller.rb @@ -14,7 +14,7 @@ class Admin::LogbookTemplatesController < ApplicationController def create @template = LogbookTemplate.new(template_params) if @template.save - redirect_to admin_logbook_templates_path, notice: "Template added." + redirect_to admin_logbook_templates_path, notice: t("flash.admin_logbook_templates.template_added") else render :new, status: :unprocessable_entity end @@ -24,7 +24,7 @@ class Admin::LogbookTemplatesController < ApplicationController def update if @template.update(template_params) - redirect_to admin_logbook_templates_path, notice: "Template updated." + redirect_to admin_logbook_templates_path, notice: t("flash.admin_logbook_templates.template_updated") else render :edit, status: :unprocessable_entity end @@ -32,12 +32,12 @@ class Admin::LogbookTemplatesController < ApplicationController def destroy @template.destroy! - redirect_to admin_logbook_templates_path, notice: "Template deleted." + redirect_to admin_logbook_templates_path, notice: t("flash.admin_logbook_templates.template_deleted") end def restore added = LogbookTemplate.restore_defaults! - redirect_to admin_logbook_templates_path, notice: added.positive? ? "Restored #{helpers.pluralize(added, 'built-in template')}." : "All the built-in templates are already here." + redirect_to admin_logbook_templates_path, notice: added.positive? ? t("flash.admin_logbook_templates.restored", count: added) : t("flash.admin_logbook_templates.all_present") end private diff --git a/app/controllers/admin/offsite_backups_controller.rb b/app/controllers/admin/offsite_backups_controller.rb index 0090290..5c09bc5 100644 --- a/app/controllers/admin/offsite_backups_controller.rb +++ b/app/controllers/admin/offsite_backups_controller.rb @@ -16,12 +16,12 @@ class Admin::OffsiteBackupsController < ApplicationController changed_client = attrs[:client_id].present? && attrs[:client_id].strip != @connection.client_id @connection.disconnect! if changed_client && @connection.connected? @connection.update!(attrs.transform_values(&:strip)) - redirect_to admin_offsite_backup_path, notice: "Saved. Now connect your Google account." + redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.saved_now_connect_your") end # Off to Google to grant access (a link, so no form-action CSP entry is needed). def connect - return redirect_to(admin_offsite_backup_path, alert: "Enter the Google OAuth client ID and secret first.") unless @connection.configured? + return redirect_to(admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.enter_the_google_oauth")) unless @connection.configured? session[:offsite_oauth_state] = state = SecureRandom.urlsafe_base64(24) redirect_to GoogleDriveClient.authorize_url(client_id: @connection.client_id, redirect_uri: @connection.redirect_uri, state: state), allow_other_host: true @@ -30,9 +30,9 @@ class Admin::OffsiteBackupsController < ApplicationController def callback expected = session.delete(:offsite_oauth_state) unless expected.present? && params[:state].present? && ActiveSupport::SecurityUtils.secure_compare(expected, params[:state].to_s) - return redirect_to(admin_offsite_backup_path, alert: "That Google sign-in didn't match a request from here. Try connecting again.") + return redirect_to(admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.that_google_sign_in")) end - return redirect_to(admin_offsite_backup_path, alert: "Google Drive wasn't connected (#{params[:error]}).") if params[:error].present? || params[:code].blank? + return redirect_to(admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.google_drive_wasn_t", error: params[:error])) if params[:error].present? || params[:code].blank? token = GoogleDriveClient.exchange_code(client_id: @connection.client_id, client_secret: @connection.client_secret, code: params[:code].to_s, redirect_uri: @connection.redirect_uri) @@ -42,25 +42,25 @@ class Admin::OffsiteBackupsController < ApplicationController @connection.ensure_folders!(drive) Rails.logger.info("[offsite] #{current_user.email_address} connected Google Drive #{@connection.account_email}") OffsiteBackupJob.perform_later - redirect_to admin_offsite_backup_path, notice: "Google Drive connected (#{@connection.account_email}). The first off-site backup has started; it copies every uploaded file, so it can take a while." + redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.google_drive_connected_the", account_email: @connection.account_email) rescue GoogleDriveClient::Error => e - redirect_to admin_offsite_backup_path, alert: "Couldn't connect Google Drive: #{e.message}" + redirect_to admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.couldn_t_connect_google", message: e.message) end def destroy @connection.disconnect! Rails.logger.info("[offsite] #{current_user.email_address} disconnected Google Drive") - redirect_to admin_offsite_backup_path, notice: "Google Drive disconnected. The copies already there stay in your Drive." + redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.google_drive_disconnected_the") end def backup_now OffsiteBackupJob.perform_later - redirect_to admin_offsite_backup_path, notice: "Off-site backup started. Refresh in a minute to see the result." + redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.off_site_backup_started") end def restore_test OffsiteBackupJob.perform_later("restore_test") - redirect_to admin_offsite_backup_path, notice: "Restore test started. Refresh in a minute to see the result." + redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.restore_test_started_refresh") end private diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb index b5692ea..a2ca602 100644 --- a/app/controllers/admin/procedures_controller.rb +++ b/app/controllers/admin/procedures_controller.rb @@ -14,7 +14,7 @@ class Admin::ProceduresController < ApplicationController if @policy.update(params.require(:recordkeeping_policy).permit(:operator_name, :responsible_name, :responsible_title, :hosting_description, :offsite_backup_description, :audit_interval_months, :audit_sample_size, :additional_procedures)) - redirect_to admin_procedures_path, notice: "Saved. Review the draft and adopt it as a new revision when it's right." + redirect_to admin_procedures_path, notice: t("flash.admin_procedures.saved_review_the_draft") else @revisions = ProceduresRevision.latest_first render :show, status: :unprocessable_entity @@ -29,14 +29,14 @@ class Admin::ProceduresController < ApplicationController def adopt policy = RecordkeepingPolicy.current if policy.unfilled_fields.any? - return redirect_to(admin_procedures_path, alert: "Fill in the [bracketed] blanks first: #{policy.unfilled_fields.to_sentence}.") + return redirect_to(admin_procedures_path, alert: t("flash.admin_procedures.fill_in_the_bracketed", items: policy.unfilled_fields.to_sentence)) end - return redirect_to(admin_procedures_path, alert: "Fill in the operator, responsible person, hosting and off-site backup (or connect Google Drive) first.") unless policy.complete? + return redirect_to(admin_procedures_path, alert: t("flash.admin_procedures.fill_in_the_operator")) unless policy.complete? number = (ProceduresRevision.maximum(:number) || 0) + 1 revision = ProceduresRevision.create!(number: number, adopted_by: current_user, adopted_at: Time.current, summary: params[:summary].to_s.strip.first(500).presence || "Revision #{number}", content: draft_html(number: number, summary: params[:summary].to_s.strip.first(500))) - redirect_to admin_procedures_path, notice: "Revision #{revision.number} adopted. Print it or keep the PDF with your records." + redirect_to admin_procedures_path, notice: t("flash.admin_procedures.revision_adopted_print_it", number: revision.number) end def revision @@ -48,7 +48,7 @@ class Admin::ProceduresController < ApplicationController def draft_html(number: nil, summary: nil) render_to_string(partial: "admin/procedures/document", - locals: { policy: RecordkeepingPolicy.current, number: number || "#{(ProceduresRevision.maximum(:number) || 0) + 1} (draft)", + locals: { policy: RecordkeepingPolicy.current, number: number || t("flash.admin_procedures.draft_number", number: (ProceduresRevision.maximum(:number) || 0) + 1), adopted_at: number ? Time.current : nil, adopted_by: number ? current_user : nil, revisions: ProceduresRevision.latest_first.to_a, summary: summary }) end diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 43de13e..a595519 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -11,7 +11,7 @@ class Admin::SettingsController < ApplicationController @errors = records.flat_map { _1.errors.full_messages } if @errors.empty? Rails.logger.info("[settings] #{current_user.email_address} changed #{submitted.inspect}") - redirect_to edit_admin_settings_path, notice: "Settings saved." + redirect_to edit_admin_settings_path, notice: t("flash.admin_settings.settings_saved") else @values = %w[max_upload_mb backups_kept offsite_backups_kept documents_claude_text].index_with { Setting.integer(_1) }.merge(submitted) render :edit, status: :unprocessable_entity diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 9fbb4ee..0953bfb 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -14,7 +14,7 @@ class Admin::UsersController < ApplicationController @user = User.new(user_params) @user.admin = admin_flag if @user.save - redirect_to admin_users_path, notice: "User #{@user.email_address} created." + redirect_to admin_users_path, notice: t("flash.admin_users.user_created", email_address: @user.email_address) else render :new, status: :unprocessable_entity end @@ -26,12 +26,12 @@ class Admin::UsersController < ApplicationController attrs = user_params attrs = attrs.except(:password, :password_confirmation) if attrs[:password].blank? if @user == current_user && !admin_flag - return redirect_to admin_users_path, alert: "You can't remove your own admin rights." + return redirect_to admin_users_path, alert: t("flash.admin_users.you_can_t_remove") end @user.admin = admin_flag if @user.update(attrs) @user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password) # new password signs them out - redirect_to admin_users_path, notice: "User updated." + redirect_to admin_users_path, notice: t("flash.admin_users.user_updated") else render :edit, status: :unprocessable_entity end @@ -41,7 +41,7 @@ class Admin::UsersController < ApplicationController # keeping their account, so the signatures they made stay attributed. def unlock @user.unlock! - redirect_to admin_users_path, notice: "#{@user.email_address} unlocked." + redirect_to admin_users_path, notice: t("flash.admin_users.unlocked", email_address: @user.email_address) end # For a user who lost their authenticator: they sign in with their password @@ -49,28 +49,28 @@ class Admin::UsersController < ApplicationController def reset_two_factor @user.disable_otp! Rails.logger.info("[auth] #{current_user.email_address} turned off two-factor for #{@user.email_address}") - redirect_to admin_users_path, notice: "Two-factor turned off for #{@user.email_address}. Ask them to set it up again from their profile." + redirect_to admin_users_path, notice: t("flash.admin_users.two_factor_turned_off", email_address: @user.email_address) end def disable - return redirect_to admin_users_path, alert: "You can't disable yourself." if @user == current_user + return redirect_to admin_users_path, alert: t("flash.admin_users.you_can_t_disable") if @user == current_user @user.update!(disabled_at: Time.current) @user.sessions.destroy_all - redirect_to admin_users_path, notice: "#{@user.email_address} disabled: signed out, can't sign in or sign entries. Their past signatures are kept." + redirect_to admin_users_path, notice: t("flash.admin_users.disabled_signed_out_can", email_address: @user.email_address) end def enable @user.update!(disabled_at: nil) - redirect_to admin_users_path, notice: "#{@user.email_address} enabled." + redirect_to admin_users_path, notice: t("flash.admin_users.enabled", email_address: @user.email_address) end def destroy - return redirect_to admin_users_path, alert: "You can't delete yourself." if @user == current_user + return redirect_to admin_users_path, alert: t("flash.admin_users.you_can_t_delete") if @user == current_user if @user.entry_signatures.exists? - return redirect_to admin_users_path, alert: "#{@user.email_address} has signed logbook entries; disable the account instead of deleting it." + return redirect_to admin_users_path, alert: t("flash.admin_users.has_signed_logbook_entries", email_address: @user.email_address) end @user.destroy! - redirect_to admin_users_path, notice: "User deleted." + redirect_to admin_users_path, notice: t("flash.admin_users.user_deleted") end private diff --git a/app/controllers/air_trail_connections_controller.rb b/app/controllers/air_trail_connections_controller.rb index ed89d7f..1897c04 100644 --- a/app/controllers/air_trail_connections_controller.rb +++ b/app/controllers/air_trail_connections_controller.rb @@ -33,7 +33,7 @@ class AirTrailConnectionsController < ApplicationController # Link existing AirTrail flights and push everything else, in the background. def sync AirTrailBackfillJob.perform_later(@connection.id) - redirect_to air_trail_connection_path, notice: "Sync started. Refresh this page in a minute to see progress." + redirect_to air_trail_connection_path, notice: t("flash.air_trail_connections.sync_started_refresh_this") end def map_airport @@ -42,9 +42,9 @@ class AirTrailConnectionsController < ApplicationController match = target.present? && AirTrailSyncer.new(@connection).map_airport(code, target) if match AirTrailBackfillJob.perform_later(@connection.id) # retry flights that needed it - redirect_to air_trail_connection_path, notice: "#{code} mapped to #{match['icao']} (#{match['name']}). Retrying affected flights." + redirect_to air_trail_connection_path, notice: t("flash.air_trail_connections.mapped_to_retrying_affected", code: code, icao: match["icao"], name: match["name"]) else - redirect_to air_trail_connection_path, alert: "AirTrail has no airport matching “#{target}”." + redirect_to air_trail_connection_path, alert: t("flash.air_trail_connections.airtrail_has_no_airport", target: target) end rescue AirTrailClient::Error => e redirect_to air_trail_connection_path, alert: e.message @@ -53,7 +53,7 @@ class AirTrailConnectionsController < ApplicationController # Stops syncing. Flights already in AirTrail are left there. def destroy @connection.destroy! - redirect_to air_trail_connection_path, notice: "AirTrail disconnected. Flights already in AirTrail were left as they are." + redirect_to air_trail_connection_path, notice: t("flash.air_trail_connections.airtrail_disconnected_flights_already") end private @@ -81,9 +81,9 @@ class AirTrailConnectionsController < ApplicationController missing = me.dig("credential", "kind") == "apiKey" ? AirTrailConnection::REQUIRED_SCOPES - scopes : [] @connection.update!(remote_user_id: me["id"], remote_username: me["username"], checked_at: Time.current, status: missing.empty? ? "ok" : "error", - last_error: missing.empty? ? nil : "API key is missing scopes: #{missing.join(', ')}") + last_error: missing.empty? ? nil : t("flash.air_trail_connections.missing_scopes", scopes: missing.join(", "))) if missing.empty? - flash[:notice] = "Connected to AirTrail as #{me['username']}." + flash[:notice] = t("flash.air_trail_connections.connected_to_airtrail_as", username: me["username"]) else flash[:alert] = @connection.last_error end diff --git a/app/controllers/aircraft_controller.rb b/app/controllers/aircraft_controller.rb index 52c5d57..eea050f 100644 --- a/app/controllers/aircraft_controller.rb +++ b/app/controllers/aircraft_controller.rb @@ -29,7 +29,7 @@ class AircraftController < ApplicationController @aircraft.roles.create!(user: current_user, role: "owner") @aircraft.log_event!("aircraft", "Aircraft created") end - redirect_to @aircraft, notice: "#{@aircraft.tail_number} added." + redirect_to @aircraft, notice: t("flash.aircraft.added", tail_number: @aircraft.tail_number) rescue ActiveRecord::RecordInvalid render :new, status: :unprocessable_entity end @@ -38,8 +38,8 @@ class AircraftController < ApplicationController def update if @aircraft.update(aircraft_params) - log_event("aircraft", "Aircraft details updated") - redirect_to @aircraft, notice: "Aircraft updated." + log_event("aircraft", t("flash.aircraft.aircraft_details_updated")) + redirect_to @aircraft, notice: t("flash.aircraft.aircraft_updated") else render :edit, status: :unprocessable_entity end @@ -47,7 +47,7 @@ class AircraftController < ApplicationController def destroy @aircraft.destroy! - redirect_to root_path, notice: "#{@aircraft.tail_number} deleted." + redirect_to root_path, notice: t("flash.aircraft.deleted", tail_number: @aircraft.tail_number) end # Pilots and above: set absolute tach/hobbs readings. @@ -55,11 +55,11 @@ class AircraftController < ApplicationController delta = HoursService.new(@aircraft).update_hours!( tach_time: params.require(:tach_time), hobbs_time: params[:hobbs_time] ) - redirect_to @aircraft, notice: "Hours updated (#{delta >= 0 ? '+' : ''}#{delta})." + redirect_to @aircraft, notice: t("flash.aircraft.hours_updated", delta: "#{'+' if delta >= 0}#{delta}") rescue AircraftGroundedError => e redirect_to @aircraft, alert: e.message rescue ArgumentError - redirect_to @aircraft, alert: "Enter a valid tach reading." + redirect_to @aircraft, alert: t("flash.aircraft.enter_a_valid_tach") end private diff --git a/app/controllers/aircraft_exports_controller.rb b/app/controllers/aircraft_exports_controller.rb index 6c627db..fd3d4f3 100644 --- a/app/controllers/aircraft_exports_controller.rb +++ b/app/controllers/aircraft_exports_controller.rb @@ -13,7 +13,7 @@ class AircraftExportsController < ApplicationController Dir[EXPORT_DIR.join("*.zip")].each { |old| File.delete(old) if File.mtime(old) < 1.hour.ago } path = EXPORT_DIR.join("#{SecureRandom.hex(12)}.zip").to_s exporter.write_to(path) - log_event("aircraft", "Aircraft exported (.sam.zip)") + log_event("aircraft", t("flash.aircraft_exports.aircraft_exported_sam_zip")) # Generic binary, not application/zip: Safari unzips zip downloads into a # folder ("Open safe files"), and the archive must stay one file to import. send_file path, filename: exporter.filename, type: "application/octet-stream", disposition: "attachment" diff --git a/app/controllers/aircraft_imports_controller.rb b/app/controllers/aircraft_imports_controller.rb index 2167967..9abf8b4 100644 --- a/app/controllers/aircraft_imports_controller.rb +++ b/app/controllers/aircraft_imports_controller.rb @@ -8,14 +8,14 @@ class AircraftImportsController < ApplicationController def create file = params[:archive] - return redirect_to(new_aircraft_import_path, alert: "Choose a .sam.zip file.") if file.blank? + return redirect_to(new_aircraft_import_path, alert: t("flash.aircraft_imports.choose_a_sam_zip")) if file.blank? preview = AircraftArchive::Importer.check(file.tempfile.path) tail = params[:tail_number].to_s.strip.upcase.presence || preview.tail_number.to_s.upcase if Aircraft.where("UPPER(tail_number) = ?", tail).exists? @preview = preview @conflict = tail - flash.now[:alert] = "An aircraft #{tail} already exists. Choose another tail number for the imported one." + flash.now[:alert] = t("flash.aircraft_imports.an_aircraft_already_exists", tail: tail) return render :new, status: :unprocessable_entity end @@ -24,7 +24,7 @@ class AircraftImportsController < ApplicationController AircraftImportJob.perform_later(import.id) redirect_to aircraft_import_path(import) rescue AircraftArchive::Error => e - redirect_to new_aircraft_import_path, alert: "That archive can't be imported: #{e.message}" + redirect_to new_aircraft_import_path, alert: t("flash.aircraft_imports.that_archive_can_t", message: e.message) end def show; end diff --git a/app/controllers/aircraft_roles_controller.rb b/app/controllers/aircraft_roles_controller.rb index 24d5913..9d62166 100644 --- a/app/controllers/aircraft_roles_controller.rb +++ b/app/controllers/aircraft_roles_controller.rb @@ -12,12 +12,12 @@ class AircraftRolesController < ApplicationController user = User.find_by(email_address: params[:email_address].to_s.strip.downcase) unless user return redirect_to aircraft_aircraft_roles_path(@aircraft), - alert: "No user with that email. Ask an administrator to create their account first." + alert: t("flash.aircraft_roles.no_user_with_that") end role = @aircraft.roles.new(user: user, role: params[:role]) if role.save - log_event("role", "#{user.display_name} added as #{role.role}") - redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "#{user.display_name} added." + log_event("role", t("flash.aircraft_roles.added_as", display_name: user.display_name, role: role.role)) + redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.aircraft_roles.added", display_name: user.display_name) else redirect_to aircraft_aircraft_roles_path(@aircraft), alert: role.errors.full_messages.to_sentence end @@ -26,24 +26,24 @@ class AircraftRolesController < ApplicationController def update role = @aircraft.roles.find(params[:id]) if demoting_last_owner?(role, params[:role]) - return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: "An aircraft must keep at least one owner." + return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: t("flash.aircraft_roles.an_aircraft_must_keep") end role.update!(role: params[:role]) - log_event("role", "#{role.user.display_name} changed to #{role.role}") - redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Role updated." + log_event("role", t("flash.aircraft_roles.changed_to", display_name: role.user.display_name, role: role.role)) + redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.aircraft_roles.role_updated") end def destroy role = @aircraft.roles.find(params[:id]) if role.user == current_user - return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: "You can't remove yourself." + return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: t("flash.aircraft_roles.you_can_t_remove") end if demoting_last_owner?(role, nil) - return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: "An aircraft must keep at least one owner." + return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: t("flash.aircraft_roles.an_aircraft_must_keep_2") end role.destroy! - log_event("role", "#{role.user.display_name} removed") - redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Access removed." + log_event("role", t("flash.aircraft_roles.removed", display_name: role.user.display_name)) + redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.aircraft_roles.access_removed") end private diff --git a/app/controllers/airport_codes_controller.rb b/app/controllers/airport_codes_controller.rb index 1665331..77eb74f 100644 --- a/app/controllers/airport_codes_controller.rb +++ b/app/controllers/airport_codes_controller.rb @@ -14,6 +14,6 @@ class AirportCodesController < ApplicationController fixes = params.fetch(:fixes, {}).permit(*standardizer.unknown.map(&:code)).to_h .select { |code, _| Array(params[:fix]).include?(code) } updated = standardizer.apply!(codes, fixes: fixes) - redirect_to aircraft_flight_logs_path(@aircraft), notice: "Updated #{updated} airport entries across your flights." + redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.airport_codes.updated_airport_entries_across", count: updated) end end diff --git a/app/controllers/airworthiness_directives_controller.rb b/app/controllers/airworthiness_directives_controller.rb index beab9f2..25f32ad 100644 --- a/app/controllers/airworthiness_directives_controller.rb +++ b/app/controllers/airworthiness_directives_controller.rb @@ -23,8 +23,8 @@ class AirworthinessDirectivesController < ApplicationController @ad.save! apply_applicability(@ad, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids) end - log_event("ad", "#{@ad.bulletin_label} added: #{@ad.name}") - redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{@ad.bulletin_label} added." + log_event("ad", t("flash.airworthiness_directives.added_2", bulletin_label: @ad.bulletin_label, name: @ad.name)) + redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.added", bulletin_label: @ad.bulletin_label) rescue ActiveRecord::RecordInvalid @applies_to_airframe = applies_to_airframe? render :new, status: :unprocessable_entity @@ -34,8 +34,8 @@ class AirworthinessDirectivesController < ApplicationController def attach ad = AirworthinessDirective.find(params[:airworthiness_directive_id]) ad.aircraft << @aircraft unless ad.aircraft.include?(@aircraft) - log_event("ad", "#{ad.bulletin_label} linked: #{ad.name}") - redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{ad.name} linked." + log_event("ad", t("flash.airworthiness_directives.linked_2", bulletin_label: ad.bulletin_label, name: ad.name)) + redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.linked", name: ad.name) end def edit @@ -47,8 +47,8 @@ class AirworthinessDirectivesController < ApplicationController @ad.update!(ad_params) apply_applicability(@ad, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids) end - log_event("ad", "#{@ad.bulletin_label} updated: #{@ad.name}") - redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{@ad.bulletin_label} updated." + log_event("ad", t("flash.airworthiness_directives.updated_2", bulletin_label: @ad.bulletin_label, name: @ad.name)) + redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.updated", bulletin_label: @ad.bulletin_label) rescue ActiveRecord::RecordInvalid @applies_to_airframe = applies_to_airframe? render :edit, status: :unprocessable_entity @@ -57,8 +57,8 @@ class AirworthinessDirectivesController < ApplicationController # Removes the AD from this aircraft (the shared AD record survives if other aircraft use it). def destroy detach_from_aircraft(@ad) - log_event("ad", "#{@ad.bulletin_label} removed: #{@ad.name}") - redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{@ad.name} removed from #{@aircraft.tail_number}." + log_event("ad", t("flash.airworthiness_directives.removed", bulletin_label: @ad.bulletin_label, name: @ad.name)) + redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.removed_from", name: @ad.name, tail_number: @aircraft.tail_number) end private diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e8d9ea5..992eed4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -24,6 +24,6 @@ class ApplicationController < ActionController::Base end def require_admin! - redirect_to root_path, alert: "Admins only." unless current_user&.admin? + redirect_to root_path, alert: t("flash.application.admins_only") unless current_user&.admin? end end diff --git a/app/controllers/calendar_feeds_controller.rb b/app/controllers/calendar_feeds_controller.rb index 8a39f44..e1a3ff8 100644 --- a/app/controllers/calendar_feeds_controller.rb +++ b/app/controllers/calendar_feeds_controller.rb @@ -8,14 +8,14 @@ class CalendarFeedsController < ApplicationController def show user = User.active.find_by(calendar_token: params[:token].to_s) or return head(:not_found) - cal = Ical.new("Aircraft maintenance") + cal = Ical.new(t("flash.calendar_feeds.name")) host = Sso.app_url user.accessible_aircraft.ordered.each do |aircraft| DueList.new(aircraft).items.each do |i| - when_text = [ ("projected from recent flying" if i.projected), ("at #{i.due_hours} hrs" if i.due_hours) ].compact.join(", ") + when_text = [ (t("flash.calendar_feeds.projected") if i.projected), (t("flash.calendar_feeds.at_hours", hours: i.due_hours) if i.due_hours) ].compact.join(", ") cal.add(uid: "#{aircraft.id}-#{i.key}@simple-aircraft-manager", date: i.date, - summary: "#{aircraft.tail_number}: #{i.title}#{' (overdue)' if i.overdue?}", - description: [ "#{aircraft.tail_number}: #{i.title}", when_text.presence ].compact.join("\n"), url: "#{host}#{i.path}") + summary: t(i.overdue? ? "flash.calendar_feeds.summary_overdue" : "flash.calendar_feeds.summary", tail_number: aircraft.tail_number, title: i.title), + description: [ t("flash.calendar_feeds.summary", tail_number: aircraft.tail_number, title: i.title), when_text.presence ].compact.join("\n"), url: "#{host}#{i.path}") end end send_data cal.to_s, type: "text/calendar; charset=utf-8", disposition: "inline", filename: "aircraft-maintenance.ics" diff --git a/app/controllers/calendar_tokens_controller.rb b/app/controllers/calendar_tokens_controller.rb index 9a22f2f..0e387fa 100644 --- a/app/controllers/calendar_tokens_controller.rb +++ b/app/controllers/calendar_tokens_controller.rb @@ -2,6 +2,6 @@ class CalendarTokensController < ApplicationController def create current_user.regenerate_calendar_token - redirect_to edit_profile_path(anchor: "calendar"), notice: "Calendar link ready. Any earlier link no longer works." + redirect_to edit_profile_path(anchor: "calendar"), notice: t("flash.calendar_tokens.calendar_link_ready_any") end end diff --git a/app/controllers/components_controller.rb b/app/controllers/components_controller.rb index db8baa5..b09ca6e 100644 --- a/app/controllers/components_controller.rb +++ b/app/controllers/components_controller.rb @@ -35,8 +35,8 @@ class ComponentsController < ApplicationController def create @component = @aircraft.components.new(component_params) if @component.save - log_event("component", "Component added: #{@component}") - redirect_to aircraft_components_path(@aircraft), notice: "Component added." + log_event("component", t("flash.components.component_added_2", component: @component)) + redirect_to aircraft_components_path(@aircraft), notice: t("flash.components.component_added") else render :new, status: :unprocessable_entity end @@ -46,8 +46,8 @@ class ComponentsController < ApplicationController def update if @component.update(component_params) - log_event("component", "Component updated: #{@component}") - redirect_to aircraft_components_path(@aircraft), notice: "Component updated." + log_event("component", t("flash.components.component_updated_2", component: @component)) + redirect_to aircraft_components_path(@aircraft), notice: t("flash.components.component_updated") else render :edit, status: :unprocessable_entity end @@ -55,8 +55,8 @@ class ComponentsController < ApplicationController def destroy @component.destroy! - log_event("component", "Component deleted: #{@component}") - redirect_to aircraft_components_path(@aircraft), notice: "Component deleted." + log_event("component", t("flash.components.component_deleted_2", component: @component)) + redirect_to aircraft_components_path(@aircraft), notice: t("flash.components.component_deleted") end # Always zeroes hours since overhaul; reset_in_service=1 also zeroes the @@ -64,8 +64,8 @@ class ComponentsController < ApplicationController def reset_service replaced = params[:reset_in_service] == "1" @component.reset_service!(reset_in_service: replaced) - log_event("component", "#{replaced ? 'Replaced' : 'Serviced'}: #{@component}") - redirect_to aircraft_components_path(@aircraft), notice: "#{@component} #{replaced ? 'replaced' : 'serviced'}." + log_event("component", t(replaced ? "flash.components.replaced_event" : "flash.components.serviced_event", component: @component)) + redirect_to aircraft_components_path(@aircraft), notice: t(replaced ? "flash.components.replaced" : "flash.components.serviced", component: @component) end private diff --git a/app/controllers/concerns/aircraft_scoped.rb b/app/controllers/concerns/aircraft_scoped.rb index 6d17851..8da841b 100644 --- a/app/controllers/concerns/aircraft_scoped.rb +++ b/app/controllers/concerns/aircraft_scoped.rb @@ -32,7 +32,7 @@ module AircraftScoped def require_owner! return if owner? redirect_back fallback_location: aircraft_path(@aircraft), - alert: "Only owners can do that." + alert: t("flash.common.only_owners_can_do") end # Returns id only if it belongs to the given (aircraft-scoped) relation; else nil. diff --git a/app/controllers/concerns/entry_signing.rb b/app/controllers/concerns/entry_signing.rb index b9563ef..b3f44c5 100644 --- a/app/controllers/concerns/entry_signing.rb +++ b/app/controllers/concerns/entry_signing.rb @@ -35,11 +35,11 @@ module EntrySigning certificate = current_user.certificates.find_by(id: params[:certificate_id]) method = reauthenticated_method unless params[:confirm] == "1" - return signing_failed(entry, "Tick the box to confirm you're signing this entry.") + return signing_failed(entry, t("flash.signing.confirm_box")) end unless method - return signing_failed(entry, "This account is locked for a few minutes after too many failed tries.") if current_user.reload.locked? - return signing_failed(entry, "Re-enter your password#{' and a current authenticator code' if current_user.otp_enabled?} (or sign in again with #{Sso.label}) to sign.") + return signing_failed(entry, t("flash.signing.locked")) if current_user.reload.locked? + return signing_failed(entry, t(current_user.otp_enabled? ? "flash.signing.reauth_otp" : "flash.signing.reauth", provider: Sso.label)) end current_user.clear_failed_sign_ins! diff --git a/app/controllers/concerns/stored_upload.rb b/app/controllers/concerns/stored_upload.rb index de049cc..22e8a4d 100644 --- a/app/controllers/concerns/stored_upload.rb +++ b/app/controllers/concerns/stored_upload.rb @@ -14,10 +14,10 @@ module StoredUpload # Returns [token, nil] on success or [nil, error message]. def store_upload(file) - return [ nil, "Choose a file to upload." ] unless file.respond_to?(:path) - return [ nil, "File is too large." ] if file.size > UPLOAD_MAX_SIZE + return [ nil, I18n.t("flash.uploads.choose_file") ] unless file.respond_to?(:path) + return [ nil, I18n.t("flash.uploads.too_large") ] if file.size > UPLOAD_MAX_SIZE ext = File.extname(file.original_filename.to_s).delete(".").downcase - return [ nil, "Upload an .xlsx or .csv file." ] unless ext.in?(UPLOAD_EXTENSIONS) + return [ nil, I18n.t("flash.uploads.spreadsheet_only") ] unless ext.in?(UPLOAD_EXTENSIONS) FileUtils.mkdir_p(UPLOAD_DIR) Dir.glob(UPLOAD_DIR.join("*")).each { |f| File.delete(f) if File.mtime(f) < 1.day.ago } diff --git a/app/controllers/consumable_records_controller.rb b/app/controllers/consumable_records_controller.rb index adafe25..96b495a 100644 --- a/app/controllers/consumable_records_controller.rb +++ b/app/controllers/consumable_records_controller.rb @@ -27,8 +27,8 @@ class ConsumableRecordsController < ApplicationController def create @record = @aircraft.consumable_records.new(record_params) if @record.save - log_event(@record.record_type, "#{@record.record_type.capitalize} added: #{@record.quantity_added} #{@record.unit}") - redirect_to aircraft_consumable_records_path(@aircraft), notice: "Record added." + log_event(@record.record_type, t("flash.consumable_records.added_event", type: ConsumableRecord::TYPES[@record.record_type], quantity: @record.quantity_added, unit: @record.unit)) + redirect_to aircraft_consumable_records_path(@aircraft), notice: t("flash.consumable_records.record_added") else render :new, status: :unprocessable_entity end @@ -38,8 +38,8 @@ class ConsumableRecordsController < ApplicationController def update if @record.update(record_params) - log_event(@record.record_type, "#{@record.record_type.capitalize} record updated") - redirect_to aircraft_consumable_records_path(@aircraft), notice: "Record updated." + log_event(@record.record_type, t("flash.consumable_records.updated_event", type: ConsumableRecord::TYPES[@record.record_type])) + redirect_to aircraft_consumable_records_path(@aircraft), notice: t("flash.consumable_records.record_updated") else render :edit, status: :unprocessable_entity end @@ -47,8 +47,8 @@ class ConsumableRecordsController < ApplicationController def destroy @record.destroy! - log_event(@record.record_type, "#{@record.record_type.capitalize} record deleted") - redirect_to aircraft_consumable_records_path(@aircraft), notice: "Record deleted." + log_event(@record.record_type, t("flash.consumable_records.deleted_event", type: ConsumableRecord::TYPES[@record.record_type])) + redirect_to aircraft_consumable_records_path(@aircraft), notice: t("flash.consumable_records.record_deleted") end private diff --git a/app/controllers/direct_uploads_controller.rb b/app/controllers/direct_uploads_controller.rb index 655c85c..cc5f95a 100644 --- a/app/controllers/direct_uploads_controller.rb +++ b/app/controllers/direct_uploads_controller.rb @@ -16,9 +16,9 @@ class DirectUploadsController < ActiveStorage::DirectUploadsController def check_upload error = if !UploadValidation::ALLOWED_CONTENT_TYPES.include?(blob_args[:content_type]) - "#{blob_args[:filename]} isn't an allowed file type" + t("errors.messages.file_type", file: blob_args[:filename]) elsif blob_args[:byte_size].to_i > UploadValidation.max_size - "#{blob_args[:filename]} is over the #{UploadValidation.max_size / 1.megabyte} MB upload limit" + t("errors.messages.file_size", file: blob_args[:filename], limit: UploadValidation.max_size / 1.megabyte) end render json: { error: error }, status: :unprocessable_entity if error end diff --git a/app/controllers/document_collections_controller.rb b/app/controllers/document_collections_controller.rb index fd58e5f..0db4244 100644 --- a/app/controllers/document_collections_controller.rb +++ b/app/controllers/document_collections_controller.rb @@ -10,8 +10,8 @@ class DocumentCollectionsController < ApplicationController def create @collection = @aircraft.document_collections.new(collection_params) if @collection.save - log_event("document", "Collection created: #{@collection.name}") - redirect_to aircraft_documents_path(@aircraft), notice: "Collection created." + log_event("document", t("flash.document_collections.collection_created_2", name: @collection.name)) + redirect_to aircraft_documents_path(@aircraft), notice: t("flash.document_collections.collection_created") else render :new, status: :unprocessable_entity end @@ -21,8 +21,8 @@ class DocumentCollectionsController < ApplicationController def update if @collection.update(collection_params) - log_event("document", "Collection updated: #{@collection.name}") - redirect_to aircraft_documents_path(@aircraft), notice: "Collection updated." + log_event("document", t("flash.document_collections.collection_updated_2", name: @collection.name)) + redirect_to aircraft_documents_path(@aircraft), notice: t("flash.document_collections.collection_updated") else render :edit, status: :unprocessable_entity end @@ -30,8 +30,8 @@ class DocumentCollectionsController < ApplicationController def destroy @collection.destroy! - log_event("document", "Collection deleted: #{@collection.name}") - redirect_to aircraft_documents_path(@aircraft), notice: "Collection and its documents deleted." + log_event("document", t("flash.document_collections.collection_deleted", name: @collection.name)) + redirect_to aircraft_documents_path(@aircraft), notice: t("flash.document_collections.collection_and_its_documents") end private diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index 0ef6dc7..267e2fb 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -19,8 +19,8 @@ class DocumentsController < ApplicationController def create @document = @aircraft.documents.new(document_params) if @document.save - log_event("document", "Document added: #{@document.name}") - redirect_to aircraft_document_path(@aircraft, @document), notice: "Document added." + log_event("document", t("flash.documents.document_added_2", name: @document.name)) + redirect_to aircraft_document_path(@aircraft, @document), notice: t("flash.documents.document_added") else render :new, status: :unprocessable_entity end @@ -36,15 +36,15 @@ class DocumentsController < ApplicationController def bulk_create @bulk = bulk_defaults.merge(params.slice(:doc_type, :visibility, :document_collection_id, :new_collection).permit!.to_h.symbolize_keys) files = Array(params[:files]).compact_blank - return bulk_error("Choose some files to upload.") if files.empty? - return bulk_error("Upload at most #{MAX_BULK_FILES} files at a time.") if files.size > MAX_BULK_FILES + return bulk_error(t("flash.documents.choose_files")) if files.empty? + return bulk_error(t("flash.documents.too_many_files", max: MAX_BULK_FILES)) if files.size > MAX_BULK_FILES names = Array(params[:names]) rejected = [] groups = {} files.each_with_index do |file, i| upload = file.is_a?(String) ? unattached_blob(file) : file - next rejected << "file #{i + 1} (upload expired, try again)" unless upload + next rejected << t("flash.documents.upload_expired", number: i + 1) unless upload name = names[i].to_s.squish.presence || File.basename(upload_filename(upload), ".*").tr("_", " ").squish.presence || "Untitled" (groups[name.first(255)] ||= []) << upload end @@ -58,18 +58,18 @@ class DocumentsController < ApplicationController if doc.save created << doc else - rejected << "#{name} (#{doc.errors.full_messages.to_sentence})" + rejected << t("flash.documents.rejected_file", name: name, errors: doc.errors.full_messages.to_sentence) pages.each { _1.purge_later if _1.is_a?(ActiveStorage::Blob) } end end if created.empty? @aircraft.document_collections.find_by(id: collection_id)&.destroy if @bulk[:new_collection].present? - return bulk_error("Nothing was uploaded: #{rejected.to_sentence}.") + return bulk_error(t("flash.documents.nothing_uploaded", items: rejected.to_sentence)) end - log_event("document", "#{helpers.pluralize(created.size, 'document')} uploaded", notes: created.map(&:name).join(", ").truncate(1000)) - flash[:alert] = "Not uploaded: #{rejected.to_sentence}." if rejected.any? - redirect_to aircraft_documents_path(@aircraft), notice: "#{helpers.pluralize(created.size, 'document')} uploaded.", status: :see_other + log_event("document", t("flash.documents.bulk_uploaded_event", count: created.size), notes: created.map(&:name).join(", ").truncate(1000)) + flash[:alert] = t("flash.documents.not_uploaded", items: rejected.to_sentence) if rejected.any? + redirect_to aircraft_documents_path(@aircraft), notice: t("flash.documents.bulk_uploaded", count: created.size), status: :see_other end def edit; end @@ -81,8 +81,8 @@ class DocumentsController < ApplicationController @document.pages.attach(new_pages) if new_pages.present? Array(params[:remove_page_ids]).each { |id| @document.pages.find_by(id: id)&.purge_later } if @document.save - log_event("document", "Document updated: #{@document.name}") - redirect_to aircraft_document_path(@aircraft, @document), notice: "Document updated." + log_event("document", t("flash.documents.document_updated_2", name: @document.name)) + redirect_to aircraft_document_path(@aircraft, @document), notice: t("flash.documents.document_updated") else render :edit, status: :unprocessable_entity end @@ -90,8 +90,8 @@ class DocumentsController < ApplicationController def destroy @document.destroy! - log_event("document", "Document deleted: #{@document.name}") - redirect_to aircraft_documents_path(@aircraft), notice: "Document deleted." + log_event("document", t("flash.documents.document_deleted_2", name: @document.name)) + redirect_to aircraft_documents_path(@aircraft), notice: t("flash.documents.document_deleted") end private @@ -120,7 +120,7 @@ class DocumentsController < ApplicationController def bulk_collection return [ scoped_id(@aircraft.document_collections, @bulk[:document_collection_id]), nil ] if @bulk[:new_collection].blank? col = @aircraft.document_collections.create(name: @bulk[:new_collection].squish, visibility: @bulk[:visibility].presence || "private") - col.persisted? ? [ col.id, nil ] : [ nil, "Couldn't create the collection: #{col.errors.full_messages.to_sentence}." ] + col.persisted? ? [ col.id, nil ] : [ nil, t("flash.documents.collection_failed", errors: col.errors.full_messages.to_sentence) ] end def set_document = @document = @aircraft.documents.find(params[:id]) diff --git a/app/controllers/entry_signatures_controller.rb b/app/controllers/entry_signatures_controller.rb index 0864e4c..b17e594 100644 --- a/app/controllers/entry_signatures_controller.rb +++ b/app/controllers/entry_signatures_controller.rb @@ -12,7 +12,7 @@ class EntrySignaturesController < ApplicationController def create sign_entry(@entry) do |signature| - redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: "Signed. #{EntrySignature::LABEL} #{signature.signer_name}, #{signature.certificate_label} #{signature.certificate_number}." + redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: t("flash.entry_signatures.signed", label: EntrySignature.label, signer_name: signature.signer_name, certificate_label: signature.certificate_label, certificate_number: signature.certificate_number) end end diff --git a/app/controllers/flight_imports_controller.rb b/app/controllers/flight_imports_controller.rb index 2d73761..4ff3db9 100644 --- a/app/controllers/flight_imports_controller.rb +++ b/app/controllers/flight_imports_controller.rb @@ -18,7 +18,7 @@ class FlightImportsController < ApplicationController # Preview. def show @token = params[:token].to_s - return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(@token) + return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(@token) @filename = params[:filename].to_s @starting_tach = params[:starting_tach].presence @@ -31,17 +31,17 @@ class FlightImportsController < ApplicationController def confirm token = params[:token].to_s - return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(token) + return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(token) import = build_import(token, params[:filename], starting_tach: params[:starting_tach], starting_hobbs: params[:starting_hobbs]) count = import.import!(user: current_user, update_aircraft_hours: params[:update_aircraft_hours] == "1") discard_upload(token) - redirect_to aircraft_flight_logs_path(@aircraft), notice: "Imported #{count} flights." + redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_imports.imported_flights", count: count) rescue FlightImport::Error => e redirect_to new_aircraft_flight_import_path(@aircraft), alert: e.message rescue AircraftGroundedError redirect_to aircraft_flight_logs_path(@aircraft), - alert: "Flights imported, but aircraft hours weren't updated: the aircraft is grounded and enforcement is on." + alert: t("flash.flight_imports.flights_imported_but_aircraft") end private diff --git a/app/controllers/flight_logs_controller.rb b/app/controllers/flight_logs_controller.rb index d2bc695..297141e 100644 --- a/app/controllers/flight_logs_controller.rb +++ b/app/controllers/flight_logs_controller.rb @@ -26,12 +26,12 @@ class FlightLogsController < ApplicationController begin @track = TrackParser.parse_attachment(@flight_log.track_log) rescue TrackParser::Error => e - @track_error = "Couldn't read track: #{e.message}" + @track_error = t("flash.flight_logs.track_unreadable", message: e.message) end begin @engine_data = EngineDataParser.parse_attachment(@flight_log.engine_data) rescue EngineDataParser::Error, ActiveStorage::FileNotFoundError => e - @engine_data_error = "Couldn't read engine data: #{e.message}" + @engine_data_error = t("flash.flight_logs.engine_data_unreadable", message: e.message) end @air_trail_connection = @flight_log.user&.air_trail_connection @air_trail_sync = @flight_log.air_trail_syncs.first @@ -57,12 +57,12 @@ class FlightLogsController < ApplicationController def create # Already received (sent again from the offline queue): don't log it twice. if (key = params.dig(:flight_log, :client_key).to_s.presence) && @aircraft.flight_logs.exists?(client_key: key.first(64)) - return redirect_to(aircraft_flight_logs_path(@aircraft), notice: "Flight already logged.") + return redirect_to(aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_logs.flight_already_logged")) end @flight_log = @aircraft.flight_logs.new(flight_log_params) if @flight_log.valid? HoursService.new(@aircraft).log_flight!(@flight_log) - redirect_to aircraft_flight_logs_path(@aircraft), notice: "Flight logged (#{@flight_log.tach_time} hrs)." + redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_logs.flight_logged_hrs", tach_time: @flight_log.tach_time) else render :new, status: :unprocessable_entity end @@ -73,11 +73,11 @@ class FlightLogsController < ApplicationController def attach_engine_data file = params.dig(:flight_log, :engine_data) - return redirect_to(aircraft_flight_log_path(@aircraft, @flight_log), alert: "Choose an engine data file.") if file.blank? + return redirect_to(aircraft_flight_log_path(@aircraft, @flight_log), alert: t("flash.flight_logs.choose_an_engine_data")) if file.blank? @flight_log.engine_data = file if @flight_log.save - redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: "Engine data attached." + redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: t("flash.flight_logs.engine_data_attached") else redirect_to aircraft_flight_log_path(@aircraft, @flight_log), alert: @flight_log.errors.full_messages.to_sentence end @@ -85,14 +85,14 @@ class FlightLogsController < ApplicationController def remove_engine_data @flight_log.engine_data.purge_later - redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: "Engine data removed." + redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: t("flash.flight_logs.engine_data_removed") end # Deleting a flight does not roll back hours; correct those with an hours update. def destroy @aircraft.flight_logs.find(params[:id]).destroy! - log_event("flight", "Flight log deleted") - redirect_to aircraft_flight_logs_path(@aircraft), notice: "Flight log deleted. Aircraft hours were not changed." + log_event("flight", t("flash.flight_logs.flight_log_deleted")) + redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_logs.flight_log_deleted_aircraft") end private @@ -108,7 +108,7 @@ class FlightLogsController < ApplicationController def require_engine_data_access! return if manage_engine_data? - redirect_to aircraft_flight_log_path(@aircraft, @flight_log), alert: "Only owners or the flight's pilot can do that." + redirect_to aircraft_flight_log_path(@aircraft, @flight_log), alert: t("flash.flight_logs.only_owners_or_the") end def flight_log_params diff --git a/app/controllers/inspection_records_controller.rb b/app/controllers/inspection_records_controller.rb index 84f5e13..305cabc 100644 --- a/app/controllers/inspection_records_controller.rb +++ b/app/controllers/inspection_records_controller.rb @@ -12,8 +12,8 @@ class InspectionRecordsController < ApplicationController def create @record = InspectionRecord.new(record_params.merge(aircraft: @aircraft)) if @record.save - log_event("inspection", "Inspection completed: #{@record.inspection_type.name}") - redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection recorded." + log_event("inspection", t("flash.inspection_records.inspection_completed", name: @record.inspection_type.name)) + redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_records.inspection_recorded") else render :new, status: :unprocessable_entity end @@ -23,8 +23,8 @@ class InspectionRecordsController < ApplicationController def update if @record.update(record_params) - log_event("inspection", "Inspection record updated: #{@record.inspection_type.name}") - redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection record updated." + log_event("inspection", t("flash.inspection_records.inspection_record_updated_2", name: @record.inspection_type.name)) + redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_records.inspection_record_updated") else render :edit, status: :unprocessable_entity end @@ -32,8 +32,8 @@ class InspectionRecordsController < ApplicationController def destroy @record.destroy! - log_event("inspection", "Inspection record deleted: #{@record.inspection_type.name}") - redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection record deleted." + log_event("inspection", t("flash.inspection_records.inspection_record_deleted_2", name: @record.inspection_type.name)) + redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_records.inspection_record_deleted") end private diff --git a/app/controllers/inspection_types_controller.rb b/app/controllers/inspection_types_controller.rb index 3ddce2c..f6c3993 100644 --- a/app/controllers/inspection_types_controller.rb +++ b/app/controllers/inspection_types_controller.rb @@ -8,12 +8,12 @@ class InspectionTypesController < ApplicationController @inspection_type = InspectionType.new(required: true, recurring: true) @applies_to_airframe = true if (@major_record = ica_record) - @inspection_type.name = "ICA: #{@major_record.title}".first(120) + @inspection_type.name = t("flash.inspection_types.ica_name", title: @major_record.title).first(120) @applies_to_airframe = @major_record.component.nil? @inspection_type.components = [ @major_record.component ] if @major_record.component elsif (component = @aircraft.components.find_by(id: params[:component_id])) # From a component's page: applies to that part, e.g. "Magneto 500-hour inspection". - @inspection_type.name = "#{component} inspection" + @inspection_type.name = t("flash.inspection_types.component_name", component: component) @inspection_type.components = [ component ] @applies_to_airframe = false end @@ -26,11 +26,11 @@ class InspectionTypesController < ApplicationController apply_applicability(@inspection_type, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids) ica_record&.update!(ica_inspection_type: @inspection_type) end - log_event("inspection", "Inspection type added: #{@inspection_type.name}") + log_event("inspection", t("flash.inspection_types.inspection_type_added_2", name: @inspection_type.name)) if (record = ica_record) - redirect_to aircraft_major_record_path(@aircraft, record), notice: "ICA inspection added. Record when it was last done to see when it's next due." + redirect_to aircraft_major_record_path(@aircraft, record), notice: t("flash.inspection_types.ica_inspection_added_record") else - redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection type added." + redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_types.inspection_type_added") end rescue ActiveRecord::RecordInvalid @applies_to_airframe = applies_to_airframe? @@ -47,8 +47,8 @@ class InspectionTypesController < ApplicationController @inspection_type.update!(type_params) apply_applicability(@inspection_type, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids) end - log_event("inspection", "Inspection type updated: #{@inspection_type.name}") - redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection type updated." + log_event("inspection", t("flash.inspection_types.inspection_type_updated_2", name: @inspection_type.name)) + redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_types.inspection_type_updated") rescue ActiveRecord::RecordInvalid @applies_to_airframe = applies_to_airframe? render :edit, status: :unprocessable_entity @@ -56,8 +56,8 @@ class InspectionTypesController < ApplicationController def destroy detach_from_aircraft(@inspection_type) - log_event("inspection", "Inspection type removed: #{@inspection_type.name}") - redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection removed from #{@aircraft.tail_number}." + log_event("inspection", t("flash.inspection_types.inspection_type_removed", name: @inspection_type.name)) + redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_types.inspection_removed_from", tail_number: @aircraft.tail_number) end private diff --git a/app/controllers/invited_signings_controller.rb b/app/controllers/invited_signings_controller.rb index 6b092b5..d214c31 100644 --- a/app/controllers/invited_signings_controller.rb +++ b/app/controllers/invited_signings_controller.rb @@ -5,7 +5,7 @@ class InvitedSigningsController < ApplicationController include EntrySigning allow_unauthenticated_access only: %i[show account] before_action :set_invitation - rate_limit to: 10, within: 15.minutes, only: :account, with: -> { redirect_to new_session_path, alert: "Try again later." } + rate_limit to: 10, within: 15.minutes, only: :account, with: -> { redirect_to new_session_path, alert: t("flash.invited_signings.try_again_later") } def show @entry = @invitation.logbook_entry @@ -24,13 +24,13 @@ class InvitedSigningsController < ApplicationController def account return redirect_to(invited_signing_path(params[:token])) if authenticated? if User.exists?(email_address: @invitation.email) || !Sso.password_login? - return redirect_to invited_signing_path(params[:token]), alert: "Sign in to continue." + return redirect_to invited_signing_path(params[:token]), alert: t("flash.invited_signings.sign_in_to_continue") end user = User.new(params.permit(:name, :password, :password_confirmation).merge(email_address: @invitation.email)) if user.save reset_session start_new_session_for user - redirect_to invited_signing_path(params[:token]), notice: "Account created. Add your certificate, then sign." + redirect_to invited_signing_path(params[:token]), notice: t("flash.invited_signings.account_created_add_your") else @entry = @invitation.logbook_entry @account_errors = user.errors.full_messages @@ -44,7 +44,7 @@ class InvitedSigningsController < ApplicationController return render(:wrong_account) unless current_user.email_address == @invitation.email sign_entry(@entry) do |signature| @invitation.update!(used_at: Time.current, user: current_user) - redirect_to invited_signing_path(params[:token]), notice: "Signed. #{EntrySignature::LABEL} #{signature.signer_name}, #{signature.certificate_label} #{signature.certificate_number}." + redirect_to invited_signing_path(params[:token]), notice: t("flash.invited_signings.signed", label: EntrySignature.label, signer_name: signature.signer_name, certificate_label: signature.certificate_label, certificate_number: signature.certificate_number) end end diff --git a/app/controllers/loading_setups_controller.rb b/app/controllers/loading_setups_controller.rb index 707ef83..bbcaf9f 100644 --- a/app/controllers/loading_setups_controller.rb +++ b/app/controllers/loading_setups_controller.rb @@ -13,8 +13,8 @@ class LoadingSetupsController < ApplicationController @setup = LoadingSetup.from_params(permitted.to_h) if @setup.valid? @aircraft.update!(loading_stations: @setup.stations_json, cg_envelope: @setup.envelope.map { |w, cg| [ w.to_f, cg.to_f ] }) - log_event("aircraft", "Loading stations and CG envelope updated") - redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Loading setup saved." + log_event("aircraft", t("flash.loading_setups.loading_stations_and_cg")) + redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.loading_setups.loading_setup_saved") else render :edit, status: :unprocessable_entity end diff --git a/app/controllers/logbook_entries_controller.rb b/app/controllers/logbook_entries_controller.rb index 4f743e2..a46cf1e 100644 --- a/app/controllers/logbook_entries_controller.rb +++ b/app/controllers/logbook_entries_controller.rb @@ -18,10 +18,10 @@ class LogbookEntriesController < ApplicationController # Someone has checked a transcribed entry against the scan. def verify @entry.update!(verified: true) - log_event("logbook", "Transcribed logbook entry verified: #{@entry.date}") + log_event("logbook", t("flash.logbook_entries.transcribed_logbook_entry_verified", date: @entry.date)) next_entry = @aircraft.logbook_entries.unverified.order(:date, :id).first redirect_to next_entry ? aircraft_logbook_entry_path(@aircraft, next_entry) : aircraft_logbook_entries_path(@aircraft), - notice: next_entry ? "Verified. Here's the next one to check." : "Verified. All transcribed entries are checked." + notice: next_entry ? t("flash.logbook_entries.verified_next") : t("flash.logbook_entries.verified_all") end def show; end @@ -36,11 +36,11 @@ class LogbookEntriesController < ApplicationController @entry.supersedes = correctable(params.dig(:logbook_entry, :supersedes_id)) @entry.assign_parts(parts_params, @aircraft) if @entry.save - log_event("logbook", "Logbook entry #{@entry.supersedes ? 'correction ' : ''}added (#{@entry.date})") + log_event("logbook", t(@entry.supersedes ? "flash.logbook_entries.correction_added_event" : "flash.logbook_entries.logbook_entry_added", date: @entry.date)) record_parts_service record_inspections redirect_to aircraft_logbook_entry_path(@aircraft, @entry), - notice: @entry.supersedes ? "Correction saved. Sign it to supersede the original entry." : "Logbook entry added." + notice: @entry.supersedes ? t("flash.logbook_entries.correction_saved") : t("flash.logbook_entries.added") else render :new, status: :unprocessable_entity end @@ -52,8 +52,8 @@ class LogbookEntriesController < ApplicationController @entry.assign_attributes(entry_params) @entry.assign_parts(parts_params, @aircraft) if @entry.save - log_event("logbook", "Logbook entry updated (#{@entry.date})") - redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: "Logbook entry updated." + log_event("logbook", t("flash.logbook_entries.logbook_entry_updated_2", date: @entry.date)) + redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: t("flash.logbook_entries.logbook_entry_updated") else render :edit, status: :unprocessable_entity end @@ -61,8 +61,8 @@ class LogbookEntriesController < ApplicationController def destroy @entry.destroy! - log_event("logbook", "Logbook entry deleted (#{@entry.date})") - redirect_to aircraft_logbook_entries_path(@aircraft), notice: "Logbook entry deleted." + log_event("logbook", t("flash.logbook_entries.logbook_entry_deleted_2", date: @entry.date)) + redirect_to aircraft_logbook_entries_path(@aircraft), notice: t("flash.logbook_entries.logbook_entry_deleted") end private @@ -70,7 +70,7 @@ class LogbookEntriesController < ApplicationController # Signed entries are locked (AC 120-78B 2.1.2.8): changes go in a correction. def require_unsigned return unless @entry.signed? - redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: "This entry is signed, so it can't be changed or deleted. Make a correction entry instead." + redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: t("flash.logbook_entries.this_entry_is_signed") end # A signed, not yet superseded entry of this aircraft. @@ -99,7 +99,7 @@ class LogbookEntriesController < ApplicationController part = @entry.parts.find { _1.component_id == id.to_i } or next component = part.component component.service_from_entry!(date: @entry.date, hours_at_entry: part.hours_at_entry, flown_since: flown, replaced: p["service"] == "replaced") - log_event("component", "#{p['service'] == 'replaced' ? 'Replaced' : 'Serviced'}: #{component} (logbook entry #{@entry.date})") + log_event("component", t(p["service"] == "replaced" ? "flash.logbook_entries.replaced_event" : "flash.logbook_entries.serviced_event", component: component, date: @entry.date)) end end @@ -110,7 +110,7 @@ class LogbookEntriesController < ApplicationController @aircraft.applicable_inspection_types.where(id: ids).find_each do |type| @aircraft.inspection_records.create!(inspection_type: type, logbook_entry: @entry, date: @entry.date, aircraft_hours: @entry.aircraft_hours_at_entry) - log_event("inspection", "Inspection completed: #{type.name} (logbook entry #{@entry.date})") + log_event("inspection", t("flash.logbook_entries.inspection_completed_logbook_entry", name: type.name, date: @entry.date)) end end diff --git a/app/controllers/logbook_imports_controller.rb b/app/controllers/logbook_imports_controller.rb index e42eb85..12e9adb 100644 --- a/app/controllers/logbook_imports_controller.rb +++ b/app/controllers/logbook_imports_controller.rb @@ -11,7 +11,7 @@ class LogbookImportsController < ApplicationController def create files = Array(params[:pages]).compact_blank - return redirect_to(new_aircraft_logbook_import_path(@aircraft), alert: "Choose the scanned pages to upload.") if files.empty? + return redirect_to(new_aircraft_logbook_import_path(@aircraft), alert: t("flash.logbook_imports.choose_the_scanned_pages")) if files.empty? # Page order follows the file names ("page-002" before "page-010"). files = files.sort_by { |f| f.original_filename.to_s.downcase.scan(/\d+|\D+/).map { _1.match?(/\d/) ? [ 0, _1.to_i ] : [ 1, _1 ] } } @@ -32,7 +32,7 @@ class LogbookImportsController < ApplicationController import = @aircraft.logbook_imports.create!(user: current_user, document: document, log_type: params[:log_type], transcribe: params[:transcribe] == "1" && LogbookImport.ai_available?) end - log_event("document", "Logbook pages uploaded: #{document.name} (#{files.size} #{'page'.pluralize(files.size)})") + log_event("document", t("flash.logbook_imports.pages_uploaded", name: document.name, count: files.size)) LogbookTranscriptionJob.perform_later(import.id) redirect_to aircraft_logbook_import_path(@aircraft, import) end diff --git a/app/controllers/logbook_prints_controller.rb b/app/controllers/logbook_prints_controller.rb index 691e83e..efc9db7 100644 --- a/app/controllers/logbook_prints_controller.rb +++ b/app/controllers/logbook_prints_controller.rb @@ -10,7 +10,7 @@ class LogbookPrintsController < ApplicationController def show pdf = LogbookEntryPdf.new(@aircraft, @entries, layout: params[:layout], start_at: params[:start_at]) - log_event("logbook", "Logbook entries printed (#{@entries.size})") + log_event("logbook", t("flash.logbook_prints.logbook_entries_printed", count: @entries.size)) send_data pdf.render, filename: pdf.filename, type: "application/pdf", disposition: "inline" end @@ -19,6 +19,6 @@ class LogbookPrintsController < ApplicationController def set_entries ids = Array(params[:ids]).map(&:to_i).first(200) @entries = @aircraft.logbook_entries.where(id: ids).includes(:component, :parts, :signature, inspection_records: :inspection_type).order(:date, :id).to_a - redirect_to aircraft_logbook_entries_path(@aircraft), alert: "Choose the entries to print." if @entries.empty? + redirect_to aircraft_logbook_entries_path(@aircraft), alert: t("flash.logbook_prints.choose_the_entries_to") if @entries.empty? end end diff --git a/app/controllers/maintenance_reports_controller.rb b/app/controllers/maintenance_reports_controller.rb index c8a2bb4..b5da41b 100644 --- a/app/controllers/maintenance_reports_controller.rb +++ b/app/controllers/maintenance_reports_controller.rb @@ -4,7 +4,7 @@ class MaintenanceReportsController < ApplicationController def show @report = MaintenanceReport.new(@aircraft) - log_event("aircraft", "Maintenance status report viewed") if params[:print] + log_event("aircraft", t("flash.maintenance_reports.maintenance_status_report_viewed")) if params[:print] render layout: "report" end end diff --git a/app/controllers/major_records_controller.rb b/app/controllers/major_records_controller.rb index 2e53270..3798abb 100644 --- a/app/controllers/major_records_controller.rb +++ b/app/controllers/major_records_controller.rb @@ -17,8 +17,8 @@ class MajorRecordsController < ApplicationController def create @record = @aircraft.major_records.new(record_params) if @record.save - log_event("major_record", "#{@record.type_label} added: #{@record.title}") - redirect_to aircraft_major_records_path(@aircraft), notice: "Record added." + log_event("major_record", t("flash.major_records.added", type_label: @record.type_label, title: @record.title)) + redirect_to aircraft_major_records_path(@aircraft), notice: t("flash.major_records.record_added") else render :new, status: :unprocessable_entity end @@ -28,8 +28,8 @@ class MajorRecordsController < ApplicationController def update if @record.update(record_params) - log_event("major_record", "#{@record.type_label} updated: #{@record.title}") - redirect_to aircraft_major_record_path(@aircraft, @record), notice: "Record updated." + log_event("major_record", t("flash.major_records.updated", type_label: @record.type_label, title: @record.title)) + redirect_to aircraft_major_record_path(@aircraft, @record), notice: t("flash.major_records.record_updated") else render :edit, status: :unprocessable_entity end @@ -37,8 +37,8 @@ class MajorRecordsController < ApplicationController def destroy @record.destroy! - log_event("major_record", "#{@record.type_label} deleted: #{@record.title}") - redirect_to aircraft_major_records_path(@aircraft), notice: "Record deleted." + log_event("major_record", t("flash.major_records.deleted", type_label: @record.type_label, title: @record.title)) + redirect_to aircraft_major_records_path(@aircraft), notice: t("flash.major_records.record_deleted") end private diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index a02fa4b..6279e29 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -19,8 +19,8 @@ class NotesController < ApplicationController def create @note = @aircraft.notes.new(note_params.merge(user: current_user)) if @note.save - log_event("note", "Note added") - redirect_to aircraft_notes_path(@aircraft), notice: "Note added." + log_event("note", t("flash.notes.note_added_2")) + redirect_to aircraft_notes_path(@aircraft), notice: t("flash.notes.note_added") else render :new, status: :unprocessable_entity end @@ -30,8 +30,8 @@ class NotesController < ApplicationController def update if @note.update(note_params.merge(edited_at: Time.current)) - log_event("note", "Note updated") - redirect_to aircraft_notes_path(@aircraft), notice: "Note updated." + log_event("note", t("flash.notes.note_updated_2")) + redirect_to aircraft_notes_path(@aircraft), notice: t("flash.notes.note_updated") else render :edit, status: :unprocessable_entity end @@ -39,8 +39,8 @@ class NotesController < ApplicationController def destroy @note.destroy! - log_event("note", "Note deleted") - redirect_to aircraft_notes_path(@aircraft), notice: "Note deleted." + log_event("note", t("flash.notes.note_deleted_2")) + redirect_to aircraft_notes_path(@aircraft), notice: t("flash.notes.note_deleted") end private diff --git a/app/controllers/oil_analyses_controller.rb b/app/controllers/oil_analyses_controller.rb index 77000ef..0223a58 100644 --- a/app/controllers/oil_analyses_controller.rb +++ b/app/controllers/oil_analyses_controller.rb @@ -24,8 +24,8 @@ class OilAnalysesController < ApplicationController def create @analysis = @aircraft.oil_analyses.new(analysis_params) if @analysis.save - log_event("oil_analysis", "Oil analysis added (sampled #{@analysis.sample_date})") - redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: "Oil analysis saved." + log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_added_sampled", sample_date: @analysis.sample_date)) + redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: t("flash.oil_analyses.oil_analysis_saved") else render :new, status: :unprocessable_entity end @@ -35,13 +35,13 @@ class OilAnalysesController < ApplicationController # earlier samples, so samples already on file are skipped rather than duplicated. def import file = params[:report] - return redirect_to(new_aircraft_oil_analysis_path(@aircraft), alert: "Choose a lab report PDF.") if file.blank? + return redirect_to(new_aircraft_oil_analysis_path(@aircraft), alert: t("flash.oil_analyses.choose_a_lab_report")) if file.blank? report = OilReportParser.from_pdf(file.tempfile) file.rewind if report.tail_number.present? && normalize_tail(report.tail_number) != normalize_tail(@aircraft.tail_number) return redirect_to(new_aircraft_oil_analysis_path(@aircraft), - alert: "That report is for #{report.tail_number}, not #{@aircraft.tail_number}.") + alert: t("flash.oil_analyses.that_report_is_for", report_tail: report.tail_number, tail_number: @aircraft.tail_number)) end engine = engine_for(report) @@ -57,20 +57,20 @@ class OilAnalysesController < ApplicationController current_record.report.attach(file) if current_record && !current_record.report.attached? skipped = report.samples.size - created.size - created.each { log_event("oil_analysis", "Oil analysis imported (sampled #{_1.sample_date})") } - notice = "Imported #{helpers.pluralize(created.size, 'sample')} from the #{report.lab} report." - notice += " #{helpers.pluralize(skipped, 'sample was', plural: 'samples were')} already recorded." if skipped.positive? + created.each { log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_imported_sampled", sample_date: _1.sample_date)) } + notice = t("flash.oil_analyses.imported", count: created.size, lab: report.lab) + notice += " #{t('flash.oil_analyses.already_recorded', count: skipped)}" if skipped.positive? redirect_to aircraft_oil_analyses_path(@aircraft), notice: notice rescue OilReportParser::Error => e - redirect_to new_aircraft_oil_analysis_path(@aircraft), alert: "Couldn't import that report: #{e.message}" + redirect_to new_aircraft_oil_analysis_path(@aircraft), alert: t("flash.oil_analyses.couldn_t_import_that", message: e.message) end def edit; end def update if @analysis.update(analysis_params) - log_event("oil_analysis", "Oil analysis updated (sampled #{@analysis.sample_date})") - redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: "Oil analysis updated." + log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_updated_sampled", sample_date: @analysis.sample_date)) + redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: t("flash.oil_analyses.oil_analysis_updated") else render :edit, status: :unprocessable_entity end @@ -78,8 +78,8 @@ class OilAnalysesController < ApplicationController def destroy @analysis.destroy! - log_event("oil_analysis", "Oil analysis deleted (sampled #{@analysis.sample_date})") - redirect_to aircraft_oil_analyses_path(@aircraft), notice: "Oil analysis deleted." + log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_deleted_sampled", sample_date: @analysis.sample_date)) + redirect_to aircraft_oil_analyses_path(@aircraft), notice: t("flash.oil_analyses.oil_analysis_deleted") end private diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb index 322fd3a..4a26b28 100644 --- a/app/controllers/passwords_controller.rb +++ b/app/controllers/passwords_controller.rb @@ -2,8 +2,8 @@ class PasswordsController < ApplicationController allow_unauthenticated_access before_action :require_password_login before_action :set_user_by_token, only: %i[ edit update ] - rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_session_path, alert: "Try again later." } - rate_limit to: 10, within: 15.minutes, only: :update, with: -> { redirect_to new_session_path, alert: "Try again later." } + rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_session_path, alert: t("flash.passwords.try_again_later") } + rate_limit to: 10, within: 15.minutes, only: :update, with: -> { redirect_to new_session_path, alert: t("flash.passwords.try_again_later_2") } def new end @@ -13,7 +13,7 @@ class PasswordsController < ApplicationController PasswordsMailer.reset(user).deliver_later end - redirect_to new_session_path, notice: "Password reset instructions sent (if user with that email address exists)." + redirect_to new_session_path, notice: t("flash.passwords.password_reset_instructions_sent") end def edit @@ -22,7 +22,7 @@ class PasswordsController < ApplicationController def update if params[:password].present? && @user.update(params.permit(:password, :password_confirmation)) @user.sessions.destroy_all # a reset signs out every device - redirect_to new_session_path, notice: "Password has been reset." + redirect_to new_session_path, notice: t("flash.passwords.password_has_been_reset") else redirect_to edit_password_path(params[:token]), alert: @user.errors.full_messages.to_sentence.presence || "Enter a new password." end @@ -30,12 +30,12 @@ class PasswordsController < ApplicationController private def require_password_login - redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login? + redirect_to new_session_path, alert: t("flash.passwords.sign_in_with", label: Sso.label) unless Sso.password_login? end def set_user_by_token @user = User.find_by_password_reset_token!(params[:token]) rescue ActiveSupport::MessageVerifier::InvalidSignature - redirect_to new_password_path, alert: "Password reset link is invalid or has expired." + redirect_to new_password_path, alert: t("flash.passwords.password_reset_link_is") end end diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 0bd37e6..141d616 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -14,13 +14,13 @@ class ProfilesController < ApplicationController # Checked before assigning: setting a new password replaces the digest at once. if sensitive && !@user.authenticate_password(params.dig(:user, :current_password).to_s) @user.assign_attributes(attrs.except(:password, :password_confirmation)) - @user.errors.add(:base, "Enter your current password to change your email or password") + @user.errors.add(:base, :current_password_needed) return render :edit, status: :unprocessable_entity end @user.assign_attributes(attrs) if @user.save @user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password) - redirect_to root_path, notice: "Profile updated." + redirect_to root_path, notice: t("flash.profiles.profile_updated") else render :edit, status: :unprocessable_entity end @@ -28,6 +28,6 @@ class ProfilesController < ApplicationController def sign_out_others count = current_user.sessions.where.not(id: Current.session.id).destroy_all.size - redirect_to edit_profile_path, notice: "Signed out #{helpers.pluralize(count, 'other session')}." + redirect_to edit_profile_path, notice: t("flash.profiles.signed_out_others", count: count) end end diff --git a/app/controllers/record_versions_controller.rb b/app/controllers/record_versions_controller.rb index 26ecfaa..15ef972 100644 --- a/app/controllers/record_versions_controller.rb +++ b/app/controllers/record_versions_controller.rb @@ -18,17 +18,17 @@ class RecordVersionsController < ApplicationController def restore version = RecordVersion.where(aircraft_id: @aircraft.id, event: "unlink", item_type: SHARED.keys).find(params[:id]) record = SHARED.fetch(version.item_type).find_by(id: version.item_id) - return redirect_to(aircraft_record_versions_path(@aircraft), alert: "That record no longer exists.") unless record + return redirect_to(aircraft_record_versions_path(@aircraft), alert: t("flash.record_versions.that_record_no_longer")) unless record c = version.changes_hash if c["applies_to"] == "component" component = @aircraft.components.find_by(id: c["component_id"]) - return redirect_to(aircraft_record_versions_path(@aircraft), alert: "That component no longer exists; edit the record's applicability instead.") unless component + return redirect_to(aircraft_record_versions_path(@aircraft), alert: t("flash.record_versions.that_component_no_longer")) unless component record.components << component unless record.components.include?(component) else record.aircraft << @aircraft unless record.aircraft.include?(@aircraft) end log_event(version.item_type == "AirworthinessDirective" ? "ad" : "inspection", "Restored: #{record} applies again") - redirect_to aircraft_record_versions_path(@aircraft), notice: "#{record} applies to #{@aircraft.tail_number} again." + redirect_to aircraft_record_versions_path(@aircraft), notice: t("flash.record_versions.applies_to_again", record: record, tail_number: @aircraft.tail_number) end # Whether an unlink can still be undone (the record exists and isn't linked that way now). diff --git a/app/controllers/records_packages_controller.rb b/app/controllers/records_packages_controller.rb index 57bb3d9..e331ba7 100644 --- a/app/controllers/records_packages_controller.rb +++ b/app/controllers/records_packages_controller.rb @@ -10,7 +10,7 @@ class RecordsPackagesController < ApplicationController Dir[dir.join("*.zip")].each { |old| File.delete(old) if File.mtime(old) < 1.hour.ago } path = dir.join("#{SecureRandom.hex(12)}.zip").to_s package.write_to(path) - log_event("aircraft", "Records package downloaded") + log_event("aircraft", t("flash.records_packages.records_package_downloaded")) # Generic binary, not application/zip: Safari unzips zip downloads into a # folder ("Open safe files"); the package should stay one file to hand over. send_file path, filename: package.filename, type: "application/octet-stream", disposition: "attachment" diff --git a/app/controllers/searches_controller.rb b/app/controllers/searches_controller.rb index e88f0b7..34d1c03 100644 --- a/app/controllers/searches_controller.rb +++ b/app/controllers/searches_controller.rb @@ -1,7 +1,7 @@ # One search box across the records of the aircraft the user can see # (or one aircraft, from its own pages). class SearchesController < ApplicationController - rate_limit to: 60, within: 1.minute, with: -> { redirect_to root_path, alert: "Too many searches; wait a moment." } + rate_limit to: 60, within: 1.minute, with: -> { redirect_to root_path, alert: t("flash.searches.too_many_searches_wait") } def show fleet = current_user.accessible_aircraft.ordered.to_a diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 237587b..87e1848 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,45 +1,44 @@ class SessionsController < ApplicationController allow_unauthenticated_access only: %i[new create two_factor verify_two_factor] - rate_limit to: 10, within: 3.minutes, only: %i[create verify_two_factor], with: -> { redirect_to new_session_url, alert: "Try again later." } + rate_limit to: 10, within: 3.minutes, only: %i[create verify_two_factor], with: -> { redirect_to new_session_url, alert: t("flash.sessions.try_again_later") } - FAILED = "Try another email address or password. After #{User::LOCK_AFTER} failed tries in a row an account is locked for #{User::LOCK_FOR.inspect}.".freeze def new end def create - return redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login? + return redirect_to new_session_path, alert: t("flash.sessions.sign_in_with", label: Sso.label) unless Sso.password_login? if (user = User.authenticate_with_lockout(email_address: params[:email_address], password: params[:password])) && user.disabled? - redirect_to new_session_path, alert: "This account is disabled." + redirect_to new_session_path, alert: t("flash.sessions.this_account_is_disabled") elsif user begin_sign_in user, return_to: after_authentication_url else - redirect_to new_session_path(email_address: params[:email_address].to_s.first(200)), alert: FAILED + redirect_to new_session_path(email_address: params[:email_address].to_s.first(200)), alert: t("flash.sessions.failed", tries: User::LOCK_AFTER, minutes: User::LOCK_FOR.in_minutes.to_i) end end # Second step for accounts with an authenticator app. def two_factor - redirect_to new_session_path, alert: "Sign in again." unless pending_otp_user + redirect_to new_session_path, alert: t("flash.sessions.sign_in_again") unless pending_otp_user end def verify_two_factor user = pending_otp_user - return redirect_to(new_session_path, alert: "That took too long. Sign in again.") unless user + return redirect_to(new_session_path, alert: t("flash.sessions.that_took_too_long")) unless user if user.locked? reset_session - redirect_to new_session_path, alert: FAILED + redirect_to new_session_path, alert: t("flash.sessions.failed", tries: User::LOCK_AFTER, minutes: User::LOCK_FOR.in_minutes.to_i) elsif user.verify_second_factor(params[:code]) user.clear_failed_sign_ins! return_to = after_authentication_url reset_session start_new_session_for user - notice = user.recovery_codes_left < 3 ? "Signed in. You have #{user.recovery_codes_left} recovery codes left: make new ones on your profile." : nil + notice = user.recovery_codes_left < 3 ? t("flash.sessions.few_recovery_codes", count: user.recovery_codes_left) : nil redirect_to return_to, notice: notice else user.register_failed_sign_in! - redirect_to two_factor_session_path, alert: "That code didn't match. Try the current code from your authenticator app, or a recovery code." + redirect_to two_factor_session_path, alert: t("flash.sessions.that_code_didn_t") end end diff --git a/app/controllers/setup_controller.rb b/app/controllers/setup_controller.rb index fa474dd..08b9659 100644 --- a/app/controllers/setup_controller.rb +++ b/app/controllers/setup_controller.rb @@ -12,7 +12,7 @@ class SetupController < ApplicationController @user.admin = true if @user.save start_new_session_for @user - redirect_to root_path, notice: "Welcome! You're the administrator. Add your first aircraft." + redirect_to root_path, notice: t("flash.setup.welcome_you_re_the") else render :new, status: :unprocessable_entity end diff --git a/app/controllers/share_tokens_controller.rb b/app/controllers/share_tokens_controller.rb index 7a29e25..1cacdb7 100644 --- a/app/controllers/share_tokens_controller.rb +++ b/app/controllers/share_tokens_controller.rb @@ -6,8 +6,8 @@ class ShareTokensController < ApplicationController token = @aircraft.share_tokens.new(params.require(:share_token).permit(:label, :privilege, :expires_at)) token.created_by = current_user if token.save - log_event("aircraft", "Share link created (#{token.privilege})", notes: token.label) - redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Share link created." + log_event("aircraft", t("flash.share_tokens.share_link_created_2", privilege: token.privilege), notes: token.label) + redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.share_tokens.share_link_created") else redirect_to aircraft_aircraft_roles_path(@aircraft), alert: token.errors.full_messages.to_sentence end @@ -16,7 +16,7 @@ class ShareTokensController < ApplicationController def destroy token = @aircraft.share_tokens.find(params[:id]) token.destroy! - log_event("aircraft", "Share link revoked", notes: token.label) - redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Share link revoked." + log_event("aircraft", t("flash.share_tokens.share_link_revoked_2"), notes: token.label) + redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.share_tokens.share_link_revoked") end end diff --git a/app/controllers/sign_in_links_controller.rb b/app/controllers/sign_in_links_controller.rb index 5fd3f75..dd5cbf6 100644 --- a/app/controllers/sign_in_links_controller.rb +++ b/app/controllers/sign_in_links_controller.rb @@ -7,8 +7,8 @@ class SignInLinksController < ApplicationController allow_unauthenticated_access before_action :require_email_sign_in before_action :set_user_by_token, only: %i[show consume] - rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_sign_in_link_path, alert: "Try again later." } - rate_limit to: 20, within: 15.minutes, only: :consume, with: -> { redirect_to new_session_path, alert: "Try again later." } + rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_sign_in_link_path, alert: t("flash.sign_in_links.try_again_later") } + rate_limit to: 20, within: 15.minutes, only: :consume, with: -> { redirect_to new_session_path, alert: t("flash.sign_in_links.try_again_later_2") } def new end @@ -18,25 +18,25 @@ class SignInLinksController < ApplicationController SessionsMailer.sign_in_link(user).deliver_later end # Same answer either way, so this can't be used to find accounts. - redirect_to new_session_path, notice: "If there's an account for that address, a sign-in link is on its way. It works once, for 15 minutes." + redirect_to new_session_path, notice: t("flash.sign_in_links.if_there_s_an") end def show end def consume - return redirect_to new_session_path, alert: "This account is disabled." if @user.disabled? - begin_sign_in @user, return_to: root_path, notice: "Signed in." # signing in also spends the link + return redirect_to new_session_path, alert: t("flash.sign_in_links.this_account_is_disabled") if @user.disabled? + begin_sign_in @user, return_to: root_path, notice: t("flash.sign_in_links.signed_in") # signing in also spends the link end private def require_email_sign_in - redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login? + redirect_to new_session_path, alert: t("flash.sign_in_links.sign_in_with", label: Sso.label) unless Sso.password_login? end def set_user_by_token @user = User.find_by_token_for(:email_sign_in, params[:token].to_s) - redirect_to new_sign_in_link_path, alert: "That sign-in link has expired or was already used. Get a new one below." unless @user + redirect_to new_sign_in_link_path, alert: t("flash.sign_in_links.that_sign_in_link") unless @user end end diff --git a/app/controllers/signing_invitations_controller.rb b/app/controllers/signing_invitations_controller.rb index a74fa24..e291fe3 100644 --- a/app/controllers/signing_invitations_controller.rb +++ b/app/controllers/signing_invitations_controller.rb @@ -3,22 +3,22 @@ class SigningInvitationsController < ApplicationController include AircraftScoped before_action :require_owner! before_action :set_entry - rate_limit to: 10, within: 1.hour, only: :create, with: -> { redirect_back fallback_location: root_path, alert: "Too many invitations; try again later." } + rate_limit to: 10, within: 1.hour, only: :create, with: -> { redirect_back fallback_location: root_path, alert: t("flash.signing_invitations.too_many_invitations_try") } def new @invitation = @entry.signing_invitations.new end def create - return redirect_to(aircraft_logbook_entry_path(@aircraft, @entry), alert: "This entry is already signed.") if @entry.signed? + return redirect_to(aircraft_logbook_entry_path(@aircraft, @entry), alert: t("flash.signing_invitations.this_entry_is_already")) if @entry.signed? unless MailSettings.configured? - return redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: "Email isn't set up, so invitations can't be sent (Admin → About)." + return redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: t("flash.signing_invitations.email_isn_t_set") end @invitation = @entry.signing_invitations.new(params.require(:signing_invitation).permit(:email, :message).merge(invited_by: current_user)) if @invitation.save SigningInvitationMailer.invite(@invitation, @invitation.token).deliver_later - log_event("logbook", "Signature requested from #{@invitation.email} (#{@entry.date} entry)") - redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: "Invitation sent to #{@invitation.email}. The link works once, for #{SigningInvitation::VALID_FOR.inspect}." + log_event("logbook", t("flash.signing_invitations.signature_requested_from_entry", email: @invitation.email, date: @entry.date)) + redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: t("flash.signing_invitations.invitation_sent_to_the", email: @invitation.email, _: SigningInvitation::VALID_FOR.inspect) else render :new, status: :unprocessable_entity end diff --git a/app/controllers/squawks_controller.rb b/app/controllers/squawks_controller.rb index 6b3ec89..ca64b79 100644 --- a/app/controllers/squawks_controller.rb +++ b/app/controllers/squawks_controller.rb @@ -17,8 +17,8 @@ class SquawksController < ApplicationController def create @squawk = @aircraft.squawks.new(squawk_params.merge(reported_by: current_user)) if @squawk.save - log_event("squawk", "Squawk reported: #{@squawk.priority_label}", notes: @squawk.issue_reported.truncate(200)) - redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk reported." + log_event("squawk", t("flash.squawks.squawk_reported_2", priority_label: @squawk.priority_label), notes: @squawk.issue_reported.truncate(200)) + redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_reported") else render :new, status: :unprocessable_entity end @@ -30,8 +30,8 @@ class SquawksController < ApplicationController @squawk.assign_attributes(squawk_params.except(:attachments)) change_attachments if @squawk.save - log_event("squawk", "Squawk updated") - redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk updated." + log_event("squawk", t("flash.squawks.squawk_updated_2")) + redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_updated") else render :edit, status: :unprocessable_entity end @@ -42,7 +42,7 @@ class SquawksController < ApplicationController def resolution @entry = @aircraft.logbook_entries.new(date: Date.current, entry_type: "MAINTENANCE", log_type: "AC", aircraft_hours_at_entry: @aircraft.current_hours, - text: "Corrected: #{@squawk.issue_reported}", component: @squawk.component, + text: t("flash.squawks.corrected_text", issue: @squawk.issue_reported), component: @squawk.component, component_hours_at_entry: @squawk.component&.hours_in_service, component_since_overhaul_at_entry: @squawk.component&.hours_since_overhaul) @entry.log_type = "ENG" if @squawk.component&.engine? @@ -56,13 +56,13 @@ class SquawksController < ApplicationController @entry = @aircraft.logbook_entries.new(resolution_entry_params.merge(entry_type: "MAINTENANCE")) @entry.assign_parts(params.fetch(:logbook_entry, {}).permit(parts: {})[:parts]&.to_h || {}, @aircraft) return render(:resolution, status: :unprocessable_entity) unless @entry.save - log_event("logbook", "Logbook entry added: #{@entry.date}") + log_event("logbook", t("flash.squawks.logbook_entry_added", date: @entry.date)) @entry when "existing" then @aircraft.logbook_entries.find_by(id: params[:logbook_entry_id]) end @squawk.resolve!(notes: params[:resolution_notes], logbook_entry: entry) - log_event("squawk", "Squawk resolved", notes: @squawk.issue_reported.truncate(200)) - redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk resolved#{' and recorded in the logbook' if entry}." + log_event("squawk", t("flash.squawks.squawk_resolved_2"), notes: @squawk.issue_reported.truncate(200)) + redirect_to aircraft_squawks_path(@aircraft), notice: t(entry ? "flash.squawks.resolved_logged" : "flash.squawks.squawk_resolved") end def deferral; end @@ -70,8 +70,8 @@ class SquawksController < ApplicationController def defer if @squawk.defer(checks: params[:checks], name: params[:deferred_by_name], role: params[:deferred_by_role], action: params[:deferral_action], notes: params[:deferral_notes]) - log_event("squawk", "Inoperative item deferred (91.213(d))", notes: @squawk.issue_reported.truncate(200)) - redirect_to aircraft_squawks_path(@aircraft), notice: "Deferred. Keep the placard in place until it's fixed." + log_event("squawk", t("flash.squawks.inoperative_item_deferred_91"), notes: @squawk.issue_reported.truncate(200)) + redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.deferred_keep_the_placard") else render :deferral, status: :unprocessable_entity end @@ -79,20 +79,20 @@ class SquawksController < ApplicationController def undefer @squawk.undefer! - log_event("squawk", "Deferral removed", notes: @squawk.issue_reported.truncate(200)) - redirect_to aircraft_squawks_path(@aircraft), notice: "Deferral removed." + log_event("squawk", t("flash.squawks.deferral_removed_2"), notes: @squawk.issue_reported.truncate(200)) + redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.deferral_removed") end def reopen @squawk.update!(resolved: false, resolved_at: nil) - log_event("squawk", "Squawk reopened") - redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk reopened." + log_event("squawk", t("flash.squawks.squawk_reopened_2")) + redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_reopened") end def destroy @squawk.destroy! - log_event("squawk", "Squawk deleted") - redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk deleted." + log_event("squawk", t("flash.squawks.squawk_deleted_2")) + redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_deleted") end private diff --git a/app/controllers/sso_controller.rb b/app/controllers/sso_controller.rb index 1e1fef9..9f8390b 100644 --- a/app/controllers/sso_controller.rb +++ b/app/controllers/sso_controller.rb @@ -9,7 +9,7 @@ class SsoController < ApplicationController allow_unauthenticated_access only: %i[callback failure] before_action :require_sso - rate_limit to: 20, within: 3.minutes, only: :callback, with: -> { redirect_to new_session_path, alert: "Try again later." } + rate_limit to: 20, within: 3.minutes, only: :callback, with: -> { redirect_to new_session_path, alert: t("flash.sso.try_again_later") } def callback auth = request.env["omniauth.auth"] @@ -20,11 +20,10 @@ class SsoController < ApplicationController user = User.find_by(sso_uid: auth.uid) || link_by_email(auth) || create_user(auth) unless user email = auth.info&.email.presence - return redirect_to new_session_path, alert: "There's no account for #{email || 'that sign-in'} here yet. " \ - "Ask an administrator to add you, or sign in with your password and link #{Sso.label} from your profile." + return redirect_to new_session_path, alert: t("flash.sso.there_s_no_account", email: email || t("flash.sso.that_sign_in"), provider: Sso.label) end - return redirect_to new_session_path, alert: "This account is disabled." if user.disabled? + return redirect_to new_session_path, alert: t("flash.sso.this_account_is_disabled") if user.disabled? sync_admin(user, auth) return_to = session[:return_to_after_authenticating] @@ -34,22 +33,21 @@ class SsoController < ApplicationController end # OmniAuth's error codes; anything else (network errors…) is logged, not shown. - FAILURES = { "invalid_credentials" => "invalid credentials", "csrf_detected" => "the sign-in expired, try again", - "access_denied" => "access denied", "timeout" => "timed out" }.freeze + FAILURES = %w[invalid_credentials csrf_detected access_denied timeout].freeze def failure - reason = FAILURES[params[:message].to_s] + reason = t(params[:message], scope: "flash.sso.failures") if FAILURES.include?(params[:message].to_s) Rails.logger.warn("[sso] sign-in failed: #{params[:message].to_s.truncate(300)}") unless reason redirect_to(authenticated? ? edit_profile_path : new_session_path, - alert: "#{Sso.label} sign-in failed (#{reason || "couldn't reach or verify #{Sso.label}; see the server log"}).") + alert: t("flash.sso.failed", provider: Sso.label, reason: reason || t("flash.sso.unreachable", provider: Sso.label))) end def destroy unless Sso.password_login? - return redirect_to edit_profile_path, alert: "Password sign-in is off, so unlinking #{Sso.label} would lock you out." + return redirect_to edit_profile_path, alert: t("flash.sso.password_sign_in_is", label: Sso.label) end current_user.update!(sso_uid: nil) - redirect_to edit_profile_path, notice: "#{Sso.label} unlinked. Sign in with your email and password from now on." + redirect_to edit_profile_path, notice: t("flash.sso.unlinked_sign_in_with", label: Sso.label) end private @@ -61,16 +59,16 @@ class SsoController < ApplicationController # Signed in again (e.g. to sign a logbook entry): note when, and go back. def reauthenticated(auth) session[:reauthenticated_at] = Time.current.to_i - redirect_to session.delete(:after_reauth).presence || edit_profile_path, notice: "Signed in again with #{Sso.label}." + redirect_to session.delete(:after_reauth).presence || edit_profile_path, notice: t("flash.sso.signed_in_again_with", label: Sso.label) end def link(auth) owner = User.find_by(sso_uid: auth.uid) if owner && owner != current_user - redirect_to edit_profile_path, alert: "That #{Sso.label} account is already linked to another user." + redirect_to edit_profile_path, alert: t("flash.sso.that_account_is_already", label: Sso.label) else current_user.update!(sso_uid: auth.uid) - redirect_to edit_profile_path, notice: "#{Sso.label} linked. You can now sign in with it." + redirect_to edit_profile_path, notice: t("flash.sso.linked_you_can_now", label: Sso.label) end end diff --git a/app/controllers/standard_inspections_controller.rb b/app/controllers/standard_inspections_controller.rb index 0b6a1f8..b784af7 100644 --- a/app/controllers/standard_inspections_controller.rb +++ b/app/controllers/standard_inspections_controller.rb @@ -7,10 +7,10 @@ class StandardInspectionsController < ApplicationController def create added = StandardInspections.add!(@aircraft, params[:templates]) if added.any? - log_event("inspection", "Standard inspections added", notes: added.map(&:name).join(", ")) - redirect_to aircraft_inspections_path(@aircraft), notice: "Added #{added.map(&:name).to_sentence}. Record when each was last done to see when it's next due." + log_event("inspection", t("flash.standard_inspections.standard_inspections_added"), notes: added.map(&:name).join(", ")) + redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.standard_inspections.added_record_when_each", items: added.map(&:name).to_sentence) else - redirect_to new_aircraft_standard_inspections_path(@aircraft), alert: "Nothing new was chosen." + redirect_to new_aircraft_standard_inspections_path(@aircraft), alert: t("flash.standard_inspections.nothing_new_was_chosen") end end end diff --git a/app/controllers/two_factors_controller.rb b/app/controllers/two_factors_controller.rb index 22175b8..37f6941 100644 --- a/app/controllers/two_factors_controller.rb +++ b/app/controllers/two_factors_controller.rb @@ -1,10 +1,10 @@ # Profile → Two-factor: set up an authenticator app (TOTP) for password and # emailed-link sign-in, turn it off, or make new recovery codes. class TwoFactorsController < ApplicationController - rate_limit to: 10, within: 5.minutes, only: %i[create destroy recovery_codes], with: -> { redirect_to edit_profile_path(anchor: "two-factor"), alert: "Try again later." } + rate_limit to: 10, within: 5.minutes, only: %i[create destroy recovery_codes], with: -> { redirect_to edit_profile_path(anchor: "two-factor"), alert: t("flash.two_factors.try_again_later") } def new - return redirect_to(back_path, notice: "Two-factor is already on.") if current_user.otp_enabled? + return redirect_to(back_path, notice: t("flash.two_factors.two_factor_is_already")) if current_user.otp_enabled? session[:pending_otp_secret] ||= User.new_otp_secret @secret = session[:pending_otp_secret] svg = RQRCode::QRCode.new(User.otp_uri(@secret, current_user.email_address)).as_svg(module_size: 4, use_path: true, viewbox: true) @@ -20,22 +20,22 @@ class TwoFactorsController < ApplicationController log_security("turned on two-factor") render :codes else - redirect_to new_two_factor_path(return_to: params[:return_to]), alert: "That code didn't match. Check the time on your phone and try the current code." + redirect_to new_two_factor_path(return_to: params[:return_to]), alert: t("flash.two_factors.that_code_didn_t") end end def recovery_codes - return redirect_to(edit_profile_path(anchor: "two-factor"), alert: "That code didn't match.") unless current_user.verify_second_factor(params[:code]) + return redirect_to(edit_profile_path(anchor: "two-factor"), alert: t("flash.two_factors.that_code_didn_t_2")) unless current_user.verify_second_factor(params[:code]) @codes = current_user.enable_otp!(current_user.otp_secret) log_security("made new recovery codes") render :codes end def destroy - return redirect_to(edit_profile_path(anchor: "two-factor"), alert: "That code didn't match.") unless current_user.verify_second_factor(params[:code]) + return redirect_to(edit_profile_path(anchor: "two-factor"), alert: t("flash.two_factors.that_code_didn_t_3")) unless current_user.verify_second_factor(params[:code]) current_user.disable_otp! log_security("turned off two-factor") - redirect_to edit_profile_path(anchor: "two-factor"), notice: "Two-factor is off." + redirect_to edit_profile_path(anchor: "two-factor"), notice: t("flash.two_factors.two_factor_is_off") end private diff --git a/app/controllers/user_certificates_controller.rb b/app/controllers/user_certificates_controller.rb index 5fbc1b5..ff0888e 100644 --- a/app/controllers/user_certificates_controller.rb +++ b/app/controllers/user_certificates_controller.rb @@ -6,23 +6,23 @@ class UserCertificatesController < ApplicationController certificate = current_user.certificates.new(certificate_params) back = safe_return_to || edit_profile_path(anchor: "certificates") if certificate.save - redirect_to back, notice: "#{certificate.kind_label} certificate added." + redirect_to back, notice: t("flash.user_certificates.certificate_added", kind_label: certificate.kind_label) else - redirect_to back, alert: "Certificate not added: #{certificate.errors.full_messages.to_sentence}." + redirect_to back, alert: t("flash.user_certificates.certificate_not_added", items: certificate.errors.full_messages.to_sentence) end end def update if @certificate.update(certificate_params) - redirect_to edit_profile_path(anchor: "certificates"), notice: "Certificate updated." + redirect_to edit_profile_path(anchor: "certificates"), notice: t("flash.user_certificates.certificate_updated") else - redirect_to edit_profile_path(anchor: "certificates"), alert: "Certificate not updated: #{@certificate.errors.full_messages.to_sentence}." + redirect_to edit_profile_path(anchor: "certificates"), alert: t("flash.user_certificates.certificate_not_updated", items: @certificate.errors.full_messages.to_sentence) end end def destroy @certificate.destroy! - redirect_to edit_profile_path(anchor: "certificates"), notice: "Certificate removed." + redirect_to edit_profile_path(anchor: "certificates"), notice: t("flash.user_certificates.certificate_removed") end private diff --git a/app/controllers/weight_balance_records_controller.rb b/app/controllers/weight_balance_records_controller.rb index 213c383..05a7dd8 100644 --- a/app/controllers/weight_balance_records_controller.rb +++ b/app/controllers/weight_balance_records_controller.rb @@ -19,8 +19,8 @@ class WeightBalanceRecordsController < ApplicationController def create @record = @aircraft.weight_balance_records.new(record_params) if @record.save - log_event("aircraft", "Weight & balance recorded: #{@record.empty_weight} lb @ #{@record.empty_arm} in") - redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Weight & balance saved." + log_event("aircraft", t("flash.weight_balance_records.weight_balance_recorded_lb", empty_weight: @record.empty_weight, empty_arm: @record.empty_arm)) + redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.weight_balance_records.weight_balance_saved") else render :new, status: :unprocessable_entity end @@ -30,8 +30,8 @@ class WeightBalanceRecordsController < ApplicationController def update if @record.update(record_params) - log_event("aircraft", "Weight & balance updated (#{@record.date})") - redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Weight & balance updated." + log_event("aircraft", t("flash.weight_balance_records.weight_balance_updated_2", date: @record.date)) + redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.weight_balance_records.weight_balance_updated") else render :edit, status: :unprocessable_entity end @@ -39,8 +39,8 @@ class WeightBalanceRecordsController < ApplicationController def destroy @record.destroy! - log_event("aircraft", "Weight & balance record deleted (#{@record.date})") - redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Record deleted." + log_event("aircraft", t("flash.weight_balance_records.weight_balance_record_deleted", date: @record.date)) + redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.weight_balance_records.record_deleted") end private diff --git a/app/form_builders/app_form_builder.rb b/app/form_builders/app_form_builder.rb index f0ec20b..75385ef 100644 --- a/app/form_builders/app_form_builder.rb +++ b/app/form_builders/app_form_builder.rb @@ -5,7 +5,7 @@ # <%= f.field :public, as: :checkbox, label: "Show on share links" %> class AppFormBuilder < ActionView::Helpers::FormBuilder def field(method, as: :text, label: nil, hint: nil, collection: nil, include_blank: false, wrapper: {}, **opts) - label_text = label || method.to_s.humanize + label_text = label || (object.class.respond_to?(:human_attribute_name) ? object.class.human_attribute_name(method) : method.to_s.humanize) errors = object.respond_to?(:errors) ? object.errors[method] : [] if as == :checkbox @@ -35,7 +35,7 @@ class AppFormBuilder < ActionView::Helpers::FormBuilder @template.content_tag(:div, class: wrapper[:class]) do label(method, label_text, class: "label") + input + (hint ? @template.content_tag(:p, hint, class: "hint") : "".html_safe) + - errors.map { |e| @template.content_tag(:p, "#{label_text} #{e}", class: "field-error") }.join.html_safe + errors.map { |e| @template.content_tag(:p, I18n.t("errors.format", attribute: label_text, message: e), class: "field-error") }.join.html_safe end end @@ -49,10 +49,10 @@ class AppFormBuilder < ActionView::Helpers::FormBuilder label(every, label, class: "label") + @template.content_tag(:div, class: "flex gap-2") do number_field(every, class: "input min-w-0 flex-1", min: 1, step: 1, inputmode: "numeric") + - select(:"#{name}_unit", CalendarInterval::UNITS.invert, {}, class: "input w-auto", "aria-label": "#{label} unit") + select(:"#{name}_unit", CalendarInterval::UNITS.invert, {}, class: "input w-auto", "aria-label": I18n.t("helpers.form.interval_unit", label: label)) end + (hint ? @template.content_tag(:p, hint, class: "hint") : "".html_safe) + - errors.map { |e| @template.content_tag(:p, "#{label} #{e}", class: "field-error") }.join.html_safe + errors.map { |e| @template.content_tag(:p, I18n.t("errors.format", attribute: label, message: e), class: "field-error") }.join.html_safe end end diff --git a/app/helpers/aircraft_helper.rb b/app/helpers/aircraft_helper.rb index 20258f0..1821c58 100644 --- a/app/helpers/aircraft_helper.rb +++ b/app/helpers/aircraft_helper.rb @@ -2,32 +2,32 @@ module AircraftHelper # Tabs on the aircraft pages: [label, path, controller names that highlight it, owner_only] def aircraft_tabs(aircraft) [ - [ "Overview", aircraft_path(aircraft), %w[aircraft] ], - [ "Components", aircraft_components_path(aircraft), %w[components] ], - [ "Squawks", aircraft_squawks_path(aircraft), %w[squawks] ], - [ "Flights", aircraft_flight_logs_path(aircraft), %w[flight_logs flight_imports air_trail_exports airport_codes] ], - [ "Oil & Fuel", aircraft_consumable_records_path(aircraft), %w[consumable_records oil_analyses] ], - [ "Logbook", aircraft_logbook_entries_path(aircraft), %w[logbook_entries] ], - [ "Inspections", aircraft_inspections_path(aircraft), %w[inspections inspection_types inspection_records] ], - [ "ADs", aircraft_airworthiness_directives_path(aircraft), %w[airworthiness_directives ad_compliances ad_imports] ], - [ "Documents", aircraft_documents_path(aircraft), %w[documents document_collections] ], - [ "Major Records", aircraft_major_records_path(aircraft), %w[major_records] ], - [ "W&B", aircraft_weight_balance_records_path(aircraft), %w[weight_balance_records loading_setups] ], - [ "Notes", aircraft_notes_path(aircraft), %w[notes] ], - [ "Activity", aircraft_events_path(aircraft), %w[events record_versions] ] + [ I18n.t("helpers.aircraft.overview"), aircraft_path(aircraft), %w[aircraft] ], + [ I18n.t("helpers.aircraft.components"), aircraft_components_path(aircraft), %w[components] ], + [ I18n.t("helpers.aircraft.squawks"), aircraft_squawks_path(aircraft), %w[squawks] ], + [ I18n.t("helpers.aircraft.flights"), aircraft_flight_logs_path(aircraft), %w[flight_logs flight_imports air_trail_exports airport_codes] ], + [ I18n.t("helpers.aircraft.oil_fuel"), aircraft_consumable_records_path(aircraft), %w[consumable_records oil_analyses] ], + [ I18n.t("helpers.aircraft.logbook"), aircraft_logbook_entries_path(aircraft), %w[logbook_entries] ], + [ I18n.t("helpers.aircraft.inspections"), aircraft_inspections_path(aircraft), %w[inspections inspection_types inspection_records] ], + [ I18n.t("helpers.aircraft.ads"), aircraft_airworthiness_directives_path(aircraft), %w[airworthiness_directives ad_compliances ad_imports] ], + [ I18n.t("helpers.aircraft.documents"), aircraft_documents_path(aircraft), %w[documents document_collections] ], + [ I18n.t("helpers.aircraft.major_records"), aircraft_major_records_path(aircraft), %w[major_records] ], + [ I18n.t("helpers.aircraft.w_b"), aircraft_weight_balance_records_path(aircraft), %w[weight_balance_records loading_setups] ], + [ I18n.t("helpers.aircraft.notes"), aircraft_notes_path(aircraft), %w[notes] ], + [ I18n.t("helpers.aircraft.activity"), aircraft_events_path(aircraft), %w[events record_versions] ] ] end def component_options(aircraft, include_blank: true) opts = aircraft.components.where.not(status: "DISPOSED").includes(:component_type).map { [ _1.to_s, _1.id ] } - include_blank ? [ [ "— None —", nil ] ] + opts : opts + include_blank ? [ [ I18n.t("helpers.aircraft.none"), nil ] ] + opts : opts end def document_options(aircraft) - [ [ "— None —", nil ] ] + aircraft.documents.ordered.map { [ _1.name, _1.id ] } + [ [ I18n.t("helpers.aircraft.none"), nil ] ] + aircraft.documents.ordered.map { [ _1.name, _1.id ] } end def logbook_options(aircraft) - [ [ "— None —", nil ] ] + aircraft.logbook_entries.recent_first.limit(300).map { [ "#{_1.date} – #{_1.text.truncate(60)}", _1.id ] } + [ [ I18n.t("helpers.aircraft.none"), nil ] ] + aircraft.logbook_entries.recent_first.limit(300).map { [ I18n.t("helpers.aircraft.text", date: _1.date, truncate: (_1.text.truncate(60))), _1.id ] } end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7dfe7f9..1906e7f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -7,19 +7,19 @@ module ApplicationHelper # How dates and times read across the app: "Nov 8, 2026", "Nov 8, 2026 14:05". # (Signatures and the record history keep exact UTC timestamps, 2026-11-08 14:05 UTC.) def fmt_date(value) - value ? value.to_date.strftime("%b %-d, %Y") : "—" + value ? l(value.to_date, format: :app) : "—" end def fmt_time(value) - value ? value.in_time_zone.strftime("%b %-d, %Y %H:%M") : "—" + value ? l(value.in_time_zone, format: :app) : "—" end - # Secondary actions (imports, exports, printing, tools) behind one "More" + # Secondary actions (imports, exports, printing, tools) behind one I18n.t("helpers.application.more") # button, so each section shows only its main action. The block gives the # items: links or button_to forms with class "menu-item". - def more_menu(label = "More", small: false, &block) + def more_menu(label = I18n.t("helpers.application.more"), small: false, &block) tag.details(class: "relative", data: { controller: "dropdown", action: "click@window->dropdown#closeOutside keydown.esc@window->dropdown#close" }) do - tag.summary(class: [ "btn-secondary list-none [&::-webkit-details-marker]:hidden", ("btn-sm" if small) ], title: "More actions") do + tag.summary(class: [ "btn-secondary list-none [&::-webkit-details-marker]:hidden", ("btn-sm" if small) ], title: I18n.t("helpers.application.more_actions")) do safe_join([ label, tag.span("▾", class: "text-xs", "aria-hidden": true) ], " ") end + tag.div(capture(&block), class: "menu") end @@ -29,7 +29,7 @@ module ApplicationHelper def airworthiness_badge(status, large: false) tag.span(status.label, class: [ "badge-#{AIRWORTHINESS_COLORS[status.status]}", ("text-sm px-3 py-1" if large) ], - title: Airworthiness::DISCLAIMER) + title: Airworthiness.disclaimer) end # Badge class (or text class) for one airworthiness issue. @@ -39,22 +39,18 @@ module ApplicationHelper { "RED" => "text-red-700", "LIMITED" => "text-sky-700", "INFO" => "text-slate-600" }.fetch(issue.severity, "text-amber-700") end - COMPLIANCE_BADGES = { - "compliant" => [ "green", "Compliant" ], "due_soon" => [ "orange", "Due Soon" ], - "overdue" => [ "red", "Overdue" ], "no_compliance" => [ "red", "No Record" ], - "never_completed" => [ "red", "Never Completed" ], "conditional" => [ "gray", "Conditional" ], - "not_applicable" => [ "gray", "N/A" ] - }.freeze + COMPLIANCE_COLORS = { "compliant" => "green", "due_soon" => "orange", "overdue" => "red", "no_compliance" => "red", + "never_completed" => "red", "conditional" => "gray", "not_applicable" => "gray" }.freeze def compliance_badge(status) - color, text = COMPLIANCE_BADGES.fetch(status, [ "gray", status.to_s.humanize ]) - tag.span(text, class: "badge-#{color}") + color = COMPLIANCE_COLORS.fetch(status, "gray") + tag.span(t(status, scope: "helpers.application.compliance", default: status.to_s.humanize), class: "badge-#{color}") end def life_badge(status) return "" unless status - color, text = { overdue: [ "red", "Overdue" ], due_soon: [ "orange", "Due Soon" ], ok: [ "green", "OK" ] }[status] - tag.span(text, class: "badge-#{color}") + color = { overdue: "red", due_soon: "orange", ok: "green" }[status] + tag.span(t(status, scope: "helpers.application.life"), class: "badge-#{color}") end def squawk_priority_badge(squawk) @@ -78,7 +74,7 @@ module ApplicationHelper link_to ad.name, link[0], class: "link", target: "_blank", rel: "noopener noreferrer", title: link[1] end - def delete_button(label, path, confirm: "Are you sure?", **opts) + def delete_button(label, path, confirm: I18n.t("helpers.application.are_you_sure"), **opts) button_to label, path, method: :delete, form: { data: { turbo_confirm: confirm }, class: "inline" }, class: opts[:class] || "btn-danger btn-sm" end diff --git a/app/helpers/flight_logs_helper.rb b/app/helpers/flight_logs_helper.rb index 3764911..0ab3ba4 100644 --- a/app/helpers/flight_logs_helper.rb +++ b/app/helpers/flight_logs_helper.rb @@ -21,11 +21,11 @@ module FlightLogsHelper [ "CHT", recording.cht_keys, "°F", CYLINDER_COLORS ], [ "EGT", recording.egt_keys, "°F", CYLINDER_COLORS ], [ "RPM", [ :rpm ], "rpm" ], - [ "Manifold pressure", [ :map ], "inHg" ], - [ "Fuel flow", [ :fuel_flow ], "gph" ], - [ "Oil temp", [ :oil_t ], "°F" ], - [ "Oil pressure", [ :oil_p ], "psi" ], - [ "Volts", [ :volts ], "V" ] + [ I18n.t("helpers.flight_logs.manifold_pressure"), [ :map ], "inHg" ], + [ I18n.t("helpers.flight_logs.fuel_flow"), [ :fuel_flow ], "gph" ], + [ I18n.t("helpers.flight_logs.oil_temp"), [ :oil_t ], "°F" ], + [ I18n.t("helpers.flight_logs.oil_pressure"), [ :oil_p ], "psi" ], + [ I18n.t("helpers.flight_logs.volts"), [ :volts ], "V" ] ].filter_map do |title, keys, unit, colors| keys = keys.select { recording.channels.key?(_1) } { title: title, keys: keys, unit: unit, colors: colors || [ CHART_COLOR ] } if keys.any? diff --git a/app/helpers/oil_analyses_helper.rb b/app/helpers/oil_analyses_helper.rb index 6ef217b..c724d63 100644 --- a/app/helpers/oil_analyses_helper.rb +++ b/app/helpers/oil_analyses_helper.rb @@ -10,7 +10,7 @@ module OilAnalysesHelper def oil_property(analysis, key) value = analysis.property(key) or return "—" - _, unit = OilAnalysis::PROPERTIES.fetch(key) + unit = OilAnalysis::PROPERTY_UNITS.fetch(key) number = number_with_precision(value, precision: 2, strip_insignificant_zeros: true) unit.present? ? "#{number} #{unit}" : number end @@ -24,7 +24,7 @@ module OilAnalysesHelper value = analysis.value(element) flagged = analysis.flagged?(element) content = tag.span(ppm(value), class: [ "tabular-nums", ("font-semibold text-red-700" if flagged) ], - title: ("Over #{OilAnalysis::FLAG_RATIO}× the lab average" if flagged)) + title: (I18n.t("helpers.oil_analyses.over_the_lab_average", _: (OilAnalysis::FLAG_RATIO)) if flagged)) avg = analysis.average(element) avg ? safe_join([ content, tag.div("(#{ppm(avg)})", class: "text-xs text-slate-500 tabular-nums") ]) : content end diff --git a/app/javascript/controllers/airport_autocomplete_controller.js b/app/javascript/controllers/airport_autocomplete_controller.js index 0881378..e40369f 100644 --- a/app/javascript/controllers/airport_autocomplete_controller.js +++ b/app/javascript/controllers/airport_autocomplete_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" // Airport code field with suggestions from the airport database. //
@@ -108,7 +109,7 @@ export default class extends Controller { const code = this.inputTarget.value.trim().toUpperCase() const match = this.results.find((a) => a.code === code || (a.aka || []).includes(code)) if (match) this.setHint(this.describeAirport(match)) - else if (code.length >= 2 && code.length <= 4 && !code.includes(" ")) this.setHint("Not in the airport database", true) + else if (code.length >= 2 && code.length <= 4 && !code.includes(" ")) this.setHint(t("airports.not_found"), true) else this.setHint("") } diff --git a/app/javascript/controllers/bulk_upload_controller.js b/app/javascript/controllers/bulk_upload_controller.js index 9c2bb3d..7de46f4 100644 --- a/app/javascript/controllers/bulk_upload_controller.js +++ b/app/javascript/controllers/bulk_upload_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" import { DirectUpload } from "@rails/activestorage" // Bulk document upload. Picked files (or a whole folder) are listed with an @@ -53,7 +54,7 @@ export default class extends Controller { defaultName(item) { const parts = item.path.split("/") if (this.groupTarget.checked && parts.length > 1) return parts[parts.length - 2] - return parts[parts.length - 1].replace(/\.[^.]+$/, "").replace(/_/g, " ").replace(/\s+/g, " ").trim() || "Untitled" + return parts[parts.length - 1].replace(/\.[^.]+$/, "").replace(/_/g, " ").replace(/\s+/g, " ").trim() || t("bulk_upload.untitled") } render() { @@ -72,7 +73,7 @@ export default class extends Controller { name.type = "text" name.className = "input" name.value = item.name - name.setAttribute("aria-label", `Document name for ${item.path}`) + name.setAttribute("aria-label", t("bulk_upload.name_for", { path: item.path })) name.disabled = this.uploading name.addEventListener("input", () => { item.name = name.value; item.custom = true; this.updateSummary() }) @@ -90,7 +91,7 @@ export default class extends Controller { remove.type = "button" remove.className = "btn-secondary btn-sm" remove.textContent = "✕" - remove.setAttribute("aria-label", `Remove ${item.path}`) + remove.setAttribute("aria-label", t("bulk_upload.remove", { path: item.path })) remove.disabled = this.uploading remove.addEventListener("click", () => { this.items.splice(index, 1); this.render() }) @@ -109,9 +110,9 @@ export default class extends Controller { updateSummary() { const files = this.items.length - const docs = new Set(this.items.map((item) => item.name.trim() || "Untitled")).size + const docs = new Set(this.items.map((item) => item.name.trim() || t("bulk_upload.untitled"))).size this.summaryTarget.textContent = `${files} ${files === 1 ? "file" : "files"} → ${docs} ${docs === 1 ? "document" : "documents"}` - this.submitTarget.textContent = files ? `Upload ${docs} ${docs === 1 ? "document" : "documents"}` : "Upload" + this.submitTarget.textContent = files ? t("bulk_upload.upload_count", { count: docs }) : t("bulk_upload.upload") } size(bytes) { @@ -124,9 +125,9 @@ export default class extends Controller { if (this.ready) return event.preventDefault() if (this.uploading) return - if (this.items.length === 0) return this.say("Choose some files to upload.") + if (this.items.length === 0) return this.say(t("bulk_upload.choose_files")) if (this.items.some((item) => item.file.size > this.maxBytesValue)) { - return this.say("Remove the files marked in red first.") + return this.say(t("bulk_upload.remove_red")) } this.items.forEach((item) => { if (item.state === "error") item.state = "pending" }) @@ -134,11 +135,11 @@ export default class extends Controller { const queue = this.items.filter((item) => item.state === "pending") const total = queue.length let finished = 0 - this.say(`Uploading 0 of ${total}…`) + this.say(t("bulk_upload.uploading", { done: 0, total })) const worker = async () => { for (let item = queue.shift(); item; item = queue.shift()) { await this.upload(item) - this.say(`Uploading ${++finished} of ${total}…`) + this.say(t("bulk_upload.uploading", { done: ++finished, total })) } } await Promise.all([ worker(), worker(), worker() ]) @@ -156,7 +157,7 @@ export default class extends Controller { } this.uploading = false this.ready = true - this.say("Saving…") + this.say(t("bulk_upload.saving")) // When nothing was left to upload this all ran inside the click's submit // event, during which the browser ignores requestSubmit, so wait a tick. setTimeout(() => this.element.requestSubmit()) diff --git a/app/javascript/controllers/engine_chart_controller.js b/app/javascript/controllers/engine_chart_controller.js index 4184ca5..1fb9f0d 100644 --- a/app/javascript/controllers/engine_chart_controller.js +++ b/app/javascript/controllers/engine_chart_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" // Interactive viewer for engine monitor charts. Clicking a chart opens it large // with higher-resolution data (fetched once, on first open): a crosshair shows @@ -35,7 +36,7 @@ export default class extends Controller { this.render() } catch (error) { this.statusTarget.hidden = false - this.statusTarget.textContent = `Couldn't load the engine data (${error.message}).` + this.statusTarget.textContent = t("engine.load_failed", { message: error.message }) } } diff --git a/app/javascript/controllers/entry_template_controller.js b/app/javascript/controllers/entry_template_controller.js index af2663b..01cc6b2 100644 --- a/app/javascript/controllers/entry_template_controller.js +++ b/app/javascript/controllers/entry_template_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" // Fills a new logbook entry from a template: the wording, and when the // template sets them, the entry type, the logbook (which also picks the @@ -9,7 +10,7 @@ export default class extends Controller { apply() { const option = this.templateTarget.selectedOptions[0] if (!option?.dataset.text) return - if (this.textTarget.value.trim() && !confirm("Replace the entry text with this template?")) return + if (this.textTarget.value.trim() && !confirm(t("entry_template.confirm"))) return const { text, entryType, logType, certificate } = option.dataset this.textTarget.value = text if (entryType && this.hasEntryTypeTarget) this.entryTypeTarget.value = entryType diff --git a/app/javascript/controllers/insert_text_controller.js b/app/javascript/controllers/insert_text_controller.js index fccd652..c0ecde8 100644 --- a/app/javascript/controllers/insert_text_controller.js +++ b/app/javascript/controllers/insert_text_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" // Fills a textarea with suggested text (asks before replacing what's there). export default class extends Controller { @@ -8,7 +9,7 @@ export default class extends Controller { insert(event) { event.preventDefault() const field = this.fieldTarget - if (field.value.trim() && !confirm("Replace what's in the box with the suggested text?")) return + if (field.value.trim() && !confirm(t("insert_text.confirm"))) return field.value = this.textValue field.focus() field.setSelectionRange(0, 0) diff --git a/app/javascript/controllers/markdown_editor_controller.js b/app/javascript/controllers/markdown_editor_controller.js index ac796a2..dba2c3a 100644 --- a/app/javascript/controllers/markdown_editor_controller.js +++ b/app/javascript/controllers/markdown_editor_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" // Write / Preview tabs for a Markdown textarea. The preview is rendered by the // server, with the same Markdown rules and sanitizing as the saved note. @@ -17,7 +18,7 @@ export default class extends Controller { async preview() { this.select(true) - this.outputTarget.textContent = "Loading preview…" + this.outputTarget.textContent = t("markdown.loading") const token = document.querySelector("meta[name=csrf-token]")?.content try { const response = await fetch(this.urlValue, { @@ -29,7 +30,7 @@ export default class extends Controller { if (!response.ok) throw new Error(`HTTP ${response.status}`) this.outputTarget.innerHTML = await response.text() // sanitized server-side } catch (error) { - this.outputTarget.textContent = `Couldn't load the preview (${error.message}).` + this.outputTarget.textContent = t("markdown.load_failed", { message: error.message }) } } diff --git a/app/javascript/controllers/next_due_controller.js b/app/javascript/controllers/next_due_controller.js index 111f808..ab0e0f0 100644 --- a/app/javascript/controllers/next_due_controller.js +++ b/app/javascript/controllers/next_due_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" import { nextDue, describeDue } from "next_due" // Live next-due preview (and prefill of an AD's next-due tach reading) from @@ -40,12 +41,12 @@ export default class extends Controller { if (!this.hasPreviewTarget) return const rule = this.currentRule let text - if (this.isPermanent) text = "Permanent compliance or not applicable: never due again." + if (this.isPermanent) text = t("next_due.permanent") else if (!this.ruleTarget.value) text = "" - else if (!rule) text = "One-time: no recurring due date." + else if (!rule) text = t("next_due.one_time") else { if (this.hasDueHoursTarget && this.manual) due = { ...due, hours: parseFloat(this.dueHoursTarget.value) } - text = describeDue(due) ? `Next due: ${describeDue(due)}` : "Enter the date and hours to calculate the next due." + text = describeDue(due) ? t("next_due.next_due", { due: describeDue(due) }) : t("next_due.enter") } this.previewTarget.textContent = text this.previewTarget.hidden = text === "" diff --git a/app/javascript/controllers/offline_flight_controller.js b/app/javascript/controllers/offline_flight_controller.js index a10b047..f70cac2 100644 --- a/app/javascript/controllers/offline_flight_controller.js +++ b/app/javascript/controllers/offline_flight_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" import { queue, formFields, newKey } from "controllers/offline_queue" // The Log Flight form: with no connection, the flight is kept on this device @@ -48,7 +49,7 @@ export default class extends Controller { try { await queue.add(item) } catch (_) { - this.say("No connection, and this browser can't store the flight. Write it down and log it when you're back online.") + this.say(t("offline.no_storage")) return } this.prefillFrom(item) @@ -56,7 +57,7 @@ export default class extends Controller { this.keyTarget.value = newKey() this.pending = null window.scrollTo({ top: 0 }) - this.say("No connection: flight saved on this device. It's sent automatically when you're back online. Log the next leg below, or close the app.") + this.say(t("offline.saved_on_device")) document.dispatchEvent(new CustomEvent("offline-queue:changed")) } diff --git a/app/javascript/controllers/offline_sync_controller.js b/app/javascript/controllers/offline_sync_controller.js index 080ae83..b40ec4c 100644 --- a/app/javascript/controllers/offline_sync_controller.js +++ b/app/javascript/controllers/offline_sync_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" import { queue } from "controllers/offline_queue" // On every page: sends flights logged offline once there's a connection, and @@ -29,7 +30,7 @@ export default class extends Controller { for (const item of items.filter((i) => !i.error)) { const result = await this.send(item) if (result === "sent") { await queue.remove(item.id); sent++ } - else if (result === "signin") { this.show("Sign in to send the flights logged offline."); return } + else if (result === "signin") { this.show(t("offline.sign_in")); return } else if (result === "offline") break else { item.error = result; await queue.put(item) } } @@ -52,15 +53,15 @@ export default class extends Controller { const html = await response.text() const doc = new DOMParser().parseFromString(html, "text/html") const message = [ ...doc.querySelectorAll("[role=alert], .field-error") ].map((e) => e.textContent.trim()).filter(Boolean).join(" ") - return message || `Not accepted (${response.status}).` + return message || t("offline.not_accepted", { status: response.status }) } status(items, sent = 0) { const failed = items.filter((i) => i.error) const waiting = items.length - failed.length const parts = [] - if (sent) parts.push(`Sent ${sent} flight${sent > 1 ? "s" : ""} logged offline.`) - if (waiting) parts.push(`${waiting} flight${waiting > 1 ? "s" : ""} logged offline waiting for a connection.`) + if (sent) parts.push(t("offline.sent", { count: sent })) + if (waiting) parts.push(t("offline.waiting", { count: waiting })) this.show(parts.join(" "), failed) } @@ -72,7 +73,7 @@ export default class extends Controller { const date = (item.fields.find(([ n ]) => n === "flight_log[date]") || [])[1] || "" const row = document.createElement("p") row.textContent = `${item.tail} flight ${date} logged offline wasn't accepted: ${item.error} ` - const discard = Object.assign(document.createElement("button"), { type: "button", textContent: "Discard", className: "btn-secondary btn-sm ml-1" }) + const discard = Object.assign(document.createElement("button"), { type: "button", textContent: t("offline.discard"), className: "btn-secondary btn-sm ml-1" }) discard.addEventListener("click", async () => { await queue.remove(item.id); this.sync() }) row.append(discard) banner.append(row) diff --git a/app/javascript/controllers/theme_controller.js b/app/javascript/controllers/theme_controller.js index 4a31b06..b4df050 100644 --- a/app/javascript/controllers/theme_controller.js +++ b/app/javascript/controllers/theme_controller.js @@ -1,7 +1,7 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" const CHOICES = ["system", "light", "dark"] -const LABELS = { system: "System", light: "Light", dark: "Dark" } // Light / dark / follow-the-OS theme toggle. The choice is kept in // localStorage; the layout's inline script applies it before first paint. @@ -40,7 +40,7 @@ export default class extends Controller { this.element.querySelectorAll("[data-theme-icon]").forEach((icon) => { icon.classList.toggle("hidden", icon.dataset.themeIcon !== choice) }) - const label = `Theme: ${LABELS[choice]}${choice === "system" ? ` (${theme})` : ""}` + const label = choice === "system" ? t("theme.system", { theme: t(`theme.${theme}`) }) : t("theme.label", { choice: t(`theme.${choice}`) }) this.element.title = label this.element.setAttribute("aria-label", label) if (changed) window.dispatchEvent(new CustomEvent("theme:change", { detail: { theme } })) diff --git a/app/javascript/controllers/wb_calculator_controller.js b/app/javascript/controllers/wb_calculator_controller.js index d05e710..b027ca4 100644 --- a/app/javascript/controllers/wb_calculator_controller.js +++ b/app/javascript/controllers/wb_calculator_controller.js @@ -1,4 +1,5 @@ import { Controller } from "@hotwired/stimulus" +import { t } from "i18n" // Loading calculator: takeoff and landing weight and CG from the empty // weight & moment plus each station's load, checked against max gross weight, @@ -42,19 +43,19 @@ export default class extends Controller { this.show("landing", landing) if (!loaded) { - this.messagesTarget.replaceChildren(Object.assign(document.createElement("li"), { className: "text-slate-500", textContent: "Enter the loading to check weight and CG." })) + this.messagesTarget.replaceChildren(Object.assign(document.createElement("li"), { className: "text-slate-500", textContent: t("wb.enter_loading") })) this.draw(takeoff, landing) return } if (this.maxGrossValue && takeoff.weight > this.maxGrossValue) { - messages.push([ "bad", `Takeoff weight is ${(takeoff.weight - this.maxGrossValue).toFixed(1)} lb over the maximum of ${this.maxGrossValue} lb.` ]) + messages.push([ "bad", t("wb.over_gross", { over: (takeoff.weight - this.maxGrossValue).toFixed(1), max: this.maxGrossValue }) ]) } if (this.envelopeValue.length >= 3) { - for (const [ name, point ] of [ [ "Takeoff", takeoff ], [ "Landing", landing ] ]) { - if (!this.inside(point)) messages.push([ "bad", `${name} CG ${point.cg.toFixed(2)} in at ${point.weight.toFixed(0)} lb is outside the envelope.` ]) + for (const [ name, point ] of [ [ t("wb.takeoff"), takeoff ], [ t("wb.landing"), landing ] ]) { + if (!this.inside(point)) messages.push([ "bad", t("wb.outside", { name, cg: point.cg.toFixed(2), weight: point.weight.toFixed(0) }) ]) } } - if (!messages.length) messages.push([ "ok", "Within the limits entered here." ]) + if (!messages.length) messages.push([ "ok", t("wb.within_limits") ]) this.messagesTarget.replaceChildren(...messages.map(([ kind, text ]) => { const li = document.createElement("li") li.className = kind === "ok" ? "text-emerald-700" : "text-red-700" diff --git a/app/javascript/i18n.js b/app/javascript/i18n.js new file mode 100644 index 0000000..5eed2aa --- /dev/null +++ b/app/javascript/i18n.js @@ -0,0 +1,22 @@ +// Strings for the page's scripts: the "js" keys of config/locales, which the +// layout puts in - + <%= t(".skip_to_content_html") %>
<%= link_to root_path, class: "flex items-center gap-2 font-semibold tracking-tight whitespace-nowrap" do %> - ✈ SAM + ✈ "><%= t(".sam") %> <% end %> <% if current_user %> <%# Phones: Fleet, theme and one menu for the rest. %> -
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index cd89ef1..f152b0a 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -1,5 +1,5 @@ - +