From bdeba7fa55ab7ad5b5e260706f71ea029bdf8b95 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Tue, 1 Oct 2024 11:18:27 -0400 Subject: [PATCH 01/32] Vote-2878: add new Info Card Component (#1014) --- .../votegov/src/sass/components/_index.scss | 1 + .../src/sass/components/info-card.scss | 21 +++++++++++++++++ .../templates/component/info-card.html.twig | 23 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 web/themes/custom/votegov/src/sass/components/info-card.scss create mode 100644 web/themes/custom/votegov/templates/component/info-card.html.twig diff --git a/web/themes/custom/votegov/src/sass/components/_index.scss b/web/themes/custom/votegov/src/sass/components/_index.scss index 7af9b12c1..c8d1b2f1a 100644 --- a/web/themes/custom/votegov/src/sass/components/_index.scss +++ b/web/themes/custom/votegov/src/sass/components/_index.scss @@ -25,3 +25,4 @@ @forward "a11y-toolbar"; @forward "double-deck-card"; @forward "to-top"; +@forward "info-card" diff --git a/web/themes/custom/votegov/src/sass/components/info-card.scss b/web/themes/custom/votegov/src/sass/components/info-card.scss new file mode 100644 index 000000000..7d5ac5adf --- /dev/null +++ b/web/themes/custom/votegov/src/sass/components/info-card.scss @@ -0,0 +1,21 @@ +@use "uswds-core" as *; +@use "mixins" as *; +@use "variables" as *; + +.vote-info-card { + @include u-border(1px, 'gray-cool-20', 'solid'); + @include u-radius('lg'); + @include u-padding(4); + + .vote-info-card + & { + @include u-margin-top(4); + + @include at-media('tablet') { + @include u-margin-top(6); + } + } + + > * + * { + @include u-margin-top(3); + } +} diff --git a/web/themes/custom/votegov/templates/component/info-card.html.twig b/web/themes/custom/votegov/templates/component/info-card.html.twig new file mode 100644 index 000000000..9145f9216 --- /dev/null +++ b/web/themes/custom/votegov/templates/component/info-card.html.twig @@ -0,0 +1,23 @@ +
+

+ {{ heading }} +

+ {% if body %} +
+ {{ body }} +
+ {% endif %} + {% if link %} +
+ {% include '@votegov/component/button.html.twig' with { + 'href': link.url, + 'label': link.title + } %} +
+ {% endif %} + {% if footer %} + + {% endif %} +
From 9d9b28b2896a146f800a18f3de81f6c465e522e3 Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Wed, 2 Oct 2024 10:46:49 -0700 Subject: [PATCH 02/32] VOTE-2882 display intro or not needed state content (#1023) --- ...view_display.node.state_territory.full.yml | 105 ++++++++---- ...erritory.field_registration_not_needed.yml | 2 +- .../StateContentDefaultFormatter.php | 6 - .../templates/component/info-card.html.twig | 23 +++ ..._node--state-territory--by-mail.html.twig} | 0 ...ode--state-territory--in-person.html.twig} | 0 ...Y_node--state-territory--online.html.twig} | 6 + .../LEGACY_node--state-territory.html.twig | 142 ++++++++++++++++ ...ode--state-territory--not-needed.html.twig | 34 ++-- .../node/node--state-territory.html.twig | 151 ++++++------------ 10 files changed, 305 insertions(+), 164 deletions(-) rename web/themes/custom/votegov/templates/node/{node--state-territory--by-mail.html.twig => LEGACY_node--state-territory--by-mail.html.twig} (100%) rename web/themes/custom/votegov/templates/node/{node--state-territory--in-person.html.twig => LEGACY_node--state-territory--in-person.html.twig} (100%) rename web/themes/custom/votegov/templates/node/{node--state-territory--online.html.twig => LEGACY_node--state-territory--online.html.twig} (94%) create mode 100644 web/themes/custom/votegov/templates/node/LEGACY_node--state-territory.html.twig diff --git a/config/sync/core.entity_view_display.node.state_territory.full.yml b/config/sync/core.entity_view_display.node.state_territory.full.yml index e745f32ce..b53320b6a 100644 --- a/config/sync/core.entity_view_display.node.state_territory.full.yml +++ b/config/sync/core.entity_view_display.node.state_territory.full.yml @@ -56,6 +56,7 @@ dependencies: - link - options - user + - vote_fields id: node.state_territory.full targetEntityType: node bundle: state_territory @@ -64,7 +65,7 @@ content: content_moderation_control: settings: { } third_party_settings: { } - weight: 0 + weight: 1 region: content field_accepts_nvrf: type: boolean @@ -74,7 +75,14 @@ content: format_custom_false: '' format_custom_true: '' third_party_settings: { } - weight: 20 + weight: 21 + region: content + field_check_registration: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 25 region: content field_confirm_registration_link: type: link @@ -86,7 +94,7 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 14 + weight: 15 region: content field_election_homepage_link: type: link @@ -98,7 +106,7 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 1 + weight: 2 region: content field_g_in_person_deadline: type: string @@ -106,7 +114,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 13 + weight: 14 region: content field_g_mail_postmarked_deadline: type: string @@ -114,7 +122,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 9 + weight: 10 region: content field_g_mail_received_deadline: type: string @@ -122,7 +130,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 11 + weight: 12 region: content field_g_online_deadline: type: string @@ -130,7 +138,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 7 + weight: 8 region: content field_in_person_deadline: type: double_field_unformatted_list @@ -152,7 +160,14 @@ content: scale: 2 inline: true third_party_settings: { } - weight: 12 + weight: 13 + region: content + field_in_person_registration: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 27 region: content field_in_state_name: type: string @@ -160,7 +175,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 21 + weight: 22 region: content field_is_state: type: boolean @@ -170,7 +185,7 @@ content: format_custom_false: '' format_custom_true: '' third_party_settings: { } - weight: 18 + weight: 19 region: content field_mail_postmarked_deadline: type: datetime_default @@ -179,7 +194,7 @@ content: timezone_override: '' format_type: long_date third_party_settings: { } - weight: 8 + weight: 9 region: content field_mail_received_deadline: type: datetime_default @@ -188,7 +203,14 @@ content: timezone_override: '' format_type: long_date third_party_settings: { } - weight: 10 + weight: 11 + region: content + field_mail_registration: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 28 region: content field_media: type: entity_reference_entity_view @@ -199,6 +221,13 @@ content: third_party_settings: { } weight: 0 region: content + field_military_and_overseas_regi: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 29 + region: content field_more_info_link: type: link label: hidden @@ -209,7 +238,7 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 5 + weight: 6 region: content field_of_state_name: type: string @@ -217,7 +246,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 22 + weight: 23 region: content field_online_deadline: type: double_field_unformatted_list @@ -239,7 +268,14 @@ content: scale: 2 inline: true third_party_settings: { } - weight: 6 + weight: 7 + region: content + field_online_registration: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 30 region: content field_override_confirm_reg_link: type: link @@ -251,7 +287,7 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 15 + weight: 16 region: content field_override_election_hp_link: type: link @@ -263,7 +299,7 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 2 + weight: 3 region: content field_override_more_info_link: type: link @@ -275,7 +311,7 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 16 + weight: 17 region: content field_override_registration_link: type: link @@ -287,7 +323,14 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 4 + weight: 5 + region: content + field_registration_intro: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 26 region: content field_registration_link: type: link @@ -299,14 +342,21 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 3 + weight: 4 + region: content + field_registration_not_needed: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 31 region: content field_registration_type: type: list_key label: hidden settings: { } third_party_settings: { } - weight: 17 + weight: 18 region: content field_state_abbreviation: type: string @@ -314,7 +364,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 19 + weight: 20 region: content field_updated_date: type: datetime_default @@ -323,30 +373,23 @@ content: timezone_override: '' format_type: revision_date third_party_settings: { } - weight: 23 + weight: 24 region: content hidden: body: true field_address_location_inst: true - field_check_registration: true field_content_version: true field_identification_inst: true - field_in_person_registration: true - field_mail_registration: true field_mail_registration_link: true field_mailing_address_inst: true field_metatags: true - field_military_and_overseas_regi: true field_nvrf_fields: true field_nvrf_last_updated_date: true - field_online_registration: true field_override_mail_reg_link: true field_pdf_pages: true field_personal_information_inst: true field_political_party_inst: true field_reg_eligibility_desc: true - field_registration_intro: true - field_registration_not_needed: true langcode: true links: true published_at: true diff --git a/config/sync/field.field.node.state_territory.field_registration_not_needed.yml b/config/sync/field.field.node.state_territory.field_registration_not_needed.yml index 3c4e20d41..90f063c3d 100644 --- a/config/sync/field.field.node.state_territory.field_registration_not_needed.yml +++ b/config/sync/field.field.node.state_territory.field_registration_not_needed.yml @@ -11,7 +11,7 @@ id: node.state_territory.field_registration_not_needed field_name: field_registration_not_needed entity_type: node bundle: state_territory -label: 'Registration not needed' +label: 'Registration not needed (override)' description: '' required: false translatable: true diff --git a/web/modules/custom/vote_fields/src/Plugin/Field/FieldFormatter/StateContentDefaultFormatter.php b/web/modules/custom/vote_fields/src/Plugin/Field/FieldFormatter/StateContentDefaultFormatter.php index 663f187cd..68d0fbfae 100644 --- a/web/modules/custom/vote_fields/src/Plugin/Field/FieldFormatter/StateContentDefaultFormatter.php +++ b/web/modules/custom/vote_fields/src/Plugin/Field/FieldFormatter/StateContentDefaultFormatter.php @@ -28,24 +28,18 @@ public function viewElements(FieldItemListInterface $items, $langcode): array { if ($item->heading) { $element[$delta]['heading'] = [ - '#type' => 'item', - '#title' => $this->t('Heading'), '#markup' => $item->heading, ]; } if ($item->text) { $element[$delta]['text'] = [ - '#type' => 'item', - '#title' => $this->t('Text'), '#markup' => $item->text, ]; } if ($item->link_text) { $element[$delta]['link_text'] = [ - '#type' => 'item', - '#title' => $this->t('Link text'), '#markup' => $item->link_text, ]; } diff --git a/web/themes/custom/votegov/templates/component/info-card.html.twig b/web/themes/custom/votegov/templates/component/info-card.html.twig index 9145f9216..6dde7ee46 100644 --- a/web/themes/custom/votegov/templates/component/info-card.html.twig +++ b/web/themes/custom/votegov/templates/component/info-card.html.twig @@ -1,3 +1,26 @@ +{# +/** + * @file + * Default theme implementation of info card component. + * + * Component template variables: + * - heading: string (required) + * - body: string + * - link.url: string + * - link.title: string + * - footer: string + * + * Usage example: + * {% include '@votegov/component/info-card.html.twig' with { + * 'heading': var_title, + * 'body': var_body, + * 'link': { + * 'url': 'var_url', + * 'title': 'var_text', + * } + * } %} + * +#}

{{ heading }} diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--by-mail.html.twig b/web/themes/custom/votegov/templates/node/LEGACY_node--state-territory--by-mail.html.twig similarity index 100% rename from web/themes/custom/votegov/templates/node/node--state-territory--by-mail.html.twig rename to web/themes/custom/votegov/templates/node/LEGACY_node--state-territory--by-mail.html.twig diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--in-person.html.twig b/web/themes/custom/votegov/templates/node/LEGACY_node--state-territory--in-person.html.twig similarity index 100% rename from web/themes/custom/votegov/templates/node/node--state-territory--in-person.html.twig rename to web/themes/custom/votegov/templates/node/LEGACY_node--state-territory--in-person.html.twig diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--online.html.twig b/web/themes/custom/votegov/templates/node/LEGACY_node--state-territory--online.html.twig similarity index 94% rename from web/themes/custom/votegov/templates/node/node--state-territory--online.html.twig rename to web/themes/custom/votegov/templates/node/LEGACY_node--state-territory--online.html.twig index 4bdf0793b..645bbe4a2 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--online.html.twig +++ b/web/themes/custom/votegov/templates/node/LEGACY_node--state-territory--online.html.twig @@ -7,6 +7,12 @@ #} {% block content %} + {% set registration_intro = state_display_content.field_registration_intro.0 | merge(content.field_registration_intro.0 | default([])) %} + {% if registration_intro is not empty %} +

{{ registration_intro.heading }}

+ {{ registration_intro.text }} + {% endif %} + {# How to register to vote #}

{{ 'How to register and update your registration' | t({ '@state_name': state_name }) }}

{# registration link, more info link #} diff --git a/web/themes/custom/votegov/templates/node/LEGACY_node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/LEGACY_node--state-territory.html.twig new file mode 100644 index 000000000..bd8c55a2d --- /dev/null +++ b/web/themes/custom/votegov/templates/node/LEGACY_node--state-territory.html.twig @@ -0,0 +1,142 @@ +{# +/** + * @file + * Bixal USWDS Theme override to display a node: State/Territory. + */ +#} + +{# Caching the data in content object #} +{% set savedCache = content | render %} + +{% set classes = [ + 'node--' ~ node.bundle|clean_class, + node.isPromoted() ? 'node--promoted', + node.isSticky() ? 'node--sticky', + not node.isPublished() ? 'node--unpublished', + view_mode ? 'node--view-mode-' ~ view_mode|clean_class, + 'vote-state-territory-content' +] %} + +{% set state_name = label | field_value | render %} +{% set in_state_name = node.field_in_state_name.value | default("@state_name") | t({ "@state_name": state_name}) %} +{% set of_state_name = node.field_of_state_name.value | default("@state_name") | t({ "@state_name": state_name}) %} +{% set state_abrev = content.field_state_abbreviation | field_value | render %} +{% set in_english = "(in English)" | t %} +{% set election_date = "11/05/2024" | date('U') | format_date('long_date') | replace(t_numbers[language].numbers | default([])) %} +{% set election_link_text = 'Find state and local election dates.' | t %} +{% if language != "en" %} + {% set election_link_text = election_link_text ~ ' ' ~ in_english %} +{% endif %} +{% set election_link %} + {{ election_link_text }} +{% endset %} + +{# Set postmarked deadline with fallback #} +{% if content.field_mail_postmarked_deadline | render %} +{% set postmarked_deadline = 'Must be postmarked by @date' | t({'@date': content.field_mail_postmarked_deadline.0 | render}) %} +{% else %} +{% set postmarked_deadline = content.field_g_mail_postmarked_deadline | field_value %} +{% endif %} + +{# Set received deadline with fallback #} +{% if content.field_mail_received_deadline | render %} +{% set received_deadline = 'Must be received by @date' | t({'@date': content.field_mail_received_deadline.0 | render}) %} +{% else %} +{% set received_deadline = content.field_g_mail_received_deadline | field_value %} +{% endif %} + +{# Set the deadline with fallback, prioritizing postmarked deadline. #} +{% set deadline_bymail = postmarked_deadline | default(received_deadline) %} + +{# Set in person deadline #} +{% set deadline_inperson = content.field_in_person_deadline | field_value | default(content.field_g_in_person_deadline | field_value) %} + +{# Set online deadline #} +{% set deadline_online = content.field_online_deadline | field_value | default(content.field_g_online_deadline | field_value) %} + +{# Korean 'state' character logic #} +{% if language == 'ko' and node.field_is_state.value %} + {% set korean_state_char = "state" | t %} + {% set state_name = state_name ~ " " ~ korean_state_char %} +{% endif %} + + + {# Hold these title_* placeholders for potential integration #} + {{ title_prefix }} + {{ title_suffix }} + +
+ {% if drupal_view('inline_alert', 'embed_1') | render | striptags | trim %} + {{ drupal_view('inline_alert', 'embed_1') }} + {% endif %} + + {% block content %} + {{ content }} + {% endblock %} + + {% block deadlines %} + {# Registration deadlines #} +

{{ 'Voter registration deadlines' | t({ '@state_name': state_name }) }}

+

+ {{ 'Voter registration deadlines are for the November 05, 2024 election. @link' | t({ + '@link': {'#markup': election_link} | render, + '@election_date': {'#markup': election_date} | render } + ) }} +

+
    + {% if deadline_online %} +
  • {{ 'Online registration deadline:' | t }} {{ deadline_online }}
  • + {% endif %} + + {% if deadline_bymail %} +
  • {{ 'Register by mail deadline:' | t }} {{ deadline_bymail }}
  • + {% endif %} + + {% if deadline_inperson %} +
  • {{ 'In person registration deadline:' | t }} {{ deadline_inperson }}
  • + {% endif %} +
+ {% endblock %} + + {% block confirm %} + {# Check voter registration #} + {% if content.field_confirm_registration_link | render %} + {% set confirm_reg_link = content.field_override_confirm_reg_link | field_value | render | default( content.field_confirm_registration_link | field_value | render ) %} + {% set confirm_reg_link_text = "confirm your voter registration status" | t %} + + {% if language != "en" and not content.field_override_confirm_reg_link | render %} + {% set confirm_reg_link_text = confirm_reg_link_text ~ ' ' ~ in_english %} + {% endif %} + +

{{ 'How to check your voter registration' | t({ '@state_name': state_name }) }}

+ {% if state_abrev != 'wy' %} +

{{ 'You can @link on @state_name’s election website.' | t({ + '@link': { "#markup": "#{confirm_reg_link_text}" } | render, + '@state_name': state_name, + '@of_state_name': of_state_name, + '@in_state_name': in_state_name + }) }} +

+ {% else %} {# Wyoming alt text #} + {% set alt_confirm_reg_link_text = "Click here to view Wyoming's county clerk contact information (PDF)" | t %} +

{{ 'You can confirm your voter registration status by contacting your local registration office. @link.' | t({ + '@link': { "#markup": "#{alt_confirm_reg_link_text}" } | render + }) }} +

+ {% endif %} + {% endif %} + {% endblock %} + + {% if node.field_accepts_nvrf.value == 1 %} + {{ drupal_entity('block_content', '3') }} + {% endif %} + + {# Checking if updated date is set and then render the field #} + {% if content.field_updated_date | field_value is not empty %} +

+ {# Striptags and raw filters were added to accomodate Navajo date formats. #} + {{'Last updated:' | t }} {{ content.field_updated_date | render | replace(t_numbers[language].numbers | default([])) | striptags('') | raw }} +

+ {% endif %} +
+
diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig index 8c35ba215..f200120dd 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig @@ -7,23 +7,19 @@ #} {% block content %} - {# More info #} - {% if content.field_more_info_link | render %} -

{{ 'How to register to vote' | t({ '@state_name': state_name }) }}

- {% set more_info_link = content.field_override_more_info_link | field_value | render | default( content.field_more_info_link | field_value | render ) %} - {% set more_info_link_text = "Learn more about voting" | t({'@state_name': state_name}) %} + {% if registration_not_needed is not empty %} +

{{ registration_not_needed.heading }}

- {% if language != "en" and not content.field_override_more_info_link | render %} - {% set more_info_link_text = more_info_link_text ~ ' ' ~ in_english %} - {% endif %} + {{ registration_not_needed.text }} -

{{ 'Voter registration is not required in @state_name. @link on @state_name’s election website.' | t({ - '@link': { "#markup": "#{more_info_link_text}"} | render, - '@state_name': state_name, - '@of_state_name': of_state_name, - '@in_state_name': in_state_name - }) }} -

+ {% if more_info_link and registration_not_needed.link_text %} +

+ {% include '@votegov/component/button.html.twig' with { + 'label': registration_not_needed.link_text, + 'href': more_info_link + } %} +

+ {% endif %} {% endif %} {# JSON Schema #} @@ -48,11 +44,3 @@ {# }#} {##} {% endblock %} - -{% block deadlines %} - {# No deadline info. #} -{% endblock %} - -{% block confirm %} - {# No confirmation info. #} -{% endblock %} diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index bd8c55a2d..ae8133f4b 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -17,48 +17,29 @@ 'vote-state-territory-content' ] %} -{% set state_name = label | field_value | render %} -{% set in_state_name = node.field_in_state_name.value | default("@state_name") | t({ "@state_name": state_name}) %} -{% set of_state_name = node.field_of_state_name.value | default("@state_name") | t({ "@state_name": state_name}) %} -{% set state_abrev = content.field_state_abbreviation | field_value | render %} -{% set in_english = "(in English)" | t %} -{% set election_date = "11/05/2024" | date('U') | format_date('long_date') | replace(t_numbers[language].numbers | default([])) %} -{% set election_link_text = 'Find state and local election dates.' | t %} -{% if language != "en" %} - {% set election_link_text = election_link_text ~ ' ' ~ in_english %} -{% endif %} -{% set election_link %} - {{ election_link_text }} -{% endset %} - -{# Set postmarked deadline with fallback #} -{% if content.field_mail_postmarked_deadline | render %} -{% set postmarked_deadline = 'Must be postmarked by @date' | t({'@date': content.field_mail_postmarked_deadline.0 | render}) %} -{% else %} -{% set postmarked_deadline = content.field_g_mail_postmarked_deadline | field_value %} -{% endif %} - -{# Set received deadline with fallback #} -{% if content.field_mail_received_deadline | render %} -{% set received_deadline = 'Must be received by @date' | t({'@date': content.field_mail_received_deadline.0 | render}) %} -{% else %} -{% set received_deadline = content.field_g_mail_received_deadline | field_value %} -{% endif %} - -{# Set the deadline with fallback, prioritizing postmarked deadline. #} -{% set deadline_bymail = postmarked_deadline | default(received_deadline) %} - -{# Set in person deadline #} -{% set deadline_inperson = content.field_in_person_deadline | field_value | default(content.field_g_in_person_deadline | field_value) %} - -{# Set online deadline #} -{% set deadline_online = content.field_online_deadline | field_value | default(content.field_g_online_deadline | field_value) %} - -{# Korean 'state' character logic #} -{% if language == 'ko' and node.field_is_state.value %} - {% set korean_state_char = "state" | t %} - {% set state_name = state_name ~ " " ~ korean_state_char %} -{% endif %} +{# Links with fallbacks. #} +{% set more_info_link = content.field_override_more_info_link | field_value | default(content.field_more_info_link | field_value) | render | trim %} +{% set confirm_registration_link = content.field_override_confirm_reg_link | field_value | default(content.field_confirm_registration_link | field_value) | render | trim %} +{#{% set election_homepage_link = content.field_override_election_hp_link | field_value | default(content.field_election_homepage_link | field_value) | render | trim %}#} +{% set registration_link = content.field_override_registration_link | field_value | default(content.field_registration_link | field_value) | render | trim %} +{% set state_mail_pdf_link = content.field_override_mail_reg_link | field_value | default(content.field_mail_registration_link | field_value) | render | trim %} + +{# Deadlines with fallbacks. #} +{% set online_deadline = content.field_online_deadline | field_value | default(content.field_g_online_deadline | field_value) %} +{% set inperson_deadline = content.field_in_person_deadline | field_value | default(content.field_g_in_person_deadline | field_value) %} +{% set postmarked_deadline = content.field_mail_postmarked_deadline | field_value | default(content.field_g_mail_postmarked_deadline | field_value) %} +{% set received_deadline = content.field_mail_received_deadline | field_value | default(content.field_g_mail_received_deadline | field_value) %} + +{# State content with fallbacks. #} +{# Get default state display content from the block type. #} +{% set state_display_content = drupal_entity('block_content', 22) %} +{% set registration_not_needed = state_display_content.field_registration_not_needed.0 | merge(content.field_registration_not_needed.0 | default([])) %} +{% set registration_intro = state_display_content.field_registration_intro.0 | merge(content.field_registration_intro.0 | default([])) %} +{% set online_registration = state_display_content.field_online_registration.0 | merge(content.field_online_registration.0 | default([])) %} +{% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | merge(content.field_military_and_overseas_regi.0 | default([])) %} +{% set mail_registration = state_display_content.field_mail_registration.0 | merge(content.field_mail_registration.0 | default([])) %} +{% set inperson_registration = state_display_content.field_in_person_registration.0 | merge(content.field_in_person_registration.0 | default([])) %} +{% set check_registration = state_display_content.field_check_registration.0 | merge(content.field_check_registration.0 | default([])) %} {# Hold these title_* placeholders for potential integration #} @@ -71,72 +52,36 @@ {% endif %} {% block content %} - {{ content }} - {% endblock %} - - {% block deadlines %} - {# Registration deadlines #} -

{{ 'Voter registration deadlines' | t({ '@state_name': state_name }) }}

-

- {{ 'Voter registration deadlines are for the November 05, 2024 election. @link' | t({ - '@link': {'#markup': election_link} | render, - '@election_date': {'#markup': election_date} | render } - ) }} -

- - {% endblock %} + {% if online_registration is not empty %} + {{ online_registration }} + {{ online_deadline }} + {{ registration_link }} + {% endif %} - {% block confirm %} - {# Check voter registration #} - {% if content.field_confirm_registration_link | render %} - {% set confirm_reg_link = content.field_override_confirm_reg_link | field_value | render | default( content.field_confirm_registration_link | field_value | render ) %} - {% set confirm_reg_link_text = "confirm your voter registration status" | t %} + {% if mail_registration is not empty %} + {{ mail_registration }} + {{ postmarked_deadline }} + {{ received_deadline }} + {{ state_mail_pdf_link }} + {% endif %} - {% if language != "en" and not content.field_override_confirm_reg_link | render %} - {% set confirm_reg_link_text = confirm_reg_link_text ~ ' ' ~ in_english %} - {% endif %} + {% if inperson_registration is not empty %} + {{ inperson_registration }} + {{ inperson_deadline }} + {% endif %} -

{{ 'How to check your voter registration' | t({ '@state_name': state_name }) }}

- {% if state_abrev != 'wy' %} -

{{ 'You can @link on @state_name’s election website.' | t({ - '@link': { "#markup": "#{confirm_reg_link_text}" } | render, - '@state_name': state_name, - '@of_state_name': of_state_name, - '@in_state_name': in_state_name - }) }} -

- {% else %} {# Wyoming alt text #} - {% set alt_confirm_reg_link_text = "Click here to view Wyoming's county clerk contact information (PDF)" | t %} -

{{ 'You can confirm your voter registration status by contacting your local registration office. @link.' | t({ - '@link': { "#markup": "#{alt_confirm_reg_link_text}" } | render - }) }} -

- {% endif %} + {% if military_overseas_registration is not empty %} + {{ military_overseas_registration }} {% endif %} {% endblock %} - - {% if node.field_accepts_nvrf.value == 1 %} - {{ drupal_entity('block_content', '3') }} - {% endif %} - - {# Checking if updated date is set and then render the field #} - {% if content.field_updated_date | field_value is not empty %} -

- {# Striptags and raw filters were added to accomodate Navajo date formats. #} - {{'Last updated:' | t }} {{ content.field_updated_date | render | replace(t_numbers[language].numbers | default([])) | striptags('') | raw }} -

- {% endif %} - From f9e5279a4c77ccc6684e384c4f82064c6c20bcb6 Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Wed, 2 Oct 2024 12:50:18 -0700 Subject: [PATCH 03/32] VOTE-2882 refine fallbacks for the state display content (#1024) --- .../node/node--state-territory.html.twig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index ae8133f4b..33bf1da75 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -32,14 +32,14 @@ {# State content with fallbacks. #} {# Get default state display content from the block type. #} -{% set state_display_content = drupal_entity('block_content', 22) %} -{% set registration_not_needed = state_display_content.field_registration_not_needed.0 | merge(content.field_registration_not_needed.0 | default([])) %} -{% set registration_intro = state_display_content.field_registration_intro.0 | merge(content.field_registration_intro.0 | default([])) %} -{% set online_registration = state_display_content.field_online_registration.0 | merge(content.field_online_registration.0 | default([])) %} -{% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | merge(content.field_military_and_overseas_regi.0 | default([])) %} -{% set mail_registration = state_display_content.field_mail_registration.0 | merge(content.field_mail_registration.0 | default([])) %} -{% set inperson_registration = state_display_content.field_in_person_registration.0 | merge(content.field_in_person_registration.0 | default([])) %} -{% set check_registration = state_display_content.field_check_registration.0 | merge(content.field_check_registration.0 | default([])) %} +{% set state_display_content = drupal_entity('block_content', 22) | children %} +{% set registration_not_needed = state_display_content.field_registration_not_needed.0 | default([]) | merge(content.field_registration_not_needed.0 | default([])) %} +{% set registration_intro = state_display_content.field_registration_intro.0 | default([]) | merge(content.field_registration_intro.0 | default([])) %} +{% set online_registration = state_display_content.field_online_registration.0 | default([]) | merge(content.field_online_registration.0 | default([])) %} +{% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | default([]) | merge(content.field_military_and_overseas_regi.0 | default([])) %} +{% set mail_registration = state_display_content.field_mail_registration.0 | default([]) | merge(content.field_mail_registration.0 | default([])) %} +{% set inperson_registration = state_display_content.field_in_person_registration.0 | default([]) | merge(content.field_in_person_registration.0 | default([])) %} +{% set check_registration = state_display_content.field_check_registration.0 | default([]) | merge(content.field_check_registration.0 | default([])) %} {# Hold these title_* placeholders for potential integration #} From d821f0a00c48fad1e1a703996a413da14e084cc1 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:54:31 -0600 Subject: [PATCH 04/32] VOTE-2886 state enhancement in person (#1028) --- .../node/node--state-territory.html.twig | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 33bf1da75..3879b6a9a 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -41,11 +41,17 @@ {% set inperson_registration = state_display_content.field_in_person_registration.0 | default([]) | merge(content.field_in_person_registration.0 | default([])) %} {% set check_registration = state_display_content.field_check_registration.0 | default([]) | merge(content.field_check_registration.0 | default([])) %} +{# Registration types #} +{% set registration_types = content.field_registration_type | field_value | column('#markup') %} +{% set has_in_person = "in-person" in registration_types %} +{% set has_mail = "by-mail" in registration_types %} +{% set has_online = "online" in registration_types %} +{% set not_needed = "not-needed" in registration_types %} + {# Hold these title_* placeholders for potential integration #} {{ title_prefix }} {{ title_suffix }} -
{% if drupal_view('inline_alert', 'embed_1') | render | striptags | trim %} {{ drupal_view('inline_alert', 'embed_1') }} @@ -75,9 +81,17 @@ {{ state_mail_pdf_link }} {% endif %} - {% if inperson_registration is not empty %} - {{ inperson_registration }} - {{ inperson_deadline }} + {% if has_in_person and (inperson_registration is not empty) %} + {% set body = inperson_registration.text['#markup'] | t({'@state_in-person_deadline': inperson_deadline | render }) %} + {% set link_title = inperson_registration.link_text['#markup'] | t({'@state_name': title_english }) %} + {% include '@votegov/component/info-card.html.twig' with { + 'heading': inperson_registration.heading, + 'body': body, + 'link': { + 'url': more_info_link, + 'title': link_title, + } + } %} {% endif %} {% if military_overseas_registration is not empty %} From b103f8038be6423e61833915c0d188f91bd81030 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:55:36 -0600 Subject: [PATCH 05/32] VOTE-2883 Election date display (#1025) --- ...isplay.block_content.state_display_content.default.yml | 2 +- .../templates/node/node--state-territory.html.twig | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml index 2c6c6ff58..4ef0d7b58 100644 --- a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml @@ -44,7 +44,7 @@ content: label: above settings: timezone_override: '' - format_type: medium + format_type: long_date third_party_settings: { } weight: 10 region: content diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 3879b6a9a..0421f6914 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -40,6 +40,8 @@ {% set mail_registration = state_display_content.field_mail_registration.0 | default([]) | merge(content.field_mail_registration.0 | default([])) %} {% set inperson_registration = state_display_content.field_in_person_registration.0 | default([]) | merge(content.field_in_person_registration.0 | default([])) %} {% set check_registration = state_display_content.field_check_registration.0 | default([]) | merge(content.field_check_registration.0 | default([])) %} +{% set election_date = state_display_content.field_election_date.0 | default([]) | merge(content.field_election_date.0 | default([])) %} +{% set election_text = state_display_content.field_election_text.0 | default([]) | merge(content.field_election_text.0 | default([])) %} {# Registration types #} {% set registration_types = content.field_registration_type | field_value | column('#markup') %} @@ -63,6 +65,12 @@ {{ confirm_registration_link }} {% endif %} + {# Election Date #} + {% if (election_date is not empty) and (election_text is not empty) %} + {% set election_date_text = election_text['#text'] | t({'@date': election_date | render }) %} + {{ election_date_text }} + {% endif %} + {% if registration_intro is not empty %}

{{ registration_intro.heading }}

{{ registration_intro.text }} From 87873bbe0de834b8b16d974f904e84507122a821 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:09:23 -0600 Subject: [PATCH 06/32] VOTE-2884 Configure the display of online reg card (#1035) --- .../node/node--state-territory.html.twig | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 0421f6914..503a09b33 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -50,6 +50,13 @@ {% set has_online = "online" in registration_types %} {% set not_needed = "not-needed" in registration_types %} +{# Registration types #} +{% set registration_types = content.field_registration_type | field_value | column('#markup') %} +{% set has_in_person = "in-person" in registration_types %} +{% set has_mail = "by-mail" in registration_types %} +{% set has_online = "online" in registration_types %} +{% set not_needed = "not-needed" in registration_types %} + {# Hold these title_* placeholders for potential integration #} {{ title_prefix }} @@ -76,10 +83,20 @@ {{ registration_intro.text }} {% endif %} - {% if online_registration is not empty %} + {% if has_online and (online_registration is not empty) %} {{ online_registration }} {{ online_deadline }} {{ registration_link }} + {% set body = online_registration.text['#markup'] | t({'@state_online_deadline': online_deadline | render, '@state_name': title_english}) %} + {% set link_title = online_registration.link_text['#markup'] | t({'@state_name': title_english }) %} + {% include '@votegov/component/info-card.html.twig' with { + 'heading': online_registration.heading, + 'body': body, + 'link': { + 'url': registration_link, + 'title': link_title, + } + } %} {% endif %} {% if mail_registration is not empty %} From 926fd754c6ce78ae29fad4902bb0b5bd94cb39aa Mon Sep 17 00:00:00 2001 From: Mandy Lloyd Date: Tue, 8 Oct 2024 13:49:08 -0400 Subject: [PATCH 07/32] VOTE-2888: Configure in-page navigation (#1026) * VOTE-2888: Configure in-page nav on stage page * make aside block empty on not needed template --- ...ode--state-territory--not-needed.html.twig | 4 ++++ .../node/node--state-territory.html.twig | 22 ++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig index f200120dd..47c87896c 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig @@ -6,6 +6,10 @@ */ #} +{% block aside %} +{# keep empty for not needed #} +{% endblock %} + {% block content %} {% if registration_not_needed is not empty %}

{{ registration_not_needed.heading }}

diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 503a09b33..5bf60c660 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -14,7 +14,9 @@ node.isSticky() ? 'node--sticky', not node.isPublished() ? 'node--unpublished', view_mode ? 'node--view-mode-' ~ view_mode|clean_class, - 'vote-state-territory-content' + 'vote-main-content-row', + 'vote-block-margin-y--narrow', + 'usa-in-page-nav-container' ] %} {# Links with fallbacks. #} @@ -61,11 +63,24 @@ {# Hold these title_* placeholders for potential integration #} {{ title_prefix }} {{ title_suffix }} -
+ {% if drupal_view('inline_alert', 'embed_1') | render | striptags | trim %} - {{ drupal_view('inline_alert', 'embed_1') }} + {{ drupal_view('inline_alert', 'embed_1') }} {% endif %} + {% block aside %} + +{% endblock %} + +
{% block content %} {% if check_registration is not empty %} {{ check_registration }} @@ -124,3 +139,4 @@ {% endif %} {% endblock %}
+
From 570529c0c28e3148ca7a6646967d21a03e54605f Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Wed, 9 Oct 2024 06:17:48 -0700 Subject: [PATCH 08/32] VOTE-2885 configure state mail registration section (#1039) --- ..._content.state_display_content.default.yml | 48 ++++++++++--- ...view_display.node.state_territory.full.yml | 13 +++- .../config/schema/vote_fields.schema.yml | 10 +++ .../Field/FieldWidget/StateContentWidget.php | 39 +++++++++++ .../templates/component/info-card.html.twig | 2 +- ...ode--state-territory--not-needed.html.twig | 4 ++ .../node/node--state-territory.html.twig | 68 +++++++++++++++++-- 7 files changed, 167 insertions(+), 17 deletions(-) diff --git a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml index b4b58e994..1cad9e3e8 100644 --- a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml @@ -29,7 +29,11 @@ content: type: vote_fields_state_content weight: 3 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_display_title: type: string_textfield @@ -60,43 +64,71 @@ content: type: vote_fields_state_content weight: 7 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_mail_registration: type: vote_fields_state_content weight: 5 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_military_and_overseas_regi: type: vote_fields_state_content weight: 8 region: content - settings: { } + settings: + form_subfield_display: + heading: heading + text: text + link_text: 0 third_party_settings: { } field_nvrf_details: type: vote_fields_state_content weight: 6 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_online_registration: type: vote_fields_state_content weight: 4 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_registration_intro: type: vote_fields_state_content weight: 2 region: content - settings: { } + settings: + form_subfield_display: + heading: heading + text: text + link_text: 0 third_party_settings: { } field_registration_not_needed: type: vote_fields_state_content weight: 9 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } info: type: string_textfield diff --git a/config/sync/core.entity_view_display.node.state_territory.full.yml b/config/sync/core.entity_view_display.node.state_territory.full.yml index b53320b6a..57fdf8221 100644 --- a/config/sync/core.entity_view_display.node.state_territory.full.yml +++ b/config/sync/core.entity_view_display.node.state_territory.full.yml @@ -212,6 +212,18 @@ content: third_party_settings: { } weight: 28 region: content + field_mail_registration_link: + type: link + label: hidden + settings: + trim_length: null + url_only: true + url_plain: true + rel: '0' + target: '0' + third_party_settings: { } + weight: 32 + region: content field_media: type: entity_reference_entity_view label: hidden @@ -380,7 +392,6 @@ hidden: field_address_location_inst: true field_content_version: true field_identification_inst: true - field_mail_registration_link: true field_mailing_address_inst: true field_metatags: true field_nvrf_fields: true diff --git a/web/modules/custom/vote_fields/config/schema/vote_fields.schema.yml b/web/modules/custom/vote_fields/config/schema/vote_fields.schema.yml index 969a648b9..d64ee992e 100644 --- a/web/modules/custom/vote_fields/config/schema/vote_fields.schema.yml +++ b/web/modules/custom/vote_fields/config/schema/vote_fields.schema.yml @@ -13,3 +13,13 @@ field.value.vote_fields_state_content: link_text: type: string label: Link text + +field.field_settings.vote_fields_state_content: + type: mapping + label: Field settings + mapping: + form_subfield_display: + type: list + label: Fields to display in the form + sequence: + type: string diff --git a/web/modules/custom/vote_fields/src/Plugin/Field/FieldWidget/StateContentWidget.php b/web/modules/custom/vote_fields/src/Plugin/Field/FieldWidget/StateContentWidget.php index c5b4f3376..ee606c809 100644 --- a/web/modules/custom/vote_fields/src/Plugin/Field/FieldWidget/StateContentWidget.php +++ b/web/modules/custom/vote_fields/src/Plugin/Field/FieldWidget/StateContentWidget.php @@ -20,15 +20,52 @@ */ final class StateContentWidget extends WidgetBase { + /** + * {@inheritdoc} + */ + public static function defaultSettings(): array { + $settings['form_subfield_display'] = [ + 'heading', + 'text', + 'link_text', + ]; + + return $settings + parent::defaultSettings(); + } + + /** + * {@inheritdoc} + */ + public function settingsForm(array $form, FormStateInterface $form_state): array { + $settings = $this->getSettings(); + + $element['form_subfield_display'] = [ + '#type' => 'checkboxes', + '#title' => t('Fields to display in the form'), + '#options' => [ + 'heading' => 'Heading', + 'text' => 'Text', + 'link_text' => 'Link text', + ], + '#required' => TRUE, + '#default_value' => $settings['form_subfield_display'], + '#description' => t('Select all subfields that you want to display in the form.'), + ]; + + return $element; + } + /** * {@inheritdoc} */ public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state): array { + $settings = $this->getSettings(); $element['heading'] = [ '#type' => 'textfield', '#title' => $this->t('Heading'), '#default_value' => $items[$delta]->heading ?? NULL, + '#access' => in_array('heading', $settings['form_subfield_display']), ]; $element['text'] = [ @@ -37,12 +74,14 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen '#default_value' => $items[$delta]->text ?? NULL, '#format' => 'simple_html', '#allowed_formats' => ['simple_html'], + '#access' => in_array('text', $settings['form_subfield_display']), ]; $element['link_text'] = [ '#type' => 'textfield', '#title' => $this->t('Link text'), '#default_value' => $items[$delta]->link_text ?? NULL, + '#access' => in_array('link_text', $settings['form_subfield_display']), ]; $element['#theme_wrappers'] = ['fieldset']; diff --git a/web/themes/custom/votegov/templates/component/info-card.html.twig b/web/themes/custom/votegov/templates/component/info-card.html.twig index 6dde7ee46..dcaddf593 100644 --- a/web/themes/custom/votegov/templates/component/info-card.html.twig +++ b/web/themes/custom/votegov/templates/component/info-card.html.twig @@ -30,7 +30,7 @@ {{ body }}
{% endif %} - {% if link %} + {% if link.url and link.title %}
{% include '@votegov/component/button.html.twig' with { 'href': link.url, diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig index 47c87896c..4129ce295 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig @@ -24,6 +24,10 @@ } %}

{% endif %} + + {% if military_overseas_registration is not empty %} + {{ military_overseas_registration }} + {% endif %} {% endif %} {# JSON Schema #} diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 5bf60c660..2d604ee29 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -19,6 +19,11 @@ 'usa-in-page-nav-container' ] %} +{% set state_name = label | field_value | render %} +{% set accepts_nvrf = node.field_accepts_nvrf.value == 1 %} + +{% set has_mail = "by-mail" in (content.field_registration_type | field_value | column('#markup')) %} + {# Links with fallbacks. #} {% set more_info_link = content.field_override_more_info_link | field_value | default(content.field_more_info_link | field_value) | render | trim %} {% set confirm_registration_link = content.field_override_confirm_reg_link | field_value | default(content.field_confirm_registration_link | field_value) | render | trim %} @@ -29,8 +34,22 @@ {# Deadlines with fallbacks. #} {% set online_deadline = content.field_online_deadline | field_value | default(content.field_g_online_deadline | field_value) %} {% set inperson_deadline = content.field_in_person_deadline | field_value | default(content.field_g_in_person_deadline | field_value) %} -{% set postmarked_deadline = content.field_mail_postmarked_deadline | field_value | default(content.field_g_mail_postmarked_deadline | field_value) %} -{% set received_deadline = content.field_mail_received_deadline | field_value | default(content.field_g_mail_received_deadline | field_value) %} +{# Set postmarked deadline with fallback #} +{% if content.field_mail_postmarked_deadline | render %} + {% set postmarked_deadline = 'Must be postmarked by @date' | t({'@date': content.field_mail_postmarked_deadline.0 | render}) %} +{% else %} + {% set postmarked_deadline = content.field_g_mail_postmarked_deadline | field_value %} +{% endif %} + +{# Set received deadline with fallback #} +{% if content.field_mail_received_deadline | render %} + {% set received_deadline = 'Must be received by @date' | t({'@date': content.field_mail_received_deadline.0 | render}) %} +{% else %} + {% set received_deadline = content.field_g_mail_received_deadline | field_value %} +{% endif %} + +{# Set the deadline with fallback, prioritizing postmarked deadline. #} +{% set bymail_deadline = postmarked_deadline | default(received_deadline) %} {# State content with fallbacks. #} {# Get default state display content from the block type. #} @@ -40,6 +59,7 @@ {% set online_registration = state_display_content.field_online_registration.0 | default([]) | merge(content.field_online_registration.0 | default([])) %} {% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | default([]) | merge(content.field_military_and_overseas_regi.0 | default([])) %} {% set mail_registration = state_display_content.field_mail_registration.0 | default([]) | merge(content.field_mail_registration.0 | default([])) %} +{% set nvrf_details = state_display_content.field_nvrf_details.0 | default([]) | merge(content.field_nvrf_details.0 | default([])) %} {% set inperson_registration = state_display_content.field_in_person_registration.0 | default([]) | merge(content.field_in_person_registration.0 | default([])) %} {% set check_registration = state_display_content.field_check_registration.0 | default([]) | merge(content.field_check_registration.0 | default([])) %} {% set election_date = state_display_content.field_election_date.0 | default([]) | merge(content.field_election_date.0 | default([])) %} @@ -114,11 +134,45 @@ } %} {% endif %} - {% if mail_registration is not empty %} - {{ mail_registration }} - {{ postmarked_deadline }} - {{ received_deadline }} - {{ state_mail_pdf_link }} + {% if has_mail and mail_registration is not empty %} + {% set mail_body %} +

{{ 'Mail-in registration deadline:' | t }} {{ bymail_deadline }}

+ {{ mail_registration.text }} + + {% if state_mail_pdf_link and mail_registration.link_text %} +

{{ link(mail_registration.link_text, state_mail_pdf_link) }}

+ {% endif %} + {% endset %} + + {% if accepts_nvrf and nvrf_details is not empty %} + {% set mail_footer %} +
+ {% if nvrf_details.heading %} +

{{ nvrf_details.heading }}

+ {% endif %} + + {{ nvrf_details.text }} + + {% if nvrf_details.link_text %} + {# Set path to form dynamically using page route. #} + {% set form_route = language != 'es' ? 'vote_nvrf.nvrf_page' : 'vote_nvrf.nvrf_page_es' %} + {% set state_name = currentnode.label | lower | replace({' ': '-'}) %} + + {% include '@votegov/component/button.html.twig' with { + 'href': 'internal:' ~ path(form_route, {'state_name': state_name}), + 'label': nvrf_details.link_text, + 'data_label': 'data-state-ext', + 'data': 'nvrf-pdf-tool-registration' + } %} + {% endif %} + {% endset %} + {% endif %} + + {% include '@votegov/component/info-card.html.twig' with { + 'heading': mail_registration.heading, + 'body': mail_body | render | trim | t({'@state_name': state_name}), + 'footer': mail_footer + } %} {% endif %} {% if has_in_person and (inperson_registration is not empty) %} From 9a3d93271b3eb4f22a9eef5e49146deee4f81cc8 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:39:15 -0400 Subject: [PATCH 09/32] Vote-2887: Config for Outside US Info Card (#1040) --- .../votegov/templates/node/node--state-territory.html.twig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 2d604ee29..75a3712c0 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -189,7 +189,10 @@ {% endif %} {% if military_overseas_registration is not empty %} - {{ military_overseas_registration }} + {% include '@votegov/component/info-card.html.twig' with { + 'heading': military_overseas_registration.heading, + 'body': military_overseas_registration.text, + } %} {% endif %} {% endblock %}
From 68f40b93769a55bcf8192798f8c1770f6621d7bd Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:41:56 -0400 Subject: [PATCH 10/32] Vote-2978: Config for Override NVRF field (#1045) * Updating twing file for some clean up * Update to config for new NVRF override field --- ...m_display.node.state_territory.default.yml | 60 +++++++++++++++---- ...w_display.node.state_territory.default.yml | 8 +++ ...view_display.node.state_territory.full.yml | 2 + ...ew_display.node.state_territory.teaser.yml | 2 + ...ode.state_territory.field_nvrf_details.yml | 21 +++++++ .../field.storage.node.field_nvrf_details.yml | 19 ++++++ .../node/node--state-territory.html.twig | 9 --- 7 files changed, 102 insertions(+), 19 deletions(-) create mode 100644 config/sync/field.field.node.state_territory.field_nvrf_details.yml create mode 100644 config/sync/field.storage.node.field_nvrf_details.yml diff --git a/config/sync/core.entity_form_display.node.state_territory.default.yml b/config/sync/core.entity_form_display.node.state_territory.default.yml index 9d3f40381..a0b512725 100644 --- a/config/sync/core.entity_form_display.node.state_territory.default.yml +++ b/config/sync/core.entity_form_display.node.state_territory.default.yml @@ -28,6 +28,7 @@ dependencies: - field.field.node.state_territory.field_metatags - field.field.node.state_territory.field_military_and_overseas_regi - field.field.node.state_territory.field_more_info_link + - field.field.node.state_territory.field_nvrf_details - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name @@ -228,6 +229,7 @@ third_party_settings: - field_registration_intro - field_online_registration - field_mail_registration + - field_nvrf_details - field_in_person_registration - field_military_and_overseas_regi - field_registration_not_needed @@ -277,7 +279,11 @@ content: type: vote_fields_state_content weight: 12 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_confirm_registration_link: type: link_default @@ -368,9 +374,13 @@ content: third_party_settings: { } field_in_person_registration: type: vote_fields_state_content - weight: 16 + weight: 17 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_in_state_name: type: string_textfield @@ -403,7 +413,11 @@ content: type: vote_fields_state_content weight: 15 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_mail_registration_link: type: link_default @@ -438,9 +452,13 @@ content: third_party_settings: { } field_military_and_overseas_regi: type: vote_fields_state_content - weight: 17 + weight: 18 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_more_info_link: type: link_default @@ -450,6 +468,16 @@ content: placeholder_url: '' placeholder_title: '' third_party_settings: { } + field_nvrf_details: + type: vote_fields_state_content + weight: 16 + region: content + settings: + form_subfield_display: + - heading + - text + - link_text + third_party_settings: { } field_nvrf_fields: type: field_nvrf_fields weight: 22 @@ -497,7 +525,11 @@ content: type: vote_fields_state_content weight: 14 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_override_confirm_reg_link: type: link_default @@ -575,7 +607,11 @@ content: type: vote_fields_state_content weight: 13 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_registration_link: type: link_default @@ -587,9 +623,13 @@ content: third_party_settings: { } field_registration_not_needed: type: vote_fields_state_content - weight: 18 + weight: 19 region: content - settings: { } + settings: + form_subfield_display: + - heading + - text + - link_text third_party_settings: { } field_registration_type: type: options_buttons diff --git a/config/sync/core.entity_view_display.node.state_territory.default.yml b/config/sync/core.entity_view_display.node.state_territory.default.yml index b8e0f0928..22a71c933 100644 --- a/config/sync/core.entity_view_display.node.state_territory.default.yml +++ b/config/sync/core.entity_view_display.node.state_territory.default.yml @@ -28,6 +28,7 @@ dependencies: - field.field.node.state_territory.field_metatags - field.field.node.state_territory.field_military_and_overseas_regi - field.field.node.state_territory.field_more_info_link + - field.field.node.state_territory.field_nvrf_details - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name @@ -279,6 +280,13 @@ content: third_party_settings: { } weight: 7 region: content + field_nvrf_details: + type: vote_fields_state_content_default + label: above + settings: { } + third_party_settings: { } + weight: 47 + region: content field_nvrf_fields: type: field_nvrf_fields_default label: above diff --git a/config/sync/core.entity_view_display.node.state_territory.full.yml b/config/sync/core.entity_view_display.node.state_territory.full.yml index 57fdf8221..231a2f10c 100644 --- a/config/sync/core.entity_view_display.node.state_territory.full.yml +++ b/config/sync/core.entity_view_display.node.state_territory.full.yml @@ -29,6 +29,7 @@ dependencies: - field.field.node.state_territory.field_metatags - field.field.node.state_territory.field_military_and_overseas_regi - field.field.node.state_territory.field_more_info_link + - field.field.node.state_territory.field_nvrf_details - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name @@ -394,6 +395,7 @@ hidden: field_identification_inst: true field_mailing_address_inst: true field_metatags: true + field_nvrf_details: true field_nvrf_fields: true field_nvrf_last_updated_date: true field_override_mail_reg_link: true diff --git a/config/sync/core.entity_view_display.node.state_territory.teaser.yml b/config/sync/core.entity_view_display.node.state_territory.teaser.yml index 86bc4a271..f8227ece6 100644 --- a/config/sync/core.entity_view_display.node.state_territory.teaser.yml +++ b/config/sync/core.entity_view_display.node.state_territory.teaser.yml @@ -29,6 +29,7 @@ dependencies: - field.field.node.state_territory.field_metatags - field.field.node.state_territory.field_military_and_overseas_regi - field.field.node.state_territory.field_more_info_link + - field.field.node.state_territory.field_nvrf_details - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name @@ -93,6 +94,7 @@ hidden: field_metatags: true field_military_and_overseas_regi: true field_more_info_link: true + field_nvrf_details: true field_nvrf_fields: true field_nvrf_last_updated_date: true field_of_state_name: true diff --git a/config/sync/field.field.node.state_territory.field_nvrf_details.yml b/config/sync/field.field.node.state_territory.field_nvrf_details.yml new file mode 100644 index 000000000..f9486a27b --- /dev/null +++ b/config/sync/field.field.node.state_territory.field_nvrf_details.yml @@ -0,0 +1,21 @@ +uuid: 526fae57-1fb0-4ad0-ab3d-39f560634e67 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_nvrf_details + - node.type.state_territory + module: + - vote_fields +id: node.state_territory.field_nvrf_details +field_name: field_nvrf_details +entity_type: node +bundle: state_territory +label: 'NVRF details (override)' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: vote_fields_state_content diff --git a/config/sync/field.storage.node.field_nvrf_details.yml b/config/sync/field.storage.node.field_nvrf_details.yml new file mode 100644 index 000000000..3265a98df --- /dev/null +++ b/config/sync/field.storage.node.field_nvrf_details.yml @@ -0,0 +1,19 @@ +uuid: 5da4a342-22fe-449e-8edb-0d68fcd6db60 +langcode: en +status: true +dependencies: + module: + - node + - vote_fields +id: node.field_nvrf_details +field_name: field_nvrf_details +entity_type: node +type: vote_fields_state_content +settings: { } +module: vote_fields +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 75a3712c0..16533c730 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -22,8 +22,6 @@ {% set state_name = label | field_value | render %} {% set accepts_nvrf = node.field_accepts_nvrf.value == 1 %} -{% set has_mail = "by-mail" in (content.field_registration_type | field_value | column('#markup')) %} - {# Links with fallbacks. #} {% set more_info_link = content.field_override_more_info_link | field_value | default(content.field_more_info_link | field_value) | render | trim %} {% set confirm_registration_link = content.field_override_confirm_reg_link | field_value | default(content.field_confirm_registration_link | field_value) | render | trim %} @@ -72,13 +70,6 @@ {% set has_online = "online" in registration_types %} {% set not_needed = "not-needed" in registration_types %} -{# Registration types #} -{% set registration_types = content.field_registration_type | field_value | column('#markup') %} -{% set has_in_person = "in-person" in registration_types %} -{% set has_mail = "by-mail" in registration_types %} -{% set has_online = "online" in registration_types %} -{% set not_needed = "not-needed" in registration_types %} - {# Hold these title_* placeholders for potential integration #} {{ title_prefix }} From b3a5941e22c24d27b65f5ac5c5a98e45ed674e22 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Thu, 17 Oct 2024 15:36:31 -0400 Subject: [PATCH 11/32] Vote-2957: No Online Registration (#1054) * add placeholder for no online reg * Updating twig template * Update to config for new field --- ..._content.state_display_content.default.yml | 29 +++++++++----- ..._content.state_display_content.default.yml | 8 ++++ ...y_content.field_no_online_registration.yml | 21 ++++++++++ ...k_content.field_no_online_registration.yml | 19 ++++++++++ .../node/node--state-territory.html.twig | 38 +++++++++---------- 5 files changed, 85 insertions(+), 30 deletions(-) create mode 100644 config/sync/field.field.block_content.state_display_content.field_no_online_registration.yml create mode 100644 config/sync/field.storage.block_content.field_no_online_registration.yml diff --git a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml index 1cad9e3e8..5194c8126 100644 --- a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml @@ -11,6 +11,7 @@ dependencies: - field.field.block_content.state_display_content.field_in_person_registration - field.field.block_content.state_display_content.field_mail_registration - field.field.block_content.state_display_content.field_military_and_overseas_regi + - field.field.block_content.state_display_content.field_no_online_registration - field.field.block_content.state_display_content.field_nvrf_details - field.field.block_content.state_display_content.field_online_registration - field.field.block_content.state_display_content.field_registration_intro @@ -45,13 +46,13 @@ content: third_party_settings: { } field_election_date: type: datetime_default - weight: 10 + weight: 11 region: content settings: { } third_party_settings: { } field_election_text: type: text_textarea - weight: 11 + weight: 12 region: content settings: rows: 3 @@ -62,7 +63,7 @@ content: hide_guidelines: '0' field_in_person_registration: type: vote_fields_state_content - weight: 7 + weight: 8 region: content settings: form_subfield_display: @@ -72,7 +73,7 @@ content: third_party_settings: { } field_mail_registration: type: vote_fields_state_content - weight: 5 + weight: 6 region: content settings: form_subfield_display: @@ -82,7 +83,7 @@ content: third_party_settings: { } field_military_and_overseas_regi: type: vote_fields_state_content - weight: 8 + weight: 9 region: content settings: form_subfield_display: @@ -90,9 +91,19 @@ content: text: text link_text: 0 third_party_settings: { } + field_no_online_registration: + type: vote_fields_state_content + weight: 5 + region: content + settings: + form_subfield_display: + - heading + - text + - link_text + third_party_settings: { } field_nvrf_details: type: vote_fields_state_content - weight: 6 + weight: 7 region: content settings: form_subfield_display: @@ -122,7 +133,7 @@ content: third_party_settings: { } field_registration_not_needed: type: vote_fields_state_content - weight: 9 + weight: 10 region: content settings: form_subfield_display: @@ -140,13 +151,13 @@ content: third_party_settings: { } langcode: type: language_select - weight: 13 + weight: 14 region: content settings: include_locked: true third_party_settings: { } translation: - weight: 12 + weight: 13 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml index 4ef0d7b58..58b7b987b 100644 --- a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml @@ -11,6 +11,7 @@ dependencies: - field.field.block_content.state_display_content.field_in_person_registration - field.field.block_content.state_display_content.field_mail_registration - field.field.block_content.state_display_content.field_military_and_overseas_regi + - field.field.block_content.state_display_content.field_no_online_registration - field.field.block_content.state_display_content.field_nvrf_details - field.field.block_content.state_display_content.field_online_registration - field.field.block_content.state_display_content.field_registration_intro @@ -76,6 +77,13 @@ content: third_party_settings: { } weight: 8 region: content + field_no_online_registration: + type: vote_fields_state_content_default + label: above + settings: { } + third_party_settings: { } + weight: 12 + region: content field_nvrf_details: type: vote_fields_state_content_default label: above diff --git a/config/sync/field.field.block_content.state_display_content.field_no_online_registration.yml b/config/sync/field.field.block_content.state_display_content.field_no_online_registration.yml new file mode 100644 index 000000000..6749065fd --- /dev/null +++ b/config/sync/field.field.block_content.state_display_content.field_no_online_registration.yml @@ -0,0 +1,21 @@ +uuid: 398183c8-0c7a-4960-aaf6-d3bb2caa3f9c +langcode: en +status: true +dependencies: + config: + - block_content.type.state_display_content + - field.storage.block_content.field_no_online_registration + module: + - vote_fields +id: block_content.state_display_content.field_no_online_registration +field_name: field_no_online_registration +entity_type: block_content +bundle: state_display_content +label: 'No Online registration' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: vote_fields_state_content diff --git a/config/sync/field.storage.block_content.field_no_online_registration.yml b/config/sync/field.storage.block_content.field_no_online_registration.yml new file mode 100644 index 000000000..beefc4179 --- /dev/null +++ b/config/sync/field.storage.block_content.field_no_online_registration.yml @@ -0,0 +1,19 @@ +uuid: fb15b55f-486c-41b1-9c7b-5296239c2e10 +langcode: en +status: true +dependencies: + module: + - block_content + - vote_fields +id: block_content.field_no_online_registration +field_name: field_no_online_registration +entity_type: block_content +type: vote_fields_state_content +settings: { } +module: vote_fields +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 16533c730..41135a01d 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -62,13 +62,8 @@ {% set check_registration = state_display_content.field_check_registration.0 | default([]) | merge(content.field_check_registration.0 | default([])) %} {% set election_date = state_display_content.field_election_date.0 | default([]) | merge(content.field_election_date.0 | default([])) %} {% set election_text = state_display_content.field_election_text.0 | default([]) | merge(content.field_election_text.0 | default([])) %} +{% set no_online_registration = state_display_content.field_no_online_registration.0 | default([]) | merge(content.field_no_online_registration.0 | default([])) %} -{# Registration types #} -{% set registration_types = content.field_registration_type | field_value | column('#markup') %} -{% set has_in_person = "in-person" in registration_types %} -{% set has_mail = "by-mail" in registration_types %} -{% set has_online = "online" in registration_types %} -{% set not_needed = "not-needed" in registration_types %} {# Hold these title_* placeholders for potential integration #} @@ -109,21 +104,22 @@ {{ registration_intro.text }} {% endif %} - {% if has_online and (online_registration is not empty) %} - {{ online_registration }} - {{ online_deadline }} - {{ registration_link }} - {% set body = online_registration.text['#markup'] | t({'@state_online_deadline': online_deadline | render, '@state_name': title_english}) %} - {% set link_title = online_registration.link_text['#markup'] | t({'@state_name': title_english }) %} - {% include '@votegov/component/info-card.html.twig' with { - 'heading': online_registration.heading, - 'body': body, - 'link': { - 'url': registration_link, - 'title': link_title, - } - } %} - {% endif %} +{# setting online registration variables #} +{% set online_registration_vars = has_online ? online_registration : no_online_registration %} +{% set body_vars = has_online ? {'@state_online_deadline': online_deadline | render, '@state_name': title_english} : {'@state_name': title_english} %} + +{% if online_registration_vars is not empty %} + {% set body = online_registration_vars.text['#markup'] | t(body_vars) %} + {% set link_title = online_registration_vars.link_text['#markup'] | t({'@state_name': title_english}) %} + {% include '@votegov/component/info-card.html.twig' with { + 'heading': online_registration_vars.heading, + 'body': body, + 'link': { + 'url': registration_link, + 'title': link_title, + } + } %} +{% endif %} {% if has_mail and mail_registration is not empty %} {% set mail_body %} From 939de51bdac13c470533faf35504a0121b9d72a2 Mon Sep 17 00:00:00 2001 From: SamiraMSadat Date: Fri, 18 Oct 2024 08:39:20 -0600 Subject: [PATCH 12/32] HOTFIX - Restore registration type variables --- .../votegov/templates/node/node--state-territory.html.twig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 41135a01d..aa7c04846 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -64,6 +64,12 @@ {% set election_text = state_display_content.field_election_text.0 | default([]) | merge(content.field_election_text.0 | default([])) %} {% set no_online_registration = state_display_content.field_no_online_registration.0 | default([]) | merge(content.field_no_online_registration.0 | default([])) %} +{# Registration types #} +{% set registration_types = content.field_registration_type | field_value | column('#markup') %} +{% set has_in_person = "in-person" in registration_types %} +{% set has_mail = "by-mail" in registration_types %} +{% set has_online = "online" in registration_types %} +{% set not_needed = "not-needed" in registration_types %} {# Hold these title_* placeholders for potential integration #} From 284b5213d6c149affd1cc5f4140e3d894c48a572 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Fri, 18 Oct 2024 10:41:03 -0400 Subject: [PATCH 13/32] Vote-2959: Deprecate Registration Intro Field (#1056) * Update to twig templete * Update to config --------- Co-authored-by: SamiraMSadat --- ..._content.state_display_content.default.yml | 11 ---------- ...m_display.node.state_territory.default.yml | 11 ---------- ..._content.state_display_content.default.yml | 8 ------- ...w_display.node.state_territory.default.yml | 8 ------- ...view_display.node.state_territory.full.yml | 8 ------- ...ew_display.node.state_territory.teaser.yml | 2 -- ...splay_content.field_registration_intro.yml | 21 ------------------- ...ate_territory.field_registration_intro.yml | 21 ------------------- ...block_content.field_registration_intro.yml | 19 ----------------- ....storage.node.field_registration_intro.yml | 19 ----------------- .../node/node--state-territory.html.twig | 6 ------ 11 files changed, 134 deletions(-) delete mode 100644 config/sync/field.field.block_content.state_display_content.field_registration_intro.yml delete mode 100644 config/sync/field.field.node.state_territory.field_registration_intro.yml delete mode 100644 config/sync/field.storage.block_content.field_registration_intro.yml delete mode 100644 config/sync/field.storage.node.field_registration_intro.yml diff --git a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml index 5194c8126..c868def24 100644 --- a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml @@ -14,7 +14,6 @@ dependencies: - field.field.block_content.state_display_content.field_no_online_registration - field.field.block_content.state_display_content.field_nvrf_details - field.field.block_content.state_display_content.field_online_registration - - field.field.block_content.state_display_content.field_registration_intro - field.field.block_content.state_display_content.field_registration_not_needed module: - allowed_formats @@ -121,16 +120,6 @@ content: - text - link_text third_party_settings: { } - field_registration_intro: - type: vote_fields_state_content - weight: 2 - region: content - settings: - form_subfield_display: - heading: heading - text: text - link_text: 0 - third_party_settings: { } field_registration_not_needed: type: vote_fields_state_content weight: 10 diff --git a/config/sync/core.entity_form_display.node.state_territory.default.yml b/config/sync/core.entity_form_display.node.state_territory.default.yml index a0b512725..4350668ff 100644 --- a/config/sync/core.entity_form_display.node.state_territory.default.yml +++ b/config/sync/core.entity_form_display.node.state_territory.default.yml @@ -43,7 +43,6 @@ dependencies: - field.field.node.state_territory.field_personal_information_inst - field.field.node.state_territory.field_political_party_inst - field.field.node.state_territory.field_reg_eligibility_desc - - field.field.node.state_territory.field_registration_intro - field.field.node.state_territory.field_registration_link - field.field.node.state_territory.field_registration_not_needed - field.field.node.state_territory.field_registration_type @@ -603,16 +602,6 @@ content: rows: 5 placeholder: '' third_party_settings: { } - field_registration_intro: - type: vote_fields_state_content - weight: 13 - region: content - settings: - form_subfield_display: - - heading - - text - - link_text - third_party_settings: { } field_registration_link: type: link_default weight: 6 diff --git a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml index 58b7b987b..c3c08ee1a 100644 --- a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml @@ -14,7 +14,6 @@ dependencies: - field.field.block_content.state_display_content.field_no_online_registration - field.field.block_content.state_display_content.field_nvrf_details - field.field.block_content.state_display_content.field_online_registration - - field.field.block_content.state_display_content.field_registration_intro - field.field.block_content.state_display_content.field_registration_not_needed module: - datetime @@ -98,13 +97,6 @@ content: third_party_settings: { } weight: 4 region: content - field_registration_intro: - type: vote_fields_state_content_default - label: above - settings: { } - third_party_settings: { } - weight: 3 - region: content field_registration_not_needed: type: vote_fields_state_content_default label: above diff --git a/config/sync/core.entity_view_display.node.state_territory.default.yml b/config/sync/core.entity_view_display.node.state_territory.default.yml index 22a71c933..3702d9251 100644 --- a/config/sync/core.entity_view_display.node.state_territory.default.yml +++ b/config/sync/core.entity_view_display.node.state_territory.default.yml @@ -43,7 +43,6 @@ dependencies: - field.field.node.state_territory.field_personal_information_inst - field.field.node.state_territory.field_political_party_inst - field.field.node.state_territory.field_reg_eligibility_desc - - field.field.node.state_territory.field_registration_intro - field.field.node.state_territory.field_registration_link - field.field.node.state_territory.field_registration_not_needed - field.field.node.state_territory.field_registration_type @@ -429,13 +428,6 @@ content: third_party_settings: { } weight: 32 region: content - field_registration_intro: - type: vote_fields_state_content_default - label: above - settings: { } - third_party_settings: { } - weight: 46 - region: content field_registration_link: type: link label: hidden diff --git a/config/sync/core.entity_view_display.node.state_territory.full.yml b/config/sync/core.entity_view_display.node.state_territory.full.yml index 231a2f10c..e85834a7e 100644 --- a/config/sync/core.entity_view_display.node.state_territory.full.yml +++ b/config/sync/core.entity_view_display.node.state_territory.full.yml @@ -44,7 +44,6 @@ dependencies: - field.field.node.state_territory.field_personal_information_inst - field.field.node.state_territory.field_political_party_inst - field.field.node.state_territory.field_reg_eligibility_desc - - field.field.node.state_territory.field_registration_intro - field.field.node.state_territory.field_registration_link - field.field.node.state_territory.field_registration_not_needed - field.field.node.state_territory.field_registration_type @@ -338,13 +337,6 @@ content: third_party_settings: { } weight: 5 region: content - field_registration_intro: - type: vote_fields_state_content_default - label: hidden - settings: { } - third_party_settings: { } - weight: 26 - region: content field_registration_link: type: link label: hidden diff --git a/config/sync/core.entity_view_display.node.state_territory.teaser.yml b/config/sync/core.entity_view_display.node.state_territory.teaser.yml index f8227ece6..75cd90ed3 100644 --- a/config/sync/core.entity_view_display.node.state_territory.teaser.yml +++ b/config/sync/core.entity_view_display.node.state_territory.teaser.yml @@ -44,7 +44,6 @@ dependencies: - field.field.node.state_territory.field_personal_information_inst - field.field.node.state_territory.field_political_party_inst - field.field.node.state_territory.field_reg_eligibility_desc - - field.field.node.state_territory.field_registration_intro - field.field.node.state_territory.field_registration_link - field.field.node.state_territory.field_registration_not_needed - field.field.node.state_territory.field_registration_type @@ -109,7 +108,6 @@ hidden: field_personal_information_inst: true field_political_party_inst: true field_reg_eligibility_desc: true - field_registration_intro: true field_registration_link: true field_registration_not_needed: true field_registration_type: true diff --git a/config/sync/field.field.block_content.state_display_content.field_registration_intro.yml b/config/sync/field.field.block_content.state_display_content.field_registration_intro.yml deleted file mode 100644 index fb2fe29ab..000000000 --- a/config/sync/field.field.block_content.state_display_content.field_registration_intro.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 6e4058ae-1e1e-4a2f-8ca9-cc1772cb12b7 -langcode: en -status: true -dependencies: - config: - - block_content.type.state_display_content - - field.storage.block_content.field_registration_intro - module: - - vote_fields -id: block_content.state_display_content.field_registration_intro -field_name: field_registration_intro -entity_type: block_content -bundle: state_display_content -label: 'Registration intro' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: { } -field_type: vote_fields_state_content diff --git a/config/sync/field.field.node.state_territory.field_registration_intro.yml b/config/sync/field.field.node.state_territory.field_registration_intro.yml deleted file mode 100644 index 34adc33b9..000000000 --- a/config/sync/field.field.node.state_territory.field_registration_intro.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 02278e3c-56da-44b8-a453-f1059178d6af -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_registration_intro - - node.type.state_territory - module: - - vote_fields -id: node.state_territory.field_registration_intro -field_name: field_registration_intro -entity_type: node -bundle: state_territory -label: 'Registration intro (override)' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: { } -field_type: vote_fields_state_content diff --git a/config/sync/field.storage.block_content.field_registration_intro.yml b/config/sync/field.storage.block_content.field_registration_intro.yml deleted file mode 100644 index 96953bf27..000000000 --- a/config/sync/field.storage.block_content.field_registration_intro.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 1398a67d-49c9-405e-ab74-55a62270a1fa -langcode: en -status: true -dependencies: - module: - - block_content - - vote_fields -id: block_content.field_registration_intro -field_name: field_registration_intro -entity_type: block_content -type: vote_fields_state_content -settings: { } -module: vote_fields -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_registration_intro.yml b/config/sync/field.storage.node.field_registration_intro.yml deleted file mode 100644 index b065f4c0c..000000000 --- a/config/sync/field.storage.node.field_registration_intro.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 5309c8a7-fa8f-440e-ac41-681a0d227be0 -langcode: en -status: true -dependencies: - module: - - node - - vote_fields -id: node.field_registration_intro -field_name: field_registration_intro -entity_type: node -type: vote_fields_state_content -settings: { } -module: vote_fields -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index aa7c04846..7b878fbf6 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -53,7 +53,6 @@ {# Get default state display content from the block type. #} {% set state_display_content = drupal_entity('block_content', 22) | children %} {% set registration_not_needed = state_display_content.field_registration_not_needed.0 | default([]) | merge(content.field_registration_not_needed.0 | default([])) %} -{% set registration_intro = state_display_content.field_registration_intro.0 | default([]) | merge(content.field_registration_intro.0 | default([])) %} {% set online_registration = state_display_content.field_online_registration.0 | default([]) | merge(content.field_online_registration.0 | default([])) %} {% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | default([]) | merge(content.field_military_and_overseas_regi.0 | default([])) %} {% set mail_registration = state_display_content.field_mail_registration.0 | default([]) | merge(content.field_mail_registration.0 | default([])) %} @@ -105,11 +104,6 @@ {{ election_date_text }} {% endif %} - {% if registration_intro is not empty %} -

{{ registration_intro.heading }}

- {{ registration_intro.text }} - {% endif %} - {# setting online registration variables #} {% set online_registration_vars = has_online ? online_registration : no_online_registration %} {% set body_vars = has_online ? {'@state_online_deadline': online_deadline | render, '@state_name': title_english} : {'@state_name': title_english} %} From a110d9418a092008bf9e716326211f13476507ab Mon Sep 17 00:00:00 2001 From: Mandy Lloyd Date: Fri, 18 Oct 2024 20:18:59 -0400 Subject: [PATCH 14/32] VOTE-2880/2881: Configure and style call out box (#1047) --- .../custom/votegov/src/sass/_variables.scss | 2 +- .../votegov/src/sass/components/_index.scss | 3 +- .../src/sass/components/call-out-box.scss | 26 +++++++++ .../component/call-out-box.html.twig | 31 ++++++++++ .../node/node--state-territory.html.twig | 56 ++++++++++--------- 5 files changed, 90 insertions(+), 28 deletions(-) create mode 100644 web/themes/custom/votegov/src/sass/components/call-out-box.scss create mode 100644 web/themes/custom/votegov/templates/component/call-out-box.html.twig diff --git a/web/themes/custom/votegov/src/sass/_variables.scss b/web/themes/custom/votegov/src/sass/_variables.scss index f5c03dbdb..00603ec32 100644 --- a/web/themes/custom/votegov/src/sass/_variables.scss +++ b/web/themes/custom/votegov/src/sass/_variables.scss @@ -15,7 +15,7 @@ $ac-cool-light: #0AAAE2; // cyan-30v $bg-light: #F0F0F0; // gray-cool-2 $bg-secondary-light: #F7F9FA; $bg-light-medium: #D3D3D3; // gray-cool-20 is this just for the horizontal rule? -$bg-light-cool: #E2EDF2; // blue-warm-10 +$bg-light-cool: #E7F6F8; // blue-warm-10 $bg-hero-default: #A9CFD2; //High Contrast Colors. diff --git a/web/themes/custom/votegov/src/sass/components/_index.scss b/web/themes/custom/votegov/src/sass/components/_index.scss index c8d1b2f1a..cc1e9e49a 100644 --- a/web/themes/custom/votegov/src/sass/components/_index.scss +++ b/web/themes/custom/votegov/src/sass/components/_index.scss @@ -25,4 +25,5 @@ @forward "a11y-toolbar"; @forward "double-deck-card"; @forward "to-top"; -@forward "info-card" +@forward "info-card"; +@forward "call-out-box"; diff --git a/web/themes/custom/votegov/src/sass/components/call-out-box.scss b/web/themes/custom/votegov/src/sass/components/call-out-box.scss new file mode 100644 index 000000000..d1d8c98b2 --- /dev/null +++ b/web/themes/custom/votegov/src/sass/components/call-out-box.scss @@ -0,0 +1,26 @@ +@use "uswds-core" as *; +@use "variables" as *; +@use "mixins" as *; + +.vote-call-out-box { + @include u-padding(4); + @include u-margin-bottom(6); + background-color: $bg-light-cool; + + @include at-media('tablet') { + @include u-radius('lg'); + } + + @include at-media-max('tablet') { + @include u-padding-x(3); + @include u-margin-x(-3); + } +} + +.vote-call-out-box--offset { + @include u-margin-top(-4); + + @include at-media('tablet') { + margin-top: -6rem; + } +} diff --git a/web/themes/custom/votegov/templates/component/call-out-box.html.twig b/web/themes/custom/votegov/templates/component/call-out-box.html.twig new file mode 100644 index 000000000..bda01b2cb --- /dev/null +++ b/web/themes/custom/votegov/templates/component/call-out-box.html.twig @@ -0,0 +1,31 @@ +{# +/** + * @file + * Default theme implementation to Call out box component. + * + * Template variables: + * - heading: string + * - text: string + * - link_url: string + * - link_text: string or uri + * + * Usage example: + * {% include '@votegov/component/call-out-box.html.twig' with { + * 'heading': var_heading, + * 'text': var_text, + * 'link_url': var_uri, + * 'link_text': var_link_text + * } %} + * +#} + +{% if link_url %} + {% set link_markup %} + {{ link_text }} + {% endset %} +{% endif %} + +
+

{{ heading }}

+ {{ text | t({'@link': {'#markup': link_markup } | render }) }} +
diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 7b878fbf6..9a7d83e99 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -8,17 +8,6 @@ {# Caching the data in content object #} {% set savedCache = content | render %} -{% set classes = [ - 'node--' ~ node.bundle|clean_class, - node.isPromoted() ? 'node--promoted', - node.isSticky() ? 'node--sticky', - not node.isPublished() ? 'node--unpublished', - view_mode ? 'node--view-mode-' ~ view_mode|clean_class, - 'vote-main-content-row', - 'vote-block-margin-y--narrow', - 'usa-in-page-nav-container' -] %} - {% set state_name = label | field_value | render %} {% set accepts_nvrf = node.field_accepts_nvrf.value == 1 %} @@ -51,7 +40,7 @@ {# State content with fallbacks. #} {# Get default state display content from the block type. #} -{% set state_display_content = drupal_entity('block_content', 22) | children %} +{% set state_display_content = drupal_entity('block_content', 23) | children %} {% set registration_not_needed = state_display_content.field_registration_not_needed.0 | default([]) | merge(content.field_registration_not_needed.0 | default([])) %} {% set online_registration = state_display_content.field_online_registration.0 | default([]) | merge(content.field_online_registration.0 | default([])) %} {% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | default([]) | merge(content.field_military_and_overseas_regi.0 | default([])) %} @@ -70,6 +59,17 @@ {% set has_online = "online" in registration_types %} {% set not_needed = "not-needed" in registration_types %} +{% set classes = [ + 'node--' ~ node.bundle|clean_class, + node.isPromoted() ? 'node--promoted', + node.isSticky() ? 'node--sticky', + not node.isPublished() ? 'node--unpublished', + view_mode ? 'node--view-mode-' ~ view_mode|clean_class, + 'vote-main-content-row', + 'vote-block-margin-y--narrow', + 'usa-in-page-nav-container' +] %} + {# Hold these title_* placeholders for potential integration #} {{ title_prefix }} @@ -80,22 +80,26 @@ {% endif %} {% block aside %} - -{% endblock %} + + {% endblock %}
- {% block content %} + {% block content %} {% if check_registration is not empty %} - {{ check_registration }} - {{ confirm_registration_link }} + {% include '@votegov/component/call-out-box.html.twig' with { + 'heading': check_registration.heading, + 'text': check_registration.text | render | trim, + 'link_text': check_registration.link_text | render | trim | t({'@state_name': title_english}), + 'link_url': confirm_registration_link + } %} {% endif %} {# Election Date #} @@ -121,7 +125,7 @@ } %} {% endif %} - {% if has_mail and mail_registration is not empty %} + {% if has_mail and mail_registration is not empty %} {% set mail_body %}

{{ 'Mail-in registration deadline:' | t }} {{ bymail_deadline }}

{{ mail_registration.text }} From f83098bec3ecfae27d29d16b58ccd82ceb6e3922 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:31:43 -0400 Subject: [PATCH 15/32] Vote-2958: No mail registration block (#1058) * update to twig template * Update to config * updated no mail to have nvrf render if checked * VOTE-2958 Fix the mail deadline replacement * VOTE-2958 Use state name var with capital letter --------- Co-authored-by: SamiraMSadat --- ..._content.state_display_content.default.yml | 19 +++- ..._content.state_display_content.default.yml | 8 ++ ...lay_content.field_no_mail_registration.yml | 21 +++++ ...ock_content.field_no_mail_registration.yml | 19 ++++ .../node/node--state-territory.html.twig | 94 +++++++++++-------- 5 files changed, 119 insertions(+), 42 deletions(-) create mode 100644 config/sync/field.field.block_content.state_display_content.field_no_mail_registration.yml create mode 100644 config/sync/field.storage.block_content.field_no_mail_registration.yml diff --git a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml index c868def24..d9177ea62 100644 --- a/config/sync/core.entity_form_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_form_display.block_content.state_display_content.default.yml @@ -11,6 +11,7 @@ dependencies: - field.field.block_content.state_display_content.field_in_person_registration - field.field.block_content.state_display_content.field_mail_registration - field.field.block_content.state_display_content.field_military_and_overseas_regi + - field.field.block_content.state_display_content.field_no_mail_registration - field.field.block_content.state_display_content.field_no_online_registration - field.field.block_content.state_display_content.field_nvrf_details - field.field.block_content.state_display_content.field_online_registration @@ -27,7 +28,7 @@ mode: default content: field_check_registration: type: vote_fields_state_content - weight: 3 + weight: 2 region: content settings: form_subfield_display: @@ -72,7 +73,7 @@ content: third_party_settings: { } field_mail_registration: type: vote_fields_state_content - weight: 6 + weight: 5 region: content settings: form_subfield_display: @@ -90,9 +91,19 @@ content: text: text link_text: 0 third_party_settings: { } + field_no_mail_registration: + type: vote_fields_state_content + weight: 6 + region: content + settings: + form_subfield_display: + - heading + - text + - link_text + third_party_settings: { } field_no_online_registration: type: vote_fields_state_content - weight: 5 + weight: 4 region: content settings: form_subfield_display: @@ -112,7 +123,7 @@ content: third_party_settings: { } field_online_registration: type: vote_fields_state_content - weight: 4 + weight: 3 region: content settings: form_subfield_display: diff --git a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml index c3c08ee1a..ffaacff6d 100644 --- a/config/sync/core.entity_view_display.block_content.state_display_content.default.yml +++ b/config/sync/core.entity_view_display.block_content.state_display_content.default.yml @@ -11,6 +11,7 @@ dependencies: - field.field.block_content.state_display_content.field_in_person_registration - field.field.block_content.state_display_content.field_mail_registration - field.field.block_content.state_display_content.field_military_and_overseas_regi + - field.field.block_content.state_display_content.field_no_mail_registration - field.field.block_content.state_display_content.field_no_online_registration - field.field.block_content.state_display_content.field_nvrf_details - field.field.block_content.state_display_content.field_online_registration @@ -76,6 +77,13 @@ content: third_party_settings: { } weight: 8 region: content + field_no_mail_registration: + type: vote_fields_state_content_default + label: above + settings: { } + third_party_settings: { } + weight: 13 + region: content field_no_online_registration: type: vote_fields_state_content_default label: above diff --git a/config/sync/field.field.block_content.state_display_content.field_no_mail_registration.yml b/config/sync/field.field.block_content.state_display_content.field_no_mail_registration.yml new file mode 100644 index 000000000..fd496b5d0 --- /dev/null +++ b/config/sync/field.field.block_content.state_display_content.field_no_mail_registration.yml @@ -0,0 +1,21 @@ +uuid: e83b3278-b739-423f-bf0a-c0b06adae44c +langcode: en +status: true +dependencies: + config: + - block_content.type.state_display_content + - field.storage.block_content.field_no_mail_registration + module: + - vote_fields +id: block_content.state_display_content.field_no_mail_registration +field_name: field_no_mail_registration +entity_type: block_content +bundle: state_display_content +label: 'No Mail Registration' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: vote_fields_state_content diff --git a/config/sync/field.storage.block_content.field_no_mail_registration.yml b/config/sync/field.storage.block_content.field_no_mail_registration.yml new file mode 100644 index 000000000..744f688f1 --- /dev/null +++ b/config/sync/field.storage.block_content.field_no_mail_registration.yml @@ -0,0 +1,19 @@ +uuid: a507f1aa-1dc8-47f6-84d4-9ce4cf1ef11b +langcode: en +status: true +dependencies: + module: + - block_content + - vote_fields +id: block_content.field_no_mail_registration +field_name: field_no_mail_registration +entity_type: block_content +type: vote_fields_state_content +settings: { } +module: vote_fields +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 9a7d83e99..4f73cafd0 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -40,11 +40,12 @@ {# State content with fallbacks. #} {# Get default state display content from the block type. #} -{% set state_display_content = drupal_entity('block_content', 23) | children %} +{% set state_display_content = drupal_entity('block_content', 22) | children %} {% set registration_not_needed = state_display_content.field_registration_not_needed.0 | default([]) | merge(content.field_registration_not_needed.0 | default([])) %} {% set online_registration = state_display_content.field_online_registration.0 | default([]) | merge(content.field_online_registration.0 | default([])) %} {% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | default([]) | merge(content.field_military_and_overseas_regi.0 | default([])) %} {% set mail_registration = state_display_content.field_mail_registration.0 | default([]) | merge(content.field_mail_registration.0 | default([])) %} +{% set no_mail_registration = state_display_content.field_no_mail_registration.0 | default([]) | merge(content.field_no_mail_registration.0 | default([])) %} {% set nvrf_details = state_display_content.field_nvrf_details.0 | default([]) | merge(content.field_nvrf_details.0 | default([])) %} {% set inperson_registration = state_display_content.field_in_person_registration.0 | default([]) | merge(content.field_in_person_registration.0 | default([])) %} {% set check_registration = state_display_content.field_check_registration.0 | default([]) | merge(content.field_check_registration.0 | default([])) %} @@ -125,46 +126,63 @@ } %} {% endif %} - {% if has_mail and mail_registration is not empty %} - {% set mail_body %} -

{{ 'Mail-in registration deadline:' | t }} {{ bymail_deadline }}

- {{ mail_registration.text }} - - {% if state_mail_pdf_link and mail_registration.link_text %} -

{{ link(mail_registration.link_text, state_mail_pdf_link) }}

- {% endif %} - {% endset %} - - {% if accepts_nvrf and nvrf_details is not empty %} - {% set mail_footer %} -
- {% if nvrf_details.heading %} -

{{ nvrf_details.heading }}

- {% endif %} - - {{ nvrf_details.text }} - - {% if nvrf_details.link_text %} - {# Set path to form dynamically using page route. #} - {% set form_route = language != 'es' ? 'vote_nvrf.nvrf_page' : 'vote_nvrf.nvrf_page_es' %} - {% set state_name = currentnode.label | lower | replace({' ': '-'}) %} - - {% include '@votegov/component/button.html.twig' with { - 'href': 'internal:' ~ path(form_route, {'state_name': state_name}), - 'label': nvrf_details.link_text, - 'data_label': 'data-state-ext', - 'data': 'nvrf-pdf-tool-registration' - } %} - {% endif %} - {% endset %} - {% endif %} +{# NVRF details and logic to be used in the mail registration footer #} +{% set mail_footer %} + {% if accepts_nvrf and nvrf_details is not empty %} +
+ {% if nvrf_details.heading %} +

{{ nvrf_details.heading }}

+ {% endif %} - {% include '@votegov/component/info-card.html.twig' with { - 'heading': mail_registration.heading, - 'body': mail_body | render | trim | t({'@state_name': state_name}), - 'footer': mail_footer + {{ nvrf_details.text }} + + {% if nvrf_details.link_text %} + {# Set path to form dynamically using page route. #} + {% set form_route = language!= 'es'? 'vote_nvrf.nvrf_page' : 'vote_nvrf.nvrf_page_es' %} + {% set state_name = currentnode.label | lower | replace({' ': '-'}) %} + + {% include '@votegov/component/button.html.twig' with { + 'href': 'internal:' ~ path(form_route, {'state_name': state_name}), + 'label': nvrf_details.link_text, + 'data_label': 'data-state-ext', + 'data': 'nvrf-pdf-tool-registration' } %} {% endif %} + {% endif %} +{% endset %} + +{# Mail registration content #} +{% if has_mail and (mail_registration is not empty) %} + {% set mail_body %} + {{ mail_registration.text }} + + {% if state_mail_pdf_link %} +

{{ link(mail_registration.link_text, state_mail_pdf_link) }}

+ {% endif %} + {% endset %} + + {% include '@votegov/component/info-card.html.twig' with { + 'heading': mail_registration.heading, + 'body': mail_body | render | trim | t({'@state_mail_deadline': bymail_deadline ,'@state_name': title_english}), + 'footer': mail_footer + } %} + {# No mail registration content #} +{% else %} + {% if not has_mail and (no_mail_registration is not empty) %} + {% set no_mail_body = no_mail_registration.text['#markup'] | t({'@state_name': title_english}) %} + {% set no_mail_link_title = no_mail_registration.link_text['#markup'] | t({'@state_name': title_english }) %} + + {% include '@votegov/component/info-card.html.twig' with { + 'heading': no_mail_registration.heading, + 'body': no_mail_body, + 'link': { + 'url': more_info_link, + 'title': no_mail_link_title, + }, + 'footer': mail_footer + } %} + {% endif %} +{% endif %} {% if has_in_person and (inperson_registration is not empty) %} {% set body = inperson_registration.text['#markup'] | t({'@state_in-person_deadline': inperson_deadline | render }) %} From 88cf019dbbaadbf8316c7a2c1040d67d029e101b Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Wed, 23 Oct 2024 07:11:09 -0600 Subject: [PATCH 16/32] VOTE-3020 Reenable the NVRF details field in the state override content (#1065) --- ...view_display.node.state_territory.full.yml | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/config/sync/core.entity_view_display.node.state_territory.full.yml b/config/sync/core.entity_view_display.node.state_territory.full.yml index e85834a7e..2983a691b 100644 --- a/config/sync/core.entity_view_display.node.state_territory.full.yml +++ b/config/sync/core.entity_view_display.node.state_territory.full.yml @@ -167,7 +167,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 27 + weight: 26 region: content field_in_state_name: type: string @@ -210,7 +210,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 28 + weight: 27 region: content field_mail_registration_link: type: link @@ -222,7 +222,7 @@ content: rel: '0' target: '0' third_party_settings: { } - weight: 32 + weight: 31 region: content field_media: type: entity_reference_entity_view @@ -238,7 +238,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 29 + weight: 28 region: content field_more_info_link: type: link @@ -252,6 +252,13 @@ content: third_party_settings: { } weight: 6 region: content + field_nvrf_details: + type: vote_fields_state_content_default + label: hidden + settings: { } + third_party_settings: { } + weight: 32 + region: content field_of_state_name: type: string label: hidden @@ -287,7 +294,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 30 + weight: 29 region: content field_override_confirm_reg_link: type: link @@ -354,7 +361,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 31 + weight: 30 region: content field_registration_type: type: list_key @@ -387,7 +394,6 @@ hidden: field_identification_inst: true field_mailing_address_inst: true field_metatags: true - field_nvrf_details: true field_nvrf_fields: true field_nvrf_last_updated_date: true field_override_mail_reg_link: true From 330cd03cdc818483e20f71f81e8006badb7d96a9 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Wed, 23 Oct 2024 10:25:18 -0600 Subject: [PATCH 17/32] VOTE-2972 additional check reg box (#1060) --- .../src/sass/components/call-out-box.scss | 10 ++++++ .../sass/uswds-overrides/usa-in-page-nav.scss | 21 +++++++++--- .../node/node--state-territory.html.twig | 33 ++++++++++++------- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/web/themes/custom/votegov/src/sass/components/call-out-box.scss b/web/themes/custom/votegov/src/sass/components/call-out-box.scss index d1d8c98b2..5a5a6164c 100644 --- a/web/themes/custom/votegov/src/sass/components/call-out-box.scss +++ b/web/themes/custom/votegov/src/sass/components/call-out-box.scss @@ -15,6 +15,16 @@ @include u-padding-x(3); @include u-margin-x(-3); } + + .vote-side-nav__container > & { + @include u-padding(3); + @include u-margin-x(0); + @include u-margin-y(3); + + h2 { + @include u-font('sans','sm'); + } + } } .vote-call-out-box--offset { diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss index b156664e9..343ab435a 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss @@ -2,16 +2,29 @@ @use "variables" as *; @use "mixins" as *; -.usa-in-page-nav { - @include grid-offset(1); - margin-inline-start: calc(100% / 12); - padding-inline-start: 2rem; +.vote-side-nav__container { + @include u-padding-left(8); + @include u-margin-left(8); + @include u-width('full'); + @include u-position('sticky'); + @include u-order(2); + margin-top: units($theme-in-page-nav-margin-top); + max-width: 20rem; + top: units($theme-in-page-nav-top); @include at-media-max('tablet-lg') { @include u-display('none'); } } +.usa-in-page-nav { + @include grid-offset(1); + @include u-margin-left(0); + @include u-padding(0); + max-width: inherit; + position: unset; +} + .usa-in-page-nav__list { @include u-border(0); border-inline-start: 1px solid $bg-light-medium; diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 4f73cafd0..d026fb7a7 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -40,7 +40,7 @@ {# State content with fallbacks. #} {# Get default state display content from the block type. #} -{% set state_display_content = drupal_entity('block_content', 22) | children %} +{% set state_display_content = drupal_entity('block_content', 23) | children %} {% set registration_not_needed = state_display_content.field_registration_not_needed.0 | default([]) | merge(content.field_registration_not_needed.0 | default([])) %} {% set online_registration = state_display_content.field_online_registration.0 | default([]) | merge(content.field_online_registration.0 | default([])) %} {% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | default([]) | merge(content.field_military_and_overseas_regi.0 | default([])) %} @@ -81,18 +81,29 @@ {% endif %} {% block aside %} - + {% endblock %} -
+
{% block content %} {% if check_registration is not empty %} {% include '@votegov/component/call-out-box.html.twig' with { From 40daefaea3faee077b1f7c7f2eb1dbad3038781a Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:38:01 -0600 Subject: [PATCH 18/32] VOTE-3006 empty link text bug (#1066) --- .../node/node--state-territory.html.twig | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index d026fb7a7..6ee24b91a 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -126,7 +126,9 @@ {% if online_registration_vars is not empty %} {% set body = online_registration_vars.text['#markup'] | t(body_vars) %} - {% set link_title = online_registration_vars.link_text['#markup'] | t({'@state_name': title_english}) %} + {% if online_registration_vars.link_text %} + {% set link_title = online_registration_vars.link_text['#markup'] | t({'@state_name': title_english}) %} + {% endif %} {% include '@votegov/component/info-card.html.twig' with { 'heading': online_registration_vars.heading, 'body': body, @@ -145,7 +147,7 @@

{{ nvrf_details.heading }}

{% endif %} - {{ nvrf_details.text }} + {{ nvrf_details.text['#markup'] | t({'@state_name': title_english}) }} {% if nvrf_details.link_text %} {# Set path to form dynamically using page route. #} @@ -167,7 +169,7 @@ {% set mail_body %} {{ mail_registration.text }} - {% if state_mail_pdf_link %} + {% if state_mail_pdf_link and mail_registration.link_text %}

{{ link(mail_registration.link_text, state_mail_pdf_link) }}

{% endif %} {% endset %} @@ -177,11 +179,13 @@ 'body': mail_body | render | trim | t({'@state_mail_deadline': bymail_deadline ,'@state_name': title_english}), 'footer': mail_footer } %} - {# No mail registration content #} +{# No mail registration content #} {% else %} {% if not has_mail and (no_mail_registration is not empty) %} {% set no_mail_body = no_mail_registration.text['#markup'] | t({'@state_name': title_english}) %} - {% set no_mail_link_title = no_mail_registration.link_text['#markup'] | t({'@state_name': title_english }) %} + {% if no_mail_registration.link_text %} + {% set no_mail_link_title = no_mail_registration.link_text['#markup'] | t({'@state_name': title_english }) %} + {% endif %} {% include '@votegov/component/info-card.html.twig' with { 'heading': no_mail_registration.heading, @@ -197,7 +201,9 @@ {% if has_in_person and (inperson_registration is not empty) %} {% set body = inperson_registration.text['#markup'] | t({'@state_in-person_deadline': inperson_deadline | render }) %} - {% set link_title = inperson_registration.link_text['#markup'] | t({'@state_name': title_english }) %} + {% if inperson_registration.link_text %} + {% set link_title = inperson_registration.link_text['#markup'] | t({'@state_name': title_english }) %} + {% endif %} {% include '@votegov/component/info-card.html.twig' with { 'heading': inperson_registration.heading, 'body': body, From 52b41bac6fe42a759a9c73c0a086b2def73a7ce2 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Tue, 29 Oct 2024 08:52:33 -0600 Subject: [PATCH 19/32] VOTE-3036 Replicate markup changes for in page nav to voter guide page (#1070) --- .../layout/page--node--voter-guide.html.twig | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig b/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig index 0564121e0..83fdf45b5 100644 --- a/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig +++ b/web/themes/custom/votegov/templates/layout/page--node--voter-guide.html.twig @@ -10,15 +10,17 @@ 'variant': 'dark' } %}
- +
{{ page.content }}
From 0332132fa688c1b38f0d6633b2ff60345b90fc25 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Tue, 29 Oct 2024 09:09:20 -0600 Subject: [PATCH 20/32] VOTE- 3024 fix election date styling (#1067) --- .../custom/votegov/src/sass/components/call-out-box.scss | 2 +- web/themes/custom/votegov/src/sass/components/date.scss | 4 ++++ .../custom/votegov/src/sass/components/info-card.scss | 9 +++------ .../templates/node/node--state-territory.html.twig | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/themes/custom/votegov/src/sass/components/call-out-box.scss b/web/themes/custom/votegov/src/sass/components/call-out-box.scss index 5a5a6164c..048bce2fe 100644 --- a/web/themes/custom/votegov/src/sass/components/call-out-box.scss +++ b/web/themes/custom/votegov/src/sass/components/call-out-box.scss @@ -4,7 +4,7 @@ .vote-call-out-box { @include u-padding(4); - @include u-margin-bottom(6); + @include u-margin-bottom(5); background-color: $bg-light-cool; @include at-media('tablet') { diff --git a/web/themes/custom/votegov/src/sass/components/date.scss b/web/themes/custom/votegov/src/sass/components/date.scss index 78ce7bcfe..06df4cf44 100644 --- a/web/themes/custom/votegov/src/sass/components/date.scss +++ b/web/themes/custom/votegov/src/sass/components/date.scss @@ -7,3 +7,7 @@ @include u-margin-top(4); } } + +.vote-date--election { + @include u-font('sans', 'md'); +} diff --git a/web/themes/custom/votegov/src/sass/components/info-card.scss b/web/themes/custom/votegov/src/sass/components/info-card.scss index 7d5ac5adf..7826de447 100644 --- a/web/themes/custom/votegov/src/sass/components/info-card.scss +++ b/web/themes/custom/votegov/src/sass/components/info-card.scss @@ -6,13 +6,10 @@ @include u-border(1px, 'gray-cool-20', 'solid'); @include u-radius('lg'); @include u-padding(4); + @include u-margin-top(4); - .vote-info-card + & { - @include u-margin-top(4); - - @include at-media('tablet') { - @include u-margin-top(6); - } + @include at-media('tablet') { + @include u-margin-top(5); } > * + * { diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 6ee24b91a..4588235a6 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -117,7 +117,7 @@ {# Election Date #} {% if (election_date is not empty) and (election_text is not empty) %} {% set election_date_text = election_text['#text'] | t({'@date': election_date | render }) %} - {{ election_date_text }} +
{{ election_date_text }}
{% endif %} {# setting online registration variables #} From cfadc1abd1cf3cfb87d629c466563e62bfb35146 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:19:44 -0400 Subject: [PATCH 21/32] Vote-3051: not needed template update (#1081) * Vote-3051: update to not needed template * Vote-3051: adding update date to tempalte --- ...ode--state-territory--not-needed.html.twig | 59 +++++++------------ .../node/node--state-territory.html.twig | 8 +++ 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig index 4129ce295..abcaff16f 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig @@ -7,48 +7,31 @@ #} {% block aside %} -{# keep empty for not needed #} + {# keep empty for not needed #} {% endblock %} {% block content %} - {% if registration_not_needed is not empty %} -

{{ registration_not_needed.heading }}

+ {% if registration_not_needed is not empty %} + {# setting link text to be in inline hyper link #} + {% if registration_not_needed.link_text %} + {% set link_markup %} + {{ registration_not_needed.link_text | render | trim | t({'@state_name': title_english}) }} + {% endset %} + {% endif %} + {# setting body text to have palceholder for both state name and link #} + {% set body = registration_not_needed.text['#markup']| t({'@state_name': title_english, '@link': {'#markup': link_markup } | render}) %} - {{ registration_not_needed.text }} + {% include '@votegov/component/info-card.html.twig' with { + 'heading': registration_not_needed.heading, + 'body': body, + } %} - {% if more_info_link and registration_not_needed.link_text %} -

- {% include '@votegov/component/button.html.twig' with { - 'label': registration_not_needed.link_text, - 'href': more_info_link - } %} -

- {% endif %} + {% endif %} + {% if military_overseas_registration is not empty %} + {% include '@votegov/component/info-card.html.twig' with { + 'heading': military_overseas_registration.heading, + 'body': military_overseas_registration.text, + } %} + {% endif %} - {% if military_overseas_registration is not empty %} - {{ military_overseas_registration }} - {% endif %} - {% endif %} - - {# JSON Schema #} - {# Commenting this out until we have a chance to review and improve #} -{# #} {% endblock %} diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 4588235a6..c8d91d8c0 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -221,5 +221,13 @@ } %} {% endif %} {% endblock %} + + {# Checking if updated date is set and then render the field #} + {% if content.field_updated_date | field_value is not empty %} +

+ {# Striptags and raw filters were added to accomodate Navajo date formats. #} + {{'Last updated:' | t }} {{ content.field_updated_date | render | replace(t_numbers[language].numbers | default([])) | striptags('') | raw }} +

+ {% endif %}
From 30bf4d6c9d8f0b15f0731d6c7e5cf9491eea014c Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Tue, 5 Nov 2024 07:18:45 -0700 Subject: [PATCH 22/32] VOTE-3092 Replace left styles with inline start (#1091) --- .../votegov/src/sass/uswds-overrides/usa-in-page-nav.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss index 343ab435a..d342e7bdc 100644 --- a/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss +++ b/web/themes/custom/votegov/src/sass/uswds-overrides/usa-in-page-nav.scss @@ -3,12 +3,12 @@ @use "mixins" as *; .vote-side-nav__container { - @include u-padding-left(8); - @include u-margin-left(8); @include u-width('full'); @include u-position('sticky'); @include u-order(2); margin-top: units($theme-in-page-nav-margin-top); + margin-inline-start: 4rem; + padding-inline-start: 4rem; max-width: 20rem; top: units($theme-in-page-nav-top); From 763c695179e9af8a00b3f682f0c1927d890a2220 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Wed, 13 Nov 2024 12:10:21 -0700 Subject: [PATCH 23/32] VOTE-3057 Remove old state page strings from po files (#1098) --- .../custom/vote_utility/translations/am.po | 79 -------------- .../custom/vote_utility/translations/ar.po | 94 ---------------- .../custom/vote_utility/translations/bn.po | 79 -------------- .../custom/vote_utility/translations/es.po | 88 --------------- .../custom/vote_utility/translations/fr.po | 100 +----------------- .../custom/vote_utility/translations/hi.po | 80 -------------- .../custom/vote_utility/translations/ht.po | 100 ------------------ .../custom/vote_utility/translations/ja.po | 97 ----------------- .../custom/vote_utility/translations/km.po | 79 -------------- .../custom/vote_utility/translations/ko.po | 79 -------------- .../custom/vote_utility/translations/nv.po | 92 ---------------- .../custom/vote_utility/translations/pt.po | 97 ----------------- .../custom/vote_utility/translations/ru.po | 97 ----------------- .../custom/vote_utility/translations/so.po | 97 ----------------- .../custom/vote_utility/translations/tl.po | 79 -------------- .../custom/vote_utility/translations/vi.po | 79 -------------- .../custom/vote_utility/translations/ypk.po | 73 ------------- .../vote_utility/translations/zh-hans.po | 82 -------------- .../custom/vote_utility/translations/zh.po | 79 -------------- 19 files changed, 1 insertion(+), 1649 deletions(-) diff --git a/web/modules/custom/vote_utility/translations/am.po b/web/modules/custom/vote_utility/translations/am.po index e78b1a536..9309b762d 100644 --- a/web/modules/custom/vote_utility/translations/am.po +++ b/web/modules/custom/vote_utility/translations/am.po @@ -71,91 +71,12 @@ msgstr "Vote.govን በትዊተር ላይ ይከተሉ (በእንግሊዘኛ)" msgid "Search vote.gov" msgstr "Vote.gov ን ይፈልጉ" -#state -msgid "Register to vote in @state_name" -msgstr "ለመምረጥ ይመዝገቡ @state_name" - -msgid "How to register to vote" -msgstr "ለመምረጥ እንዴት ነው የሚመዘገቡት" - -msgid "How to register and update your registration" -msgstr "ለመምረጥ እንዴት ነው የሚመዘገቡት" - -msgid "Other ways to register to vote" -msgstr "ለመምረጥ መመዝገቢያ ሌላ መንገዶች" - -msgid "Register by mail deadline:" -msgstr "በፖስታ ምዝገባ የመጨረሻ ቀን፦" - msgid "Must be postmarked by @date" msgstr "@date የፓስታ ማህተም ያረፈበት መሆን አለበት" msgid "Must be received by @date" msgstr "@date መድረስ አለበት" -msgid "Online registration deadline:" -msgstr "ድረገጽ ላይ ምዝገባ የመጨረሻ ቀን፦" - -msgid "Voter registration deadlines" -msgstr "የመራጮች ምዝገባ የመጨረሻ ቀናት" - -msgid "In person registration deadline:" -msgstr "በአካል ምዝገባ የመጨረሻ ቀን፦" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "ለ @election_date ምርጫ የመራጮች ምዝገባ የመጨረሻ ቀን" - -msgid "Find state and local election dates." -msgstr "" - -msgid "How to check your voter registration" -msgstr "ለመምረጥ መመዝገብዎን እንዴት ማረጋገጥ ይችላሉ" - -msgid "You can confirm your voter registration status on @link." -msgstr "የመራጮች ምዝገባ ሁኔታዎን @link ላይ ማረጋገጥ ይችላሉ።" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "ድምጽ ለመስጠት መመዝገብዎን ለማረጋገጥ የአካባቢዎን የምዝገባ ቢሮ መገናኘት ይችላሉ። @link." - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "የዋዮሚንግ ካውንቲ ፀሐፊን ማግኘት የሚችሉበት መረጃ (PDF) ለማየት እዚህ ጠቅ ያድርጉ" - -msgid "Find out ways to register" -msgstr "እንዴት መመዝገብ እንደሚችሉ ይወቁ " - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "በድረገጽ ምዝገባ በአሁኑ ጊዜ የለም። ለመምረጥ @link @state_name ስቴት የምርጫ ድረገጽ።" - -msgid "Learn more about how to register" -msgstr "እንዴት መመዝገብ እንደሚችሉ ይወቁ" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "አካባቢዎ በሚገኘው የምርጫ ቢሮ በአካል በመገኘት ይመዝገቡ። @link በ@state_name ስቴት የምርጫ ድረገጽ።" - -msgid "Learn more about voting" -msgstr "እንዴት መመዝገብ እንዳለብዎ የበለጠ ይወቁ" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "የመራጮች ምዝገባ አያስፈልግም በ@state_name. @link በ@state_name ስቴት የምርጫ ድረገጽ።" - -msgid "Start or update your registration online" -msgstr "በድረገጽ ላይ ምዝገባዎን ይጀምሩ" - -msgid "@link on @state_name’s election website." -msgstr "@link በ@state_name ስቴት የምርጫ ድረገጽ።" - -msgid "register to vote by mail or in person" -msgstr "በፖስታ ወይም በአካል ለመምረጥ ይመዝገቡ" - -msgid "You can also @link on @state_name’s election website." -msgstr "እርስዎ በተጨማሪ @link ይችላሉ በ@state_name ስቴት የምርጫ ድረገጽ።" - -msgid "confirm your voter registration status" -msgstr "የመራጮች ምዝገባ ሁኔታዎን ያረጋግጡ" - -msgid "You can @link on @state_name’s election website." -msgstr "እርስዎ @link በ@state_name ስቴት የምርጫ ድረገጽ." - msgid "External link opens in new window" msgstr "የውጭ አገናኙ አዲስ ድህረ ገጽ ይከፍታል" diff --git a/web/modules/custom/vote_utility/translations/ar.po b/web/modules/custom/vote_utility/translations/ar.po index d2845dbeb..29d18825f 100644 --- a/web/modules/custom/vote_utility/translations/ar.po +++ b/web/modules/custom/vote_utility/translations/ar.po @@ -116,106 +116,12 @@ msgstr "ابحث عن vote.gov" msgid "Official government website" msgstr "الموقع الالكتروني الرسمي للحكومة" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "سجل للتصويت في @state_name" - -# data.translations.register.heading2 (state phrase updates) -msgid "How to register to vote" -msgstr "كيفية التسجيل للتصويت" - -msgid "How to register and update your registration" -msgstr "كيف تُسجل وتُحدث سجلك الانتخابي" - -# data.translations.register.other_language_selection__heading (state phrase updates) -msgid "Other ways to register to vote" -msgstr "طرق أخرى للتسجيل للتصويت" - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "التسجيل عن طريق البريد الموعد النهائي:" - msgid "Must be postmarked by @date" msgstr "يجب ختمه بالبريد بحلول @date" msgid "Must be received by @date" msgstr "يجب أن يتم استلامه بحلول @date" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "الموعد النهائي للتسجيل عبر الإنترنت:" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "الموعد النهائي للتسجيل الشخصي:" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "المواعيد النهائية لتسجيل الناخبين هي لانتخابات 5 نوفمبر/تشرين الثاني 2024." - -msgid "Find state and local election dates." -msgstr "تعرف على مواعيد الانتخابات على مستوى الولاية والمحليات." - -# data.translations.register.dates__heading (state phrase updates) -msgid "Voter registration deadlines" -msgstr "المواعيد النهائية لتسجيل الناخبين" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "كيفية التحقق من تسجيل الناخبين الخاص بك" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "يمكنك تأكيد حالة تسجيل الناخب الخاص بك عن طريق الاتصال بمكتب التسجيل المحلي. @link." - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "انقر هنا لعرض معلومات الاتصال بموظف مقاطعة وايومنغ (PDF) (باللغة الإنجليزية)" - -# data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "You can @link on @state_name’s election website." -msgstr "يمكنك @link على @state_name موقع انتخابات الولاية" - -# @link: data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "confirm your voter registration status" -msgstr "تأكيد حالة تسجيل الناخب" - -# data.translations.register.by_mail__intro (see accessibility updates) -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "التسجيل عبر الإنترنت غير متاح حاليا. @link للتصويت على @state_name موقع انتخابات الولاية." - -# @link: data.translations.register.by_mail__intro (see accessibility updates) -msgid "Find out ways to register" -msgstr "اكتشف طرق التسجيل" - -# data.translations.register.in_person__intro (see accessibility updates) -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "سجل شخصيًا في مكتب الانتخابات المحلي. @link على @state_name موقع انتخابات الولاية." - -# @link: data.translations.register.in_person__intro (see accessibility updates) -msgid "Learn more about how to register" -msgstr "تعرف على المزيد حول كيفية التسجيل" - -# data.translations.register.not_needed__intro (see accessibility updates) -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "تسجيل الناخبين غير مطلوب في ولاية @state_name. @link على @state_name موقع انتخابات الولاية" - -# @link: data.translations.register.not_needed__intro (see accessibility updates) -msgid "Learn more about voting" -msgstr "تعرف على المزيد حول التصويت" - -# data.translations.register.online__answer1 (see accessibility updates) -msgid "@link on @state_name’s election website." -msgstr "@link على @state_name موقع انتخابات الولاية" - - -# data.translations.register.online__answer2 (see accessibility updates) -msgid "You can also @link on @state_name’s election website." -msgstr "يمكنك أيضًا @link على @state_name موقع انتخابات الولاية" - -# @link: data.translations.register.online__answer2 (see accessibility updates) -msgid "register to vote by mail or in person" -msgstr "التسجيل للتصويت عن طريق البريد أو شخصيًا" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/bn.po b/web/modules/custom/vote_utility/translations/bn.po index 84722687e..146e4a83b 100644 --- a/web/modules/custom/vote_utility/translations/bn.po +++ b/web/modules/custom/vote_utility/translations/bn.po @@ -71,91 +71,12 @@ msgstr "টুইটারে vote.gov অনুসরণ করুন (ইং msgid "Search vote.gov" msgstr "Vote.gov অনুসন্ধান করুন" -#state -msgid "Register to vote in @state_name" -msgstr "@state_name এ ভোট দিতে নিবন্ধন করুন" - -msgid "How to register to vote" -msgstr "ভোট দেওয়ার জন্য কীভাবে নিবন্ধন করবেন" - -msgid "How to register and update your registration" -msgstr "ভোট দেওয়ার জন্য কীভাবে নিবন্ধন করবেন" - -msgid "Other ways to register to vote" -msgstr "ভোট নিবন্ধন করার অন্যান্য উপায়" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "@election_date নির্বাচনের জন্য ভোটার নিবন্ধনের সময়সীমা" - -msgid "Find state and local election dates." -msgstr "" - -msgid "Register by mail deadline:" -msgstr "ডাকযোগে নিবন্ধনের সময়সীমা:" - -msgid "Online registration deadline:" -msgstr "অনলাইন নিবন্ধনের সময়সীমা:" - -msgid "Voter registration deadlines" -msgstr "ভোটার নিবন্ধনের সময়সীমা" - -msgid "In person registration deadline:" -msgstr "ব্যক্তিগতভাবে নিবন্ধনের সময়সীমা:" - -msgid "How to check your voter registration" -msgstr "কীভাবে আপনার ভোটার নিবন্ধন পরীক্ষা করবেন" - -msgid "You can confirm your voter registration status on @link." -msgstr "আপনি আপনার ভোটার রেজিস্ট্রেশন স্ট্যাটাস নিশ্চিত করতে পারেন @link" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "আপনি আপনার স্থানীয় নিবন্ধন অফিসে যোগাযোগ করে আপনার ভোটার নিবন্ধন স্থিতি নিশ্চিত করতে পারেন। @link।" - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Wyoming এর কাউন্টি ক্লার্ক যোগাযোগের তথ্য (PDF) দেখতে এখানে ক্লিকরুন (ইংরেজীতে)" - -msgid "Find out ways to register" -msgstr "নিবন্ধন করার উপায় খুঁজে বের করুন" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "অনলাইন নিবন্ধন বর্তমানে উপলব্ধ নেই. রাজ্য নির্বাচনের ওয়েবসাইটে ভোট দেওয়ার জন্য @link।" - -msgid "Learn more about how to register" -msgstr "কীভাবে নিবন্ধন করবেন সে সম্পর্কে আরও জানুন" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "আপনার স্থানীয় নির্বাচন অফিসে ব্যক্তিগতভাবে নিবন্ধন করুন। রাজ্য নির্বাচনের ওয়েবসাইটে @link।" - -msgid "Learn more about voting" -msgstr "ভোটিং সম্পর্কে আরও জানুন" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "ভার্জিনিয়ায় ভোটার নিবন্ধনের প্রয়োজন নেই। @link রাজ্য নির্বাচনের ওয়েবসাইটে" - -msgid "Start or update your registration online" -msgstr "আপনার অনলাইন নিবন্ধন শুরু করুন" - -msgid "@link on @state_name’s election website." -msgstr "রাজ্য নির্বাচনের ওয়েবসাইটে @link" - -msgid "register to vote by mail or in person" -msgstr "মেইলে বা ব্যক্তিগতভাবে ভোট দিতে নিবন্ধন করতে পারেন" - msgid "Must be postmarked by @date" msgstr "পোস্ট চিহ্ন করা আবশ্যক @date" msgid "Must be received by @date" msgstr "@date এর মধ্যে অবশ্যই গ্রহণ করতে হবে" -msgid "You can also @link on @state_name’s election website." -msgstr "আপনি রাজ্য নির্বাচনের ওয়েবসাইটেও @link" - -msgid "confirm your voter registration status" -msgstr "আপনার ভোটার নিবন্ধন স্থিতি নিশ্চিত করতে পারেন" - -msgid "You can @link on @state_name’s election website." -msgstr "আপনি রাজ্য নির্বাচনের ওয়েবসাইটে @link" - msgid "External link opens in new window" msgstr "বাহ্যিক লিঙ্ক নতুন উইন্ডো খোলে" diff --git a/web/modules/custom/vote_utility/translations/es.po b/web/modules/custom/vote_utility/translations/es.po index 125b932d7..5a2ab3088 100644 --- a/web/modules/custom/vote_utility/translations/es.po +++ b/web/modules/custom/vote_utility/translations/es.po @@ -101,10 +101,6 @@ msgstr "Busque en vote.gov" msgid "Search component" msgstr "Componente de búsqueda" -#state -msgid "Register to vote in @state_name" -msgstr "Regístrese para votar en @state_name" - #state tool aria label msgid "Register to vote selector tool" msgstr "Herramienta selector para registrarse para votar" @@ -113,87 +109,12 @@ msgstr "Herramienta selector para registrarse para votar" msgid "States and territories list" msgstr "Lista de estados y territorios" -msgid "How to register to vote" -msgstr "Cómo registrarse para votar" - -msgid "How to register and update your registration" -msgstr "Cómo registrarse y poner al día su registro" - -msgid "Other ways to register to vote" -msgstr "Otras formas de registrarse para votar" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Los plazos para el registro de votantes son para las elecciones del @election_date. @link" - -msgid "Find state and local election dates." -msgstr "Encuentre las fechas de las elecciones locales y estatales." - -msgid "Register by mail deadline:" -msgstr "Registrarse por correo postal:" - msgid "Must be postmarked by @date" msgstr "Debe tener el sello postal a más tardar el @date" msgid "Must be received by @date" msgstr "Debe ser recibido a más tardar el @date" -msgid "Online registration deadline:" -msgstr "Inscripción por internet:" - -msgid "Voter registration deadlines" -msgstr "Plazos para el registro de votantes" - -msgid "In person registration deadline:" -msgstr "Registrarse en persona:" - -msgid "How to check your voter registration" -msgstr "Cómo comprobar su registro de votante" - -msgid "You can confirm your voter registration status on @link." -msgstr "Usted puede comprobar el estado de su registro de votante en @link." - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Usted puede confirmar el estado de su inscripción de votante comunicándose con su oficina de registro local. @link." - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Haga clic aquí para ver la información de contacto de los secretarios de los condados de Wyoming" - -msgid "Find out ways to register" -msgstr "Encuentre cómo inscribirse" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "La inscripción en línea no está disponible actualmente. @link para votar, visitando el sitio web de elecciones estatales de @state_name." - -msgid "Learn more about how to register" -msgstr "Para más información sobre cómo inscribirse" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Inscríbase en persona en su oficina electoral local. @link, visite el sitio web de elecciones estatales de @state_name." - -msgid "Learn more about voting" -msgstr "Para más información sobre la votación" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "En @state_name no es obligatorio inscribirse para votar. @link, visite el sitio web de elecciones estatales de @state_name." - -msgid "Start or update your registration online" -msgstr "Empiece o ponga al día su registro en línea" - -msgid "@link on @state_name’s election website." -msgstr "@link en el sitio web de elecciones estatales de @state_name." - -msgid "register to vote by mail or in person" -msgstr "inscribirse para votar por correo o en persona" - -msgid "You can also @link on @state_name’s election website." -msgstr "Usted también puede @link en el sitio web de elecciones estatales de @state_name." - -msgid "confirm your voter registration status" -msgstr "verificar el estado de su inscripción en el registro electoral" - -msgid "You can @link on @state_name’s election website." -msgstr "Usted puede @link en el sitio web de elecciones estatales de @state_name." - msgid "External link opens in new window" msgstr "El enlace externo se abre en una nueva ventana" @@ -203,15 +124,6 @@ msgstr "Ir al contenido principal" msgid "(in English)" msgstr "(en inglés)" -msgid "Register to vote selector tool" -msgstr "Herramienta selector para registrarse para votar" - -msgid "Select your state or territory" -msgstr "Seleccione su estado o territorio" - -msgid "States and territories list" -msgstr "Lista de sugerencias de estados y territorios" - #banner msgid "Official government website" msgstr "Sitio web oficial del gobierno" diff --git a/web/modules/custom/vote_utility/translations/fr.po b/web/modules/custom/vote_utility/translations/fr.po index 66b75e618..bcd2c3cce 100644 --- a/web/modules/custom/vote_utility/translations/fr.po +++ b/web/modules/custom/vote_utility/translations/fr.po @@ -155,118 +155,20 @@ msgstr "Drapeau américain" msgid "External election resources" msgstr "Liens électoraux" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "Inscrivez-vous pour voter @in_state_name" - -# data.translations.register.heading2 (state phrase updates) -msgid "How to register to vote" -msgstr "Comment vous inscrire pour voter" - -msgid "How to register and update your registration" -msgstr "Comment vous inscrire et mettre à jour votre inscription" - -# data.translations.register.other_language_selection__heading (state phrase updates) -msgid "Other ways to register to vote" -msgstr "Autres façons de vous inscrire au vote" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Les dates limites d'inscription de vote sont pour l'élection du @election_date. @link" - -msgid "Find state and local election dates." -msgstr "Trouvez les dates des élections étatiques et locales" - -msgid "Start or update your registration online" -msgstr "Commencez ou mettez à jour votre inscription" - # data.translations.state_tool_aria_label msgid "Register to vote selector tool" msgstr "Outil de sélection pour l'inscription de vote" -msgid "Select your state or territory" -msgstr "Sélectionnez votre État ou territoire" - # data.translations.state_list_aria_label msgid "States and territories list" msgstr "Liste de suggestions pour les États et territoires" -msgid "Find state and local election dates." -msgstr "Trouvez les dates des élections étatiques et locales." - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "La date limite d'inscription par courrier:" - msgid "Must be postmarked by @date" msgstr "Au plus tard @date avec un cachet de la poste faisant foi" msgid "Must be received by @date" msgstr "Doit être reçu au plus tard @date" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "La date limite d'inscription en ligne:" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "La date limite d'inscription en personne:" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "Comment vérifier votre inscription au vote" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Vous pouvez confirmer le statut de votre inscription au vote en contactant votre bureau local d'inscription. @link." - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Cliquez ici pour les coordonnées du greffier de comté du Wyoming (PDF) (en anglais)" - -# data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "You can @link on @state_name’s election website." -msgstr "Vous pouvez @link au site Web électoral @of_state_name." - -# @link: data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "confirm your voter registration status" -msgstr "confirmer votre statut d'inscription au vote" - -# data.translations.register.by_mail__intro (see accessibility updates) -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "L'inscription en ligne est temporairement indisponible. @link pour voter en allant au site Web électoral @of_state_name." - -# @link: data.translations.register.by_mail__intro (see accessibility updates) -msgid "Find out ways to register" -msgstr "Découvrez comment vous inscrire" - -# data.translations.register.in_person__intro (see accessibility updates) -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Inscrivez-vous en personne à votre bureau électoral local. @link au site Web électoral @of_state_name." - -# @link: data.translations.register.in_person__intro (see accessibility updates) -msgid "Learn more about how to register" -msgstr "En savoir plus sur l'inscription" - -# data.translations.register.not_needed__intro (see accessibility updates) -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "L'inscription au vote n'est pas obligatoire @in_state_name. @link au site Web électoral @of_state_name." - -# @link: data.translations.register.not_needed__intro (see accessibility updates) -msgid "Learn more about voting" -msgstr "En savoir plus sur le vote" - -# data.translations.register.online__answer1 (see accessibility updates) -msgid "@link on @state_name’s election website." -msgstr "@link au site Web électoral @of_state_name." - -# data.translations.register.online__answer2 (see accessibility updates) -msgid "You can also @link on @state_name’s election website." -msgstr "Vous pouvez aussi @link au site Web électoral @of_state_name." - -# @link: data.translations.register.online__answer2 (see accessibility updates) -msgid "register to vote by mail or in person" -msgstr "vous inscrire pour voter par courrier ou en personne" - # Temporary military and overseas voter cards msgid "Voting as a military service member" msgstr "Voter en tant que membre de militaire" @@ -366,4 +268,4 @@ msgid "Saturday" msgstr "samedi" msgid "Know your voting rights" -msgstr "Connaissez vos droits de vote" \ No newline at end of file +msgstr "Connaissez vos droits de vote" diff --git a/web/modules/custom/vote_utility/translations/hi.po b/web/modules/custom/vote_utility/translations/hi.po index 2724db52e..1d4bff805 100644 --- a/web/modules/custom/vote_utility/translations/hi.po +++ b/web/modules/custom/vote_utility/translations/hi.po @@ -79,92 +79,12 @@ msgstr "Vote.gov को X पर फ़ॉलो करें (अंग्रे msgid "Search vote.gov" msgstr "Vote.gov पर खोजें" -#state -msgid "Register to vote in @state_name" -msgstr "@state_name में मतदान करने के लिए पंजीकरण करें" - -msgid "How to register to vote" -msgstr "मतदान करने के लिए पंजीकरण कैसे करें" - -msgid "How to register and update your registration" -msgstr "मतदान करने के लिए पंजीकरण कैसे करें" - -msgid "Other ways to register to vote" -msgstr "मतदान के लिए पंजीकरण करने के अन्य तरीके" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "@election_date चुनाव के लिए मतदाता पंजीकरण की समय सीमा" - -msgid "Find state and local election dates." -msgstr "" - -msgid "Register by mail deadline:" -msgstr "डाक द्वारा पंजीकरण की अंतिम तिथि:" - msgid "Must be postmarked by @date" msgstr "@date तक पोस्टमार्क होना चाहिए" msgid "Must be received by @date" msgstr "@date तक पहुँच जाना चाहिए" -msgid "Online registration deadline:" -msgstr "ऑनलाइन पंजीकरण की अंतिम तिथि:" - -msgid "Voter registration deadlines" -msgstr "मतदाता पंजीकरण की अंतिम तारीख़ें" - -msgid "In person registration deadline:" -msgstr "व्यक्तिगत रूप से पंजीकरण की अंतिम तिथि:" - -msgid "How to check your voter registration" -msgstr "अपने मतदाता पंजीकरण की जांच कैसे करें" - -msgid "You can confirm your voter registration status on @link." -msgstr "आप @link पर अपने मतदाता पंजीकरण की स्थिति की पुष्टि कर सकते हैं।" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "आप अपने स्थानीय पंजीकरण कार्यालय से संपर्क करके अपने मतदाता पंजीकरण की स्थिति की पुष्टि कर सकते हैं। @link" - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "(व्योमिंग के काउंटी क्लर्क की संपर्क जानकारी (पीडीएफ) देखने के लिए यहां क्लिक करें) (अंग्रेज़ी में)।" - -msgid "Find out ways to register" -msgstr "पंजीकरण करने के तरीकों के बारे में जानकारी प्राप्त करें" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "ऑनलाइन पंजीकरण अभी उपलब्ध नहीं है। @state_name राज्य की चुनाव वेबसाइट पर मतदान करने के लिए @link।" - -msgid "Learn more about how to register" -msgstr "पंजीकरण करने की विधि के बारे में अधिक जानकारी प्राप्त करें" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "अपने स्थानीय चुनाव कार्यालय में व्यक्तिगत रूप से पंजीकरण करें। @state_name राज्य की चुनाव वेबसाइट पर @link।" - -msgid "Learn more about voting" -msgstr "मतदान के बारे में अधिक जानकारी प्राप्त करें" - - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "वर्जीनिया में मतदाता पंजीकरण की आवश्यकता नहीं है। @state_name राज्य की चुनाव वेबसाइट पर @link।" - -msgid "Start or update your registration online" -msgstr "अपना ऑनलाइन पंजीकरण शुरू करें" - -msgid "@link on @state_name’s election website." -msgstr "@state_name राज्य की चुनाव वेबसाइट पर @link।" - -msgid "register to vote by mail or in person" -msgstr "डाक या व्यक्तिगत रूप से मतदान करने के लिए पंजीकरण" - -msgid "You can also @link on @state_name’s election website." -msgstr "आप @state_name राज्य की चुनाव वेबसाइट पर @link भी कर सकते हैं।" - -msgid "confirm your voter registration status" -msgstr "अपनी मतदाता पंजीकरण की स्थिति की पुष्टि" - -msgid "You can @link on @state_name’s election website." -msgstr "आप @state_name राज्य की चुनाव वेबसाइट पर @link कर सकते हैं।" - msgid "External link opens in new window" msgstr "बाहरी लिंक नई विंडो खोलता है" diff --git a/web/modules/custom/vote_utility/translations/ht.po b/web/modules/custom/vote_utility/translations/ht.po index 7d301a45b..3c1c5b1c1 100644 --- a/web/modules/custom/vote_utility/translations/ht.po +++ b/web/modules/custom/vote_utility/translations/ht.po @@ -119,112 +119,12 @@ msgstr "Fè rechèch sou vote.gov" msgid "Official government website" msgstr "Sit entènèt ofisyèl gouvènman an" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "Enskri pou vote nan @state_name" - -# data.translations.register.heading2 (state phrase update) -msgid "How to register to vote" -msgstr "Kijan pou enskri pou vote" - -msgid "How to register and update your registration" -msgstr "Kijan pou enskri epi mete enskripsyon w ajou" - -msgid "Start or update your online registration" -msgstr "Demare oswa mete enskripsyon anliy ou ajou" - -# data.translations.register.other_language_selection__heading (state phrase update) -msgid "Other ways to register to vote" -msgstr "Lòt fason pou enskri pou vote" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Dat limit pou enskripsyon votè se pou eleksyon la @election_date. @link" - -msgid "Find state and local election dates." -msgstr "Jwenn dat eleksyon Eta ak lokal yo." - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "Dat limit enskripsyon pa korespondans:" - msgid "Must be postmarked by @date" msgstr "Dwe gen so lapòs pou pita nan dat k ap @date" msgid "Must be received by @date" msgstr "Dwe rive pou pita @date" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "Dat limit enskripsyon anliy:" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "Dat limit enskripsyon an pèsòn:" - -# data.translations.register.dates__heading (state phrase update) -msgid "Voter registration deadlines" -msgstr "Dat limit pou votè yo enskri" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "Kijan pou tcheke enskripsyon votè w" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Ou ka konfime nan ki pwen enskripsyon votè w te fè a rive, lè w antre an kontak avèk biwo enskripsyon lokal ou a. @link." - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Klike la a pou w wè enfòmasyon pou kontakte grefye Konte Wyoming la (PDF) (ann Anglè)" - -# data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "You can @link on @state_name’s election website." -msgstr "Ou kapab @link sou sit entènèt eleksyon Eta w la @state_name " - -# @link: data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "confirm your voter registration status" -msgstr "konfime estati enskripsyon elektè w la" - -# data.translations.register.by_mail__intro (see accessibility updates) -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "Enskripsyon anliy pa disponib kounye a. @link pou vote sou sit entènèt eleksyon Eta w la @state_name." - -# @link: data.translations.register.by_mail__intro (see accessibility updates) -msgid "Find out ways to register" -msgstr "Chache fason pou w enskri" - -# data.translations.register.in_person__intro (see accessibility updates) -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Al enskri an pèsòn nan biwo eleksyon lokal ou. @link sou sit entènèt eleksyon Eta w la @state_name." - -# @link: data.translations.register.in_person__intro (see accessibility updates) -msgid "Learn more about how to register" -msgstr "Jwenn plis enfòmasyon sou fason pou w enskri" - -# data.translations.register.not_needed__intro (see accessibility updates) -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "Enskripsyon pou elektè pa obligatwa nan @state_name. @link sou sit wèb eleksyon Eta w la @state_name" - -# @link: data.translations.register.not_needed__intro (see accessibility updates) -msgid "Learn more about voting" -msgstr "Aprann plis sou pwosesis vòt la" - -# data.translations.register.online__answer1 (see accessibility updates) -msgid "@link on @state_name’s election website." -msgstr "@link sou sit wèb eleksyon Eta w la sou @state_name" - -# @link: data.translations.register.online__answer1 (see accessibility updates) -msgid "Start or update your registration online" -msgstr "Kòmanse enskripsyon ou anliy" - -# data.translations.register.online__answer2 (see accessibility updates) -msgid "You can also @link on @state_name’s election website." -msgstr "Ou kapab @link sou sit entènèt eleksyon Eta w la @state_name" - -# @link: data.translations.register.online__answer2 (see accessibility updates) -msgid "register to vote by mail or in person" -msgstr "enskri pou vote tou pa lapòs oswa an pèsòn" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/ja.po b/web/modules/custom/vote_utility/translations/ja.po index 48ceae07b..801333775 100644 --- a/web/modules/custom/vote_utility/translations/ja.po +++ b/web/modules/custom/vote_utility/translations/ja.po @@ -112,109 +112,12 @@ msgstr "vote.gov (英語)検索" msgid "Official government website" msgstr "政府の公式ウェブサイト" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "@state_name(州名)で投票登録" - -# data.translations.register.heading2 (state phrase updates) -msgid "How to register to vote" -msgstr "有権者登録の方法" - -msgid "How to register and update your registration" -msgstr "登録および登録の更新方法" - -# data.translations.register.other_language_selection__heading (state phrase updates) -msgid "Other ways to register to vote" -msgstr "その他の有権者登録方法" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "@election_dateの選挙における有権者登録の締切について @link" - -msgid "Find state and local election dates." -msgstr "州および地方選挙の日程を調べる" - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "郵送での登録締切:" - msgid "Must be postmarked by @date" msgstr "@date 消印有効" msgid "Must be received by @date" msgstr "@date 必着" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "オンライン登録の締め切り:" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "来場登録の締め切り:" - -# data.translations.register.dates__heading (state phrase updates) -msgid "Voter registration deadlines" -msgstr "有権者登録の締め切り" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "有権者登録を確認する方法" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "あなたの有権者登録状況は、最寄りの登録事務所に問い合わせることで確認できます。@link。" - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Wyoming州郡庁の連絡先(PDF)はこちらをクリックしてください" - -# data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "You can @link on @state_name’s election website." -msgstr "@state_name(州名)の州選挙ウェブサイトで @link を行うことができます。" - -# @link: data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "confirm your voter registration status" -msgstr "有権者登録の確認は" - -# data.translations.register.by_mail__intro (see accessibility updates) -msgid "Online registration is currently not available. @link を使用して @state_name の選挙ウェブサイトで投票してください" -msgstr "オンライン登録は現在ご利用いただけません。投票登録の方法については、(state_name(州名)の選挙ウェブサイト)(英語)をご覧ください。" - -# @link: data.translations.register.by_mail__intro (see accessibility updates) -msgid "Find out ways to register" -msgstr "選挙人登録する方法を見つけるには" - -# data.translations.register.in_person__intro (see accessibility updates) -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "最寄りの選挙事務所に直接来場して登録しましょう。@link は@state_name (州名)の州選挙ウェブサイトをご覧ください。" - -# @link: data.translations.register.in_person__intro (see accessibility updates) -msgid "Learn more about how to register" -msgstr "登録方法については" - -# data.translations.register.not_needed__intro (see accessibility updates) -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "@state_nameでは有権者登録は必要ありません。@link は@state_name(州名)の州選挙のウェブサイトをご覧ください。" - -# @link: data.translations.register.not_needed__intro (see accessibility updates) -msgid "Learn more about voting" -msgstr "投票についての詳細は" - -# data.translations.register.online__answer1 (see accessibility updates) -msgid "@link on @state_name’s election website." -msgstr "@link は@state_name(州名)の州選挙のウェブサイトをご覧ください。" - -# @link: data.translations.register.online__answer1 (see accessibility updates) -msgid "Start or update your registration online" -msgstr "登録を開始または更新する" - -# data.translations.register.online__answer2 (see accessibility updates) -msgid "You can also @link on @state_name’s election website." -msgstr "また、@link は@state_name(州名)の州選挙ウェブサイトからでもできます。" - -# @link: data.translations.register.online__answer2 (see accessibility updates) -msgid "register to vote by mail or in person" -msgstr "郵送または直接来場して投票登録" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/km.po b/web/modules/custom/vote_utility/translations/km.po index 5b34bf8b8..8c6ef56ef 100644 --- a/web/modules/custom/vote_utility/translations/km.po +++ b/web/modules/custom/vote_utility/translations/km.po @@ -71,91 +71,12 @@ msgstr "តាមដាន vote.gov នៅលើ X (ជាភាសាអង់ msgid "Search vote.gov" msgstr "ស្រាវជ្រាវរក vote.gov" -#state -msgid "Register to vote in @state_name" -msgstr "ចុះឈ្មោះដើម្បីបោះឆ្នោតនៅរដ្ឋ @state_name" - -msgid "How to register to vote" -msgstr "របៀបចុះឈ្មោះដើម្បីបោះឆ្នោត" - -msgid "How to register and update your registration" -msgstr "របៀបចុះឈ្មោះដើម្បីបោះឆ្នោត" - -msgid "Other ways to register to vote" -msgstr "វិធីផ្សេងៗទៀតដើម្បីចុះឈ្មោះបោះឆ្នោត" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "ថ្ងៃផុតកំណត់នៃការចុះឈ្មោះឣ្នកបោះឆ្នោតសម្រាប់ការបោះឆ្នោត @election_date" - -msgid "Find state and local election dates." -msgstr "" - -msgid "Register by mail deadline:" -msgstr "ថ្ងៃផុតកំណត់ចុះឈ្មោះតាមសំបុត្រ៖" - msgid "Must be postmarked by @date" msgstr "ត្រូវតែបានបិទតែមប្រៃសណីយ៍ត្រឹមថ្ @date" msgid "Must be received by @date" msgstr "ត្រូវតែបានទទួលត្រឹមថ្ @date" -msgid "Online registration deadline:" -msgstr "ថ្ងៃផុតកំណត់ការចុះឈ្មោះអនឡាញ៖" - -msgid "Voter registration deadlines" -msgstr "កាលបរិច្ឆេទផុតកំណត់ការចុះឈ្មោះឣ្នកបោះឆ្នោត" - -msgid "In person registration deadline:" -msgstr "ថ្ងៃផុតកំណត់ការចុះឈ្មោះដោយមកផ្ទាល់៖" - -msgid "How to check your voter registration" -msgstr "ររបៀបពិនិត្យមើលការចុះឈ្មោះឣ្នកបោះឆ្នោតរបស់ឣ្នក" - -msgid "You can confirm your voter registration status on @link." -msgstr "អ្នកអាចបញ្ជាក់ស្ថានភាពការចុះឈ្មោះអ្នកបោះឆ្នោតរបស់អ្នកនៅលើ @link" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "អ្នកអាចបញ្ជាក់ស្ថានភាពការចុះឈ្មោះបោះឆ្នោតរបស់អ្នកដោយទំនាក់ទំនងទៅការិយាល័យផ្នែកចុឈ្មោះក្នុងមូលដ្ឋានរបស់អ្នក។ @link។" - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr " ចុចទីនេះដើម្បីមើលព័ត៌មានទំនាក់ទំនងទៅស្មៀនប្រចាំខោនធីរបស់រដ្ឋ Wyoming (PDF) (ជាភាសាអង់គ្លេស)" - -msgid "Find out ways to register" -msgstr "ស្វែងរកវិធីនានាដើម្បីចុះឈ្មោះ" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "ការចុះឈ្មោះតាមអ៊ីនធឺណិតបច្ចុប្បន្នមិនមានទេ។ @link ដើម្បីបោះឆ្នោតនៅលើគេហទំព័របោះឆ្នោតរដ្ឋរបស់ @state_name។" - -msgid "Learn more about how to register" -msgstr "ស្វែងយល់បន្ថែមអំពីរបៀបចុះឈ្មោះ" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "ចុះឈ្មោះដោយផ្ទាល់នៅការិយាល័យបោះឆ្នោតក្នុងតំបន់របស់អ្នក។ @link នៅលើគេហទំព័របោះឆ្នោតរដ្ឋរបស់ @state_name។" - -msgid "Learn more about voting" -msgstr "ស្វែងយល់បន្ថែមអំពីការបោះឆ្នោត" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "ការចុះឈ្មោះបោះឆ្នោតមិនត្រូវបានទាមទារនៅក្នុងរដ្ឋ @state_name ទេ។ @link នៅលើគេហទំព័របោះឆ្នោតរដ្ឋរបស់ @state_name" - -msgid "Start or update your registration online" -msgstr "ចាប់ផ្តើមការចុះឈ្មោះតាមអ៊ីនធឺណិតរបស់អ្នក" - -msgid "@link on @state_name’s election website." -msgstr "@link នៅលើគេហទំព័របោះឆ្នោតរដ្ឋរបស់ @state_name" - -msgid "register to vote by mail or in person" -msgstr "ចុះឈ្មោះបោះឆ្នោតតាមសំបុត្រ ឬដោយផ្ទាល់" - -msgid "You can also @link on @state_name’s election website." -msgstr "អ្នកក៏អាច @link នៅលើគេហទំព័របោះឆ្នោតរដ្ឋរបស់ @state_name" - -msgid "confirm your voter registration status" -msgstr "បញ្ជាក់ស្ថានភាពចុះឈ្មោះអ្នកបោះឆ្នោតរបស់អ្នក" - -msgid "You can @link on @state_name’s election website." -msgstr "អ្នកអាច @link នៅលើគេហទំព័របោះឆ្នោតរដ្ឋរបស់ @state_name" - msgid "External link opens in new window" msgstr "តំណខាងក្រៅបើកផ្ទាំងបង្ឣួចថ្មី" diff --git a/web/modules/custom/vote_utility/translations/ko.po b/web/modules/custom/vote_utility/translations/ko.po index bcf8429a3..5cde40dd2 100644 --- a/web/modules/custom/vote_utility/translations/ko.po +++ b/web/modules/custom/vote_utility/translations/ko.po @@ -74,91 +74,12 @@ msgstr "vote.gov 사이트 트위터 팔로우하기 (영어로 제공)" msgid "Search vote.gov" msgstr "vote.gov 사이트 검색" -#state -msgid "Register to vote in @state_name" -msgstr "@state_name 유권자 등록 안내 " - -msgid "How to register to vote" -msgstr "유권자 등록 방법" - -msgid "How to register and update your registration" -msgstr "유권자 등록 방법" - -msgid "Other ways to register to vote" -msgstr "기타 유권자 등록 방법" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "@election_date 선거 유권자 등록 마감일" - -msgid "Find state and local election dates." -msgstr "" - -msgid "Register by mail deadline:" -msgstr "우편 투표자 등록 마감일:" - msgid "Must be postmarked by @date" msgstr "반드시 @date 까지 소인이 찍혀야 합니다." msgid "Must be received by @date" msgstr "반드시 @date 까지 접수되어야 합니다." -msgid "Online registration deadline:" -msgstr "온라인 등록 마감일:" - -msgid "Voter registration deadlines" -msgstr "유권자 등록 마감일" - -msgid "In person registration deadline:" -msgstr "직접 투표자 등록 마감일: " - -msgid "How to check your voter registration" -msgstr "유권자 등록 정보 확인 방법 안내" - -msgid "You can confirm your voter registration status on @link." -msgstr "@link." - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "귀하의 유권자 등록 상태는 지역 등록 사무소에 연락하여 확인할 수 있습니다. @link." - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "와이오밍 카운티 기록 보관 사무소 연락처는 여기를 클릭하십시오 (PDF파일) (영어로 제공)" - -msgid "Find out ways to register" -msgstr "등록 방법 검색하기" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "현재는 온라인 등록이 불가합니다. 투표를 하시려면 @state_name 선거 사무국 웹사이트에서 @link를 이용하시기 바랍니다." - -msgid "Learn more about how to register" -msgstr "등록 방법에 대해 자세히 알아보기" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "귀하가 거주하는 지역의 선거 사무소를 직접 방문하여 등록하시기 바랍니다. @state_name 선거국 웹사이트에서 @link를 이용하시기 바랍니다." - -msgid "Learn more about voting" -msgstr "투표에 대해 자세히 알아보기" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "@state_name 는 유권자 등록이 필요하지 않습니다. @state_name 선거국 웹사이트에서 @link를 이용하시기 바랍니다." - -msgid "Start or update your registration online" -msgstr "온라인 등록 시작하기" - -msgid "@link on @state_name’s election website." -msgstr " @state_name 선거국 웹사이트에서 @link를 이용하시기 바랍니다." - -msgid "register to vote by mail or in person" -msgstr "우편 우표 또는 직접 투표 등록하기" - -msgid "You can also @link on @state_name’s election website." -msgstr "@state_name 선거국 웹사이트에서 @link를 선택하실 수 있습니다." - -msgid "confirm your voter registration status" -msgstr "유권자 등록 상태 확인하기" - -msgid "You can @link on @state_name’s election website." -msgstr "@state_name 선거국 웹사이트에서 @link를 하실 수 있습니다." - msgid "External link opens in new window" msgstr "외부 링크 사이트는 새 창에서 연결됩니다" diff --git a/web/modules/custom/vote_utility/translations/nv.po b/web/modules/custom/vote_utility/translations/nv.po index 60d61b75c..1cfb6a606 100644 --- a/web/modules/custom/vote_utility/translations/nv.po +++ b/web/modules/custom/vote_utility/translations/nv.po @@ -112,104 +112,12 @@ msgstr "Vote.gov hanit1h" msgid "Official government website" msgstr "Naat'1anii al1adi7g77 bi-website" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "Ha'did77l77[ i'ii'n77[ biniiy4 @state_name" - -# data.translations.register.heading2 -msgid "How to register to vote" -msgstr "E'et'11d haayit'4ego b1 hazh'dii['88h" - -msgid "How to register and update your registration" -msgstr "E'et'11d haayit'4ego b1 hazh'dii['88h" - - -# data.translations.register.other_language_selection__heading -msgid "Other ways to register to vote" -msgstr "N11n1 [ah 1t'4ego e'et'11d b1 hazh'didool7[7g77" - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "Naaltsoos nin1h1jeehd00 ha'd7l44hgo koj8' b1 ah00t'i':" - msgid "Must be postmarked by @date" msgstr "Naaltsoos nin1h1jeehd00 bik'ini'7t'32 doolee[ @date" msgid "Must be received by @date" msgstr "Kwe'4 yoo[k11[go n7didooltsos @date" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "B44sh [ich7'ii bee ha'd7l44hgo koj8' b1 ah00t'i':" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "I'ii'n77[ biniiy4 yah ajigh11hgo ha'dilne' bee nihoolzh77sh" - -# data.translations.register.dates__heading -msgid "Voter registration deadlines" -msgstr "E'et'11d b1 ha'diln4h7g77 bee e'e'aah g0ne'" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "Hait'1o i'ii'n77[ biniiy4 hazh'dii['88h7g77 han7t1h" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "I'ii'n77[ biniiy4 ha'dinilaago k44hon7t'98gi i'ii'n77[ bi[ na'anishgi b7na'7d7[kid. @link" - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Kwe'4 bi[ ad7lch77d Wyoming hahoodzohj7 county clerk woly4ego bi[ da'7n77shj7 hane' <PDF> d7n77['88[go <Bilag1ana k'ehj7>" - -# data.translations.register.confirm_registration__intro -msgid "You can @link on @state_name’s election website." -msgstr "@link i'ii'n77[ bi[ haz'32gi bi-website-gi @state_name d7n77['88[." - -# @link: data.translations.register.confirm_registration__intro -msgid "confirm your voter registration status" -msgstr "E'et'11d biniy4 b1 ha'dinil1ago baa nid7n4eshtaa[ n7n7zingo" - -# data.translations.register.by_mail__intro -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "B44sh [ich7'ii nits7kees7 biyi'j8' e'doot'a[ biniy4 hazh'didool7[7g77 47 k'ad 1din. @link e'doot'a[ biniy4 h0tsaago hahoodzo bi-website-gi @state_name" - -# @link: data.translations.register.by_mail__intro -msgid "Find out ways to register" -msgstr "Haadayit'4ego hazh'di'dool7[7g77 han7t1" - -# data.translations.register.in_person__intro -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "T'11 ni[ haz'1n7gi yah ad77n1a[go ha'di'd77l77[. @link h0tsaago hahoodzo bi-website-gi @state_name." - -# @link: data.translations.register.in_person__intro -msgid "Learn more about how to register" -msgstr "E'et'11d biniy4 ha'diln4h7g77 hazh0'0 b7hoo['aah" - -# data.translations.register.not_needed__intro -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "@state_name biyi' e'et'11d b1 hada'dilne'7g77 doo bee haz'32 da. @link h0tsaago hahoodzo bi-website-gi @state_name." - -# @link: data.translations.register.not_needed__intro -msgid "Learn more about voting" -msgstr "I'ii'n77[ hazh0'0 b7hoo['aah" - -# data.translations.register.online__answer1 -msgid "@link on @state_name’s election website." -msgstr "@link h0tsaago hahoodzo i'ii'n77[ bi[ haz'32gi bi-website-gi @state_name." - -# @link: data.translations.register.online__answer1 -msgid "Start or update your registration online" -msgstr "B44sh [ich7'ii nits7kees7 biyi'j8' hada'diln4h7g77 bee ha'd7l44h" - -# data.translations.register.online__answer2 -msgid "You can also @link on @state_name’s election website." -msgstr "N11na a[d0' @link h0tsaago hahoodzo i'ii'n77[ bi[ haz'32gi bi-website-gi @state_name." - -# @link: data.translations.register.online__answer2 -msgid "register to vote by mail or in person" -msgstr "naaltsoos naanin1h1jeehgi 47 doodago t'11 ni yah anin1ahgo e'et'11d biniy4 ha'd7l44h" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/pt.po b/web/modules/custom/vote_utility/translations/pt.po index a5ff798d6..fa4a296d9 100644 --- a/web/modules/custom/vote_utility/translations/pt.po +++ b/web/modules/custom/vote_utility/translations/pt.po @@ -119,109 +119,12 @@ msgstr "Pesquisar vote.gov" msgid "Official government website" msgstr "Página web oficial do governo" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "Registrar-se para votar em @state_name" - -# data.translations.register.heading2 (state phrase updates) -msgid "How to register to vote" -msgstr "Como registrar-se para votar" - -msgid "How to register and update your registration" -msgstr "Como registrar-se para votar" - -# data.translations.register.other_language_selection__heading (state phrase updates) -msgid "Other ways to register to vote" -msgstr "Outras maneiras de registrar-se para votar" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Prazos para registro de eleitores para a eleição de @election_date" - -msgid "Find state and local election dates." -msgstr "" - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "Prazo final para registrar-se por correspondência:" - msgid "Must be postmarked by @date" msgstr "Deve estar carimbado até o @date" msgid "Must be received by @date" msgstr "Deve ser recebido até o @date" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "Prazo final para registrar-se on-line:" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "Prazo final de registro em pessoa:" - -# data.translations.register.dates__heading (state phrase updates) -msgid "Voter registration deadlines" -msgstr "Os prazos de registro de eleitores" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "Como você pode verificar seu registro de eleitor" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Você pode confirmar seu status de registro de eleitor entrando em contato com o cartório de registro local. @link." - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Clique aqui para ver as informações de contato do secretário do condado de Wyoming (PDF) (em inglês)" - -# data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "You can @link on @state_name’s election website." -msgstr "Também pode @link na página web de eleição estadual do @state_name" - -# @link: data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "confirm your voter registration status" -msgstr "confirmar o status do seu registro de eleitor" - -# data.translations.register.by_mail__intro (see accessibility updates) -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "O registro on-line não está disponível no momento. @link para votar na página web de eleição estadual do @state_name." - -# @link: data.translations.register.by_mail__intro (see accessibility updates) -msgid "Find out ways to register" -msgstr "Descubra maneiras de registrar-se" - -# data.translations.register.in_person__intro (see accessibility updates) -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Registre-se em pessoa no seu escritório de eleições local. @link na página web de eleição estadual do @state_name." - -# @link: data.translations.register.in_person__intro (see accessibility updates) -msgid "Learn more about how to register" -msgstr "Aprenda mais sobre como registrar-se" - -# data.translations.register.not_needed__intro (see accessibility updates) -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "O registro de eleitores não é mandatório em @state_name. @link na página web de eleição estadual de @state_name." - -# @link: data.translations.register.not_needed__intro (see accessibility updates) -msgid "Learn more about voting" -msgstr "Aprenda mais sobre a votação" - -# data.translations.register.online__answer1 (see accessibility updates) -msgid "@link on @state_name’s election website." -msgstr "@link na página web de eleição estadual do @state_name" - -# @link: data.translations.register.online__answer1 (see accessibility updates) -msgid "Start or update your registration online" -msgstr "Comece o seu registro on-line" - -# data.translations.register.online__answer2 (see accessibility updates) -msgid "You can also @link on @state_name’s election website." -msgstr "Também pode @link na página web de eleição estadual do @state_name" - -# @link: data.translations.register.online__answer2 (see accessibility updates) -msgid "register to vote by mail or in person" -msgstr "registrar-se para votar por correspondência ou em pessoa" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/ru.po b/web/modules/custom/vote_utility/translations/ru.po index 2f37bf6ed..94db078f7 100644 --- a/web/modules/custom/vote_utility/translations/ru.po +++ b/web/modules/custom/vote_utility/translations/ru.po @@ -112,109 +112,12 @@ msgstr "Поиск vote.gov" msgid "Official government website" msgstr "Официальный правительственный сайт" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "Зарегистрируйтесь для голосования в @state_name" - -# data.translations.register.heading2 (state phrase updates) -msgid "How to register to vote" -msgstr "Как зарегистрироваться для голосования" - -msgid "How to register and update your registration" -msgstr "Как зарегистрироваться для голосования" - -# data.translations.register.other_language_selection__heading (state phrase updates) -msgid "Other ways to register to vote" -msgstr "Другие способы зарегистрироваться для голосования" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Крайние сроки регистрации избирателей на выборы @election_date" - -msgid "Find state and local election dates." -msgstr "" - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "Крайний срок регистрации по почте:" - msgid "Must be postmarked by @date" msgstr "Должен иметь почтовый штемпель до @date" msgid "Must be received by @date" msgstr "Должен быть получен до @date" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "Крайний срок регистрации он-лайн:" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "Крайний срок личной регистрации:" - -# data.translations.register.dates__heading (state phrase updates) -msgid "Voter registration deadlines" -msgstr "Крайние сроки регистрации избирателей" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "Как проверить вашу регистрацию избирателя" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Вы можете подтвердить свой статус регистрации избирателя, связавшись с местным регистрационным офисом. @link." - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Нажмите здесь, чтобы просмотреть контактную информацию клерка округа Вайоминг (PDF) (по-английски)" - -# data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "You can @link on @state_name’s election website." -msgstr "Вы можете @link на веб-сайте выборов штата @state_name" - -# @link: data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "confirm your voter registration status" -msgstr "подтвердить свой статус регистрации избирателя" - -# data.translations.register.by_mail__intro (see accessibility updates) -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "Онлайн-регистрация в настоящее время недоступна. @link для голосования на веб-сайте выборов штата @state_name." - -# @link: data.translations.register.by_mail__intro (see accessibility updates) -msgid "Find out ways to register" -msgstr "Узнайте, как зарегистрироваться" - -# data.translations.register.in_person__intro (see accessibility updates) -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Зарегистрируйтесь лично в своём местном избирательном участке. @link на веб-сайте выборов в штате @state_name." - -# @link: data.translations.register.in_person__intro (see accessibility updates) -msgid "Learn more about how to register" -msgstr "Узнайте больше о том, как зарегистрироваться" - -# data.translations.register.not_needed__intro (see accessibility updates) -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "Регистрация избирателей в @state_name не требуется. @link на веб-сайте штата @state_name" - -# @link: data.translations.register.not_needed__intro (see accessibility updates) -msgid "Learn more about voting" -msgstr "Подробнее о голосовании" - -# data.translations.register.online__answer1 (see accessibility updates) -msgid "@link on @state_name’s election website." -msgstr "@link на веб-сайте выборов штата @state_name" - -# @link: data.translations.register.online__answer1 (see accessibility updates) -msgid "Start or update your registration online" -msgstr "Начните онлайн-регистрацию" - -# data.translations.register.online__answer2 (see accessibility updates) -msgid "You can also @link on @state_name’s election website." -msgstr "Вы также можете @link на веб-сайте выборов штата @state_name" - -# @link: data.translations.register.online__answer2 (see accessibility updates) -msgid "register to vote by mail or in person" -msgstr "зарегистрироваться для голосования по почте или лично" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/so.po b/web/modules/custom/vote_utility/translations/so.po index 1c01ab239..97446a7ed 100644 --- a/web/modules/custom/vote_utility/translations/so.po +++ b/web/modules/custom/vote_utility/translations/so.po @@ -112,109 +112,12 @@ msgstr "Baar vote.gov" msgid "Official government website" msgstr "Bogga rasmiga ah ee dawladda" -# data.translations.register.heading -msgid "Register to vote in @state_name" -msgstr "Is diiwaan geli si aad uga codeyso @state_name" - -# data.translations.register.heading2 (state phrase updates) -msgid "How to register to vote" -msgstr "Sida la isugu diiwaan geliyo si’ loo codeeyo" - -msgid "How to register and update your registration" -msgstr "Sida la isugu diiwaan geliyo si’ loo codeeyo" - -# data.translations.register.other_language_selection__heading (state phrase updates) -msgid "Other ways to register to vote" -msgstr "Siyaabo kale oo la isu diwaangeliyo si loo codeeyo." - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Wakhtiyada kama dambaysta ah ee diiwaangelinta codbixiyaha ee doorashada @election_date" - -msgid "Find state and local election dates." -msgstr "" - -# data.translations.register.dates__bymail_deadline -msgid "Register by mail deadline:" -msgstr "Is-diwaangeli wakhtiga kama dambaysta ah ee boostada:" - msgid "Must be postmarked by @date" msgstr "Waa in boostadu qabataa @date" msgid "Must be received by @date" msgstr "Waa in la helaa ugu dambayn @date" -# data.translations.register.dates__byonline_deadline -msgid "Online registration deadline:" -msgstr "Is diiwaangelinta online-ka ee kama dambaysta ah:" - -# data.translations.register.dates__inperson_deadline -msgid "In person registration deadline:" -msgstr "Isdiiwaangelinta qof-ahaaneed ee kama dambaysta ah:" - -# data.translations.register.dates__heading (state phrase updates) -msgid "Voter registration deadlines" -msgstr "Wakhtiyada kama dambaysta ah ee diiwaangelinta codbixiyayaasha" - -# data.translations.register.confirm_registration__heading -msgid "How to check your voter registration" -msgstr "Sida loo hubiyo isdiiwaangelintaada cod-bixiyaha" - -# data.translations.register.confirm_registration__intro_WY -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Waxaad ka xaqiijin kartaa halka uu maraayo diiwaangelinta codbixintaada adiga oo la xiriiraya xafiiska diiwaangelinta ee degaankaaga. @link." - -# @link: data.translations.register.confirm_registration__link_WY -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Riix halkan si aad u daawato macluumaadka xiriirka karraaniga degmada Wyoming (PDF) (oo af Ingiriis ah)" - -# data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "You can @link on @state_name’s election website." -msgstr "Waxaad @link bogga doorashada gobolka @state_name." - -# @link: data.translations.register.confirm_registration__intro (see accessibility updates) -msgid "confirm your voter registration status" -msgstr "sugi kartaa xaaladda diiwaangelinta codbixintaada" - -# data.translations.register.by_mail__intro (see accessibility updates) -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "Diiwaangelinta onlaynka hadda lama heli karo. @link si aad uga codayso bogga gobolka @state_name." - -# @link: data.translations.register.by_mail__intro (see accessibility updates) -msgid "Find out ways to register" -msgstr "Soo ogow siyaabo la isu diwaangeliyo" - -# data.translations.register.in_person__intro (see accessibility updates) -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Toos isaga diiwaan geli xafiiska maxalliga ah ee doorashada deegaankaaga. @link bogga doorashada gobolka @state_name." - -# @link: data.translations.register.in_person__intro (see accessibility updates) -msgid "Learn more about how to register" -msgstr "Ka baro wax dheeraad ah oo ku saabsan sida la isaga diiwaan geliyo" - -# data.translations.register.not_needed__intro (see accessibility updates) -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "Diiwaangelinta codbixiyaha looma baahna @state_name. @link bogga doorashada gobolka @state_name." - -# @link: data.translations.register.not_needed__intro (see accessibility updates) -msgid "Learn more about voting" -msgstr "Wax dheeraad ah ka baro xagga cod bixinta" - -# data.translations.register.online__answer1 (see accessibility updates) -msgid "@link on @state_name’s election website." -msgstr "@link bogga doorashada gobolka @state_name." - -# @link: data.translations.register.online__answer1 (see accessibility updates) -msgid "Start or update your registration online" -msgstr "Bilow is diiwaangelintaada onlyanka ah" - -# data.translations.register.online__answer2 (see accessibility updates) -msgid "You can also @link on @state_name’s election website." -msgstr "Waxaad sidoo kale @link bogga doorashada gobolka @state_name." - -# @link: data.translations.register.online__answer2 (see accessibility updates) -msgid "register to vote by mail or in person" -msgstr "isku diiwaangelin kartaa inaad ku codayso boostada ama qof ahaan" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/tl.po b/web/modules/custom/vote_utility/translations/tl.po index c111d5071..ed7076c40 100644 --- a/web/modules/custom/vote_utility/translations/tl.po +++ b/web/modules/custom/vote_utility/translations/tl.po @@ -72,91 +72,12 @@ msgstr "I-follow ang vote.gov sa X (sa Ingles)" msgid "Search vote.gov" msgstr "I-search ang vote.gov" -#state -msgid "Register to vote in @state_name" -msgstr "Magparehistro para bumoto sa @state_name" - -msgid "How to register to vote" -msgstr "Paano magparehistro para bumoto" - -msgid "How to register and update your registration" -msgstr "Paano magparehistro para bumoto" - -msgid "Other ways to register to vote" -msgstr "Iba pang mga paraan para magrehistro para bumoto" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Mga deadline ng rehistrasyon ng botante para sa @election_date, na halalan" - -msgid "Find state and local election dates." -msgstr "" - -msgid "Register by mail deadline:" -msgstr "Deadline ng pagpaparehistro sa pamamagitan ng koreo" - msgid "Must be postmarked by @date" msgstr "Dapat na naka-postmark ng @date" msgid "Must be received by @date" msgstr "Dapat matanggap ng @date" -msgid "Online registration deadline:" -msgstr "Deadline ng pagpaparehistro sa online" - -msgid "Voter registration deadlines" -msgstr "Mga huling araw para sa rehistrasyon ng botante" - -msgid "In person registration deadline:" -msgstr "Deadline ng personal na pagpaparehistro" - -msgid "How to check your voter registration" -msgstr "Paano i-tsek ang inyong rehistrasyon ng botante" - -msgid "You can confirm your voter registration status on @link." -msgstr "Maaari ninyong kumpirmahin ang istado ng inyong rehistrasyon ng botante sa @link." - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Maaari ninyong kumpirmahin ang estado ng inyong rehistrasyon ng botante sa pamamagitan ng pakikipag-ugnayan sa inyong lokal na opisina ng rehistrasyon. @link" - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "I-click ito upang makita ang impormasyon sa pakikipag-ugnayan sa clerk ng county (PDF) ng Wyoming (sa Ingles)." - -msgid "Find out ways to register" -msgstr "Alamin ang mga paraan para magparehistro" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "Kasalukuyang hindi magagamit ang online na rehistrasyon. @link para bumoto sa website ng eleksyon ng estado ng @state_name." - -msgid "Learn more about how to register" -msgstr "Matuto nang higit pa tungkol sa kung paano magparehistro" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Magrehistro nang personal sa inyong lokal na tanggapan ng eleksyon. @link sa website ng eleksyon ng estado ng @state_name." - -msgid "Learn more about voting" -msgstr "Matuto pa tungkol sa pagboto" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "Ang pagpaparehistro ng botante ay hindi kinakailangan sa @state_name. @link sa website ng eleksyon ng estado ng @state_name." - -msgid "Start or update your registration online" -msgstr "Simulan ang inyong online na rehistrasyon" - -msgid "@link on @state_name’s election website." -msgstr "@link sa website ng eleksyon ng estado ng @state_name." - -msgid "register to vote by mail or in person" -msgstr "magparehistro para bumoto sa pamamagitan ng koreo o nang personal" - -msgid "You can also @link on @state_name’s election website." -msgstr "Maaari rin kayong @link sa website ng eleksyon ng estado ng @state_name." - -msgid "confirm your voter registration status" -msgstr "kumpirmahin ang estado ng inyong rehistrasyon ng botante" - -msgid "You can @link on @state_name’s election website." -msgstr "Maaari ninyong @link sa website ng eleksyon ng estado ng @state_name." - msgid "External link opens in new window" msgstr "Ang panlabas na link ay magbubukas ng bagong window" diff --git a/web/modules/custom/vote_utility/translations/vi.po b/web/modules/custom/vote_utility/translations/vi.po index 16eb15299..0a7ae0710 100644 --- a/web/modules/custom/vote_utility/translations/vi.po +++ b/web/modules/custom/vote_utility/translations/vi.po @@ -71,91 +71,12 @@ msgstr "Theo dõi vote.gov trên X (bằng Tiếng Anh)" msgid "Search vote.gov" msgstr "Tìm kiếm vote.gov" -#state -msgid "Register to vote in @state_name" -msgstr "Đăng ký bỏ phiếu bầu ở @state_name" - -msgid "How to register to vote" -msgstr "Làm thế nào để đăng ký bỏ phiếu" - -msgid "How to register and update your registration" -msgstr "Làm thế nào để đăng ký bỏ phiếu" - -msgid "Other ways to register to vote" -msgstr "Các cách khác để đăng ký bỏ phiếu" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "Thời hạn cuối cùng đăng ký cử tri cho cuộc bầu cử @election_date" - -msgid "Find state and local election dates." -msgstr "" - -msgid "Register by mail deadline:" -msgstr "Thời hạn đăng ký qua đường bưu điện: " - msgid "Must be postmarked by @date" msgstr "Cần được đánh dấu bưu điện trước @date" msgid "Must be received by @date" msgstr "Phải được nhận trước @date" -msgid "Online registration deadline:" -msgstr "Thời hạn đăng ký trực tuyến: " - -msgid "Voter registration deadlines" -msgstr "Thời hạn cuối cùng đăng ký cử tri" - -msgid "In person registration deadline:" -msgstr "Thời hạn đăng ký trực tiếp: " - -msgid "How to check your voter registration" -msgstr "Làm thế nào kiểm tra đăng ký cử tri của bạn" - -msgid "You can confirm your voter registration status on @link." -msgstr "Bạn có thể xác nhận hiện trạng đăng ký cử tri của mình trên @link" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Ban có thể xác nhận tình trạng đăng ký bầu cử của mình bằng cách liên lạc với văn phòng đăng ký địa phương. @link." - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Nhấp vào đây để xem thông tin liên lạc của thư ký quận Wyoming (PDF) (bằng Tiếng Anh)" - -msgid "Find out ways to register" -msgstr "Tìm hiểu cách đăng ký" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "Đăng ký trực tuyến hiện không có sẵn. @link bỏ phiếu tại trang website bầu cử cấp tiểu bang của @state_name. " - -msgid "Learn more about how to register" -msgstr "Tìm hiểu thêm về cách đăng ký" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Đăng ký trực tiếp tại văn phòng bầu cử địa phương của bạn. @link tại trang website bầu cử cấp tiểu bang của @state_name." - -msgid "Learn more about voting" -msgstr "Tìm hiểu thêm về cách đăng ký" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "Ở tiểu bang @state_name không yêu cầu bắt buộc phải đăng ký bầu cử. @link tại trang website bầu cử cấp tiểu bang của @state_name." - -msgid "Start or update your registration online" -msgstr "Hãy bắt đầu đăng ký bầu cử trực tuyến" - -msgid "@link on @state_name’s election website." -msgstr "@link trên trang website bầu cử cấp tiểu bang của @state_name." - -msgid "register to vote by mail or in person" -msgstr "đăng ký bỏ phiếu qua thư hoặc trực tiếp" - -msgid "You can also @link on @state_name’s election website." -msgstr "Bạn cũng có thể @link trên trang web bầu cử cấp tiểu bang của @state_name." - -msgid "confirm your voter registration status" -msgstr "xác nhận hiện trạng đăng ký cử tri của mình" - -msgid "You can @link on @state_name’s election website." -msgstr "Bạn có thể @link trên trang web bầu cử cấp tiểu bang của @state_name." - msgid "External link opens in new window" msgstr "Liên kết bên ngoài mở cửa sổ mới" diff --git a/web/modules/custom/vote_utility/translations/ypk.po b/web/modules/custom/vote_utility/translations/ypk.po index 95f049da9..2c8340a01 100644 --- a/web/modules/custom/vote_utility/translations/ypk.po +++ b/web/modules/custom/vote_utility/translations/ypk.po @@ -71,85 +71,12 @@ msgstr "Maligtigu vote.gov X-ekun (Laluramkestun)" msgid "Search vote.gov" msgstr "Ivaghivikigu vote.gov" -#state -msgid "Register to vote in @state_name" -msgstr "Ilaten nakmikinaluten @state_name-mi" - -msgid "How to register to vote" -msgstr "Naten ilatelleghqaq nakmikimun" - -msgid "How to register and update your registration" -msgstr "Naten ilatelleghqaq nakmikimun" - -msgid "Other ways to register to vote" -msgstr "Ilaneng ilatelleghqaneng" - -msgid "Register by mail deadline:" -msgstr "Ilatelleq tuyuqayugkun tuuniviga:" - msgid "Must be postmarked by @date" msgstr "Tuyumayaghqaguq @date" msgid "Must be received by @date" msgstr "Kaasimayaghqaguq @date" -msgid "Online registration deadline:" -msgstr "Online-ekun ilatellghem tuuniviga:" - -msgid "Voter registration deadlines" -msgstr "Nakmikimun ilatelleghqanun tuunvigi" - -msgid "In person registration deadline:" -msgstr "Gginasaghlluku ilatellghem tuuniviga: " - -msgid "How to check your voter registration" -msgstr "Esghalleghqan nakmikimun ilatellghen" - -msgid "You can confirm your voter registration status on @link." -msgstr "Ipapighqennayaghan nakmikimun ilatellghen @link-mi" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "Ipapighqesaghngaaghpegu nakmikillgheghpek ilatellghan natetulnga tuqluquvgu negpek ilatfigan qepghaghviga. @link." - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "Click here to view Wyoming's county clerk contact information (PDF) (Laluramkestun)" - -msgid "Find out ways to register" -msgstr "Naalkigu naten alla ilatelleghqan" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "Online-ekun ilatelleq pivigituq maaten. @link nakmikinaluten @state_name-mi state-angan nakmikillghan website-angani. " - -msgid "Learn more about how to register" -msgstr "Liitaghaghhu ilatelleghqan" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "Ilaten gginasaghlluku negpek nkmikivigan qepghaghvigani. @link @state_name-em state-angan nakmikillghan website-angani. " - -msgid "Learn more about voting" -msgstr "Liitaghaghhu nakmilleq" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "Nakmikimun ilaasughniituq @state_name-mi. @link @state_name-em state-angan nakmikillghan website-angani." - -msgid "Start or update your registration online" -msgstr "Piinlighhu online-ekun ilatelleq" - -msgid "@link on @state_name’s election website." -msgstr "@link @state_name-em state-angan nakmikillghan website-angani. " - -msgid "register to vote by mail or in person" -msgstr "Ilaasaghngaaghpek tuyuqayugkun nalighmeng gginasaghlluku" - -msgid "You can also @link on @state_name’s election website." -msgstr "@link @state_name-em state-angan nakmikillghan website-angani. " - -msgid "confirm your voter registration status" -msgstr "Ipapighqesaghngaaghpegu ilatellghen" - -msgid "You can @link on @state_name’s election website." -msgstr "@link @state_name-em state-angan nakmikillghan webstte-angani. " - msgid "Skip to main content" msgstr "Naghughaghten pighpigaghmun" diff --git a/web/modules/custom/vote_utility/translations/zh-hans.po b/web/modules/custom/vote_utility/translations/zh-hans.po index 4e96f7671..be75e1cce 100644 --- a/web/modules/custom/vote_utility/translations/zh-hans.po +++ b/web/modules/custom/vote_utility/translations/zh-hans.po @@ -75,94 +75,12 @@ msgstr "在 X 上关注 vote.gov (英语)" msgid "Search vote.gov" msgstr "搜索 vote.gov" -#state -msgid "Register to vote in @state_name" -msgstr "在 @state_name 注册投票" - -msgid "How to register to vote" -msgstr "如何登记投票" - -msgid "How to register and update your registration" -msgstr "如何登记和更新您的登记信息" - -msgid "Start or update your online registration" -msgstr "开始在网上登记或者更新登记信息" - -msgid "Other ways to register to vote" -msgstr "登记投票的其他方式" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "2024年11月5日选举的选民登记截止日期。" - -msgid "Find state and local election dates." -msgstr "寻找州和地方选举日期。" - -msgid "Register by mail deadline:" -msgstr "邮寄报名截止日期:" - msgid "Must be postmarked by @date" msgstr "必须在 @date 星期六之前加盖邮戳" msgid "Must be received by @date" msgstr "必须在 @date 之前收到" -msgid "Online registration deadline:" -msgstr "网上报名截止日期:" - -msgid "Voter registration deadlines" -msgstr "选民登记截止日期" - -msgid "In person registration deadline:" -msgstr "亲自报名截止日期:" - -msgid "How to check your voter registration" -msgstr "如何检查您的选民登记" - -msgid "You can confirm your voter registration status on @link." -msgstr "您可以在 @link 上确认您的选民登记状态" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "您可以聯繫當地的登記處確認您的選民登記狀態。@link。" - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "點擊此處查看懷俄明州縣書記聯繫資訊 (PDF)(英语)" - -msgid "Find out ways to register" -msgstr "了解如何注册" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "目前不提供在线注册。 @link 在 @state_name 州的选举网站上投票。" - -msgid "Learn more about how to register" -msgstr "详细了解如何注册" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "亲自到您当地的选举办公室注册。 @link @state_name 州的选举网站" - -msgid "Learn more about voting" -msgstr "详细了解如何注册" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "弗吉尼亚州不要求选民注册。 @link @state_name 州的选举网站" - -msgid "Start or update your registration online" -msgstr "开始在线注册" - -msgid "@link on @state_name’s election website." -msgstr "在 @state_name 州的选举网站上 @link" - -msgid "register to vote by mail or in person" -msgstr "邮寄或现场注册" - -msgid "You can also @link on @state_name’s election website." -msgstr "您也可以 @link @state_name 州的选举网站" - -msgid "confirm your voter registration status" -msgstr "确认您的选民注册状态" - -msgid "You can @link on @state_name’s election website." -msgstr "您可以在 @state_name 州的选举网站上 @link" - msgid "External link opens in new window" msgstr "外部链接打开新窗口" diff --git a/web/modules/custom/vote_utility/translations/zh.po b/web/modules/custom/vote_utility/translations/zh.po index 4006e60e3..9a88da631 100644 --- a/web/modules/custom/vote_utility/translations/zh.po +++ b/web/modules/custom/vote_utility/translations/zh.po @@ -71,91 +71,12 @@ msgstr "在 X 上追蹤 vote.gov (英語)" msgid "Search vote.gov" msgstr "搜尋 vote.gov" -#state -msgid "Register to vote in @state_name" -msgstr "在 @state_name 登記投票" - -msgid "How to register to vote" -msgstr "如何登記投票" - -msgid "How to register and update your registration" -msgstr "如何登記投票" - -msgid "Other ways to register to vote" -msgstr "登記投票的其他方式" - -msgid "Voter registration deadlines are for the November 05, 2024 election. @link" -msgstr "@election_date選舉的選民登記截止日期" - -msgid "Find state and local election dates." -msgstr "" - -msgid "Register by mail deadline:" -msgstr "郵寄報名截止日期:" - msgid "Must be postmarked by @date" msgstr "郵戳為憑 @date" msgid "Must be received by @date" msgstr "必須在 @date 之前寄達" -msgid "Online registration deadline:" -msgstr "網路報名截止日期:" - -msgid "Voter registration deadlines" -msgstr "選民登記截止日期" - -msgid "In person registration deadline:" -msgstr "親自報名截止日期:" - -msgid "How to check your voter registration" -msgstr "如何檢查您的選民登記" - -msgid "You can confirm your voter registration status on @link." -msgstr "您可以在@link上確認您的選民登記狀態" - -msgid "You can confirm your voter registration status by contacting your local registration office. @link." -msgstr "您可以聯繫當地的登記處確認您的選民登記狀態。 @link。" - -msgid "Click here to view Wyoming's county clerk contact information (PDF)" -msgstr "點擊此處查看懷俄明州縣書記聯繫資訊 (PDF) (英語)" - -msgid "Find out ways to register" -msgstr "瞭解如何註冊" - -msgid "Online registration is currently not available. @link to vote at @state_name’s election website." -msgstr "目前不提供線上註冊。 @link 在 @state_name 州選舉網站上投票。" - -msgid "Learn more about how to register" -msgstr "詳細瞭解如何註冊" - -msgid "Register in person at your local election office. @link on @state_name’s election website." -msgstr "親自到您當地的選舉辦公室登記。 @link @state_name 州的選舉網站" - -msgid "Learn more about voting" -msgstr "詳細瞭解如何註冊" - -msgid "Voter registration is not required in @state_name. @link on @state_name’s election website." -msgstr "維吉尼亞州不要求選民註冊。 @link @state_name 州的選舉網站" - -msgid "Start or update your registration online" -msgstr "開始線上註冊" - -msgid "@link on @state_name’s election website." -msgstr "在 @state_name 州的選舉網站上 @link" - -msgid "register to vote by mail or in person" -msgstr "郵寄或現場註冊" - -msgid "You can also @link on @state_name’s election website." -msgstr "您也可以 @link @state_name 州的選舉網站" - -msgid "confirm your voter registration status" -msgstr "確認您的選民註冊狀態" - -msgid "You can @link on @state_name’s election website." -msgstr "您可以在 @state_name 州的選舉網站上 @link" - msgid "External link opens in new window" msgstr "外部鏈接打開新窗口" From 135ce57de1ba301dfd3ba0e1d7b270123f82d477 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:09:25 -0700 Subject: [PATCH 24/32] VOTE-3094 Remove merge function from overrides in state template (#1110) This will ensure an empty override is treated as a value when other values are set. --- .../node/node--state-territory.html.twig | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index c8d91d8c0..7efc08e52 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -41,17 +41,17 @@ {# State content with fallbacks. #} {# Get default state display content from the block type. #} {% set state_display_content = drupal_entity('block_content', 23) | children %} -{% set registration_not_needed = state_display_content.field_registration_not_needed.0 | default([]) | merge(content.field_registration_not_needed.0 | default([])) %} -{% set online_registration = state_display_content.field_online_registration.0 | default([]) | merge(content.field_online_registration.0 | default([])) %} -{% set military_overseas_registration = state_display_content.field_military_and_overseas_regi.0 | default([]) | merge(content.field_military_and_overseas_regi.0 | default([])) %} -{% set mail_registration = state_display_content.field_mail_registration.0 | default([]) | merge(content.field_mail_registration.0 | default([])) %} -{% set no_mail_registration = state_display_content.field_no_mail_registration.0 | default([]) | merge(content.field_no_mail_registration.0 | default([])) %} -{% set nvrf_details = state_display_content.field_nvrf_details.0 | default([]) | merge(content.field_nvrf_details.0 | default([])) %} -{% set inperson_registration = state_display_content.field_in_person_registration.0 | default([]) | merge(content.field_in_person_registration.0 | default([])) %} -{% set check_registration = state_display_content.field_check_registration.0 | default([]) | merge(content.field_check_registration.0 | default([])) %} -{% set election_date = state_display_content.field_election_date.0 | default([]) | merge(content.field_election_date.0 | default([])) %} -{% set election_text = state_display_content.field_election_text.0 | default([]) | merge(content.field_election_text.0 | default([])) %} -{% set no_online_registration = state_display_content.field_no_online_registration.0 | default([]) | merge(content.field_no_online_registration.0 | default([])) %} +{% set registration_not_needed = content.field_registration_not_needed.0 | default(state_display_content.field_registration_not_needed.0) %} +{% set online_registration = content.field_online_registration.0 | default(state_display_content.field_online_registration.0) %} +{% set military_overseas_registration = content.field_military_and_overseas_regi.0 | default(state_display_content.field_military_and_overseas_regi.0) %} +{% set mail_registration = content.field_mail_registration.0 | default(state_display_content.field_mail_registration.0) %} +{% set no_mail_registration = content.field_no_mail_registration.0 | default(state_display_content.field_no_mail_registration.0) %} +{% set nvrf_details = content.field_nvrf_details.0 | default(state_display_content.field_nvrf_details.0) %} +{% set inperson_registration = content.field_in_person_registration.0 | default(state_display_content.field_in_person_registration.0) %} +{% set check_registration = content.field_check_registration.0 | default(state_display_content.field_check_registration.0) %} +{% set election_date = content.field_election_date.0 | default(state_display_content.field_election_date.0) %} +{% set election_text = content.field_election_text.0 | default(state_display_content.field_election_text.0) %} +{% set no_online_registration = content.field_no_online_registration.0 | default(state_display_content.field_no_online_registration.0) %} {# Registration types #} {% set registration_types = content.field_registration_type | field_value | column('#markup') %} From 910eae4659b0a58270d6175b74f461b7b3d8763a Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Mon, 18 Nov 2024 17:10:53 -0800 Subject: [PATCH 25/32] Update label of content field group on state content type --- .../core.entity_form_display.node.state_territory.default.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/sync/core.entity_form_display.node.state_territory.default.yml b/config/sync/core.entity_form_display.node.state_territory.default.yml index 4350668ff..bf2dcf3e3 100644 --- a/config/sync/core.entity_form_display.node.state_territory.default.yml +++ b/config/sync/core.entity_form_display.node.state_territory.default.yml @@ -225,14 +225,13 @@ third_party_settings: group_state_display_content: children: - field_check_registration - - field_registration_intro - field_online_registration - field_mail_registration - field_nvrf_details - field_in_person_registration - field_military_and_overseas_regi - field_registration_not_needed - label: 'State display Content' + label: 'State display override content' region: content parent_name: group_form_tabs weight: 24 From 05b2534ff11f14e6051a83d515cc282989140dc6 Mon Sep 17 00:00:00 2001 From: Christian Medders - Bixal <88721460+clmedders@users.noreply.github.com> Date: Wed, 20 Nov 2024 18:49:28 -0500 Subject: [PATCH 26/32] Vote-3156: Update Heading Placeholder for Not-Needed (#1123) --- .../node/node--state-territory--not-needed.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig index abcaff16f..af100bc4d 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig @@ -20,9 +20,11 @@ {% endif %} {# setting body text to have palceholder for both state name and link #} {% set body = registration_not_needed.text['#markup']| t({'@state_name': title_english, '@link': {'#markup': link_markup } | render}) %} + {# setting heading text to have palceholder for state name #} + {% set heading = registration_not_needed.heading['#markup']| t({'@state_name': title_english | render}) %} {% include '@votegov/component/info-card.html.twig' with { - 'heading': registration_not_needed.heading, + 'heading': heading, 'body': body, } %} From 0db7827202495a568cb66800da1183d13b2c205c Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:36:45 -0700 Subject: [PATCH 27/32] VOTE 3157 Add render filter to the state mail deadline (#1125) --- .../templates/node/node--state-territory.html.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 7efc08e52..ccb014ef2 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -25,14 +25,14 @@ {% if content.field_mail_postmarked_deadline | render %} {% set postmarked_deadline = 'Must be postmarked by @date' | t({'@date': content.field_mail_postmarked_deadline.0 | render}) %} {% else %} - {% set postmarked_deadline = content.field_g_mail_postmarked_deadline | field_value %} + {% set postmarked_deadline = content.field_g_mail_postmarked_deadline | field_value | render %} {% endif %} {# Set received deadline with fallback #} {% if content.field_mail_received_deadline | render %} {% set received_deadline = 'Must be received by @date' | t({'@date': content.field_mail_received_deadline.0 | render}) %} {% else %} - {% set received_deadline = content.field_g_mail_received_deadline | field_value %} + {% set received_deadline = content.field_g_mail_received_deadline | field_value | render %} {% endif %} {# Set the deadline with fallback, prioritizing postmarked deadline. #} @@ -114,7 +114,7 @@ } %} {% endif %} - {# Election Date #} + {# Election Date #} {% if (election_date is not empty) and (election_text is not empty) %} {% set election_date_text = election_text['#text'] | t({'@date': election_date | render }) %}
{{ election_date_text }}
@@ -176,7 +176,7 @@ {% include '@votegov/component/info-card.html.twig' with { 'heading': mail_registration.heading, - 'body': mail_body | render | trim | t({'@state_mail_deadline': bymail_deadline ,'@state_name': title_english}), + 'body': mail_body | render | trim | t({'@state_mail_deadline': bymail_deadline,'@state_name': title_english}), 'footer': mail_footer } %} {# No mail registration content #} From 83f70931ebf7ede454a572e784ace68d7a027246 Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Mon, 25 Nov 2024 13:32:35 -0800 Subject: [PATCH 28/32] Feature/vote 3125 template field integration (#1128) * VOTE-3125 remove unused strings from po files * VOTE-3125 replace hardcoded values with new field data variables --- .../custom/vote_utility/translations/am.po | 9 --- .../custom/vote_utility/translations/ar.po | 18 ----- .../custom/vote_utility/translations/bn.po | 9 --- .../custom/vote_utility/translations/es.po | 16 ----- .../custom/vote_utility/translations/fr.po | 14 ---- .../custom/vote_utility/translations/hi.po | 9 --- .../custom/vote_utility/translations/ht.po | 14 ---- .../custom/vote_utility/translations/ja.po | 10 --- .../custom/vote_utility/translations/km.po | 9 --- .../custom/vote_utility/translations/ko.po | 10 --- .../custom/vote_utility/translations/nv.po | 10 --- .../custom/vote_utility/translations/pt.po | 28 -------- .../custom/vote_utility/translations/ru.po | 10 --- .../custom/vote_utility/translations/so.po | 10 --- .../custom/vote_utility/translations/tl.po | 9 --- .../custom/vote_utility/translations/vi.po | 9 --- .../custom/vote_utility/translations/ypk.po | 9 --- .../vote_utility/translations/zh-hans.po | 18 ----- .../custom/vote_utility/translations/zh.po | 9 --- .../node/node--state-territory.html.twig | 70 ++++++++++++------- 20 files changed, 46 insertions(+), 254 deletions(-) diff --git a/web/modules/custom/vote_utility/translations/am.po b/web/modules/custom/vote_utility/translations/am.po index b044b8e55..71ba7b7ff 100644 --- a/web/modules/custom/vote_utility/translations/am.po +++ b/web/modules/custom/vote_utility/translations/am.po @@ -11,15 +11,6 @@ msgstr "" msgid "Select language" msgstr "ቋንቋ ይምረጡ" -msgid "Last updated:" -msgstr "መጨረሻ የተሻሻለው፦" - -msgid "Must be postmarked by @date" -msgstr "@date የፓስታ ማህተም ያረፈበት መሆን አለበት" - -msgid "Must be received by @date" -msgstr "@date መድረስ አለበት" - msgid "External link opens in new window" msgstr "የውጭ አገናኙ አዲስ ድህረ ገጽ ይከፍታል" diff --git a/web/modules/custom/vote_utility/translations/ar.po b/web/modules/custom/vote_utility/translations/ar.po index b23bbf940..81da7ee2f 100644 --- a/web/modules/custom/vote_utility/translations/ar.po +++ b/web/modules/custom/vote_utility/translations/ar.po @@ -16,10 +16,6 @@ msgstr "اختر اللغة" msgid "Breadcrumb" msgstr "تتبع مسارك" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "آخر تحديث:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "رابط خارجي يفتح نافذة جديدة" @@ -32,12 +28,6 @@ msgstr "تخطي إلى المحتوى الرئيسي" msgid "(in English)" msgstr "(باللغة الإنجليزية)" -msgid "Must be postmarked by @date" -msgstr "يجب ختمه بالبريد بحلول @date" - -msgid "Must be received by @date" -msgstr "يجب أن يتم استلامه بحلول @date" - # data.translations.months.january msgctxt "Long month name" msgid "January" @@ -134,13 +124,5 @@ msgstr "إغلاق" msgid "Menu" msgstr "القائمة" -#U.S. flag alt text -msgid "U.S. flag" -msgstr "علم الولايات المتحدة" - msgid "Primary navigation" msgstr "التصفح الأساسي" - -#state page -msgid "Start or update your registration online" -msgstr "ابدأ أو قُم بتحديث سجلك الانتخابي على الإنترنت" diff --git a/web/modules/custom/vote_utility/translations/bn.po b/web/modules/custom/vote_utility/translations/bn.po index aaf2aacd9..912636bc2 100644 --- a/web/modules/custom/vote_utility/translations/bn.po +++ b/web/modules/custom/vote_utility/translations/bn.po @@ -11,15 +11,6 @@ msgstr "" msgid "Select language" msgstr "ভাষা নির্বাচন করুন" -msgid "Last updated:" -msgstr "সর্বশেষ সংষ্করণ" - -msgid "Must be postmarked by @date" -msgstr "পোস্ট চিহ্ন করা আবশ্যক @date" - -msgid "Must be received by @date" -msgstr "@date এর মধ্যে অবশ্যই গ্রহণ করতে হবে" - msgid "External link opens in new window" msgstr "বাহ্যিক লিঙ্ক নতুন উইন্ডো খোলে" diff --git a/web/modules/custom/vote_utility/translations/es.po b/web/modules/custom/vote_utility/translations/es.po index 1f5289852..d366db5aa 100644 --- a/web/modules/custom/vote_utility/translations/es.po +++ b/web/modules/custom/vote_utility/translations/es.po @@ -29,15 +29,6 @@ msgstr "Menú" msgid "Close" msgstr "Cerrar" -msgid "Last updated:" -msgstr "Última actualización:" - -msgid "Must be postmarked by @date" -msgstr "Debe tener el sello postal a más tardar el @date" - -msgid "Must be received by @date" -msgstr "Debe ser recibido a más tardar el @date" - msgid "External link opens in new window" msgstr "El enlace externo se abre en una nueva ventana" @@ -47,10 +38,6 @@ msgstr "Ir al contenido principal" msgid "(in English)" msgstr "(en inglés)" -#U.S. flag alt text -msgid "U.S. flag" -msgstr "Bandera de Estados Unidos" - #month and day names msgctxt "Long month name" msgid "January" @@ -131,8 +118,5 @@ msgstr "Obtenga más información del Programa Federal de Asistencia para Votar msgid "Voting as a U.S. citizen from outside the U.S." msgstr "Votar como ciudadano en el extranjero" -msgid "Secondary navigation" -msgstr "navegación secundaria" - msgid "Know your voting rights" msgstr "Conozca su derecho al voto" diff --git a/web/modules/custom/vote_utility/translations/fr.po b/web/modules/custom/vote_utility/translations/fr.po index ba5645171..21f15e0c8 100644 --- a/web/modules/custom/vote_utility/translations/fr.po +++ b/web/modules/custom/vote_utility/translations/fr.po @@ -27,10 +27,6 @@ msgstr "Sur cette page" msgid "Breadcrumb" msgstr "Ruta de navegación" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "Dernière mise à jour:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "Lyen ekstèn lan ap louvri yon nouvo fenèt" @@ -43,16 +39,6 @@ msgstr "Passer au contenu principal" msgid "(in English)" msgstr "(en anglais)" -# data.translations.U.S._flag_alt_text -msgid "U.S. flag" -msgstr "Drapeau américain" - -msgid "Must be postmarked by @date" -msgstr "Au plus tard @date avec un cachet de la poste faisant foi" - -msgid "Must be received by @date" -msgstr "Doit être reçu au plus tard @date" - # Temporary military and overseas voter cards msgid "Voting as a military service member" msgstr "Voter en tant que membre de militaire" diff --git a/web/modules/custom/vote_utility/translations/hi.po b/web/modules/custom/vote_utility/translations/hi.po index 9990d885c..985016514 100644 --- a/web/modules/custom/vote_utility/translations/hi.po +++ b/web/modules/custom/vote_utility/translations/hi.po @@ -15,15 +15,6 @@ msgstr "भाषा चुनें" msgid "On this page" msgstr "इस पेज पर" -msgid "Last updated:" -msgstr "नवीनतम अपडेट:" - -msgid "Must be postmarked by @date" -msgstr "@date तक पोस्टमार्क होना चाहिए" - -msgid "Must be received by @date" -msgstr "@date तक पहुँच जाना चाहिए" - msgid "External link opens in new window" msgstr "बाहरी लिंक नई विंडो खोलता है" diff --git a/web/modules/custom/vote_utility/translations/ht.po b/web/modules/custom/vote_utility/translations/ht.po index f145f7088..f3a8859cc 100644 --- a/web/modules/custom/vote_utility/translations/ht.po +++ b/web/modules/custom/vote_utility/translations/ht.po @@ -19,10 +19,6 @@ msgstr "Kwout pen" msgid "Close" msgstr "Fèmen" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "Dènye mizajou:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "Lyen ekstèn lan ap louvri yon nouvo fenèt" @@ -35,12 +31,6 @@ msgstr "Ale nan kontni prensipal la" msgid "(in English)" msgstr "(ann Anglè)" -msgid "Must be postmarked by @date" -msgstr "Dwe gen so lapòs pou pita nan dat k ap @date" - -msgid "Must be received by @date" -msgstr "Dwe rive pou pita @date" - # data.translations.months.january msgctxt "Long month name" msgid "January" @@ -139,10 +129,6 @@ msgstr "Jwenn plis enfòmasyon nan Pwogram Asistans Federal pou Vote (FVAP ann A msgid "Voting as a U.S. citizen from outside the U.S." msgstr "Vote kòm sitwayen ameriken andeyò peyi Etazini" -#U.S. flag alt text -msgid "U.S. flag" -msgstr "Drapo Etazini" - #main menu button msgid "Menu" msgstr "Meni" diff --git a/web/modules/custom/vote_utility/translations/ja.po b/web/modules/custom/vote_utility/translations/ja.po index bc7d673cd..45fe39d18 100644 --- a/web/modules/custom/vote_utility/translations/ja.po +++ b/web/modules/custom/vote_utility/translations/ja.po @@ -12,10 +12,6 @@ msgstr "" msgid "Select language" msgstr "言語を選択" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "最終更新日:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "外部リンクは新しいウィンドウで開かれます。" @@ -28,12 +24,6 @@ msgstr "本文へジャンプ" msgid "(in English)" msgstr "(英語)" -msgid "Must be postmarked by @date" -msgstr "@date 消印有効" - -msgid "Must be received by @date" -msgstr "@date 必着" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/km.po b/web/modules/custom/vote_utility/translations/km.po index a77290159..832fb87fc 100644 --- a/web/modules/custom/vote_utility/translations/km.po +++ b/web/modules/custom/vote_utility/translations/km.po @@ -11,15 +11,6 @@ msgstr "" msgid "Select language" msgstr "ជ្រើសរើសភាសា" -msgid "Last updated:" -msgstr "បានធ្វើបច្ចុប្បន្នភាពលើកចុងក្រោយ៖" - -msgid "Must be postmarked by @date" -msgstr "ត្រូវតែបានបិទតែមប្រៃសណីយ៍ត្រឹមថ្ @date" - -msgid "Must be received by @date" -msgstr "ត្រូវតែបានទទួលត្រឹមថ្ @date" - msgid "External link opens in new window" msgstr "តំណខាងក្រៅបើកផ្ទាំងបង្ឣួចថ្មី" diff --git a/web/modules/custom/vote_utility/translations/ko.po b/web/modules/custom/vote_utility/translations/ko.po index 335adb2b2..6e3dffee1 100644 --- a/web/modules/custom/vote_utility/translations/ko.po +++ b/web/modules/custom/vote_utility/translations/ko.po @@ -11,19 +11,9 @@ msgstr "" msgid "Select language" msgstr "언어 선택" -msgid "Last updated:" -msgstr "마지막 업데이트일자:" - msgid "state" msgstr "주" - -msgid "Must be postmarked by @date" -msgstr "반드시 @date 까지 소인이 찍혀야 합니다." - -msgid "Must be received by @date" -msgstr "반드시 @date 까지 접수되어야 합니다." - msgid "External link opens in new window" msgstr "외부 링크 사이트는 새 창에서 연결됩니다" diff --git a/web/modules/custom/vote_utility/translations/nv.po b/web/modules/custom/vote_utility/translations/nv.po index f0a7218f2..20180ebef 100644 --- a/web/modules/custom/vote_utility/translations/nv.po +++ b/web/modules/custom/vote_utility/translations/nv.po @@ -12,10 +12,6 @@ msgstr "" msgid "Select language" msgstr "Saad choid77['88[7g77" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "Ak44'di n1zk'33z:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "T['00'd66' link-7g77 ts4ts-' 1niid7g77 22'1n11yiil'88h" @@ -28,12 +24,6 @@ msgstr "&yis77 baa hane'7gi nin7[keed" msgid "(in English)" msgstr "<Bilag1ana k'ehj7>" -msgid "Must be postmarked by @date" -msgstr "Naaltsoos nin1h1jeehd00 bik'ini'7t'32 doolee[ @date" - -msgid "Must be received by @date" -msgstr "Kwe'4 yoo[k11[go n7didooltsos @date" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/pt.po b/web/modules/custom/vote_utility/translations/pt.po index 76b5bb681..4f54e1927 100644 --- a/web/modules/custom/vote_utility/translations/pt.po +++ b/web/modules/custom/vote_utility/translations/pt.po @@ -16,10 +16,6 @@ msgstr "Selecionar a língua" msgid "On this page" msgstr "Nesta página" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "Última Atualização:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "Links externos abrem novas páginas web" @@ -32,12 +28,6 @@ msgstr "Saltar para o conteúdo principal" msgid "(in English)" msgstr "(em inglês)" -msgid "Must be postmarked by @date" -msgstr "Deve estar carimbado até o @date" - -msgid "Must be received by @date" -msgstr "Deve ser recebido até o @date" - # data.translations.months.january msgctxt "Long month name" msgid "January" @@ -129,9 +119,6 @@ msgstr "sábado" msgid "Close" msgstr "Fechar" -msgid "U.S. flag" -msgstr "Bandeira dos EUA" - msgid "Menu" msgstr "Menu" @@ -141,24 +128,9 @@ msgstr "Trilha de navegação" msgid "Primary navigation" msgstr "Navegação primária" -msgid "Introduction" -msgstr "Introdução" - #voter guide cards msgid "Learn more from the Federal Voting Assistance Program (FVAP)." msgstr "Saiba mais sobre o Programa Federal de Assistência ao Voto." -msgid "How to register and update your registration" -msgstr "Como se cadastrar e atualizar seu cadastro" - -msgid "Start or update your online registration" -msgstr "Iniciar ou atualizar seu registro online" - -msgid "Voter registration deadlines are for the November 05, 2024 election." -msgstr "Os prazos de registro de eleitores são para a eleição de 05 de novembro de 2024." - -msgid "Find state and local election dates." -msgstr "Encontre as datas das eleições estaduais e locais." - msgid "Know your voting rights" msgstr "Conheça seus direitos de voto" diff --git a/web/modules/custom/vote_utility/translations/ru.po b/web/modules/custom/vote_utility/translations/ru.po index 8d7aadeeb..805e9a6a0 100644 --- a/web/modules/custom/vote_utility/translations/ru.po +++ b/web/modules/custom/vote_utility/translations/ru.po @@ -12,10 +12,6 @@ msgstr "" msgid "Select language" msgstr "Выберите Язык" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "Последнее обновление:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "Внешняя ссылка открывает новое окно" @@ -28,12 +24,6 @@ msgstr "Перейдите к основному содержанию" msgid "(in English)" msgstr "(по-английски)" -msgid "Must be postmarked by @date" -msgstr "Должен иметь почтовый штемпель до @date" - -msgid "Must be received by @date" -msgstr "Должен быть получен до @date" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/so.po b/web/modules/custom/vote_utility/translations/so.po index 11e892abc..3eb0070aa 100644 --- a/web/modules/custom/vote_utility/translations/so.po +++ b/web/modules/custom/vote_utility/translations/so.po @@ -12,10 +12,6 @@ msgstr "" msgid "Select language" msgstr "Ka dooro luuqadda" -# config.languages.params.last_updated -msgid "Last updated:" -msgstr "waqtiga lala socodsiiyay:" - # config.languages.params.ext_link_title msgid "External link opens in new window" msgstr "Xiriirka dibadda ayaa furaya daaqad cusub" @@ -28,12 +24,6 @@ msgstr "u gudub dulucda" msgid "(in English)" msgstr "(oo af Ingiriis ah)" -msgid "Must be postmarked by @date" -msgstr "Waa in boostadu qabataa @date" - -msgid "Must be received by @date" -msgstr "Waa in la helaa ugu dambayn @date" - # data.translations.months.january msgctxt "Long month name" msgid "January" diff --git a/web/modules/custom/vote_utility/translations/tl.po b/web/modules/custom/vote_utility/translations/tl.po index 9c822c4d8..a8f38c82e 100644 --- a/web/modules/custom/vote_utility/translations/tl.po +++ b/web/modules/custom/vote_utility/translations/tl.po @@ -11,15 +11,6 @@ msgstr "" msgid "Select language" msgstr "Pumili ng wika" -msgid "Last updated:" -msgstr "Huling Na-update:" - -msgid "Must be postmarked by @date" -msgstr "Dapat na naka-postmark ng @date" - -msgid "Must be received by @date" -msgstr "Dapat matanggap ng @date" - msgid "External link opens in new window" msgstr "Ang panlabas na link ay magbubukas ng bagong window" diff --git a/web/modules/custom/vote_utility/translations/vi.po b/web/modules/custom/vote_utility/translations/vi.po index 0d9b89994..170abe32d 100644 --- a/web/modules/custom/vote_utility/translations/vi.po +++ b/web/modules/custom/vote_utility/translations/vi.po @@ -11,15 +11,6 @@ msgstr "" msgid "Select language" msgstr "Lựa chọn ngôn ngữ" -msgid "Last updated:" -msgstr "Cập nhật lần cuối:" - -msgid "Must be postmarked by @date" -msgstr "Cần được đánh dấu bưu điện trước @date" - -msgid "Must be received by @date" -msgstr "Phải được nhận trước @date" - msgid "External link opens in new window" msgstr "Liên kết bên ngoài mở cửa sổ mới" diff --git a/web/modules/custom/vote_utility/translations/ypk.po b/web/modules/custom/vote_utility/translations/ypk.po index 530b0ad74..4ee4e21ab 100644 --- a/web/modules/custom/vote_utility/translations/ypk.po +++ b/web/modules/custom/vote_utility/translations/ypk.po @@ -11,15 +11,6 @@ msgstr "" msgid "Select language" msgstr "Ulu nakmiighhu" -msgid "Last updated:" -msgstr "Kingulighmi Nutaghtekat:" - -msgid "Must be postmarked by @date" -msgstr "Tuyumayaghqaguq @date" - -msgid "Must be received by @date" -msgstr "Kaasimayaghqaguq @date" - msgid "Skip to main content" msgstr "Naghughaghten pighpigaghmun" diff --git a/web/modules/custom/vote_utility/translations/zh-hans.po b/web/modules/custom/vote_utility/translations/zh-hans.po index d3dc013d2..4c410091b 100644 --- a/web/modules/custom/vote_utility/translations/zh-hans.po +++ b/web/modules/custom/vote_utility/translations/zh-hans.po @@ -15,15 +15,6 @@ msgstr "选择语言" msgid "On this page" msgstr "本页内容" -msgid "Last updated:" -msgstr "最近更新时间:" - -msgid "Must be postmarked by @date" -msgstr "必须在 @date 星期六之前加盖邮戳" - -msgid "Must be received by @date" -msgstr "必须在 @date 之前收到" - msgid "External link opens in new window" msgstr "外部链接打开新窗口" @@ -103,15 +94,9 @@ msgstr "sábado" msgid "Sunday" msgstr "星期日" -msgid "U.S. government information and services" -msgstr "美国政府提供的信息和服务" - msgid "Close" msgstr "关闭" -msgid "U.S. flag" -msgstr "美国国旗" - msgid "Menu" msgstr "菜单" @@ -121,9 +106,6 @@ msgstr "面包屑导航" msgid "Primary navigation" msgstr "主导航" -msgid "Introduction" -msgstr "简介" - # Temporary military and overseas voter cards msgid "Voting as a military service member" msgstr "军人投票" diff --git a/web/modules/custom/vote_utility/translations/zh.po b/web/modules/custom/vote_utility/translations/zh.po index b31fb4bab..e1aa557d2 100644 --- a/web/modules/custom/vote_utility/translations/zh.po +++ b/web/modules/custom/vote_utility/translations/zh.po @@ -11,15 +11,6 @@ msgstr "" msgid "Select language" msgstr "選擇語言" -msgid "Last updated:" -msgstr "最近更新時間:" - -msgid "Must be postmarked by @date" -msgstr "郵戳為憑 @date" - -msgid "Must be received by @date" -msgstr "必須在 @date 之前寄達" - msgid "External link opens in new window" msgstr "外部鏈接打開新窗口" diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index ccb014ef2..b4634cdb3 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -21,22 +21,6 @@ {# Deadlines with fallbacks. #} {% set online_deadline = content.field_online_deadline | field_value | default(content.field_g_online_deadline | field_value) %} {% set inperson_deadline = content.field_in_person_deadline | field_value | default(content.field_g_in_person_deadline | field_value) %} -{# Set postmarked deadline with fallback #} -{% if content.field_mail_postmarked_deadline | render %} - {% set postmarked_deadline = 'Must be postmarked by @date' | t({'@date': content.field_mail_postmarked_deadline.0 | render}) %} -{% else %} - {% set postmarked_deadline = content.field_g_mail_postmarked_deadline | field_value | render %} -{% endif %} - -{# Set received deadline with fallback #} -{% if content.field_mail_received_deadline | render %} - {% set received_deadline = 'Must be received by @date' | t({'@date': content.field_mail_received_deadline.0 | render}) %} -{% else %} - {% set received_deadline = content.field_g_mail_received_deadline | field_value | render %} -{% endif %} - -{# Set the deadline with fallback, prioritizing postmarked deadline. #} -{% set bymail_deadline = postmarked_deadline | default(received_deadline) %} {# State content with fallbacks. #} {# Get default state display content from the block type. #} @@ -52,6 +36,30 @@ {% set election_date = content.field_election_date.0 | default(state_display_content.field_election_date.0) %} {% set election_text = content.field_election_text.0 | default(state_display_content.field_election_text.0) %} {% set no_online_registration = content.field_no_online_registration.0 | default(state_display_content.field_no_online_registration.0) %} +{% set last_updated_label = state_display_content.field_last_updated_label | field_value %} +{% set postmarked_mail_text = state_display_content.field_postmarked_mail_text | field_value | render | trim %} +{% set received_mail_text = state_display_content.field_received_mail_text | field_value | render | trim %} +{% set online_deadline_label = state_display_content.field_online_reg_deadline_label | field_value %} +{% set mail_deadline_label = state_display_content.field_mail_reg_deadline_label | field_value %} +{% set inperson_deadline_label = state_display_content.field_person_reg_deadline_label | field_value %} +{% set show_digital_form_link = state_display_content.field_enable_digital_form_link | field_value | render | trim == '1' %} + +{# Set postmarked deadline with fallback #} +{% if content.field_mail_postmarked_deadline | render %} + {% set postmarked_deadline = postmarked_mail_text | t({'@date': content.field_mail_postmarked_deadline.0 | render}) %} +{% else %} + {% set postmarked_deadline = content.field_g_mail_postmarked_deadline | field_value | render %} +{% endif %} + +{# Set received deadline with fallback #} +{% if content.field_mail_received_deadline | render %} + {% set received_deadline = received_mail_text | t({'@date': content.field_mail_received_deadline.0 | render}) %} +{% else %} + {% set received_deadline = content.field_g_mail_received_deadline | field_value | render %} +{% endif %} + +{# Set the deadline with fallback, prioritizing postmarked deadline. #} +{% set bymail_deadline = postmarked_deadline | default(received_deadline) %} {# Registration types #} {% set registration_types = content.field_registration_type | field_value | column('#markup') %} @@ -122,16 +130,21 @@ {# setting online registration variables #} {% set online_registration_vars = has_online ? online_registration : no_online_registration %} -{% set body_vars = has_online ? {'@state_online_deadline': online_deadline | render, '@state_name': title_english} : {'@state_name': title_english} %} {% if online_registration_vars is not empty %} - {% set body = online_registration_vars.text['#markup'] | t(body_vars) %} + {% set online_body %} + {% if online_deadline %} +

{{ online_deadline_label }} {{ online_deadline }}

+ {% endif %} + + {{ online_registration_vars.text }} + {% endset %} {% if online_registration_vars.link_text %} {% set link_title = online_registration_vars.link_text['#markup'] | t({'@state_name': title_english}) %} {% endif %} {% include '@votegov/component/info-card.html.twig' with { 'heading': online_registration_vars.heading, - 'body': body, + 'body': online_body | render | trim | t({'@state_name': title_english}), 'link': { 'url': registration_link, 'title': link_title, @@ -149,7 +162,7 @@ {{ nvrf_details.text['#markup'] | t({'@state_name': title_english}) }} - {% if nvrf_details.link_text %} + {% if nvrf_details.link_text and show_digital_form_link %} {# Set path to form dynamically using page route. #} {% set form_route = language!= 'es'? 'vote_nvrf.nvrf_page' : 'vote_nvrf.nvrf_page_es' %} {% set state_name = currentnode.label | lower | replace({' ': '-'}) %} @@ -167,6 +180,10 @@ {# Mail registration content #} {% if has_mail and (mail_registration is not empty) %} {% set mail_body %} + {% if bymail_deadline %} +

{{ mail_deadline_label }} {{ bymail_deadline }}

+ {% endif %} + {{ mail_registration.text }} {% if state_mail_pdf_link and mail_registration.link_text %} @@ -176,7 +193,7 @@ {% include '@votegov/component/info-card.html.twig' with { 'heading': mail_registration.heading, - 'body': mail_body | render | trim | t({'@state_mail_deadline': bymail_deadline,'@state_name': title_english}), + 'body': mail_body | render | trim | t({'@state_name': title_english}), 'footer': mail_footer } %} {# No mail registration content #} @@ -200,13 +217,18 @@ {% endif %} {% if has_in_person and (inperson_registration is not empty) %} - {% set body = inperson_registration.text['#markup'] | t({'@state_in-person_deadline': inperson_deadline | render }) %} + {% set inperson_body %} + {% if inperson_deadline %} +

{{ inperson_deadline_label }} {{ inperson_deadline }}

+ {% endif %} + {{ inperson_registration.text }} + {% endset %} {% if inperson_registration.link_text %} {% set link_title = inperson_registration.link_text['#markup'] | t({'@state_name': title_english }) %} {% endif %} {% include '@votegov/component/info-card.html.twig' with { 'heading': inperson_registration.heading, - 'body': body, + 'body': inperson_body | render | trim | t({'@state_name': title_english}), 'link': { 'url': more_info_link, 'title': link_title, @@ -226,7 +248,7 @@ {% if content.field_updated_date | field_value is not empty %}

{# Striptags and raw filters were added to accomodate Navajo date formats. #} - {{'Last updated:' | t }} {{ content.field_updated_date | render | replace(t_numbers[language].numbers | default([])) | striptags('') | raw }} + {{ last_updated_label }} {{ content.field_updated_date | render | replace(t_numbers[language].numbers | default([])) | striptags('') | raw }}

{% endif %}
From 6cf4f86c06df4896f3e15b4778d3e18536a3b107 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Wed, 27 Nov 2024 04:09:16 -0700 Subject: [PATCH 29/32] VOTE- 3134 replace online and in-person date fields (#1131) --- ...m_display.node.state_territory.default.yml | 49 -------------- ...w_display.node.state_territory.default.yml | 51 +------------- ...view_display.node.state_territory.full.yml | 67 +++++-------------- ...ew_display.node.state_territory.teaser.yml | 4 -- ...erritory.field_date_in_person_deadline.yml | 2 +- ...e_territory.field_date_online_deadline.yml | 2 +- ...ate_territory.field_in_person_deadline.yml | 39 ----------- ....state_territory.field_online_deadline.yml | 39 ----------- ....storage.node.field_in_person_deadline.yml | 32 --------- ...eld.storage.node.field_online_deadline.yml | 32 --------- .../node/node--state-territory.html.twig | 4 +- 11 files changed, 24 insertions(+), 297 deletions(-) delete mode 100644 config/sync/field.field.node.state_territory.field_in_person_deadline.yml delete mode 100644 config/sync/field.field.node.state_territory.field_online_deadline.yml delete mode 100644 config/sync/field.storage.node.field_in_person_deadline.yml delete mode 100644 config/sync/field.storage.node.field_online_deadline.yml diff --git a/config/sync/core.entity_form_display.node.state_territory.default.yml b/config/sync/core.entity_form_display.node.state_territory.default.yml index d66b01117..f0e4f5633 100644 --- a/config/sync/core.entity_form_display.node.state_territory.default.yml +++ b/config/sync/core.entity_form_display.node.state_territory.default.yml @@ -17,7 +17,6 @@ dependencies: - field.field.node.state_territory.field_g_mail_received_deadline - field.field.node.state_territory.field_g_online_deadline - field.field.node.state_territory.field_identification_inst - - field.field.node.state_territory.field_in_person_deadline - field.field.node.state_territory.field_in_person_registration - field.field.node.state_territory.field_in_state_name - field.field.node.state_territory.field_is_state @@ -34,7 +33,6 @@ dependencies: - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name - - field.field.node.state_territory.field_online_deadline - field.field.node.state_territory.field_online_registration - field.field.node.state_territory.field_override_confirm_reg_link - field.field.node.state_territory.field_override_election_hp_link @@ -55,7 +53,6 @@ dependencies: module: - content_moderation - datetime - - double_field - field_group - link - media_library @@ -365,29 +362,6 @@ content: rows: 5 placeholder: '' third_party_settings: { } - field_in_person_deadline: - type: double_field - weight: 6 - region: content - settings: - first: - type: datetime - label_display: block - size: 30 - placeholder: '' - label: Ok - cols: 10 - rows: 5 - second: - type: textfield - label_display: block - size: 8 - placeholder: '11:59 PM' - label: Ok - cols: 10 - rows: 5 - inline: true - third_party_settings: { } field_in_person_registration: type: vote_fields_state_content weight: 17 @@ -522,29 +496,6 @@ content: size: 60 placeholder: '' third_party_settings: { } - field_online_deadline: - type: double_field - weight: 7 - region: content - settings: - first: - type: datetime - label_display: block - size: 30 - placeholder: '' - label: Ok - cols: 10 - rows: 5 - second: - type: textfield - label_display: block - size: 8 - placeholder: '11:59 PM' - label: Ok - cols: 10 - rows: 5 - inline: true - third_party_settings: { } field_online_registration: type: vote_fields_state_content weight: 14 diff --git a/config/sync/core.entity_view_display.node.state_territory.default.yml b/config/sync/core.entity_view_display.node.state_territory.default.yml index fbad40571..045539cb4 100644 --- a/config/sync/core.entity_view_display.node.state_territory.default.yml +++ b/config/sync/core.entity_view_display.node.state_territory.default.yml @@ -17,7 +17,6 @@ dependencies: - field.field.node.state_territory.field_g_mail_received_deadline - field.field.node.state_territory.field_g_online_deadline - field.field.node.state_territory.field_identification_inst - - field.field.node.state_territory.field_in_person_deadline - field.field.node.state_territory.field_in_person_registration - field.field.node.state_territory.field_in_state_name - field.field.node.state_territory.field_is_state @@ -34,7 +33,6 @@ dependencies: - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name - - field.field.node.state_territory.field_online_deadline - field.field.node.state_territory.field_online_registration - field.field.node.state_territory.field_override_confirm_reg_link - field.field.node.state_territory.field_override_election_hp_link @@ -53,7 +51,6 @@ dependencies: - node.type.state_territory module: - datetime - - double_field - link - metatag - text @@ -119,7 +116,7 @@ content: label: above settings: timezone_override: '' - format_type: medium + format_type: long_date third_party_settings: { } weight: 49 region: content @@ -128,7 +125,7 @@ content: label: above settings: timezone_override: '' - format_type: medium + format_type: long_date third_party_settings: { } weight: 48 region: content @@ -183,28 +180,6 @@ content: third_party_settings: { } weight: 25 region: content - field_in_person_deadline: - type: double_field_unformatted_list - label: hidden - settings: - first: - format_type: long_date - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - second: - format_type: medium - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - inline: true - third_party_settings: { } - weight: 14 - region: content field_in_person_registration: type: vote_fields_state_content_default label: above @@ -330,28 +305,6 @@ content: third_party_settings: { } weight: 22 region: content - field_online_deadline: - type: double_field_unformatted_list - label: hidden - settings: - first: - format_type: long_date - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - second: - format_type: medium - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - inline: true - third_party_settings: { } - weight: 8 - region: content field_online_registration: type: vote_fields_state_content_default label: above diff --git a/config/sync/core.entity_view_display.node.state_territory.full.yml b/config/sync/core.entity_view_display.node.state_territory.full.yml index 873399cf4..77977d3cd 100644 --- a/config/sync/core.entity_view_display.node.state_territory.full.yml +++ b/config/sync/core.entity_view_display.node.state_territory.full.yml @@ -18,7 +18,6 @@ dependencies: - field.field.node.state_territory.field_g_mail_received_deadline - field.field.node.state_territory.field_g_online_deadline - field.field.node.state_territory.field_identification_inst - - field.field.node.state_territory.field_in_person_deadline - field.field.node.state_territory.field_in_person_registration - field.field.node.state_territory.field_in_state_name - field.field.node.state_territory.field_is_state @@ -35,7 +34,6 @@ dependencies: - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name - - field.field.node.state_territory.field_online_deadline - field.field.node.state_territory.field_online_registration - field.field.node.state_territory.field_override_confirm_reg_link - field.field.node.state_territory.field_override_election_hp_link @@ -54,7 +52,6 @@ dependencies: - node.type.state_territory module: - datetime - - double_field - link - options - user @@ -98,6 +95,24 @@ content: third_party_settings: { } weight: 15 region: content + field_date_in_person_deadline: + type: datetime_default + label: hidden + settings: + timezone_override: '' + format_type: long_date + third_party_settings: { } + weight: 33 + region: content + field_date_online_deadline: + type: datetime_default + label: hidden + settings: + timezone_override: '' + format_type: long_date + third_party_settings: { } + weight: 34 + region: content field_election_homepage_link: type: link label: hidden @@ -142,28 +157,6 @@ content: third_party_settings: { } weight: 8 region: content - field_in_person_deadline: - type: double_field_unformatted_list - label: hidden - settings: - first: - format_type: long_date - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - second: - format_type: medium - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - inline: true - third_party_settings: { } - weight: 13 - region: content field_in_person_registration: type: vote_fields_state_content_default label: hidden @@ -269,28 +262,6 @@ content: third_party_settings: { } weight: 23 region: content - field_online_deadline: - type: double_field_unformatted_list - label: hidden - settings: - first: - format_type: long_date - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - second: - format_type: medium - link: false - hidden: false - decimal_separator: . - thousand_separator: '' - scale: 2 - inline: true - third_party_settings: { } - weight: 7 - region: content field_online_registration: type: vote_fields_state_content_default label: hidden @@ -393,8 +364,6 @@ hidden: body: true field_address_location_inst: true field_content_version: true - field_date_in_person_deadline: true - field_date_online_deadline: true field_identification_inst: true field_mailing_address_inst: true field_metatags: true diff --git a/config/sync/core.entity_view_display.node.state_territory.teaser.yml b/config/sync/core.entity_view_display.node.state_territory.teaser.yml index f01b7e647..c57c0641f 100644 --- a/config/sync/core.entity_view_display.node.state_territory.teaser.yml +++ b/config/sync/core.entity_view_display.node.state_territory.teaser.yml @@ -18,7 +18,6 @@ dependencies: - field.field.node.state_territory.field_g_mail_received_deadline - field.field.node.state_territory.field_g_online_deadline - field.field.node.state_territory.field_identification_inst - - field.field.node.state_territory.field_in_person_deadline - field.field.node.state_territory.field_in_person_registration - field.field.node.state_territory.field_in_state_name - field.field.node.state_territory.field_is_state @@ -35,7 +34,6 @@ dependencies: - field.field.node.state_territory.field_nvrf_fields - field.field.node.state_territory.field_nvrf_last_updated_date - field.field.node.state_territory.field_of_state_name - - field.field.node.state_territory.field_online_deadline - field.field.node.state_territory.field_online_registration - field.field.node.state_territory.field_override_confirm_reg_link - field.field.node.state_territory.field_override_election_hp_link @@ -84,7 +82,6 @@ hidden: field_g_mail_received_deadline: true field_g_online_deadline: true field_identification_inst: true - field_in_person_deadline: true field_in_person_registration: true field_in_state_name: true field_is_state: true @@ -101,7 +98,6 @@ hidden: field_nvrf_fields: true field_nvrf_last_updated_date: true field_of_state_name: true - field_online_deadline: true field_online_registration: true field_override_confirm_reg_link: true field_override_election_hp_link: true diff --git a/config/sync/field.field.node.state_territory.field_date_in_person_deadline.yml b/config/sync/field.field.node.state_territory.field_date_in_person_deadline.yml index 1421e6da7..8baf81df5 100644 --- a/config/sync/field.field.node.state_territory.field_date_in_person_deadline.yml +++ b/config/sync/field.field.node.state_territory.field_date_in_person_deadline.yml @@ -11,7 +11,7 @@ id: node.state_territory.field_date_in_person_deadline field_name: field_date_in_person_deadline entity_type: node bundle: state_territory -label: 'Date in-person deadline' +label: 'In-person deadline' description: '' required: false translatable: false diff --git a/config/sync/field.field.node.state_territory.field_date_online_deadline.yml b/config/sync/field.field.node.state_territory.field_date_online_deadline.yml index 8e450a3c4..58fc0f3bc 100644 --- a/config/sync/field.field.node.state_territory.field_date_online_deadline.yml +++ b/config/sync/field.field.node.state_territory.field_date_online_deadline.yml @@ -11,7 +11,7 @@ id: node.state_territory.field_date_online_deadline field_name: field_date_online_deadline entity_type: node bundle: state_territory -label: 'Date Online Deadline' +label: 'Online Deadline' description: '' required: false translatable: false diff --git a/config/sync/field.field.node.state_territory.field_in_person_deadline.yml b/config/sync/field.field.node.state_territory.field_in_person_deadline.yml deleted file mode 100644 index 4c612533b..000000000 --- a/config/sync/field.field.node.state_territory.field_in_person_deadline.yml +++ /dev/null @@ -1,39 +0,0 @@ -uuid: 6ba62bcb-0ddf-4e86-b473-d29a94dae48d -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_in_person_deadline - - node.type.state_territory - module: - - double_field -id: node.state_territory.field_in_person_deadline -field_name: field_in_person_deadline -entity_type: node -bundle: state_territory -label: 'In-person deadline' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - first: - label: Date - list: false - allowed_values: { } - max: null - min: null - required: true - on_label: 'On' - off_label: 'Off' - second: - label: Time - list: false - allowed_values: { } - max: null - min: null - required: false - on_label: 'On' - off_label: 'Off' -field_type: double_field diff --git a/config/sync/field.field.node.state_territory.field_online_deadline.yml b/config/sync/field.field.node.state_territory.field_online_deadline.yml deleted file mode 100644 index 24dbd1175..000000000 --- a/config/sync/field.field.node.state_territory.field_online_deadline.yml +++ /dev/null @@ -1,39 +0,0 @@ -uuid: 142ca270-a827-4c60-a346-c71bbf6db2a5 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_online_deadline - - node.type.state_territory - module: - - double_field -id: node.state_territory.field_online_deadline -field_name: field_online_deadline -entity_type: node -bundle: state_territory -label: 'Online deadline' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - first: - label: Date - list: false - allowed_values: { } - max: null - min: null - required: true - on_label: 'On' - off_label: 'Off' - second: - label: Time - list: false - allowed_values: { } - max: null - min: null - required: false - on_label: 'On' - off_label: 'Off' -field_type: double_field diff --git a/config/sync/field.storage.node.field_in_person_deadline.yml b/config/sync/field.storage.node.field_in_person_deadline.yml deleted file mode 100644 index fe479b1e3..000000000 --- a/config/sync/field.storage.node.field_in_person_deadline.yml +++ /dev/null @@ -1,32 +0,0 @@ -uuid: 6dd5d9cc-f690-460d-870e-a52e29b59d45 -langcode: en -status: true -dependencies: - module: - - double_field - - node -id: node.field_in_person_deadline -field_name: field_in_person_deadline -entity_type: node -type: double_field -settings: - storage: - first: - type: datetime_iso8601 - maxlength: 255 - precision: 10 - scale: 2 - datetime_type: date - second: - type: string - maxlength: 8 - precision: 10 - scale: 2 - datetime_type: datetime -module: double_field -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_online_deadline.yml b/config/sync/field.storage.node.field_online_deadline.yml deleted file mode 100644 index f7106815a..000000000 --- a/config/sync/field.storage.node.field_online_deadline.yml +++ /dev/null @@ -1,32 +0,0 @@ -uuid: e0416ced-e99e-47ca-ae90-4c7bedd4cdfe -langcode: en -status: true -dependencies: - module: - - double_field - - node -id: node.field_online_deadline -field_name: field_online_deadline -entity_type: node -type: double_field -settings: - storage: - first: - type: datetime_iso8601 - maxlength: 255 - precision: 10 - scale: 2 - datetime_type: date - second: - type: string - maxlength: 8 - precision: 10 - scale: 2 - datetime_type: datetime -module: double_field -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index b4634cdb3..886ee5f58 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -19,8 +19,8 @@ {% set state_mail_pdf_link = content.field_override_mail_reg_link | field_value | default(content.field_mail_registration_link | field_value) | render | trim %} {# Deadlines with fallbacks. #} -{% set online_deadline = content.field_online_deadline | field_value | default(content.field_g_online_deadline | field_value) %} -{% set inperson_deadline = content.field_in_person_deadline | field_value | default(content.field_g_in_person_deadline | field_value) %} +{% set online_deadline = content.field_date_online_deadline | field_value | default(content.field_g_online_deadline | field_value) %} +{% set inperson_deadline = content.field_date_in_person_deadline | field_value | default(content.field_g_in_person_deadline | field_value) %} {# State content with fallbacks. #} {# Get default state display content from the block type. #} From 0261ecc23a5d87cc4cab3125c658f09231834811 Mon Sep 17 00:00:00 2001 From: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:41:00 -0700 Subject: [PATCH 30/32] VOTE-3149 add state page data analytics and config (#1126) --- config/sync/editor.editor.simple_html.yml | 4 +++ config/sync/filter.format.simple_html.yml | 2 +- .../component/call-out-box.html.twig | 4 +-- .../templates/component/info-card.html.twig | 4 ++- ...ode--state-territory--not-needed.html.twig | 2 +- .../node/node--state-territory.html.twig | 30 +++++++++++++++---- 6 files changed, 36 insertions(+), 10 deletions(-) diff --git a/config/sync/editor.editor.simple_html.yml b/config/sync/editor.editor.simple_html.yml index c638c7484..2ad6a21c1 100644 --- a/config/sync/editor.editor.simple_html.yml +++ b/config/sync/editor.editor.simple_html.yml @@ -15,12 +15,16 @@ settings: - italic - link - bulletedList + - sourceEditing plugins: ckeditor5_list: properties: reversed: false startIndex: false multiBlock: true + ckeditor5_sourceEditing: + allowed_tags: + - '' editor_advanced_link_link: enabled_attributes: - aria-label diff --git a/config/sync/filter.format.simple_html.yml b/config/sync/filter.format.simple_html.yml index 44ae70e44..a2f5565af 100644 --- a/config/sync/filter.format.simple_html.yml +++ b/config/sync/filter.format.simple_html.yml @@ -12,6 +12,6 @@ filters: status: true weight: -10 settings: - allowed_html: '

    1. ' + allowed_html: '

        1. ' filter_html_help: true filter_html_nofollow: false diff --git a/web/themes/custom/votegov/templates/component/call-out-box.html.twig b/web/themes/custom/votegov/templates/component/call-out-box.html.twig index bda01b2cb..cd5310e6c 100644 --- a/web/themes/custom/votegov/templates/component/call-out-box.html.twig +++ b/web/themes/custom/votegov/templates/component/call-out-box.html.twig @@ -19,9 +19,9 @@ * #} -{% if link_url %} +{% if link.url and link.title %} {% set link_markup %} - {{ link_text }} + {{ link(link.title, link.url, create_attribute().setAttribute(data.label, data.value)) }} {% endset %} {% endif %} diff --git a/web/themes/custom/votegov/templates/component/info-card.html.twig b/web/themes/custom/votegov/templates/component/info-card.html.twig index dcaddf593..52d8b28c7 100644 --- a/web/themes/custom/votegov/templates/component/info-card.html.twig +++ b/web/themes/custom/votegov/templates/component/info-card.html.twig @@ -34,7 +34,9 @@
          {% include '@votegov/component/button.html.twig' with { 'href': link.url, - 'label': link.title + 'label': link.title, + 'data_label': data.label, + 'data': data.value, } %}
          {% endif %} diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig index af100bc4d..08f5e8184 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig @@ -15,7 +15,7 @@ {# setting link text to be in inline hyper link #} {% if registration_not_needed.link_text %} {% set link_markup %} - {{ registration_not_needed.link_text | render | trim | t({'@state_name': title_english}) }} + {{ registration_not_needed.link_text | render | trim | t({'@state_name': title_english}) }} {% endset %} {% endif %} {# setting body text to have palceholder for both state name and link #} diff --git a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig index 886ee5f58..0dd6298f2 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory.html.twig @@ -104,8 +104,14 @@ {% include '@votegov/component/call-out-box.html.twig' with { 'heading': check_registration.heading, 'text': check_registration.text | render | trim, - 'link_text': check_registration.link_text | render | trim | t({'@state_name': title_english}), - 'link_url': confirm_registration_link + 'link': { + 'url': confirm_registration_link, + 'title': check_registration.link_text | render | trim | t({'@state_name': title_english}), + }, + 'data': { + 'label' : 'data-state-ext', + 'value': 'confirm-registration', + }, } %} {% endif %} @@ -117,8 +123,14 @@ {% include '@votegov/component/call-out-box.html.twig' with { 'heading': check_registration.heading, 'text': check_registration.text | render | trim, - 'link_text': check_registration.link_text | render | trim | t({'@state_name': title_english}), - 'link_url': confirm_registration_link + 'link': { + 'url': confirm_registration_link, + 'title': check_registration.link_text | render | trim | t({'@state_name': title_english}), + }, + 'data': { + 'label' : 'data-state-ext', + 'value': 'confirm-registration', + }, } %} {% endif %} @@ -148,6 +160,10 @@ 'link': { 'url': registration_link, 'title': link_title, + }, + 'data' : { + 'label': 'data-state-ext', + 'value': 'online-registration' } } %} {% endif %} @@ -187,7 +203,7 @@ {{ mail_registration.text }} {% if state_mail_pdf_link and mail_registration.link_text %} -

          {{ link(mail_registration.link_text, state_mail_pdf_link) }}

          +

          {{ link(mail_registration.link_text, state_mail_pdf_link, create_attribute().setAttribute('data-state-ext', 'state-mail-registration')) }}

          {% endif %} {% endset %} @@ -232,6 +248,10 @@ 'link': { 'url': more_info_link, 'title': link_title, + }, + 'data' : { + 'label': 'data-state-ext', + 'value': 'in-person-registration' } } %} {% endif %} From 7f8aaa0793ab5ba1b9ed322b294a2a24cccfe0a2 Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Tue, 31 Dec 2024 12:28:24 -0800 Subject: [PATCH 31/32] VOTE-3211 Update state title to use display content value (#1176) --- .../templates/component/page-title.html.twig | 23 ------------------- .../votegov/templates/layout/page.html.twig | 5 ++-- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 web/themes/custom/votegov/templates/component/page-title.html.twig diff --git a/web/themes/custom/votegov/templates/component/page-title.html.twig b/web/themes/custom/votegov/templates/component/page-title.html.twig deleted file mode 100644 index 25dd03e7f..000000000 --- a/web/themes/custom/votegov/templates/component/page-title.html.twig +++ /dev/null @@ -1,23 +0,0 @@ -{% set title = drupal_title() %} -{% set node_type = currentnode.bundle() %} - -{% if node_type == "state_territory" %} - {% set title = title | render | striptags | trim %} - {% if language == 'ko' and currentnode.field_is_state.value %} - {% set korean_state_char = "state" | t %} - {% set title = title ~ " " ~ korean_state_char %} - {% endif %} - - {% set in_state_name = currentnode.field_in_state_name.value | default("@state_name") | t({ "@state_name": title }) %} - {% set title = 'Register to vote in @state_name' | t ({ - "@state_name": title, - "@in_state_name": in_state_name - }) %} -{% endif %} - - -{{ title_prefix }} -{% if title %} - {{ title }} -{% endif %} -{{ title_suffix }} diff --git a/web/themes/custom/votegov/templates/layout/page.html.twig b/web/themes/custom/votegov/templates/layout/page.html.twig index b4e8a63e0..230ad7f43 100644 --- a/web/themes/custom/votegov/templates/layout/page.html.twig +++ b/web/themes/custom/votegov/templates/layout/page.html.twig @@ -60,6 +60,7 @@ {% set node_type = currentnode.bundle() %} {% if node_type == "state_territory" %} + {% set state_display_title = drupal_field('field_display_title', 'block_content', 23) %} {% set title = title | render | striptags | trim %} {% if language == 'ko' and currentnode.field_is_state.value %} {% set korean_state_char = "state" | t %} @@ -67,10 +68,10 @@ {% endif %} {% set in_state_name = currentnode.field_in_state_name.value | default("@state_name") | t({ "@state_name": title }) %} - {% set title = 'Register to vote in @state_name' | t ({ + {% set title = state_display_title | field_value | render | trim | t ({ "@state_name": title, "@in_state_name": in_state_name - }) %} + }) | default(title) %} {% endif %} {# Government banner component #} From 6454b7d33632ee0e72463dee7062fae77005b2e7 Mon Sep 17 00:00:00 2001 From: Ray Estrada Date: Thu, 16 Jan 2025 12:44:29 -0800 Subject: [PATCH 32/32] VOTE-3280 Update not needed template to allow heading to be optional (#1195) * VOTE-920 create a new block type for managing nvrf strings (#1187) * VOTE-920 create a new NVRF display content block type * Create new compound fields for NVRF display content block type * VOTE-3189 improve help text for nvrf fields taxonomy edit form (#1188) * VOTE-2869-3058: Update documentation for devops and disaster recovery (#1193) * VOTE-3309 Add CISA link to excluded links list (#1194) * VOTE-3280 Update not needed template to allow heading to be optional --------- Co-authored-by: tt-gsa <139235281+tt-gsa@users.noreply.github.com> Co-authored-by: SamiraMSadat <108487505+SamiraMSadat@users.noreply.github.com> Co-authored-by: SamiraMSadat --- .../votegov/templates/component/info-card.html.twig | 8 +++++--- .../node/node--state-territory--not-needed.html.twig | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web/themes/custom/votegov/templates/component/info-card.html.twig b/web/themes/custom/votegov/templates/component/info-card.html.twig index 52d8b28c7..34282226b 100644 --- a/web/themes/custom/votegov/templates/component/info-card.html.twig +++ b/web/themes/custom/votegov/templates/component/info-card.html.twig @@ -22,9 +22,11 @@ * #}
          -

          - {{ heading }} -

          + {% if heading %} +

          + {{ heading }} +

          + {% endif %} {% if body %}
          {{ body }} diff --git a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig index 08f5e8184..cbef7d4d5 100644 --- a/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig +++ b/web/themes/custom/votegov/templates/node/node--state-territory--not-needed.html.twig @@ -19,12 +19,12 @@ {% endset %} {% endif %} {# setting body text to have palceholder for both state name and link #} - {% set body = registration_not_needed.text['#markup']| t({'@state_name': title_english, '@link': {'#markup': link_markup } | render}) %} - {# setting heading text to have palceholder for state name #} - {% set heading = registration_not_needed.heading['#markup']| t({'@state_name': title_english | render}) %} + {% set body = registration_not_needed.text | render | trim | t({'@state_name': title_english, '@link': {'#markup': link_markup } | render}) %} + {# setting heading text to have placeholder for state name #} + {% set heading = registration_not_needed.heading | render | trim | t({'@state_name': title_english | render}) %} {% include '@votegov/component/info-card.html.twig' with { - 'heading': heading, + 'heading': heading is not empty ? heading, 'body': body, } %}