Merge pull request #730 from TrustTheVote-Project/staging

Staging

Author: rock-the-vote

app/views/catalist_lookups/_form.html.erb

@@ -93,4 +93,4 @@ $(document).ready(function() {
 <%= render :partial=> "registrants/phone_opt_ins", :locals=>{:form=>form} %>
 </fieldset>
 
-<%= rollover_button(:next_step, I18n.t('txt.button.lookup').html_safe) %>
+<%= rollover_button(:next_step, I18n.t(params[:utm_feature] == 'prereg_included' ? 'txt.button.lookup_pre_register' : 'txt.button.lookup').html_safe) %>

app/views/catalist_lookups/new.html.haml

@@ -1,9 +1,10 @@
-%h1{role: "heading", "aria-level": 1}= t('txt.lookup.step_1_header')
+- header_key = params[:utm_feature] == 'prereg_included' ? 'txt.lookup.step_1_header_pre_register' : 'txt.lookup.step_1_header'
+%h1{role: "heading", "aria-level": 1}= t(header_key)
 
+- intro_key = params[:utm_feature] == 'prereg_included' ? 'txt.lookup.step_1_instructions_pre_register' : 'txt.lookup.step_1_instructions'
 .intro-message
-  = t('txt.lookup.step_1_instructions').html_safe
+  = t(intro_key).html_safe
 
 = form_for(@lookup) do |form|
   = render partial: 'form', :object => form
-
   %p= I18n.t('txt.privacy_policy_acceptance').html_safe

app/views/registrants/show.html.haml

@@ -1,8 +1,9 @@
 = render :partial => 'layouts/weglot'
 
 - if !@registrant || @registrant.short_form?
+  - intro_key = params[:utm_feature] == 'prereg_included' ? 'txt.registration.intro_message_pre_register' : 'txt.registration.intro_message'
   .intro-message
-    %p=t('txt.registration.intro_message')
+    %p= t(intro_key).html_safe
 
 %h1= t('txt.registration.step_1_header')
 

app/views/step2/show.html.haml

@@ -22,11 +22,15 @@
       = form.hidden_field :locale, :value=>@registrant.locale
       = hidden_field_tag 'skip_advance', false
 
-          
+
   - if @registrant.skip_state_flow?
     %h1= t("states.custom.#{@registrant.home_state_abbrev.downcase}.by_paper_header").html_safe
+  
+    - if @registrant.home_state_abbrev.upcase == 'MI'
+      %br/
+      %p= t('states.custom.mi.by_paper_disclaimer').html_safe
+
     %p= I18n.t('txt.registration.instructions.overseas').html_safe
-    
 
 
 

config/locales/states/en.yml

@@ -1681,7 +1681,11 @@ en:
             mailing_address_1: Enter the number only
             mailing_address_1_length: PO Box is too long (maximum is %{count} characters).
         state_flow_error: ''
-        by_paper_header: Complete Registration By Paper
+        by_paper_header: Complete Preregistration or Registration By Paper
+        by_paper_disclaimer: |-
+          If you are under 17.5 years old and are pre-registering to vote, please download and submit the 
+          <a href="https://www.michigan.gov/sos/-/media/Project/Websites/sos/Elections/Election-Forms/ED-121a-Michigan-Voter-Preregistration-Application-and-Change-of-Address-Form.pdf?rev=2a0413ce83e24577ab6bbe36f2c08df7&hash=E53D1A3FBE546E4AACEE451E4EAD332A" target="_blank">Preregistration Form</a> 
+          to your local election official instead of continuing below.
         skip_online_registration: <a href="%{url}">Click here</a> to create a paper
           registration form to download, print, sign, and mail.
         skip_online_registration_no_dln: If you do not have a Michigan driver's license
@@ -2806,8 +2810,8 @@ en:
           requirements: |-
             <p>If you don’t have a state ID or an SSN, you will need to create a paper 
             request form.</p>
-        registration_deadline_text: 05/05/2025 is the last day to register before
-          the 05/20/2025 election. If you are not a U.S. citizen and a resident of
+        registration_deadline_text: 10/20/2025 is the last day to register before
+          the 11/04/2025 election. If you are not a U.S. citizen and a resident of
           Pennsylvania at least 30 days before the next election, you CANNOT register
           to vote. If you have any questions, please call 1.877.VOTESPA (1.877.868.3772).
         state_flow_error: There was a problem submitting your registration to Pennsylvania.
@@ -2891,8 +2895,8 @@ en:
           until processed and accepted.</li> <li>If accepted, you will receive a Voter
           Registration Card by mail.</li> <li>If you do not receive your Voter Registration
           Card within 14 days, contact your county voter registration office.</li>
-          </ul> <p> Deadline Alert: 05/05/2025 is the last day to register before
-          the 05/20/2025 election.</p>"
+          </ul> <p> Deadline Alert: 10/20/2025 is the last day to register before
+          the 11/04/2025 election.</p>"
         signature_capture:
           rotation_instructions: You must rotate your screen to correctly capture
             your signature. Make sure your screen rotation is enabled.

config/locales/states/es.yml

@@ -1334,13 +1334,10 @@ es:
 
 
           status_check_instructions: ''
-          
-          
         state_online_abr:
-          
           requirements: ''
         registration_deadline_text: 'Atención: La fecha límite para inscribirse y poder votar 
-        en las próximas elecciones del 20 de mayo de 2025, es el 5 de mayo de 2025.
+        en las próximas elecciones del 4 noviembre 2025, es 20 octubre 2025.
         Si usted NO es un ciudadano de los Estados Unidos y un residente de Pennsylvania por 
         lo menos 30 días antes de la próxima elección, usted NO puede registrarse para votar. 
         Si tiene preguntas, llame al 1.877.VOTESPA (1.877.868.3772).'
@@ -1430,7 +1427,7 @@ es:
           Votante por correo.</li><li>Si en 14 días no ha recibido su Tarjeta de Inscripción
           de Votante, llame a su oficina de inscripción de votantes.</li><p>Atención:
           La fecha límite para inscribirse y poder votar en las próximas elecciones
-          05/20/2025, es 05/05/2025.</p>"
+          11/04/2025, es 10/20/2025.</p>"
         signature_capture:
           rotation_instructions: Debe girar la pantalla para capturar correctamente
             su firma. Asegúrese de que la rotación de su pantalla esté habilitada.

config/locales/txt/en.yml

@@ -25,8 +25,12 @@ en:
       find_election_official_contact: 'Contact Information:'
     lookup:
       step_1_header: Check Your Voter Registration Status
+      step_1_header_pre_register: Check Your Voter Preregistration or Registration Status
       step_1_instructions: "<p>Not sure if you're registered to vote? Take one minute
         and verify your voter registration status today.</p>"
+      step_1_instructions_pre_register: "<p>Not sure if you’re preregistered or registered 
+        to vote? Take one minute and verify your preregistration or registration status 
+        today.</p>"
       step_2_header_check: We found a likely match.
       step_2_header_found: "%{first_name}, we found your voter registration."
       step_2_header_not_found: "%{first_name}, we couldn't confirm that you're registered
@@ -266,6 +270,7 @@ en:
       next: Next
       submit: Next Step
       lookup: Look Up Your Registration
+      lookup_pre_register: Look Up Your Preregistration or Registration
       trackballot: Check Ballot Status
       edit: Edit
       back: "&lt; Previous Step"
@@ -297,6 +302,8 @@ en:
       powered_by: 'powered by:'
       progress_indicator: 'Step:'
       intro_message: Voter registration takes an average of two minutes or less.
+      intro_message_pre_register: Voter registration or preregistration takes an average 
+        of two minutes or lesss.
       step_1_header: New Registrant
       step_2_header: Personal Information
       step_3_header: Additional Registration Information

config/settings.yml

@@ -574,7 +574,7 @@ ovr_states:
   PA:
     require_age_confirmation: true
     grommet_min_version: "3.5.0"
-    registration_deadline: 2025-05-20 # Must be YYYY-MM-DD format and use election date not reg deadline date for this one!
+    registration_deadline: 2025-11-04 # Must be YYYY-MM-DD format and use election date not reg deadline date for this one!
     api_settings:
       api_url: "https://paovrwebapi.vote.pa.gov/SureOVRWebAPI/api/ovr?JSONv2&sysparm_AuthKey=<%= ENV['PA_API_KEY'] %>&sysparm_action=SETAPPLICATION&sysparm_Language=0"
       api_key: <%= ENV['PA_API_KEY'] %>