Interpolate "Login.gov" everywhere (LG-4886)

app/controllers/account_reset/cancel_controller.rb

@@ -41,7 +41,10 @@ def handle_invalid_token(result)
 
     def handle_success
       sign_out if current_user
-      flash[:success] = t('two_factor_authentication.account_reset.successful_cancel')
+      flash[:success] = t(
+        'two_factor_authentication.account_reset.successful_cancel',
+        app_name: APP_NAME,
+      )
     end
 
     def token

app/controllers/idv/review_controller.rb

@@ -88,7 +88,7 @@ def init_profile
         UserAlerts::AlertUserAboutAccountVerified.call(
           user: current_user,
           date_time: event.created_at,
-          app: decorated_session.sp_name,
+          sp_name: decorated_session.sp_name,
           disavowal_token: event.disavowal_token,
         )
       end

app/controllers/users/email_confirmations_controller.rb

@@ -68,7 +68,7 @@ def message_for_already_confirmed_user
       if email_address_already_confirmed_by_current_user?
         t('devise.confirmations.already_confirmed', action: nil)
       elsif user_signed_in?
-        t('devise.confirmations.confirmed_but_remove_from_other_account')
+        t('devise.confirmations.confirmed_but_remove_from_other_account', app_name: APP_NAME)
       else
         action_text = t('devise.confirmations.sign_in')
         t('devise.confirmations.already_confirmed', action: action_text)

app/controllers/users/sessions_controller.rb

@@ -65,7 +65,7 @@ def timeout
       sign_out
       flash[:info] = t(
         'notices.session_timedout',
-        app: APP_NAME,
+        app_name: APP_NAME,
         minutes: IdentityConfig.store.session_timeout_in_minutes,
       )
       redirect_to root_url(request_id: request_id)

app/controllers/users/verify_account_controller.rb

@@ -33,7 +33,7 @@ def create
           UserAlerts::AlertUserAboutAccountVerified.call(
             user: current_user,
             date_time: event.created_at,
-            app: decorated_session.sp_name,
+            sp_name: decorated_session.sp_name,
             disavowal_token: event.disavowal_token,
           )
           flash[:success] = t('account.index.verification.success')

app/decorators/service_provider_session_decorator.rb

@@ -21,7 +21,9 @@ def custom_alert(section)
     return if sp.help_text.nil?
     language = I18n.locale.to_s
     alert = sp.help_text.dig(section, language)
-    format(alert, sp_name: sp_name, sp_create_link: sp_create_link) if alert.present?
+    if alert.present?
+      format(alert, sp_name: sp_name, sp_create_link: sp_create_link, app_name: APP_NAME)
+    end
   end
 
   def sp_logo

app/decorators/user_decorator.rb

@@ -151,9 +151,9 @@ def connected_apps
 
   def delete_account_bullet_key
     if identity_verified?
-      I18n.t('users.delete.bullet_2_loa3', app: APP_NAME)
+      I18n.t('users.delete.bullet_2_loa3', app_name: APP_NAME)
     else
-      I18n.t('users.delete.bullet_2_loa1', app: APP_NAME)
+      I18n.t('users.delete.bullet_2_loa1', app_name: APP_NAME)
     end
   end
 

app/javascript/packages/document-capture/components/selfie-capture.jsx

@@ -4,6 +4,7 @@ import {
   useState,
   useEffect,
   useCallback,
+  useContext,
   useMemo,
   useImperativeHandle,
 } from 'react';
@@ -14,6 +15,7 @@ import useIfStillMounted from '../hooks/use-if-still-mounted';
 import useInstanceId from '../hooks/use-instance-id';
 import useFocusFallbackRef from '../hooks/use-focus-fallback-ref';
 import './selfie-capture.scss';
+import AppContext from '../context/app';
 
 /** @typedef {import('react').ReactNode} ReactNode */
 
@@ -152,6 +154,8 @@ function SelfieCapture({ value, onChange, errorMessage, className }, ref) {
 
   const labelId = `selfie-capture-label-${instanceId}`;
 
+  const { appName } = useContext(AppContext);
+
   return (
     <>
       <div
@@ -229,13 +233,21 @@ function SelfieCapture({ value, onChange, errorMessage, className }, ref) {
               <>
                 <div className="selfie-capture__consent-prompt">
                   <strong className="selfie-capture__consent-prompt-banner usa-file-input__banner-text">
-                    {t('doc_auth.instructions.document_capture_selfie_consent_banner')}
+                    {t('doc_auth.instructions.document_capture_selfie_consent_banner', {
+                      app_name: appName,
+                    })}
                   </strong>
                   {isAccessRejected ? (
                     <>
-                      <p>{t('doc_auth.instructions.document_capture_selfie_consent_blocked')}</p>
                       <p>
-                        {t('doc_auth.instructions.document_capture_selfie_consent_blocked_action')}
+                        {t('doc_auth.instructions.document_capture_selfie_consent_blocked', {
+                          app_name: appName,
+                        })}
+                      </p>
+                      <p>
+                        {t('doc_auth.instructions.document_capture_selfie_consent_blocked_action', {
+                          app_name: appName,
+                        })}
                       </p>
                     </>
                   ) : (

app/javascript/packages/document-capture/context/app.js

@@ -0,0 +1,13 @@
+import { createContext } from 'react';
+
+/**
+ * @typedef AppContext
+ *
+ * @prop {string} appName name of the application (probably Login.gov)
+ */
+
+const AppContext = createContext(/** @type {AppContext} */ ({ appName: '' }));
+
+AppContext.displayName = 'AppContext';
+
+export default AppContext;

app/javascript/packages/document-capture/context/index.js

@@ -1,3 +1,4 @@
+export { default as AppContext } from './app';
 export { default as AssetContext } from './asset';
 export { default as DeviceContext } from './device';
 export { default as AcuantContext, Provider as AcuantContextProvider } from './acuant';

app/javascript/packs/document-capture.jsx

@@ -1,5 +1,6 @@
 import { render } from 'react-dom';
 import {
+  AppContext,
   DocumentCapture,
   AssetContext,
   DeviceContext,
@@ -133,39 +134,45 @@ loadPolyfills(['fetch', 'crypto', 'url']).then(async () => {
   const keepAlive = () =>
     window.fetch(keepAliveEndpoint, { method: 'POST', headers: { 'X-CSRF-Token': csrf } });
 
+  const appContext = {
+    appName: /** @type string */ (appRoot.dataset.appName),
+  };
+
   render(
-    <DeviceContext.Provider value={device}>
-      <AnalyticsContext.Provider value={{ addPageAction, noticeError }}>
-        <AcuantContextProvider
-          credentials={getMetaContent('acuant-sdk-initialization-creds')}
-          endpoint={getMetaContent('acuant-sdk-initialization-endpoint')}
-          glareThreshold={glareThreshold}
-          sharpnessThreshold={sharpnessThreshold}
-        >
-          <UploadContextProvider
-            endpoint={/** @type {string} */ (appRoot.getAttribute('data-endpoint'))}
-            statusEndpoint={/** @type {string} */ (appRoot.getAttribute('data-status-endpoint'))}
-            statusPollInterval={
-              Number(appRoot.getAttribute('data-status-poll-interval-ms')) || undefined
-            }
-            method={isAsyncForm ? 'PUT' : 'POST'}
-            csrf={csrf}
-            isMockClient={isMockClient}
-            backgroundUploadURLs={backgroundUploadURLs}
-            backgroundUploadEncryptKey={backgroundUploadEncryptKey}
-            formData={formData}
+    <AppContext.Provider value={appContext}>
+      <DeviceContext.Provider value={device}>
+        <AnalyticsContext.Provider value={{ addPageAction, noticeError }}>
+          <AcuantContextProvider
+            credentials={getMetaContent('acuant-sdk-initialization-creds')}
+            endpoint={getMetaContent('acuant-sdk-initialization-endpoint')}
+            glareThreshold={glareThreshold}
+            sharpnessThreshold={sharpnessThreshold}
           >
-            <I18nContext.Provider value={i18n.strings}>
-              <ServiceProviderContextProvider value={getServiceProvider()}>
-                <AssetContext.Provider value={assets}>
-                  <DocumentCapture isAsyncForm={isAsyncForm} onStepChange={keepAlive} />
-                </AssetContext.Provider>
-              </ServiceProviderContextProvider>
-            </I18nContext.Provider>
-          </UploadContextProvider>
-        </AcuantContextProvider>
-      </AnalyticsContext.Provider>
-    </DeviceContext.Provider>,
+            <UploadContextProvider
+              endpoint={/** @type {string} */ (appRoot.getAttribute('data-endpoint'))}
+              statusEndpoint={/** @type {string} */ (appRoot.getAttribute('data-status-endpoint'))}
+              statusPollInterval={
+                Number(appRoot.getAttribute('data-status-poll-interval-ms')) || undefined
+              }
+              method={isAsyncForm ? 'PUT' : 'POST'}
+              csrf={csrf}
+              isMockClient={isMockClient}
+              backgroundUploadURLs={backgroundUploadURLs}
+              backgroundUploadEncryptKey={backgroundUploadEncryptKey}
+              formData={formData}
+            >
+              <I18nContext.Provider value={i18n.strings}>
+                <ServiceProviderContextProvider value={getServiceProvider()}>
+                  <AssetContext.Provider value={assets}>
+                    <DocumentCapture isAsyncForm={isAsyncForm} onStepChange={keepAlive} />
+                  </AssetContext.Provider>
+                </ServiceProviderContextProvider>
+              </I18nContext.Provider>
+            </UploadContextProvider>
+          </AcuantContextProvider>
+        </AnalyticsContext.Provider>
+      </DeviceContext.Provider>
+    </AppContext.Provider>,
     appRoot,
   );
 });

app/mailers/user_mailer.rb

@@ -72,7 +72,7 @@ def phone_added(user, email_address, disavowal_token:)
 
   def account_does_not_exist(email, request_id)
     @sign_up_email_url = sign_up_email_url(request_id: request_id, locale: locale_url_param)
-    mail(to: email, subject: t('user_mailer.account_does_not_exist.subject'))
+    mail(to: email, subject: t('user_mailer.account_does_not_exist.subject', app_name: APP_NAME))
   end
 
   def personal_key_sign_in(user, email, disavowal_token:)
@@ -91,7 +91,10 @@ def new_device_sign_in(user:, email_address:, date:, location:, disavowal_token:
       @login_date = date
       @login_location = location
       @disavowal_token = disavowal_token
-      mail(to: email_address.email, subject: t('user_mailer.new_device_sign_in.subject'))
+      mail(
+        to: email_address.email,
+        subject: t('user_mailer.new_device_sign_in.subject', app_name: APP_NAME),
+      )
     end
   end
 
@@ -107,15 +110,21 @@ def account_reset_request(user, email_address, account_reset)
     with_user_locale(user) do
       @token = account_reset&.request_token
       @header = t('user_mailer.account_reset_request.header')
-      mail(to: email_address.email, subject: t('user_mailer.account_reset_request.subject'))
+      mail(
+        to: email_address.email,
+        subject: t('user_mailer.account_reset_request.subject', app_name: APP_NAME),
+      )
     end
   end
 
   def account_reset_granted(user, email_address, account_reset)
     with_user_locale(user) do
       @token = account_reset&.request_token
       @granted_token = account_reset&.granted_token
-      mail(to: email_address.email, subject: t('user_mailer.account_reset_granted.subject'))
+      mail(
+        to: email_address.email,
+        subject: t('user_mailer.account_reset_granted.subject', app_name: APP_NAME),
+      )
     end
   end
 
@@ -133,7 +142,10 @@ def account_reset_cancel(user, email_address)
 
   def please_reset_password(user, email_address)
     with_user_locale(user) do
-      mail(to: email_address, subject: t('user_mailer.please_reset_password.subject'))
+      mail(
+        to: email_address,
+        subject: t('user_mailer.please_reset_password.subject', app_name: APP_NAME),
+      )
     end
   end
 
@@ -197,15 +209,17 @@ def deleted_user_accounts_report(email:, name:, issuers:, data:)
     mail(to: email, subject: t('user_mailer.deleted_accounts_report.subject'))
   end
 
-  def account_verified(user, email_address, date_time:, app:, disavowal_token:)
+  def account_verified(user, email_address, date_time:, sp_name:, disavowal_token:)
     return unless email_should_receive_nonessential_notifications?(email_address.email)
 
     with_user_locale(user) do
       @date = I18n.localize(date_time, format: t('time.formats.event_date'))
-      @app = app
+      @sp_name = sp_name
       @disavowal_token = disavowal_token
-      @app_name = APP_NAME
-      mail(to: email_address.email, subject: t('user_mailer.account_verified.subject', app: @app))
+      mail(
+        to: email_address.email,
+        subject: t('user_mailer.account_verified.subject', sp_name: @sp_name),
+      )
     end
   end
 

app/presenters/cancellation_presenter.rb

@@ -20,10 +20,10 @@ def header
 
   def cancellation_warnings
     [
-      t('users.delete.bullet_1', app: APP_NAME),
+      t('users.delete.bullet_1', app_name: APP_NAME),
       t('users.delete.bullet_2_loa1'),
-      t('users.delete.bullet_3', app: APP_NAME),
-      t('users.delete.bullet_4', app: APP_NAME),
+      t('users.delete.bullet_3', app_name: APP_NAME),
+      t('users.delete.bullet_4', app_name: APP_NAME),
     ]
   end
 

app/presenters/confirmation_email_presenter.rb

@@ -10,12 +10,12 @@ def first_sentence
     if user.confirmed_at?
       I18n.t(
         'user_mailer.email_confirmation_instructions.first_sentence.confirmed',
-        app: app_link, confirmation_period: confirmation_period,
+        app_name: app_link, confirmation_period: confirmation_period,
       )
     else
       I18n.t(
         'user_mailer.email_confirmation_instructions.first_sentence.unconfirmed',
-        app: app_link, confirmation_period: confirmation_period,
+        app_name: app_link, confirmation_period: confirmation_period,
       )
     end
   end

app/presenters/piv_cac_authentication_login_presenter.rb

@@ -26,7 +26,7 @@ def heading
   end
 
   def info
-    t('instructions.mfa.piv_cac.sign_in')
+    t('instructions.mfa.piv_cac.sign_in', app_name: APP_NAME)
   end
 
   def url_options

app/presenters/piv_cac_error_presenter.rb

@@ -52,6 +52,7 @@ def description
     when 'user.not_found'
       t(
         'instructions.mfa.piv_cac.account_not_found_html',
+        app_name: APP_NAME,
         sign_in: @view.link_to(t('headings.sign_in_without_sp'), root_url),
         create_account: @view.link_to(t('links.create_account'), sign_up_email_url),
       )

app/presenters/two_factor_auth_code/authenticator_delivery_presenter.rb

@@ -8,7 +8,7 @@ def help_text
       t(
         "instructions.mfa.#{two_factor_authentication_method}.confirm_code_html",
         email: content_tag(:strong, user_email),
-        app: content_tag(:strong, APP_NAME),
+        app_name: content_tag(:strong, APP_NAME),
       )
     end
 

app/services/request_password_reset.rb

@@ -31,7 +31,10 @@ def send_reset_password_instructions
   end
 
   def instructions
-    I18n.t('user_mailer.email_confirmation_instructions.first_sentence.forgot_password')
+    I18n.t(
+      'user_mailer.email_confirmation_instructions.first_sentence.forgot_password',
+      app_name: APP_NAME,
+    )
   end
 
   ##

app/services/user_alerts/alert_user_about_account_verified.rb

@@ -1,13 +1,13 @@
 module UserAlerts
   class AlertUserAboutAccountVerified
-    def self.call(user:, date_time:, app:, disavowal_token:)
-      app ||= APP_NAME
+    def self.call(user:, date_time:, sp_name:, disavowal_token:)
+      sp_name ||= APP_NAME
       user.confirmed_email_addresses.each do |email_address|
         UserMailer.account_verified(
           user,
           email_address,
           date_time: date_time,
-          app: app,
+          sp_name: sp_name,
           disavowal_token: disavowal_token,
         ).deliver_now
       end