Skip to content

Commit

Permalink
Merge pull request #305 from usagov/stage
Browse files Browse the repository at this point in the history
HOTFIX Sprint 68 release
  • Loading branch information
rayestrada authored Sep 13, 2024
2 parents 173003a + 6d90afc commit 55fa661
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 47 deletions.
66 changes: 33 additions & 33 deletions data/es/navigation.json
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
{
"back": {
"state_reg_options": "Go back to state registration options",
"eligibility_req": "Back to state eligibility requirements",
"reg_options": "Back to registration options",
"personal_info": "Back to personal information",
"address_location": "Back to address and location",
"identification": "Back to identification",
"edit_info": "Edit registration information"
"state_reg_options": "Regresar a las opciones de registro estatal",
"eligibility_req": "Volver a Requisitos de elegibilidad estatal",
"reg_options": "Volver a Opciones de registro estatal",
"personal_info": "Volver a Información personal",
"address_location": "Volver a Domicilio y ubicación",
"identification": "Volver a Identificación",
"edit_info": "Editar información de registro"
},
"next": {
"start": "Continue to the digital form filler on vote.gov",
"reg_options": "Continue to view registration options",
"address_location": "Continue to address and location",
"identification": "Continue to identification",
"political_party": "Continue to political party",
"confirm_info": "Continue to review your information",
"delivery": "Confirm and continue"
"start": "Continúe con el llenado del formulario digital en vote.gov",
"reg_options": "Continuar viendo las opciones de registro",
"address_location": "Continuar a Domicilio y ubicación",
"identification": "Continuar a Identificación",
"political_party": "Continuar a Partido político",
"confirm_info": "Continuar a Revisar su información",
"delivery": "Confirmar y continuar"
},
"step_label_1": "Personal information",
"step_label_2": "Address and location",
"step_label_3": "Identification",
"step_label_4": "Political party",
"step_label_5": "Confirm your information",
"step_label_6": "Print your completed form",
"step_label_1": "Información personal",
"step_label_2": "Domicilio y ubicación",
"step_label_3": "Identificación",
"step_label_4": "Partido político",
"step_label_5": "Confirmar su información",
"step_label_6": "Confirmar su información",
"confirmation": {
"current_name": {
"label": "Current name"
"label": "Nombre actual"
},
"previous_name": {
"label": "Previous name",
"alert": "You have not changed your name, so these fields are blank."
"label": "Nombre anterior",
"alert": "Usted no ha cambiado su nombre, por lo que estos campos se encuentran en blanco."
},
"other_info": {
"label": "Other information"
"label": "Otra información"
},
"current_address": {
"label": "Home address",
"alert": "You are not registering with a current address, so these fields are blank."
"label": "dirección de casa",
"alert": "No se está registrando con una dirección actual, por lo que estos campos están en blanco."
},
"previous_address": {
"label": "Previous address",
"alert": "You are not registering with a change of address, so these fields are blank."
"label": "dirección anterior",
"alert": "No se está registrando con un cambio de dirección, por lo que estos campos están en blanco."
},
"mailing_address": {
"label": "Mailing address",
"alert": "Your mailing address is the same as your home address, so these fields are left blank."
"label": "dirección postal",
"alert": "Su dirección de correo postal es la misma que su domicilio, por lo que estos campos se han dejado en blanco."
},
"id_label": {
"label": "ID number"
"label": "Número de identificación"
},
"political_party": {
"label": "Political party"
"label": "Partido político"
},
"edit": {
"label": "Edit"
"label": "Editar"
}
}
}
20 changes: 10 additions & 10 deletions data/es/strings.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"notRequired": "Not required for your state",
"newTab": "Print your mail-in form in a new tab",
"nameChange": "I have legally changed my name since I last registered in this state.",
"month": "Month",
"day": "Day",
"year": "Year",
"notRequired": "No es un requisito en su estado",
"newTab": "Imprima el formulario en una nueva pestaña",
"nameChange": "Cambié mi nombre legalmente después de la última vez que me registré para votar.",
"month": "Mes",
"day": "Dia",
"year": "Año",
"backIcon": "back arrow icon",
"forwardIcon": "forward arrow icon",
"selectState": "Select your state or territory",
"selectStateAriaLabel": "State selection dropdown menu",
"lastUpdated": "@state_name information last updated ",
"lastUpdated": "@state_name información actualizada por última vez",
"emailLabel": "Voter Contact",
"select": "- Select -",
"download": "Download your mail-in form",
"mailDeadlineLabel": "Mail-in registration deadline:",
"select": "- Seleccione -",
"download": "Descargue el formulario",
"mailDeadlineLabel": "Plazo de registro por correo:",
"idSelectionAriaLabel": "Choose identification type"
}
3 changes: 1 addition & 2 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@ function App() {
{step >= 1 &&
<div className="text-base margin-top-5 maxw-tablet margin-x-auto">
<p>
{lastUpdatedText.replace("@state_name", stateData.name)}
<span dangerouslySetInnerHTML={{__html: lastUpdatedSanitized}}/>
{lastUpdatedText.replace("@state_name", stateData.name)} <span dangerouslySetInnerHTML={{__html: lastUpdatedSanitized}}/>
</p>
{cardFooter && (
<div dangerouslySetInnerHTML={{__html: sanitizeDOM(cardFooter.body)}}></div>
Expand Down
2 changes: 1 addition & 1 deletion src/Views/FormPages/Identification.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function Identification(props){
onInput={(e) => {e.target.setCustomValidity(''); toggleError(e, false)}}
>
<React.Fragment key=".0">
<option key="default" value="">{"Select Identification"}</option>
<option key="default" value="">{idTypeField.options[0].key}</option>
{(driverIDFieldReq) && <option key="driver-id-num" value="driver-id-num">{driverLicenseField.label}</option>}
{(stateIDFieldDReq) && <option key="state-id-num" value="state-id-num">{stateIDField.label}</option>}
{(ssnFullFieldReq) && <option key="ssn-full" value="ssn-full">{ssnFullField.label}</option>}
Expand Down
4 changes: 3 additions & 1 deletion src/Views/MultiStepForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ function MultiStepForm(props) {
const mainContent = content.find(item => item.uuid ==="2c597df4-53b6-4ef5-8301-7817b04e1099");
const mainContentTitle = sanitizeDOM(mainContent.title);
const mainContentBody = sanitizeDOM(mainContent.body);

const scrollToTop = document.getElementById('scroll-to-top');
const lang = document.documentElement.lang;

//Field data controls
const [fieldData, setFieldData] = useState({
Expand Down Expand Up @@ -374,7 +376,7 @@ function MultiStepForm(props) {
</Form>

{/* Load Touchpoints feedback form */}
{step === 6 &&
{step === 6 && lang === 'en' &&
<>
<div id="touchpoints-form-embed" className={'margin-top-6'}></div>
<Helmet>
Expand Down

0 comments on commit 55fa661

Please sign in to comment.