feat: group RTDD/RDDN in nav (resolves #1850) (#1878)

* chore: update CMS branch configuration

* chore: update CMS branch configuration

* ci: switch to new action

* feat: group RTDD/RDDN in nav (resolves #1850)

---------

Co-authored-by: greatislander <[email protected]>

.github/workflows/release-please.yml

@@ -8,7 +8,7 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v4
+      - uses: googleapis/release-please-action@v4
         id: release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

src/_includes/components/nav-menu.njk

@@ -3,7 +3,13 @@
     {% set navItems = collections.pages | eleventyNavigation %}
     {%- for item in navItems %}
       {%- if (item.order > 0) %}
-      <a {% if page.url === item.url %}aria-current="page" {% endif %}href="{{ item.url }}" {% if item.locale and item.locale !== "en-CA" %}hreflang="{{ item.locale }}" lang="{{ item.locale }}"{% endif %}>{{ item.key }}</a>
+      {%- if navItems[loop.index0 - 1].translation_key !== item.translation_key %}
+      <div>
+      {%- endif %}
+      <a data-key="{{ item.translation_key }}" {% if page.url === item.url %}aria-current="page" {% endif %}href="{{ item.url }}" {% if item.locale and item.locale !== "en-CA" %}hreflang="{{ item.locale }}" lang="{{ item.locale }}"{% endif %}>{{ item.key }}</a>
+      {%- if item.translation_key and navItems[loop.index0 + 1].translation_key !== item.translation_key %}
+      </div>
+      {%- endif %}
       {%- endif %}
     {%- endfor %}
   </nav>

src/admin/config.yml

@@ -35,6 +35,11 @@ collections:
         widget: string
         required: false
         hint: The locale of the page. If you do not specify a locale, default will be set to en-CA.
+      - label: Translation Key
+        name: translation_key
+        widget: string
+        required: false
+        hint: A unique key used to link translated content in French or English with its corresponding content in the other language.
       - label: Navigation Order
         name: menu_order
         widget: number

src/assets/styles/layout/_header.scss

@@ -177,6 +177,12 @@ header {
 					text-transform: capitalize;
 				}
 
+				div > a + a::before {
+					content: "/";
+					display: inline;
+					padding-inline: 1ch;
+				}
+
 				a[aria-current="page"] {
 					background-color: $orange-focus;
 					font-weight: $font-weight-bold;
@@ -276,6 +282,14 @@ header {
 						font-size: rem(14) !important; // Enactors.css in infusion uses !important on this element
 						line-height: rem(28);
 					}
+
+					div > a {
+						display: block;
+					}
+
+					div > a + a::before {
+						display: none;
+					}
 				}
 			}
 		}

src/collections/pages/pages.11tydata.js

@@ -5,6 +5,7 @@ module.exports = {
 		bannerImage: data => data.bannerImage ? optimizeImage(data.bannerImage) : false,
 		eleventyNavigation: {
 			key: data => data.key ? data.key : data.title,
+			translation_key: data => data.translation_key ? data.translation_key : null,
 			parent: data => data.parent ? data.parent : false,
 			order: data => data.menu_order ? data.menu_order : false,
 			locale: data => data.locale ? data.locale : "en-CA"

src/collections/pages/rddn.md

@@ -4,6 +4,7 @@ excerpt: .
 locale: fr-CA
 menu_order: 7
 key: Réglementation du Numérique
+translation_key: rtdd-rddn
 permalink: /rddn/
 ---
 ![Regulating the Digital Domain logo](/uploads/wip_rdd_colour_no-type.jpg)
@@ -28,31 +29,31 @@ L'un des aspects essentiels que cette recherche cherche à explorer est le rôle
 
 Le projet de recherche adoptera une approche interdisciplinaire. Pour ce faire, nous rassemblerons des experts de l'expérience vécue et des experts du domaine en tant que co-chercheurs. Les experts du domaine proviendront de différents domaines, y compris :
 
-* la politique, 
-  la politique, * la conception législative, 
-* l'accès à la justice 
-* les systèmes technologiques, 
-* les communications, 
-* gestion, 
-* la conception inclusive, 
-* l'inclusion numérique, 
-* l'économie, et 
-* les systèmes adaptatifs complexes. 
+* la politique,
+  la politique, * la conception législative,
+* l'accès à la justice
+* les systèmes technologiques,
+* les communications,
+* gestion,
+* la conception inclusive,
+* l'inclusion numérique,
+* l'économie, et
+* les systèmes adaptatifs complexes.
 
 Ensemble, les co-chercheurs concevront et proposeront des approches et des systèmes réglementaires qui :
 
-* qui tiennent compte de la diversité et de la complexité des besoins en matière d'accessibilité, y compris les besoins des petites minorités et des cas isolés,            
-* sont adaptés au rythme exponentiel de l'évolution des TIC et conçus pour prévenir de manière proactive l'apparition d'obstacles,       
-* soutiennent et exigent des approches intégrées de l'accessibilité plutôt que des approches séparées, afin de favoriser l'interopérabilité et les avantages pour tous les utilisateurs,            
-* soutenir l'innovation en matière d'accessibilité plutôt que de la freiner,        
+* qui tiennent compte de la diversité et de la complexité des besoins en matière d'accessibilité, y compris les besoins des petites minorités et des cas isolés,
+* sont adaptés au rythme exponentiel de l'évolution des TIC et conçus pour prévenir de manière proactive l'apparition d'obstacles,
+* soutiennent et exigent des approches intégrées de l'accessibilité plutôt que des approches séparées, afin de favoriser l'interopérabilité et les avantages pour tous les utilisateurs,
+* soutenir l'innovation en matière d'accessibilité plutôt que de la freiner,
 * ne pas créer d'incitations à la perpétuation du problème, et
 * impliquer et responsabiliser les personnes handicapées et leurs communautés pour qu'elles façonnent les exigences réglementaires, informent sur les méthodes de respect des exigences, identifient les lacunes réglementaires et affinent en permanence le système réglementaire.
 
 ## Relever six défis grâce à des pratiques inclusives et à la co-conception
 
 > Si vous souhaitez participer à la co-conception du CRDI, inscrivez-vous ici <https://forms.office.com/r/g4bgbHifqc>
 
-Six défis seront relevés par le biais d'une série de co-conceptions. Nous relèverons les défis suivants en impliquant un large éventail de parties prenantes ayant des expériences vécues et une expertise pertinentes, tout en reconnaissant que les questions sont complexes et interdépendantes. Les résultats informeront la prochaine génération de modèles de normes d'accessibilité dans le domaine numérique. L'équipe développera des stratégies qui tireront parti des propriétés du domaine numérique et des approches nécessaires pour assurer une plus grande inclusion numérique des personnes handicapées.         
+Six défis seront relevés par le biais d'une série de co-conceptions. Nous relèverons les défis suivants en impliquant un large éventail de parties prenantes ayant des expériences vécues et une expertise pertinentes, tout en reconnaissant que les questions sont complexes et interdépendantes. Les résultats informeront la prochaine génération de modèles de normes d'accessibilité dans le domaine numérique. L'équipe développera des stratégies qui tireront parti des propriétés du domaine numérique et des approches nécessaires pour assurer une plus grande inclusion numérique des personnes handicapées.
 
 Les défis sont les suivants
 
@@ -215,13 +216,13 @@ La vision de la [March of Dimes](https://www.marchofdimes.ca/en-ca/provinces/Pag
 
 ## Équipe
 
-Jutta Treviranus, principal investigator 
+Jutta Treviranus, principal investigator
 
 Vera Roberts
 
 David Pereyra
 
-Caren Watkins 
+Caren Watkins
 
 Uttara Ghodke
 

src/collections/pages/rtdd.md

@@ -3,7 +3,9 @@ title: Regulating the Digital Domain
 excerpt: The aim of RtDD is to improve digital inclusion and ICT accessibility
   for all disabled people.
 menu_order: 6
+locale: en-CA
 key: Regulating the Digital
+translation_key: rtdd-rddn
 permalink: /rtdd/
 ---
 ![Regulating the Digital Domain logo](/uploads/wip_rdd_colour_no-type.jpg)
@@ -28,59 +30,59 @@ Voir ce page en [français](https://wecount.inclusivedesign.ca/rddn)
 
 ## About the project
 
-Regulating the Digital Domain (RtDD) project focuses on addressing the persistent challenges and disparities that people with disabilities face in accessing information and communication technologies (ICT) and digital tools.  
+Regulating the Digital Domain (RtDD) project focuses on addressing the persistent challenges and disparities that people with disabilities face in accessing information and communication technologies (ICT) and digital tools.
 
-The RtDD team will: 
+The RtDD team will:
 
-* work to uncover root causes of barriers,  
-* focus on systemic issues that support digital exclusion,  
-* identify potential ways to interrupt and eliminate, improve or prevent barriers from becoming worse  
-* enhance the accessibility of digital tools, content, transactions, and computer-mediated processes (using two or more electronic devices for a process) for people with disabilities. 
+* work to uncover root causes of barriers,
+* focus on systemic issues that support digital exclusion,
+* identify potential ways to interrupt and eliminate, improve or prevent barriers from becoming worse
+* enhance the accessibility of digital tools, content, transactions, and computer-mediated processes (using two or more electronic devices for a process) for people with disabilities.
 
-The RtDD goal is to significantly improve digital inclusion and ICT accessibility for the full range of PWD (people with disabilities). To make improvements the project will address the design of a regulatory system that focuses on the challenges of regulating within the digital domain. The project findings will inform Accessibility Standards Canada on greater accessibility to digital tools, content, transactions and/or computer-mediated processes. 
+The RtDD goal is to significantly improve digital inclusion and ICT accessibility for the full range of PWD (people with disabilities). To make improvements the project will address the design of a regulatory system that focuses on the challenges of regulating within the digital domain. The project findings will inform Accessibility Standards Canada on greater accessibility to digital tools, content, transactions and/or computer-mediated processes.
 
 ## Informing standards
 
-One of the critical aspects this research seeks to explore is the role of existing standards in facilitating these interventions. Standards play a vital role in shaping digital technologies' design, development, and implementation. By understanding how standards impact accessibility interventions, the project intends to present recommendations that promote more inclusive digital innovations. 
+One of the critical aspects this research seeks to explore is the role of existing standards in facilitating these interventions. Standards play a vital role in shaping digital technologies' design, development, and implementation. By understanding how standards impact accessibility interventions, the project intends to present recommendations that promote more inclusive digital innovations.
 
-The project research will take an interdisciplinary approach. We will do this by bringing together both lived experience experts and domain experts as co-researchers. The domain experts will be from various fields including: 
+The project research will take an interdisciplinary approach. We will do this by bringing together both lived experience experts and domain experts as co-researchers. The domain experts will be from various fields including:
 
-* policy,  
-* legislative design,  
-* access to justice,  
-* technology systems,  
-* communications,  
-* management,  
-* inclusive design,  
-* digital inclusion,  
-* economics, and  
-* complex adaptive systems.  
+* policy,
+* legislative design,
+* access to justice,
+* technology systems,
+* communications,
+* management,
+* inclusive design,
+* digital inclusion,
+* economics, and
+* complex adaptive systems.
 
-Together co-researchers will design and propose regulatory approaches and systems that: 
+Together co-researchers will design and propose regulatory approaches and systems that:
 
-* address the diversity and complexity of accessibility needs, including the needs of small minorities and outliers,  
-* are suited to the exponential rates of change of ICT and designed to proactively prevent emerging barriers,  
-* support and require integrated accessibility approaches over segregated approaches to support interoperability and benefits to all users,  
-* support rather than constrain accessibility innovation,  
-* do not create incentives for the perpetuation of the problem,  
-* engage and empower people with disabilities and their communities to shape regulatory requirements, inform methods of meeting requirements, identify regulatory gaps, and continuously refine the regulatory system.  
+* address the diversity and complexity of accessibility needs, including the needs of small minorities and outliers,
+* are suited to the exponential rates of change of ICT and designed to proactively prevent emerging barriers,
+* support and require integrated accessibility approaches over segregated approaches to support interoperability and benefits to all users,
+* support rather than constrain accessibility innovation,
+* do not create incentives for the perpetuation of the problem,
+* engage and empower people with disabilities and their communities to shape regulatory requirements, inform methods of meeting requirements, identify regulatory gaps, and continuously refine the regulatory system.
 
 ## Addressing six challenges with inclusive practices and co-design
 
 > If you would like to take part in IDRC co-designs, register here
 >
 > <https://forms.office.com/r/g4bgbHifqc>
 
-Six challenges will be addressed through a series of co-designs. We will address the following challenges by engaging a wide range of stakeholders with relevant lived experiences and expertise, recognizing that the issues are complex and interrelated. The results will inform the next generation of model accessibility standards in the digital domain. The team will develop strategies that leverage the properties of the digital domain and the approaches needed to ensure greater digital inclusion for people with disabilities.	 
+Six challenges will be addressed through a series of co-designs. We will address the following challenges by engaging a wide range of stakeholders with relevant lived experiences and expertise, recognizing that the issues are complex and interrelated. The results will inform the next generation of model accessibility standards in the digital domain. The team will develop strategies that leverage the properties of the digital domain and the approaches needed to ensure greater digital inclusion for people with disabilities.
 
-The challenges are: 
+The challenges are:
 
 1. How can we meet the diverse and complex accessibility needs of people with disabilities?
 
    * People with disabilities have more varied needs than people without disabilities. Regulations tend to simplify and generalize these needs, leaving out many people who do not fit the standard criteria. Regulations also limit the potential of digital systems to adapt to individual differences. We need to design for the spectrum of accessibility needs, not just for a checklist of requirements.
-2. How can we keep up with the rapid changes in technology and prevent new barriers from emerging? 
+2. How can we keep up with the rapid changes in technology and prevent new barriers from emerging?
 
-   * Technology changes faster than standards and regulations. New opportunities and risks arise constantly. Accessibility regulations often clash with the innovation drive that fuels the digital economy. Accessibility compliance is often sacrificed for speed and novelty. We need to find ways to make accessibility a priority in the changing digital landscape, and to prevent new barriers before they become entrenched. 
+   * Technology changes faster than standards and regulations. New opportunities and risks arise constantly. Accessibility regulations often clash with the innovation drive that fuels the digital economy. Accessibility compliance is often sacrificed for speed and novelty. We need to find ways to make accessibility a priority in the changing digital landscape, and to prevent new barriers before they become entrenched.
 3. How can we ensure integration and interoperability of digital systems and devices?
 
    * The digital world is interconnected and interdependent. Functionality depends on compatibility. Accessibility regulations have created a separate market for specialized assistive technologies (AT) that often do not work well with mainstream products. This makes digital access more expensive, less functional, and less inclusive for people with disabilities who rely on AT. It also deprives the general public of the benefits of accessible design. We need to promote integration and interoperability of digital systems and devices for everyone.
@@ -231,7 +233,7 @@ The [CCB](https://ccbnational.net/shaggy/) works to improve the quality of life
 
 ### Manitoba League of Persons with Disabilities (MLPD)
 
-The[ MLPD](https://mlpd.mb.ca/) is a united voice of people with disabilities, and their supporters, that promotes equal rights, full participation in society, and facilitates positive change through advocacy and public education. 
+The[ MLPD](https://mlpd.mb.ca/) is a united voice of people with disabilities, and their supporters, that promotes equal rights, full participation in society, and facilitates positive change through advocacy and public education.
 
 **About Joelle’s role with RtDD :** Recruit members with disabilities, especially in rural and remote areas, to participate in co-design. Help disseminate project drafts for review and feedback.
 
@@ -413,13 +415,13 @@ The vision of the [March of Dimes](https://www.marchofdimes.ca/en-ca/provinces/P
 
 ## Team
 
-Jutta Treviranus, principal investigator 
+Jutta Treviranus, principal investigator
 
 Vera Roberts
 
 David Pereyra
 
-Caren Watkins 
+Caren Watkins
 
 Uttara Ghodke