wai-website-theme 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 343aadce3fce603d00b3753e0daa9194fca79530cb5b1342686d0f2844ef6f47
-  data.tar.gz: 9e2ec97fc02dd8dc87a20718af44a006d46469bb1b6acc7212c7f43385261bc3
+  metadata.gz: f5d6c9b666c105a8204fdf25caddda2cda783c72092c3608884e8ef68e1089d2
+  data.tar.gz: 728325f899dc25da7c85b235844650a43dee53dae339fea4ab8ff909d4d211c7
 SHA512:
-  metadata.gz: a9378495845f5126c3eeea900864fc1eef02e0d0be8b8af766b6ac56688fde5a04c4deaa180894b9c61740443441a1a763a3c3230667c3b2a235f9009922c10b
-  data.tar.gz: da7a7d2c5326d3e589769bd6b7e7faeebbf1f9317a658c85760f40b2c5e6fad21acce6f2f8132000850d1e2decdf9d7cf134a0df5586eefeb23696afa654ca1a
+  metadata.gz: 542172c938e59aea8ca7e01fee8e144539a30b277c5725e87a42629419bda20ce5ceee106a1d654ef56603cf1d3d9390df78aadd6876a0ad1d6b2d8c07981083
+  data.tar.gz: d56787541b933faaf1cbb4ef41da75dde904c8bea56011a5a63992e210aeab0e5389ae1436abc02f9d8a97dcabbaa2960908058662618887ff4d3abda14573e0

data/_includes/backtotop.html

@@ -1 +1 @@
-<a class="button button-backtotop" href="#top"><span>{% include_cached icon.html name="arrow-up" %} Back to Top</span></a>
+<a class="button button-backtotop" href="#top"><span>{% include_cached icon.html name="arrow-up" %} {% include t.html t="Back to Top" lang=include.lang %}</span></a>

data/_includes/excol.html

@@ -3,7 +3,7 @@
 {%- endif -%}
 {%- if include.type == 'middle' -%}
   </summary>
-  <div markdown="block">
+  <div markdown="block"{%-if include.dir %} dir="{{include.dir}}"{%- endif -%}{%-if include.lang %} lang="{{include.lang}}"{%- endif -%}>
 {%- endif -%}
 {%- if include.type == 'end' -%}
   </div>

data/_includes/feedback-box.html

@@ -1,11 +1,12 @@
 {%- if page.collection -%}{%- assign col = site.collections | where: "label", page.collection | first -%}{%- endif- %}
-{%- assign helptitle = "Help improve this page" -%}
+{%- capture helptitle -%}{% include t.html t="Help improve this page" %}{%- endcapture -%}
 {%- if page.feedbackmail -%}
   {%- assign feedbackmail = page.feedbackmail -%}
 {%- else -%}
   {%- assign feedbackmail = "wai-eo-editors@w3.org" -%}
 {%- endif -%}
-{%- capture helpdesc -%}Please share your ideas, suggestions, or comments via e-mail to the publicly-archived list [{{feedbackmail}}](mailto:{{feedbackmail}}?subject=%s) or via GitHub.{%- endcapture -%}
+{% assign reppattern = "$1|" | append: feedbackmail%}
+{%- capture helpdesc -%}{% include t.html t="Please share your ideas, suggestions, or comments via e-mail to the publicly-archived list [$1](mailto:$1?subject=%s) or via GitHub." replace=reppattern %}{%- endcapture -%}
 
 {%- unless page.github.hide -%}
 {%- if page.github.repository -%}{%- assign repo = page.github.repository -%}{%endif%}
@@ -42,21 +43,23 @@
 {%- endif- %}
 
 {%- include box.html type="start" title=helptitle h=2 class="icon space-above" icon="comments" id="helpimprove" -%}
-{%- assign url_title = page.title | uri_escape -%}
+{%- if page.lang -%}
+    {%- assign url_title = "[" | append: page.lang | append: "] " | append: page.title | uri_escape -%}
+{%- else -%}
+    {%- assign url_title = page.title | uri_escape -%}
+{%- endif -%}
 {% unless feedbackmail == "wai@w3.org" %}
-{%- capture mailbody -%}[put comment here...]{%- endcapture -%}
+{%- capture mailbody -%}{% include t.html t="[put comment here...]" %}{%- endcapture -%}
 {% else %}
-{%- capture mailbody -%}[put comment here...]
-
-I give permission to share this to a publicly-archived e-mail list.{%- endcapture -%}
+{%- capture mailbody -%}{% include t.html t="[put comment here...]\n\nI give permission to share this to a publicly-archived e-mail list." %}"}{%- endcapture -%}
 {% endunless %}
 {%- assign mailbody = mailbody | uri_escape -%}
 {{- helpdesc | replace: "%s", url_title | markdownify -}}
 <div class="button-group">
-    <a href="{{ "mailto:" | append: feedbackmail | append: "?subject=%s" | replace: "%s", url_title | append: "&body=" | append: mailbody }}" class="button"><span>E-mail</span></a>
-    <a href="https://github.com/{{repo}}/edit/{{branch}}/{{path}}"  class="button"><span>Fork &amp; Edit on GitHub</span></a>
+    <a href="{{ "mailto:" | append: feedbackmail | append: "?subject=%s" | replace: "%s", url_title | append: "&body=" | append: mailbody }}" class="button"><span>{% include t.html t="E-mail" %}</span></a>
+    <a href="https://github.com/{{repo}}/edit/{{branch}}/{{path}}"  class="button"><span>{% include t.html t="Fork &amp; Edit on GitHub" %}</span></a>
     {%- comment -%}<a href="https://github.com/{{repo}}/issues" class="button"><span>List of GitHub Issues</span></a>{%- endcomment -%}
-    <a href="https://github.com/{{repo}}/issues/new" class="button"><span>New GitHub Issue</span></a>
+    <a href="https://github.com/{{repo}}/issues/new{%- unless page.lang == 'en' -%}?title={{ "[" | append: page.lang | append: "] " | uri_escape }}{%- endunless -%}" class="button"><span>{% include t.html t="New GitHub Issue" %}</span></a>
 </div>
 {%- include box.html type="end" -%}
 {%- endunless -%}

data/_includes/footer.html

@@ -1,15 +1,28 @@
 {%- assign col = site.collections | where: "label", page.collection | first -%}
+{%- if page.changelog -%}
+  {%- assign chagelogpage=site.documents | where:"ref", page.changelog | first -%}
+  {%- unless changelogpage.ref -%}
+    {%- assign changelogpage=site.pages | where:"ref", page.changelog | first -%}
+  {%- endunless -%}
+  {% assign changelogpageurl = changelogpage.url | relative_url %}
+  {%- capture changelogtext -%}
+  {%- include_cached t.html t="Changelog" lang=page.lang -%}
+  {%- endcapture -%}
+  {%- assign changelog = '<a href="' | append: changelogpageurl | append: '">' | append: changelogtext | append: '</a>' -%}
+{%- else -%}
+  {%- assign changelog = "" -%}
+{%- endif -%}
 {% if col.footer %}
 <footer class="page-footer default-grid" aria-label="Page">
   <div class="inner">
-    {{col.footer}}
+    {{col.footer | replace: "CHANGELOG", changelog }}
   </div>
 </footer>
 {% else %}
   {% if page.footer %}
   <footer class="page-footer default-grid" aria-label="Page">
     <div class="inner">
-      {{page.footer}}
+      {{page.footer | replace: "CHANGELOG", changelog}}
     </div>
   </footer>
   {% endif %}
@@ -18,20 +31,21 @@
 <footer class="site-footer grid-4q" aria-label="Site">
   <div class="q1-start q3-end about">
     <div>
-      <p><a class="largelink" href="https://w3.org/WAI/">W3C Web Accessibility Initiative (WAI)</a></p>
-      <p>Strategies, standards, and supporting resources to make the Web accessible to people with disabilities.</p>
+      <p><a class="largelink" href="https://w3.org/WAI/" lang="en" dir="auto" translate="no">W3C Web Accessibility Initiative (WAI)</a></p>
+      <p>{% include t.html t="Strategies, standards, and supporting resources to make the Web accessible to people with disabilities." %}</p>
     </div>
-    <div>
+    <div lang="en" dir="auto" {% if site.data.lang[pagelang].rtl %}style="text-align: right;"{% endif %} translate="no">
       <p>Copyright &#xA9; {{ 'now' | date: "%Y" }} W3C <sup>&#xAE;</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.eu/"><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>) <a href="{{ "/about/using-wai-material/" | relative_url }}">Permission to Use WAI Material</a>.</p>
     </div>
   </div>
   <div class="q4-start q4-end">
-    <ul>
+    <ul style="margin-bottom:0">
       <li><a href="{{ "/about/contacting/" | relative_url }}">Contact WAI</a></li>
       <li><a href="{{ "/sitemap/" | relative_url }}">Site Map</a></li>
       <li><a href="{{ "/news/" | relative_url }}">News</a></li>
       <li><a href="{{ "/sitemap/#archive" | relative_url }}">Archive</a></li>
       <li><a href="{{ "/about/accessibility-statement/" | relative_url }}">Accessibility Statement</a></li>
+      <li><a href="{{ "/translations/" | relative_url }}"> Translations</a></li>
       <li><a href="{{ "/roles/" | relative_url }}">Resources for Roles</a></li>
     </ul>
   </div>

data/_includes/header.html

@@ -3,29 +3,58 @@ The first section creates an array of page urls that are page urls of this colle
 {%- endcomment -%}
 {%- assign col = site.collections | where: "label", page.collection | first -%}
 {%- unless site.published == true -%}
-<section class="default-grid info" tabindex="0">
-  <p class="inner">{% if site.warning_icon %}{% include_cached icon.html name="info" %} {% endif %}{% if site.warning_message %}{{site.warning_message}}{% else %}This is an unpublished draft preview that might include content that is not yet approved. The published website is at <a href="https://www.w3.org/WAI/">w3.org/WAI/</a>.{% endif %}
+<section class="default-grid info" tabindex="0" lang="en">
+  <p class="inner" style="margin: 0;padding: 1em 0;">{% if site.warning_icon %}{% include_cached icon.html name="info" %} {% endif %}{% if site.warning_message %}{{site.warning_message}}{% else %}This is an unpublished draft preview that might include content that is not yet approved. The published website is at <a href="https://www.w3.org/WAI/">w3.org/WAI/</a>.{% endif %}
   </p>
 </section>
 {%- endunless -%}
-<nav aria-label="Skip Link and Accessibility Options" id="controls" class="default-grid">
-  <ul>
-    <li><a href="#main">Skip to Content</a></li>
-    <li><a href="{{ "/meta/customize/" | relative_url }}">Change Text Size or Colors</a></li>
-  </ul>
+<nav aria-label="Skip Link, Customization, and Language Selector" id="controls" class="default-grid">
+  {% if include.translations[0].ref %}
+  {%- comment -%} Translations on this page {%- endcomment-%}
+    <ul>
+      <li><a href="#main">{% include_cached t.html t="Skip to Content" lang=pagelang %}</a></li>
+      <li class="opt"><a href="{{ "/meta/customize/" | relative_url }}">{% include_cached t.html t="Change Text Size or Colors" lang=pagelang %}</a></li>
+      <li class="opt languagelist">
+          <strong>{% include_cached t.html t="This&nbsp;page&nbsp;in:" lang=pagelang %}</strong>
+          <ul class="languagelistul">
+          {%- for p in include.translations %}
+            {%- if forloop.first -%}
+              <li>{% if 'en' == pagelang %}<strong style="text-transform: capitalize;">{{ site.data.lang['en'].nativeName }}</strong>{% else %}<a style="text-transform: capitalize;" href="{{ englishpageurl | relative_url }}" lang="en"  dir="auto" translate="no">{{ site.data.lang['en'].nativeName }}</a>{% endif %}</li>
+            {%- endif -%}
+            <li>{% if p.lang == pagelang %}<strong style="text-transform: capitalize;">{{ site.data.lang[p.lang].nativeName }}</strong>{% else %}<a style="text-transform: capitalize;" href="{{ p.url | relative_url }}" lang="{{ p.lang }}"  dir="auto" translate="no">{{ site.data.lang[p.lang].nativeName }}</a>{% endif %}</li>
+          {% endfor -%}
+          </ul>
+        </li>
+        <li class="opt">
+          <a href="{{ "/translations/" | relative_url }}">{% include_cached t.html t="All&nbsp;Translations" lang=pagelang %} {% include_cached icon.html name="translations" %}</a>
+        </li>
+        <li><button id="showoptions" data-showhidebuttonid="header-showoptions" class="showhidebutton button-inline" data-target="#controls .opt" aria-expanded="false" data-large-aria-expanded="true" data-showtext='{% include_cached icon.html name="languages" %} {% include_cached t.html t="Show Customization, Languages, Translations" lang=pagelang %}' data-hidetext='{% include_cached t.html t="Hide Options" lang=pagelang %}'>{% include_cached icon.html name="languages" %} {% include_cached t.html t="Show Customization, Languages, Translations" lang=pagelang %}</button></li>
+      </ul>
+    {% else %}
+      {%- comment -%} No Translations on this page {%- endcomment-%}
+      <ul>
+        <li><a href="#main">{% include_cached t.html t="Skip to Content" lang=pagelang %}</a></li>
+        <li class="opt">
+          <a href="{{ "/meta/customize/" | relative_url }}">{% include_cached t.html t="Change Text Size or Colors" lang=pagelang %}</a>
+        </li>
+        <li class="opt">
+            <a href="{{ "/translations/" |relative_url }}">{% include_cached t.html t="All Translations" lang=pagelang %} {% include_cached icon.html name="translations" %}</a>
+        </li>
+      </ul>
+    {%- endif -%}
 </nav>
 <header id="site-header" class="default-grid with-gap">
   <div class="logos">
-    <a class="home w3c" href="{{ "https://www.w3.org/" | relative_url }}">
+    <a lang="en" class="home w3c" href="{{ "https://www.w3.org/" | relative_url }}">
       <svg role="img" aria-label="W3C" viewBox="0 0 68 34" xmlns="http://www.w3.org/2000/svg"><g><path d="m16.117 1.006 5.759 19.58 5.759-19.58h4.17 11.444v1.946l-5.879 10.128c2.065.663 3.627 1.868 4.686 3.615 1.059 1.748 1.589 3.799 1.589 6.155 0 2.914-.775 5.363-2.324 7.348s-3.555 2.978-6.017 2.978c-1.854 0-3.469-.589-4.845-1.767-1.377-1.178-2.396-2.773-3.058-4.786l3.256-1.35c.477 1.218 1.106 2.178 1.887 2.879.781.702 1.701 1.052 2.76 1.052 1.112 0 2.052-.622 2.82-1.866.768-1.245 1.152-2.74 1.152-4.489 0-1.933-.411-3.429-1.231-4.488-.954-1.244-2.45-1.867-4.489-1.867h-1.588v-1.906l5.56-9.612h-6.712l-.382.65-8.163 27.548h-.397l-5.958-19.937-5.957 19.937h-.397l-9.53-32.168h4.17l5.759 19.58 3.892-13.185-1.906-6.395z"/><path d="m64.92 1.006c-.819 0-1.554.295-2.111.861-.591.6-.92 1.376-.92 2.178s.313 1.545.887 2.128c.583.591 1.334.912 2.145.912.793 0 1.562-.321 2.161-.903.574-.557.887-1.3.887-2.136 0-.811-.321-1.57-.878-2.136-.584-.592-1.344-.904-2.171-.904zm2.643 3.065c0 .701-.271 1.351-.768 1.832-.524.507-1.174.777-1.892.777-.675 0-1.342-.278-1.84-.785s-.777-1.157-.777-1.849.287-1.368.802-1.891c.481-.49 1.131-.751 1.84-.751.726 0 1.376.271 1.883.785.49.489.752 1.147.752 1.882zm-2.559-1.807h-1.3v3.445h.65v-1.469h.642l.701 1.469h.726l-.769-1.57c.498-.102.785-.439.785-.929 0-.625-.472-.946-1.435-.946zm-.118.422c.608 0 .886.169.886.591 0 .405-.278.549-.87.549h-.549v-1.14z"/><path d="m59.807.825.676 4.107-2.391 4.575s-.918-1.941-2.443-3.015c-1.285-.905-2.122-1.102-3.431-.832-1.681.347-3.587 2.357-4.419 4.835-.995 2.965-1.005 4.4-1.04 5.718-.056 2.113.277 3.362.277 3.362s-1.452-2.686-1.438-6.62c.009-2.808.451-5.354 1.75-7.867 1.143-2.209 2.842-3.535 4.35-3.691 1.559-.161 2.791.59 3.743 1.403 1 .854 2.01 2.721 2.01 2.721z"/><path d="m60.102 24.063s-1.057 1.889-1.715 2.617c-.659.728-1.837 2.01-3.292 2.651s-2.218.762-3.656.624c-1.437-.138-2.772-.97-3.24-1.317s-1.664-1.369-2.34-2.322-1.733-2.859-1.733-2.859.589 1.91.958 2.721c.212.467.864 1.894 1.789 3.136.863 1.159 2.539 3.154 5.086 3.604 2.547.451 4.297-.693 4.73-.97s1.346-1.042 1.924-1.66c.603-.645 1.174-1.468 1.49-1.962.231-.36.607-1.092.607-1.092z"/></g></svg>
     </a>
-    <a class="home" href="{{ "/" | relative_url }}">
+    <a lang="en" class="home" href="{{ "/" | relative_url }}">
       <span class="wai"><span class="wa">Web&nbsp;Accessibility</span> <span class="i"><span class="initieative">Initiative</span> <span>WAI</span></span></span>
     </a>
     <div class="claim">
-      <span>Strategies, standards, resources to make the Web accessible to people with disabilities</span>
+      <span>{% include_cached t.html t="Strategies, standards, resources to make the Web accessible to people with disabilities" lang=pagelang %}</span>
     </div>
-    <button class="button button-menu" aria-haspopup="true" aria-expanded="false" id="openmenu"><span>{% include_cached icon.html name="menu" %} Menu</span></button>
+    <button class="button button-menu" aria-haspopup="true" aria-expanded="false" id="openmenu"><span>{% include_cached icon.html name="menu" %} {% include_cached t.html t="Menu" lang=pagelang %}</span></button>
   </div>
 
   <div class="navigations">
@@ -37,10 +66,11 @@ The first section creates an array of page urls that are page urls of this colle
         <form action="{{ "/search/" | relative_url }}" role="search">
           <div>
             <label for="header-search">
-              <span class="visuallyhidden">Search:</span>
-              <input id="header-search" type="search" name="q" placeholder="Search" aria-label="search">
+              <span class="visuallyhidden">{% include_cached t.html t="Search" lang=pagelang %}:</span>
+              <input id="header-search" type="search" name="q" placeholder="{% include_cached t.html t="Search" lang=pagelang %}" aria-label="{% include_cached t.html t="Search" lang=pagelang %}">
             </label>
-            <button class="button button-icon button-nobg button-noborder"><span>{% include_cached icon.html name="search" label="Submit Search" %}</span></button>
+            {%capture submitsearch%}{% include_cached t.html t="Submit Search" lang=pagelang %}{%endcapture%}
+            <button class="button button-icon button-nobg button-noborder"><span>{% include_cached icon.html name="search" label=submitsearch %}</span></button>
           </div>
         </form>
       </li>
@@ -48,27 +78,35 @@ The first section creates an array of page urls that are page urls of this colle
   </nav>
 </div>
 </header>
-{%- if page.parent == '/' -%}{%- assign parent_is_home = true -%}{% endif %}
-{%- if col.parent == '/' -%}{%- assign parent_is_home = true -%}{% endif %}
-{%- if col.parent == '/news/' -%}{%- assign parent_is_home = true -%}{% endif %}
+{%- if page.parent == '/' -%}{%- assign parent_is_home = true -%}{%- endif -%}
+{%- if col.parent == '/' -%}{%- assign parent_is_home = true -%}{%- endif -%}
+{%- if col.parent == '/news/' -%}{%- assign parent_is_home = true -%}{%- endif -%}
 {%- if parent_is_home -%}
-{%- assign a_name = "" -%}
-{%- assign a_url  = "" -%}
-{%- assign b_name = "" -%}
-{%- assign b_url  = "" -%}
-{%- assign c_name = "" -%}
-{%- assign c_url  = "" -%}
-{%- assign d_name = "" -%}
-{%- assign d_url  = "" -%}
+  {%- assign a_name = "" -%}
+  {%- assign a_url  = "" -%}
+  {%- assign b_name = "" -%}
+  {%- assign b_url  = "" -%}
+  {%- assign c_name = "" -%}
+  {%- assign c_url  = "" -%}
+  {%- assign d_name = "" -%}
+  {%- assign d_url  = "" -%}
 {% else %}
 {%- if col.parent -%}
   {%- assign searchurl = col.parent -%}
 {%- else -%}
-  {%- if page.parent -%}
+  {%- if page.parent == "/" -%}
     {%- assign searchurl = page.parent -%}
+  {%- else -%}
+    {%- if (page.ref and pagelang) -%}
+    {%- if pagelang != "en" -%}
+      {%- assign searchurl = enpage.url -%}
+    {%- else -%}
+      {%- assign searchurl = page.url -%}
+    {%- endif -%}
   {%- else -%}
     {%- assign searchurl = page.url -%}
   {%- endif -%}
+  {%- endif -%}
 {%- endif -%}
 {%- assign search = true -%}
 {%- for n in site.data.navigation -%}
@@ -119,19 +157,19 @@ The first section creates an array of page urls that are page urls of this colle
 {%- endfor -%}
 {%- endif -%}
 
-<nav class="mainnav" aria-label="Main">
+<nav class="mainnav" aria-label="Main" lang="en">
   {%- if page.url == "/" %}{% assign a_url = "" %}{% endif -%}
-  {%- include navlist.html data=site.data.navigation current=a_url -%}
+  {%- include_cached navlist.html data=site.data.navigation current=a_url -%}
 </nav>
 
 {%- unless page.url == "/" -%}
-<nav class="breadcrumb default-grid" aria-label="Breadcrumb">
-  <ul class="default-container">
-    <li><a href="{{ "/" | relative_url }}">Home</a></li>
-    {%- unless a_name == "" -%}<li><a href="{{ a_url | relative_url }}"{% if a_url == page.url%} aria-current="page"{%endif%}>{{a_name}}</a></li>{%- endunless -%}
-    {%- unless b_name == "" -%}<li><a href="{{ b_url | relative_url }}"{% if b_url == page.url%} aria-current="page"{%endif%}>{{b_name}}</a></li>{%- endunless -%}
-    {%- unless c_name == "" -%}<li><a href="{{ c_url | relative_url }}"{% if c_url == page.url%} aria-current="page"{%endif%}>{{c_name}}</a></li>{%- endunless -%}
-    {%- unless d_name == "" -%}<li><a href="{{ d_url | relative_url }}"{% if d_url == page.url%} aria-current="page"{%endif%}>{{d_name}}</a></li>{%- endunless -%}
+<nav{% comment %} style="grid-column: 2/8; display: flex;"{% endcomment %} class="default-grid breadcrumb" aria-label="Breadcrumb" lang="en">
+  <ul style="align-self: center;">
+    <li><a href="{{ "/" | relative_url }}" lang="en">Home{%comment%}{% include_cached t.html t="Home" lang=pagelang %}{%endcomment%}</a></li>
+    {%- unless a_name == "" -%}<li>{% if a_url == enpage.url%}{% include_cached link.html to=a_url text=a_name aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=a_name to=a_url lang=page.lang hidelangnotice=true %}{% endif %}</li>{%- endunless -%}
+    {%- unless b_name == "" -%}<li>{% if b_url == enpage.url%}{% include_cached link.html text=b_name to=b_url aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=b_name to=b_url lang=page.lang hidelangnotice=true %}{% endif %}</li>{%- endunless -%}
+    {%- unless c_name == "" -%}<li>{% if c_url == enpage.url%}{% include_cached link.html text=c_name to=c_url aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=c_name to=c_url lang=page.lang hidelangnotice=true %}{% endif %}</li>{%- endunless -%}
+    {%- unless d_name == "" -%}<li>{% if d_url == enpage.url%}{% include_cached link.html text=d_name to=d_url aria-current="page" lang=page.lang hidelangnotice=true %}{% else %}{% include_cached link.html text=d_name to=d_url lang=page.lang hidelangnotice=true %}{% endif %}</li>{%- endunless -%}
     {%- if col.parent == '/news/' -%}<li><a href="{{ '/news/' | relative_url }}">News</a></li>{%- endif -%}
     {%- if page.parent == "/"-%}<li><a href="{{ page.url | relative_url }}" aria-current="page">{{page.title}}</a></li>{%- endif -%}
     {%- if col.parent -%}

data/_includes/inpl.html

@@ -0,0 +1,6 @@
+{%- comment -%}
+inpl.html IN Page Language
+
+takes a language array and outputs the value for the language of the current page
+{%- endcomment -%}
+{%- if include.a[include.lang] -%}{{include.a[include.lang]}}{%- else -%}{{include.a.en}}{%- endif -%}

data/_includes/lang.html

@@ -0,0 +1,7 @@
+{% if include.type == 'start' %}
+<div lang="{{include.lang}}" markdown>
+{% endif %}
+{% if  include.type == 'end' %}
+</div>
+</aside>
+{% endif %}

data/_includes/link.html

@@ -0,0 +1,92 @@
+{%- comment -%}
+
+  NEVER use inclue_cached with this.
+
+  Always use
+    {%include link.html to="/path/to/page/" text="Link Text" %}
+  Or
+    {%include link.html to="/path/to/page/" fallback="English Link Text" %}
+
+  The page title of the linked page is used unless a link text is specified. Fallback is displayed if the page cannot be found in that language.
+{%- endcomment -%}
+{%- assign pagelang = 'en' -%}
+{%- if page.lang -%}
+  {%- assign pagelang = page.lang -%}
+{%- endif -%}
+{%- if include.lang -%}
+  {%- assign pagelang = include.lang -%}
+{%- endif -%}
+{%- assign in_lang = true -%}
+{%- assign link_page=site.documents | where:"ref", include.to | where: "lang", pagelang | first -%}
+{%- unless link_page.url -%}
+  {%- assign link_page=site.pages | where:"ref", include.to | where: "lang", pagelang | first -%}
+{%- endunless -%}
+{%- unless link_page.url -%}
+  {%- assign in_lang = false -%}
+  {%- assign link_page=site.documents | where:"url", include.to | first -%}
+{%- endunless -%}
+{%- unless link_page.url -%}
+  {%- assign in_lang = false -%}
+  {%- assign link_page=site.pages | where:"url", include.to | first -%}
+{%- endunless -%}
+{%- if pagelang == 'en' %}{%- assign in_lang = true -%}{% endif -%}
+
+{%- assign link_text = "" -%}
+{%- if include.text -%}
+  {%- if include.text.en -%}
+    {%- if include.text[pagelang] -%}
+      {%- assign link_text = include.text[pagelang] -%}
+    {%- else -%}
+      {%- assign link_text = include.text.en -%}
+    {%- endif -%}
+  {%- else -%}
+    {%- assign link_text = include.text -%}
+  {%- endif -%}
+{% else %}
+  {%- if include.usenavtitle -%}
+    {%- if link_page.nav_title -%}
+      {%- assign link_text = link_page.nav_title -%}
+    {%- else -%}
+      {%- assign link_text = link_page.title -%}
+    {% endif %}
+  {%- else -%}
+      {%- assign link_text = link_page.title -%}
+  {%- endif -%}
+{%- endif -%}
+
+{%- unless link_text -%}
+  {%- if include.fallback -%}
+    {%- assign link_text = include.fallback -%}
+  {%- else -%}
+    {%- assign link_text = '[page not found in this repository, no fallback text given]' -%}
+  {%- endif -%}
+{%- endunless -%}
+
+{%- assign linklang = 'en' -%}
+{%- if link_page.lang -%}
+  {%- assign linklang = link_page.lang -%}
+{%- endif -%}
+
+{%- assign protocol = include.to | split: "://" -%}
+{%- if protocol[0] == "" -%}
+  {%- assign linkurl = 'https://www.w3.org/WAI' | append: include.to -%}
+{%- else -%}
+  {%- assign linkurl = include.to -%}
+{%- endif -%}
+
+{%- if link_page.url -%}
+  {%- assign linkurl = link_page.url | relative_url -%}
+{%- endif -%}
+
+{%- if include.id -%}
+  {%- assign linkurl = linkurl | append:'#' | append: include.id -%}
+{%- endif -%}
+
+{%- if include.fallback -%}
+  {%- unless in_lang -%}
+    {%- assign linklang = pagelang -%}
+    {%- assign link_text = include.fallback -%}
+  {%- endunless -%}
+{%- endif -%}
+
+<a lang="{{linklang}}" href="{{linkurl}}"{% if include.aria-current %} aria-current="{{include.aria-current}}"{% endif %}{% if include.class %} class="{{include.class}}"{% endif %}><span>{{ link_text }}{%- unless in_lang %}{% unless include.hidelangnotice %} <span class="lang" lang="{{pagelang}}" dir="auto" translate="no">({% include_cached t.html t="in English" lang=pagelang %})</span>{% endunless -%}{% endunless -%}{% if include.different %} {% include_cached different.html %}{% endif %}{% if include.external %} {% include_cached external.html %}{% endif %}</span></a>

data/_includes/menuitem.html

@@ -1,13 +1,15 @@
+{%- if include.current %}{% assign aria="page" %}{% else %}{% if include.insub%}{% assign aria="location" %}{% endif %}{% endif -%}
 {%- unless include.hide -%}
 <li>
-  <a class="page-link" {% if include.current %} aria-current="page" {% else %}{% if include.insub%} aria-current="location" {% endif %}{% endif %} href="{{ include.url | relative_url }}"><span>{% comment %}{% if include.url == searchurl %}{% include_cached icon.html name="chevron-right" %} {% endif %}{% endcomment %}{{include.name}}{% if include.different == true %} {% include_cached icon.html name="different-view" label="Different Layout" %}{% endif %}</span></a>
+  {% include_cached link.html to=include.url text=include.name aria-current=aria different=include.different external=include.external class="page-link" usenavtitle=true lang=page.lang hidelangnotice=true %}
   {{include.submenu}}
 </li>
 {%- else -%}
   {%- if include.current == true -%}
   <li>
-    <a class="page-link" {% if include.current %} aria-current="page" {% else %}{% if include.insub%} aria-current="location" {% endif %}{% endif %} href="{{ include.url | relative_url }}"><span>{% comment %}{% if include.url == searchurl %}{% include_cached icon.html name="chevron-right" %} {% endif %}{% endcomment %}{{include.name}}{% if include.different == true %} {% include_cached icon.html name="different-view" label="Different Layout" %}{% endif %}</span></a>
+    {% include_cached link.html to=include.url text=include.name aria-current=aria different=include.different external=include.external class="page-link" usenavtitle=true lang=page.lang hidelangnotice=true %}
     {{include.submenu}}
   </li>
   {%- endif -%}
-{%- endunless -%}
+{%- endunless -%}
+{% assign aria=false %}

data/_includes/multilang-list-policy-links.html

@@ -20,7 +20,7 @@
       {% unless lng == "en" %}
         (<span lang="{{lng}}">{{site.data.lang[lng].nativeName}}</span>)
       {% endunless %}
-      {% if include.external %}{% include_cached icon.html name="external-link" label="External Site" %}{% endif %} </a>
+      {% if include.external %}{% include external.html %}{% endif %} </a>
   </li>
 
 {% endif %}

data/_includes/navlist.html

@@ -3,7 +3,7 @@
   {%- assign the_url = item.pages.first.url -%}
   {%- unless item.mainnav == false -%}
   <li>
-    <a href="{{ the_url | relative_url }}"{% if include.current == the_url %} aria-current="location"{% endif %}><span>{{item.name}}</span></a>
+    <a href="{{ the_url | relative_url }}"{% if include.current == the_url %} aria-current="location"{% endif %}><span>{% include_cached inpl.html lang=page.lang a=item.name %}</span></a>
   </li>
   {%- endunless -%}
   {%- if forloop.last %}</ul>{% endif -%}

data/_includes/prevnext.html

@@ -1,10 +1,11 @@
+{%- if page.lang -%}{%- assign lang = page.lang -%}{%- else -%}{%- assign lang = "en" -%}{%- endif -%}
 {%- if page.order -%}
 {%- assign col = site.collections | where: "label", page.collection | first -%}
 {%- unless col.prevnext == false -%}
 {%- if page.group -%}
-  {%- assign docs = col.docs | where: "group", page.group -%}
+  {%- assign docs = col.docs | where: "group", page.group | where: "lang", lang -%}
 {%- else -%}
-  {%- assign docs = col.docs -%}
+  {%- assign docs = col.docs | where: "lang", lang -%}
 {%- endif -%}
 <nav class="pager" aria-label="Previous/Next Page">
   <ul>
@@ -13,7 +14,7 @@
       <a href="{{p.url | relative_url }}">
         {% include_cached icon.html name="arrow-left" class="pager--item-icon" %}
         <span class="pager--item-text">
-          <span class="pager--item-text-direction">Previous:</span>
+          <span class="pager--item-text-direction">{% include t.html t="Previous" %}:</span>
           <span class="pager--item-text-target">{% if p.nav_title %}{{p.nav_title}}{% else %}{{p.title}}{% endif %}</span>
         </span>
       </a>
@@ -24,7 +25,7 @@
       <a href="{{p.url | relative_url }}">
         {% include_cached icon.html name="arrow-right" class="pager--item-icon" %}
         <span class="pager--item-text">
-          <span class="pager--item-text-direction">Next:</span>
+          <span class="pager--item-text-direction">{% include t.html t="Next" %}:</span>
           <span class="pager--item-text-target">{% if p.nav_title %}{{p.nav_title}}{% else %}{{p.title}}{% endif %}</span>
         </span>
       </a>