Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Footer: text corrections #2449

Merged
merged 1 commit into from
Nov 27, 2024
+410 −32
Merged

Footer: text corrections #2449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sites/footers/deprecated/footers-v6-en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
{
"layout": null,
"title": "Content page including complete footer version 5.0",
"title": "Content page including complete footer version 6.0",
"language": "en",
"breadcrumbs": [
{ "title": "Footer", "link": "sites/footers/footers-en.html" }
],
"altLangPage": "footers-v5-fr.html",
"altLangPage": "footers-v6-fr.html",
"secondlevel": false,
"dateModified": "2023-12-04",
"dateModified": "2024-11-20",
"share": "true"
}
---
Expand Down Expand Up @@ -41,7 +41,7 @@
{% include header/header.html %}
<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
<h1 id="wb-cont" property="name">{{ page-title }}</h1>
<p>This is version 5.0 of the page footer.</p>
<p>This is version 6.0 of the page footer.</p>
{% include page-details/footer.html %}
</main>
<footer id="wb-info">
Expand Down
10 changes: 5 additions & 5 deletions sites/footers/deprecated/footers-v6-fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
{
"layout": null,
"title": "Page de contenu incluant le pied de page complet version 5.0",
"title": "Page de contenu incluant le pied de page complet version 6.0",
"language": "fr",
"breadcrumbs": [
{ "title": "Footer", "link": "sites/footers/footers-fr.html" }
],
"altLangPage": "footers-v5-en.html",
"altLangPage": "footers-v6-en.html",
"secondlevel": false,
"dateModified": "2023-12-04",
"dateModified": "2024-11-20",
"share": "true"
}
---
Expand Down Expand Up @@ -41,7 +41,7 @@
{% include header/header.html %}
<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
<h1 id="wb-cont" property="name">{{ page-title }}</h1>
<p>Voici la version 5.0 du pied de page complet par défaut.</p>
<p>Voici la version 6.0 du pied de page complet par défaut.</p>
{% include page-details/footer.html %}
</main>
<footer id="wb-info">
Expand Down Expand Up @@ -81,7 +81,7 @@ <h4><span class="wb-inv">Thèmes et sujets</span></h4>
<li><a href="https://www.canada.ca/fr/services/culture.html">Culture, histoire et sport</a></li>
<li><a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences</a></li>
<li><a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure</a></li>
<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></li>
<li><a href="https://international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></li>
<li><a href="https://www.canada.ca/fr/services/finance.html">Argent et finance</a></li>
<li><a href="https://www.canada.ca/fr/services/science.html">Science et innovation</a></li>
<li><a href="https://www.canada.ca/fr/services/autochtones.html">Autochtones</a></li>
Expand Down
115 changes: 115 additions & 0 deletions sites/footers/deprecated/footers-v7-en.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
---
{
"layout": null,
"title": "Content page including complete footer version 7.0",
"language": "en",
"breadcrumbs": [
{ "title": "Footer", "link": "sites/footers/footers-en.html" }
],
"altLangPage": "footers-v7-fr.html",
"secondlevel": false,
"dateModified": "2024-11-27",
"share": "true"
}
---

{%- include variable-core.liquid -%}
{%- capture page-title -%}
{%- if page.title -%}
{{ page.title }}
{%- else -%}
Page untitled
{%- endif -%}
{%- endcapture -%}
<!DOCTYPE html>
<html class="no-js" lang="{{ i18nText-lang | default: 'en' }}" dir="{{ i18nText-langDir | default: 'ltr' }}">

<head>
<meta charset="utf-8">
{% include license.html %}
<title>{{ page-title }} - {{ i18nText-siteTitle }}</title>
<meta content="width=device-width, initial-scale=1" name="viewport">
{% include metadata.html %}
{% include resources-inc/head.html %}
</head>

<body {% if page.pageclass %}class="{{ page.pageclass }}" {% endif %}vocab="http://schema.org/" typeof="WebPage">
{%- if page.archived -%}
{% include headers-includes/archive.html %}
{%- endif -%}
{% include skiplinks/skiplinks.html %}
{% include header/header.html %}
<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
<h1 id="wb-cont" property="name">{{ page-title }}</h1>
<p>This is version 7.0 of the page footer.</p>
{% include page-details/footer.html %}
</main>
<footer id="wb-info">
<h2 class="wb-inv">About this site</h2>
<div class="gc-contextual">
<div class="container">
<nav>
<h3>[Contextual footer header]</h3>
<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
<li><a href="http://canada.ca/en">Contextual link 1</a></li>
<li><a href="http://canada.ca/en">Contextual link 2</a></li>
<li><a href="http://canada.ca/en">Contextual link 3</a></li>
</ul>
</nav>
</div>
</div>

<div class="gc-main-footer">
<div class="container">
<nav>
<h3>Government of Canada</h3>
<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
<li><a href="https://www.canada.ca/en/contact.html">All contacts</a></li>
<li><a href="https://www.canada.ca/en/government/dept.html">Departments and agencies</a></li>
<li><a href="https://www.canada.ca/en/government/system.html">About government</a></li>
</ul>
<h4><span class="wb-inv">Themes and topics</span></h4>
<ul class="list-unstyled colcount-sm-2 colcount-md-3">
<li><a href="https://www.canada.ca/en/services/jobs.html">Jobs</a></li>
<li><a href="https://www.canada.ca/en/services/immigration-citizenship.html">Immigration and citizenship</a></li>
<li><a href="https://travel.gc.ca/">Travel and tourism</a></li>
<li><a href="https://www.canada.ca/en/services/business.html">Business</a></li>
<li><a href="https://www.canada.ca/en/services/benefits.html">Benefits</a></li>
<li><a href="https://www.canada.ca/en/services/health.html">Health</a></li>
<li><a href="https://www.canada.ca/en/services/taxes.html">Taxes</a></li>
<li><a href="https://www.canada.ca/en/services/environment.html">Environment and natural resources</a></li>
<li><a href="https://www.canada.ca/en/services/defence.html">National security and defence</a></li>
<li><a href="https://www.canada.ca/en/services/culture.html">Culture, history and sport</a></li>
<li><a href="https://www.canada.ca/en/services/policing.html">Policing, justice and emergencies</a></li>
<li><a href="https://www.canada.ca/en/services/transport.html">Transport and infrastructure</a></li>
<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world</a></li>
<li><a href="https://www.canada.ca/en/services/finance.html">Money and finance</a></li>
<li><a href="https://www.canada.ca/en/services/science.html">Science and innovation</a></li>
<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous peoples</a></li>
<li><a href="https://www.canada.ca/en/services/veterans-military.html">Veterans and military</a></li>
<li><a href="https://www.canada.ca/en/services/youth.html">Youth</a></li>
</ul>
</nav>
</div>
</div>

<div class="gc-sub-footer">
<div class="container d-flex align-items-center">
<nav>
<h3 class="wb-inv">Government of Canada Corporate</h3>
<ul>
<li><a href="https://www.canada.ca/en/social.html">Social media</a></li>
<li><a href="https://www.canada.ca/en/mobile.html">Mobile applications</a></li>
<li><a href="https://www.canada.ca/en/government/about.html">About Canada.ca</a></li><li><a href="https://www.canada.ca/en/transparency/terms.html">Terms and conditions</a></li>
<li><a href="https://www.canada.ca/en/transparency/privacy.html">Privacy</a></li>
</ul>
</nav>
<div class="wtrmrk align-self-end">
<img src="/dist/GCWeb/assets/wmms-blk.svg" alt="Symbol of the Government of Canada">
</div>
</div>
</div>
</footer>
{% include resources-inc/footer.html %}
</body>
</html>
114 changes: 114 additions & 0 deletions sites/footers/deprecated/footers-v7-fr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
---
{
"layout": null,
"title": "Page de contenu incluant le pied de page complet version 7.0",
"language": "fr",
"breadcrumbs": [
{ "title": "Footer", "link": "sites/footers/footers-fr.html" }
],
"altLangPage": "footers-v7-en.html",
"secondlevel": false,
"dateModified": "2024-11-27",
"share": "true"
}
---

{%- include variable-core.liquid -%}
{%- capture page-title -%}
{%- if page.title -%}
{{ page.title }}
{%- else -%}
Page untitled
{%- endif -%}
{%- endcapture -%}
<!DOCTYPE html>
<html class="no-js" lang="{{ i18nText-lang | default: 'fr' }}" dir="{{ i18nText-langDir | default: 'ltr' }}">

<head>
<meta charset="utf-8">
{% include license.html %}
<title>{{ page-title }} - {{ i18nText-siteTitle }}</title>
<meta content="width=device-width, initial-scale=1" name="viewport">
{% include metadata.html %}
{% include resources-inc/head.html %}
</head>

<body {% if page.pageclass %}class="{{ page.pageclass }}" {% endif %}vocab="http://schema.org/" typeof="WebPage">
{%- if page.archived -%}
{% include headers-includes/archive.html %}
{%- endif -%}
{% include skiplinks/skiplinks.html %}
{% include header/header.html %}
<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
<h1 id="wb-cont" property="name">{{ page-title }}</h1>
<p>Voici la version 7.0 du pied de page complet par défaut.</p>
{% include page-details/footer.html %}
</main>
<footer id="wb-info">
<h2 class="wb-inv">À propos de ce site</h2>
<div class="gc-contextual">
<div class="container">
<nav>
<h3>[Bande du pied de page contextuel]</h3>
<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
<li><a href="http://canada.ca/fr">Lien contextuel 1</a></li>
<li><a href="http://canada.ca/fr">Lien contextuel 2</a></li>
<li><a href="http://canada.ca/fr">Lien contextuel 3</a></li>
</ul>
</nav>
</div>
</div>

<div class="gc-main-footer">
<div class="container">
<nav>
<h3>Gouvernement du Canada</h3>
<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
<li><a href="https://www.canada.ca/fr/contact.html">Toutes les coordonnées</a></li>
<li><a href="https://www.canada.ca/fr/gouvernement/min.html">Ministères et organismes</a></li>
<li><a href="https://www.canada.ca/fr/gouvernement/systeme.html">À propos du gouvernement</a></li>
</ul>
<h4><span class="wb-inv">Thèmes et sujets</span></h4>
<ul class="list-unstyled colcount-sm-2 colcount-md-3"><li><a href="https://www.canada.ca/fr/services/emplois.html">Emplois</a></li>
<li><a href="https://www.canada.ca/fr/services/immigration-citoyennete.html">Immigration et citoyenneté</a></li>
<li><a href="https://voyage.gc.ca/">Voyage et tourisme</a></li>
<li><a href="https://www.canada.ca/fr/services/entreprises.html">Entreprises</a></li>
<li><a href="https://www.canada.ca/fr/services/prestations.html">Prestations</a></li>
<li><a href="https://www.canada.ca/fr/services/sante.html">Santé</a></li>
<li><a href="https://www.canada.ca/fr/services/impots.html">Impôts</a></li>
<li><a href="https://www.canada.ca/fr/services/environnement.html">Environnement et ressources naturelles</a></li>
<li><a href="https://www.canada.ca/fr/services/defense.html">Sécurité nationale et défense</a></li>
<li><a href="https://www.canada.ca/fr/services/culture.html">Culture, histoire et sport</a></li>
<li><a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences</a></li>
<li><a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure</a></li>
<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></li>
<li><a href="https://www.canada.ca/fr/services/finance.html">Argent et finance</a></li>
<li><a href="https://www.canada.ca/fr/services/science.html">Science et innovation</a></li>
<li><a href="https://www.canada.ca/fr/services/autochtones.html">Autochtones</a></li>
<li><a href="https://www.canada.ca/fr/services/veterans-militaire.html">Vétérans et militaires</a></li>
<li><a href="https://www.canada.ca/fr/services/jeunesse.html">Jeunesse</a></li>
</ul>
</nav>
</div>
</div>

<div class="gc-sub-footer">
<div class="container d-flex align-items-center">
<nav>
<h3 class="wb-inv">Organisation du gouvernement du Canada</h3>
<ul>
<li><a href="https://www.canada.ca/fr/sociaux.html">Médias sociaux</a></li>
<li><a href="https://www.canada.ca/fr/mobile.html">Applications mobiles</a></li>
<li><a href="https://www.canada.ca/fr/gouvernement/a-propos.html">À propos de Canada.ca</a></li><li><a href="https://www.canada.ca/fr/transparence/avis.html">Avis</a></li>
<li><a href="https://www.canada.ca/fr/transparence/confidentialite.html">Confidentialité</a></li>
</ul>
</nav>
<div class="wtrmrk align-self-end">
<img src="/dist/GCWeb/assets/wmms-blk.svg" alt="Symbole du gouvernement du Canada">
</div>
</div>
</div>
</footer>
{% include resources-inc/footer.html %}
</body>
</html>
5 changes: 3 additions & 2 deletions sites/footers/footers-en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ contextualFooter:
text: Contextual link 2
- url: http://canada.ca/en
text: Contextual link 3
dateModified: 2023-12-04
dateModified: 2024-11-20
includes:
footer: edge
language: en
Expand All @@ -29,9 +29,10 @@ Consult the Canada.ca Design System for guidance on which footer elements or cus

## Latest changes

### Version 7.0
### Version 8.0

The following changes have been made since **version 4.0**:
* Version 8.0 : Pluralized "finance" in "Money and finance", capitalized "peoples" in "Indigenous peoples".
* Version 7.0 : Added "www." to the "Canada and the world" URL.
* Version 6.0 : Changed the "Veterans and military" URL.
* Version 5.0 : Changed “All Contacts” to “All contacts”.
Expand Down
11 changes: 6 additions & 5 deletions sites/footers/footers-fr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ contextualFooter:
text: Lien contextuel 2
- url: http://canada.ca/fr
text: Lien contextuel 3
dateModified: 2023-12-04
dateModified: 2024-11-20
includes:
footer: edge
language: fr
Expand All @@ -29,12 +29,13 @@ Consultez le système de conception de Canada.ca pour savoir quels éléments de

## Changements récents

### Version 7.0
### Version 8.0

Les modifications suivantes ont été apportées depuis la **version 4.0**&nbsp;:
* Version 7.0: Ajouté "www." à l'URL du lien "<span lang="en">Canada and the world</span>".
* Version 6.0: Changé l'URL du lien "Vétérans et militaires".
* Version 5.0: Changement de "<span lang="en">All Contacts</span>" à "<span lang="en">All contacts</span>" dans la version anglaise.
* Version 8.0 : Pluriel de "finance" dans "Argent et finance", mise en majuscule de "peoples" dans "<span lang="en">Indigenous peoples</span>" dans la version anglaise.
* Version 7.0 : Ajout de "www." à l'URL de "Canada et le monde".
* Version 6.0 : Changé l'URL du lien "Vétérans et militaires".
* Version 5.0 : Changement de "<span lang="en">All Contacts</span>" à "<span lang="en">All contacts</span>" dans la version anglaise.

Les modifications suivantes ont été apportées depuis la **version 2.0**&nbsp;:
* Ajout d'une bande contextuelle au-dessus de la bande principale.
Expand Down
6 changes: 3 additions & 3 deletions sites/footers/includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h4><span class="wb-inv">{{ i18nText-themeLinks }}</span></h4>
<li><a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences</a></li>
<li><a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure</a></li>
<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></li>
<li><a href="https://www.canada.ca/fr/services/finance.html">Argent et finance</a></li>
<li><a href="https://www.canada.ca/fr/services/finance.html">Argent et finances</a></li>
<li><a href="https://www.canada.ca/fr/services/science.html">Science et innovation</a></li>
<li><a href="https://www.canada.ca/fr/services/autochtones.html">Autochtones</a></li>
<li><a href="https://www.canada.ca/fr/services/veterans-militaire.html">Vétérans et militaires</a></li>
Expand All @@ -123,9 +123,9 @@ <h4><span class="wb-inv">{{ i18nText-themeLinks }}</span></h4>
<li><a href="https://www.canada.ca/en/services/policing.html">Policing, justice and emergencies</a></li>
<li><a href="https://www.canada.ca/en/services/transport.html">Transport and infrastructure</a></li>
<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world</a></li>
<li><a href="https://www.canada.ca/en/services/finance.html">Money and finance</a></li>
<li><a href="https://www.canada.ca/en/services/finance.html">Money and finances</a></li>
<li><a href="https://www.canada.ca/en/services/science.html">Science and innovation</a></li>
<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous peoples</a></li>
<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous Peoples</a></li>
<li><a href="https://www.canada.ca/en/services/veterans-military.html">Veterans and military</a></li>
<li><a href="https://www.canada.ca/en/services/youth.html">Youth</a></li>
{%- endif -%}
Expand Down
Loading