Skip to content
This repository has been archived by the owner on Aug 15, 2024. It is now read-only.

Commit

Permalink
Merge pull request #840 from usagov/staging
Browse files Browse the repository at this point in the history
Sprint 32 release: STAGING to MASTER
  • Loading branch information
rayestrada authored May 9, 2023
2 parents f2a30c8 + 914890d commit 875342a
Show file tree
Hide file tree
Showing 49 changed files with 305 additions and 181 deletions.
1 change: 1 addition & 0 deletions assets/fonts/navajo-font/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
*.usa-prose>h3,
*.usa-prose>h4,
*.usa-prose>h5,
*.usa-skipnav,
*.usa-select[data-test="state-selection"],
*[type="button"] {
font-family: 'times_new_roman_navajoregular';
Expand Down
3 changes: 2 additions & 1 deletion assets/img/ballot_box-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/img/search--white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 4 additions & 19 deletions assets/scripts/external-links.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,19 @@
(() => {

// Enable external links behavior.
const externalLinks = document.querySelectorAll('a[href^="http"]');
// Set all whitelisted domains.
const whitelistedDomains = [
'https://www.gsa.gov',
'https://www.gsaig.gov',
'https://www.usa.gov'
];
const externalLinks = document.querySelectorAll('a[href^="https"]');

// Checks if a value matches one of the whitelistedDomains.
const matchesWhitelistedDomain = (value) => {
for (let i = 0; i < whitelistedDomains.length; i++) {
if (value.indexOf(whitelistedDomains[i]) != -1) {
return true;
}
}

return false;
}
//Get title text translation from footer element
const title_text = document.getElementById('ext-link-title').getAttribute('data-title');

// Process external links.
if (externalLinks.length) {
for (let i = 0; i < externalLinks.length; i++) {
if (!matchesWhitelistedDomain(externalLinks[i].href)) {
const svg = `<svg aria-hidden="true" viewBox="3 3 18 18" width="10" height="10"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" fill="currentColor"></path></svg>`;
var svgIcon = `<span class="ext-link">&#xFEFF;${svg}</span>`;
externalLinks[i].setAttribute('target', '_blank');
externalLinks[i].insertAdjacentHTML( 'beforeend', svgIcon );
}
externalLinks[i].setAttribute('title', title_text);
}
}

Expand Down
38 changes: 25 additions & 13 deletions config/_default/languages.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"english_only": "(ইংরেজীতে)",
"last_updated": "সর্বশেষ সংষ্করণ",
"select_language": "ভাষা নির্বাচন করুন",
"english_languageName": "Bengali"
"english_languageName": "Bengali",
"ext_link_title": "বাহ্যিক লিঙ্ক নতুন উইন্ডো খোলে"
}
},
"en": {
Expand All @@ -35,7 +36,8 @@
"english_only": "",
"last_updated": "Last Updated: ",
"select_language": "Select Language",
"english_languageName": ""
"english_languageName": "",
"ext_link_title": "External link opens new window"
}
},
"es": {
Expand All @@ -55,7 +57,8 @@
"english_only": "(en inglés)",
"last_updated": "Última actualización: ",
"select_language": "Seleccione el idioma",
"english_languageName": "Spanish"
"english_languageName": "Spanish",
"ext_link_title": "El enlace externo se abre en una nueva ventana"
}
},
"hi": {
Expand All @@ -75,7 +78,8 @@
"english_only": "(अंग्रेज़ी में)",
"last_updated": "नवीनतम अपडेट:",
"select_language": "भाषा चुनें",
"english_languageName": "Hindi"
"english_languageName": "Hindi",
"ext_link_title": "बाहरी लिंक नई विंडो खोलता है"
}
},
"ko": {
Expand All @@ -95,7 +99,8 @@
"english_only": "(영어로 제공)",
"last_updated": "마지막 업데이트일자:",
"select_language": "언어 선택",
"english_languageName": "Korean"
"english_languageName": "Korean",
"ext_link_title": "외부 링크 사이트는 새 창에서 연결됩니다"
}
},
"km": {
Expand All @@ -115,7 +120,8 @@
"english_only": "(ជាភាសាអង់គ្លេស)",
"last_updated": "បានធ្វើបច្ចុប្បន្នភាពលើកចុងក្រោយ៖",
"select_language": "ជ្រើសរើសភាសា %dropdown-list%",
"english_languageName": "Khmer"
"english_languageName": "Khmer",
"ext_link_title": "តំណខាងក្រៅបើកផ្ទាំងបង្ឣួចថ្មី"
}
},
"vi": {
Expand All @@ -135,7 +141,8 @@
"english_only": "(bằng Tiếng Anh)",
"last_updated": "Cập nhật lần cuối:",
"select_language": "Lựa chọn ngôn ngữ %dropdown-list%",
"english_languageName": "Vietnamese"
"english_languageName": "Vietnamese",
"ext_link_title": "Liên kết bên ngoài mở cửa sổ mới"
}
},
"tl": {
Expand All @@ -155,7 +162,8 @@
"english_only": "(sa Ingles)",
"last_updated": "Huling Na-update:",
"select_language": "Pumili ng wika",
"english_languageName": ""
"english_languageName": "",
"ext_link_title": "Ang panlabas na link ay magbubukas ng bagong window"
}
},
"zh": {
Expand All @@ -175,14 +183,15 @@
"english_only": "(英語)",
"last_updated": "最近更新時間:",
"select_language": "選擇語言 %dropdown-list%",
"english_languageName": "Chinese - Traditional"
"english_languageName": "Chinese - Traditional",
"ext_link_title": "外部鏈接打開新窗口"
}
},
"zh-hans": {
"contentDir": "content/zh-hans",
"title": "选民登记",
"languageName": "中文",
"weight":4,
"weight": 4,
"params": {
"Owner": "%Vote.gov% 中文",
"language_direction": "ltr",
Expand All @@ -195,7 +204,8 @@
"english_only": "(英语)",
"last_updated": "最近更新时间:",
"select_language": "选择语言",
"english_languageName": "Chinese - Simplified"
"english_languageName": "Chinese - Simplified",
"ext_link_title": "外部链接打开新窗口"
}
},
"ypk": {
Expand All @@ -215,7 +225,8 @@
"english_only": "(Laluramkestun)",
"last_updated": "Kingulighmi Nutaghtekat:",
"select_language": "Ulu nakmiighhu %dropdown-list%",
"english_languageName": ""
"english_languageName": "",
"ext_link_title": "External link opens new window"
}
},
"nv": {
Expand All @@ -236,7 +247,8 @@
"last_updated": "Ak44'di n1zk'33z: ",
"select_language": "Saad choid77['88[7g77",
"english_languageName": "Navajo",
"translation_outdated": true
"translation_outdated": true,
"ext_link_title": "External link opens new window"
}
}
}
4 changes: 2 additions & 2 deletions content/es/promoviendo-acceso-al-voto.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+++
title = "Vote.gov se moderniza"
meta-title = "Novedades y mejoras en Vote.gov"
meta-description = "Vote.gov está mejorando su accesibilidad, su acceso a otros idiomas y su usabilidad para promover el acceso al voto, en especial en las comunidades marginadas."
meta_title = "Novedades y mejoras en Vote.gov"
meta_description = "Vote.gov está mejorando su accesibilidad, su acceso a otros idiomas y su usabilidad para promover el acceso al voto, en especial en las comunidades marginadas."
translationKey = "modernization"
+++
<div class="usa-prose slick-sheet">
Expand Down
4 changes: 2 additions & 2 deletions content/tl/about-us.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+++
title = "Tungkol sa Vote.gov"
meta-title = "Tungkol sa amin"
meta-description = "Ang Vote.gov ay isang website ng gobyerno ng Estados Unidos na nagbibigay ng pinagkakatiwalaang impormasyon sa pagboto at makakatulong sa inyong makahanap ng mga panuntunan sa pagpaparehistro ng botante para sa inyong estado."
meta_title = "Tungkol sa amin"
meta_description = "Ang Vote.gov ay isang website ng gobyerno ng Estados Unidos na nagbibigay ng pinagkakatiwalaang impormasyon sa pagboto at makakatulong sa inyong makahanap ng mga panuntunan sa pagpaparehistro ng botante para sa inyong estado."
translationKey = "about"
+++

Expand Down
4 changes: 2 additions & 2 deletions content/vi/about-us.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+++
title = "Giới thiệu về Vote.gov"
meta-title = "Giới thiệu về chúng tôi"
meta-description = "Vote.gov là một trang web của chính phủ Hoa Kỳ cung cấp thông tin bỏ phiếu đáng tin cậy và có thể giúp bạn tìm các quy tắc đăng ký cử tri cho tiểu bang của bạn."
meta_title = "Giới thiệu về chúng tôi"
meta_description = "Vote.gov là một trang web của chính phủ Hoa Kỳ cung cấp thông tin bỏ phiếu đáng tin cậy và có thể giúp bạn tìm các quy tắc đăng ký cử tri cho tiểu bang của bạn."
translationKey = "about"
+++

Expand Down
4 changes: 2 additions & 2 deletions content/ypk/about-us.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+++
title = "Vote.gov-.eng ayuqelghii"
meta-title = "Whangkunneng ayuqellghii"
meta-description = "Vote.gov Amarakam kavemengan pikaa aapghaqegkanga"
meta_title = "Whangkunneng ayuqellghii"
meta_description = "Vote.gov Amarakam kavemengan pikaa aapghaqegkanga"
translationKey = "about"
+++

Expand Down
4 changes: 2 additions & 2 deletions content/zh-hans/about-us.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+++
title = "关于Vote.gov"
meta-title = "关于我们"
meta-description = "Vote.gov 是一个美国政府网站,提供可靠的投票资讯,协助您找到您所在州的选民登记规定。"
meta_title = "关于我们"
meta_description = "Vote.gov 是一个美国政府网站,提供可靠的投票资讯,协助您找到您所在州的选民登记规定。"
translationKey = "about"
+++

Expand Down
4 changes: 2 additions & 2 deletions content/zh/about-us.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
+++
title = "關於Vote.gov"
meta-title = "關於我們"
meta-description = "Vote.gov 是一個美國政府網站,提供可信的投票信息,可以幫助您找到您所在州的選民登記規則。"
meta_title = "關於我們"
meta_description = "Vote.gov 是一個美國政府網站,提供可信的投票信息,可以幫助您找到您所在州的選民登記規則。"
translationKey = "about"
+++

Expand Down
8 changes: 6 additions & 2 deletions data/translations/bn/footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"usagov_logo_alt_text": "%USA.gov% লোগো",
"eac_link": "https://www.eac.gov/",
"eac_text": "এর সাথে অংশীদারিত্বে",
"eac_logo_alt_text": "এর সাথে অংশীদারিত্বে %U.S. Election Assistance Commission%",
"eac_logo_alt_text": "মার্কিন নির্বাচন সহায়তা কমিশনের লোগো যা Vote.gov-এর সাথে অংশীদারিত্ব নির্দেশ করে",
"vote_logo_alt_text": "চেক করা ব্যালট ঢোকানো হচ্ছে সহ ভোটার বাক্সের চিত্র ভোটিং কার্যক্রম নির্দেশ করে",
"privacy_policy": "গোপনীয়তা নীতি (ইংরেজিতে)",
"privacy_policy_link_url": "https://www.usa.gov/policies",
"twitter_link": "https://twitter.com/votegov",
Expand All @@ -28,5 +29,8 @@
"identifier_link_7": "গোপনীয়তা নীতি (ইংরেজিতে)",
"identifier_more_info_aria": "সরকারি তথ্য ও সেবা",
"identifier_more_info": "মার্কিন সরকারের তথ্য এবং পরিষেবা খুঁজছেন? %link%",
"identifier_more_info__1": "USA.gov দেখুন"
"identifier_more_info__1": "USA.gov দেখুন",
"gsa_logo_alt": "জিএসএ লোগো",
"section_sign_up": "ইমেল নিবন্ধন করুন",
"section_contact": "যোগাযোগ"
}
3 changes: 2 additions & 1 deletion data/translations/bn/homepage.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"registered_links__process": "নির্বাচন প্রক্রিয়া (ইংরেজিতে)",
"registered_links__process_url": "https://www.usa.gov/election",
"search_placeholder": "Vote.gov অনুসন্ধান করুন",
"search_affiliate_translated": true
"search_affiliate_translated": true,
"section_banner": "দাপ্তরিক সরকারী ওয়েবসাইট"
}
8 changes: 6 additions & 2 deletions data/translations/en/footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"usagov_link": "https://www.usa.gov/",
"your_email_address": "Enter your email address",
"usagov_logo_alt_text": "%USA.gov% logo",
"eac_logo_alt_text": "In partnership with %U.S. Election Assistance Commission%",
"eac_logo_alt_text": "U.S. Election Assistance Commission logo which indicates a partnership with Vote.gov",
"vote_logo_alt_text": "Illustration of voter box with checked ballot being inserted to indicate voting action",
"identifier_aria": "Agency identifier",
"identifier_gsa_txt_aria": "Agency description",
"identifier_gsa_txt": "An official website of the %link%",
Expand All @@ -27,5 +28,8 @@
"identifier_link_7": "Privacy Policy",
"identifier_more_info_aria": "Government information and services",
"identifier_more_info": "Looking for U.S. government information and services? %link%",
"identifier_more_info__1": "Visit USA.gov"
"identifier_more_info__1": "Visit USA.gov",
"gsa_logo_alt": "GSA logo",
"section_sign_up": "Email sign-up",
"section_contact": "Contact"
}
3 changes: 2 additions & 1 deletion data/translations/en/homepage.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"banner__guidance_https_heading": "Secure .gov websites use HTTPS",
"banner__guidance_https_text": "A lock %lock_icon% or %https% means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.",
"search_placeholder": "Search Vote.gov",
"search_affiliate_translated": true
"search_affiliate_translated": true,
"section_banner": "Official government website"
}
8 changes: 6 additions & 2 deletions data/translations/es/footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"usagov_link": "https://www.usa.gov/espanol/",
"your_email_address": "Ingrese su email",
"usagov_logo_alt_text": "%USA.gov% en español logo",
"eac_logo_alt_text": "En colaboración con la %U.S. Election Assistance Commission%",
"eac_logo_alt_text": "Logotipo de la Comisión de Asistencia Electoral de EE. UU. para indicar su asociación con Vote.gov.",
"vote_logo_alt_text": "Ilustración del acto del voto donde una boleta marcada está siendo insertada en una urna.",
"about_link": "/es/acerca-de-votegov",
"identifier_aria": "Identificador de la agencia",
"identifier_gsa_txt_aria": "Descripción de la agencia",
Expand All @@ -29,5 +30,8 @@
"identifier_more_info_aria": "Información y servicios del gobierno",
"identifier_more_info": "¿Busca información y servicios del Gobierno de Estados Unidos? %link%",
"identifier_more_info__1": "USAGov en Español",
"privacy_policy_link": "https://www.usa.gov/es/politicas-privacidad"
"gsa_logo_alt": "Logotipo de la GSA (Administración General de Servicios)",
"privacy_policy_link": "https://www.usa.gov/es/politicas-privacidad",
"section_sign_up": "Email para inscripción",
"section_contact": "Contacto"
}
3 changes: 2 additions & 1 deletion data/translations/es/homepage.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"banner__guidance_https_heading": "Los sitios web seguros .gov usan HTTPS",
"banner__guidance_https_text": "Un candado %lock_icon% o %https% significa que usted se conectó de forma segura a un sitio web .gov. Comparta información sensible sólo en sitios web oficiales y seguros.",
"search_placeholder": "Busque en Vote.gov",
"search_affiliate_translated": true
"search_affiliate_translated": true,
"section_banner": "Sitio web oficial del gobierno"
}
10 changes: 7 additions & 3 deletions data/translations/hi/footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"usagov_logo_alt_text": "%USA.gov% प्रतीक चिन्ह ",
"eac_link": "https://www.eac.gov/",
"eac_text": "के साथ साझेदारी में",
"eac_logo_alt_text": "%U.S. Election Assistance Commission% के साथ साझेदारी में",
"eac_logo_alt_text": "अमेरिकी चुनाव सहायता आयोग (यूएस इलेक्शन असिस्टेंस कमीशन) का लोगो जो Vote.gov के साथ साझेदारी का संकेत देता है",
"vote_logo_alt_text": "मतदान क्रिया को इंगित करने के लिए मतदाता पेटी में चेक किए गए मतपत्र को डाले जाने का चित्रण",
"privacy_policy": "गोपनीयता नीति (अंग्रेज़ी में)",
"privacy_policy_link_url": "https://www.usa.gov/policies",
"twitter_link": "https://twitter.com/votegov",
Expand All @@ -28,5 +29,8 @@
"identifier_link_7": "गोपनीयता नीति (अंग्रेज़ी में)",
"identifier_more_info_aria": "सरकारी सूचना और सेवाएं",
"identifier_more_info": "यू.एस. सरकार की जानकारी और सेवाएं खोज रहे हैं? %link%",
"identifier_more_info__1": "USA.gov पर जाएं"
}
"identifier_more_info__1": "USA.gov पर जाएं",
"gsa_logo_alt": "GSA का लोगो (प्रतीक चिन्ह)",
"section_sign_up": "ईमेल के लिए साइन-अप करें",
"section_contact": "संपर्क करें "
}
Loading

0 comments on commit 875342a

Please sign in to comment.