-
+
{% include 'svg/idrc-logo.svg' %}
- {{ site[lang].title }}
+ {{ _(site.title) }}
diff --git a/src/_includes/partials/menu.njk b/src/_includes/partials/menu.njk
index 033d1bd..44745af 100644
--- a/src/_includes/partials/menu.njk
+++ b/src/_includes/partials/menu.njk
@@ -2,7 +2,7 @@
{% for item in navPages %}
{% set slug = item.key | lower %}
- {% if item.lang === lang %}
+ {% if item.locale === locale %}
{% set inCategory = item.key === category %}
diff --git a/src/assets/styles/app.styl b/src/assets/styles/app.styl
index 61d0232..67a6f64 100644
--- a/src/assets/styles/app.styl
+++ b/src/assets/styles/app.styl
@@ -138,7 +138,7 @@ a:hover .idg-logo {
.idg-locale {
width: 100%;
display: flex;
- justify-content: end;
+ justify-content: flex-end;
padding-block-start: 1rem;
padding-inline: 2rem;
}
diff --git a/src/documents/activities/activities.11tydata.js b/src/documents/activities/activities.11tydata.js
index 508868c..ab4adc6 100644
--- a/src/documents/activities/activities.11tydata.js
+++ b/src/documents/activities/activities.11tydata.js
@@ -1,26 +1,21 @@
"use strict";
-const getLang = require("../../utils/getLang.js");
const generatePermalink = require("../../utils/generatePermalink.js");
-let collection = "activities";
-
module.exports = {
category: "Activities",
layout: "layouts/category.njk",
eleventyComputed: {
- /* Determine the language of this item based on the language code in the file path. */
- lang: data => getLang(data.page.filePathStem, collection),
/* Set the translationKey, used for populating the language switcher, to the file slug. */
translationKey: data => data.page.fileSlug,
/* Build a permalink using the title, language key, and translated collection type slug. */
- permalink: data => generatePermalink(data, collection),
+ permalink: generatePermalink,
eleventyNavigation: data => {
/* To have the navigation localized, use the page's title as the navigation title. */
if (data.eleventyNavigation) {
return {
- title: data.title,
- lang: data.lang,
+ title: data.title,
+ locale: data.locale,
...data.eleventyNavigation
};
}
diff --git a/src/documents/activities/en-CA/en-CA.11tydata.js b/src/documents/activities/en-CA/en-CA.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/activities/en-CA/en-CA.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/activities/fr/fr.11tydata.js b/src/documents/activities/fr/fr.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/activities/fr/fr.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/insights/en-CA/en-CA.11tydata.js b/src/documents/insights/en-CA/en-CA.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/insights/en-CA/en-CA.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/insights/fr/fr.11tydata.js b/src/documents/insights/fr/fr.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/insights/fr/fr.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/insights/insights.11tydata.js b/src/documents/insights/insights.11tydata.js
index 5cf0141..f2dbbb5 100644
--- a/src/documents/insights/insights.11tydata.js
+++ b/src/documents/insights/insights.11tydata.js
@@ -1,26 +1,21 @@
"use strict";
-const getLang = require("../../utils/getLang.js");
const generatePermalink = require("../../utils/generatePermalink.js");
-let collection = "insights";
-
module.exports = {
category: "Insights",
layout: "layouts/category.njk",
eleventyComputed: {
- /* Determine the language of this item based on the language code in the file path. */
- lang: data => getLang(data.page.filePathStem, collection),
/* Set the translationKey, used for populating the language switcher, to the file slug. */
translationKey: data => data.page.fileSlug,
/* Build a permalink using the title, language key, and translated collection type slug. */
- permalink: data => generatePermalink(data, collection),
+ permalink: generatePermalink,
eleventyNavigation: data => {
/* To have the navigation localized, use the page's title as the navigation title. */
if (data.eleventyNavigation) {
return {
title: data.title,
- lang: data.lang,
+ locale: data.locale,
...data.eleventyNavigation
};
}
diff --git a/src/documents/pages/en-CA/en-CA.11tydata.js b/src/documents/pages/en-CA/en-CA.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/pages/en-CA/en-CA.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/pages/fr/fr.11tydata.js b/src/documents/pages/fr/fr.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/pages/fr/fr.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/pages/pages.11tydata.js b/src/documents/pages/pages.11tydata.js
index 40e80a2..d616cfc 100644
--- a/src/documents/pages/pages.11tydata.js
+++ b/src/documents/pages/pages.11tydata.js
@@ -1,18 +1,13 @@
"use strict";
-const getLang = require("../../utils/getLang.js");
const generatePermalink = require("../../utils/generatePermalink.js");
module.exports = {
layout: "layouts/index.njk",
eleventyComputed: {
- /* Determine the language of this item based on the language code in the file path. */
- lang: data => getLang(data.page.filePathStem, "pages"),
/* Set the translationKey, used for populating the language switcher, to the file slug. */
translationKey: data => {
- const lang = getLang(data.page.filePathStem, "pages");
-
- if (data.page.fileSlug === lang) {
+ if (data.page.fileSlug === data.locale) {
return "index";
}
@@ -21,13 +16,11 @@ module.exports = {
/* Build a permalink using the title and language key, or to the 404 page. */
permalink: data => {
if (data.page.fileSlug !== "404") {
- return generatePermalink(data, "pages");
+ return generatePermalink(data);
}
- let lang = getLang(data.page.filePathStem, "pages");
-
- if (lang !== data.config.defaultLanguage) {
- return `/${data.config.languages[lang].slug}/404.html`;
+ if (data.locale !== data.config.defaultLanguage) {
+ return `/${data.config.languages[data.locale].slug}/404.html`;
}
return "/404.html";
diff --git a/src/documents/practices/en-CA/en-CA.11tydata.js b/src/documents/practices/en-CA/en-CA.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/practices/en-CA/en-CA.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/practices/fr/fr.11tydata.js b/src/documents/practices/fr/fr.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/practices/fr/fr.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/practices/practices.11tydata.js b/src/documents/practices/practices.11tydata.js
index e94de43..67440d7 100644
--- a/src/documents/practices/practices.11tydata.js
+++ b/src/documents/practices/practices.11tydata.js
@@ -1,26 +1,21 @@
"use strict";
-const getLang = require("../../utils/getLang.js");
const generatePermalink = require("../../utils/generatePermalink.js");
-let collection = "practices";
-
module.exports = {
category: "Practices",
layout: "layouts/category.njk",
eleventyComputed: {
- /* Determine the language of this item based on the language code in the file path. */
- lang: data => getLang(data.page.filePathStem, collection),
/* Set the translationKey, used for populating the language switcher, to the file slug. */
translationKey: data => data.page.fileSlug,
/* Build a permalink using the title, language key, and translated collection type slug. */
- permalink: data => generatePermalink(data, collection),
+ permalink: generatePermalink,
eleventyNavigation: data => {
/* To have the navigation localized, use the page's title as the navigation title. */
if (data.eleventyNavigation) {
return {
title: data.title,
- lang: data.lang,
+ locale: data.locale,
...data.eleventyNavigation
};
}
diff --git a/src/documents/tools/en-CA/en-CA.11tydata.js b/src/documents/tools/en-CA/en-CA.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/tools/en-CA/en-CA.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/tools/fr/fr.11tydata.js b/src/documents/tools/fr/fr.11tydata.js
new file mode 100644
index 0000000..ef5d937
--- /dev/null
+++ b/src/documents/tools/fr/fr.11tydata.js
@@ -0,0 +1,10 @@
+"use strict";
+
+const i18n = require("eleventy-plugin-i18n-gettext");
+const config = require("../../../_data/config.json");
+const path = require("path");
+
+module.exports = () => {
+ let locale = path.basename(__dirname);
+ return i18n.enhance11tydata({}, locale, config.languages[locale].dir);
+};
diff --git a/src/documents/tools/tools.11tydata.js b/src/documents/tools/tools.11tydata.js
index 3e85838..1a44848 100644
--- a/src/documents/tools/tools.11tydata.js
+++ b/src/documents/tools/tools.11tydata.js
@@ -1,26 +1,21 @@
"use strict";
-const getLang = require("../../utils/getLang.js");
const generatePermalink = require("../../utils/generatePermalink.js");
-let collection = "tools";
-
module.exports = {
category: "Tools",
layout: "layouts/category.njk",
eleventyComputed: {
- /* Determine the language of this item based on the language code in the file path. */
- lang: data => getLang(data.page.filePathStem, collection),
/* Set the translationKey, used for populating the language switcher, to the file slug. */
translationKey: data => data.page.fileSlug,
/* Build a permalink using the title, language key, and translated collection type slug. */
- permalink: data => generatePermalink(data, collection),
+ permalink: generatePermalink,
eleventyNavigation: data => {
/* To have the navigation localized, use the page's title as the navigation title. */
if (data.eleventyNavigation) {
return {
title: data.title,
- lang: data.lang,
+ locale: data.locale,
...data.eleventyNavigation
};
}
diff --git a/src/locales/fr/messages.mo b/src/locales/fr/messages.mo
new file mode 100644
index 0000000..123aa87
Binary files /dev/null and b/src/locales/fr/messages.mo differ
diff --git a/src/locales/fr/messages.po b/src/locales/fr/messages.po
new file mode 100644
index 0000000..6396b4c
--- /dev/null
+++ b/src/locales/fr/messages.po
@@ -0,0 +1,105 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2021-09-29 12:50-0400\n"
+"PO-Revision-Date: 2021-09-29 12:52-0400\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0\n"
+"X-Poedit-Basepath: ../..\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-KeywordsList: _i;_n:1,2;_ni:1,2\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: locales/messages.js:3
+msgid "Breadcrumb"
+msgstr "Fil d’Ariane"
+
+#: locales/messages.js:4
+msgid "Home"
+msgstr "Accueil"
+
+#: locales/messages.js:5
+msgid "${categoryName} contents"
+msgstr "${categoryName} sommaire"
+
+#: locales/messages.js:6
+msgid "Edit this Page on GitHub"
+msgstr "Modifier cette page sur GitHub"
+
+#: locales/messages.js:7
+msgid ""
+"Created by the ${communityLink}community members${closeLink} of ${org} at "
+"${ocad}, and supported by"
+msgstr ""
+"Créé par la ${communityLink}communauté des membres${closeLink} du ${org} de "
+"${ocad}, avec le soutien de"
+
+#: locales/messages.js:8
+msgid "Hosted with ${netlify}."
+msgstr "Hébergé par ${netlify}."
+
+#: locales/messages.js:9
+msgid "This documentation is licensed under a ${license}."
+msgstr "Le contenu de ce site est sous licence ${license}."
+
+#: locales/messages.js:10
+msgid "Skip to Content"
+msgstr "Accès direct au contenu"
+
+#: locales/messages.js:11
+msgid "Home: ${siteName}"
+msgstr "Accueil: ${siteName}"
+
+#: locales/messages.js:12
+msgid "activities"
+msgstr "activités"
+
+#: locales/messages.js:13
+msgid "insights"
+msgstr "perspectives"
+
+#: locales/messages.js:14
+msgid "practices"
+msgstr "pratiques"
+
+#: locales/messages.js:15
+msgid "tools"
+msgstr "outils"
+
+#: locales/messages.js:16
+msgid "The Inclusive Design Guide"
+msgstr "Guide pour une conception inclusive"
+
+#: locales/messages.js:17
+msgid "Creative Commons CC BY 3.0"
+msgstr "Creative Commons CC BY 3.0"
+
+#: locales/messages.js:18
+msgid "https://creativecommons.org/licenses/by/3.0/"
+msgstr "https://creativecommons.org/licenses/by/3.0/deed.fr"
+
+#: locales/messages.js:19
+msgid "Inclusive Design Research Centre"
+msgstr "Centre de Recherche pour une Conception Inclusive"
+
+#: locales/messages.js:20
+msgid "https://idrc.ocad.ca/"
+msgstr ""
+
+#: locales/messages.js:21
+msgid "OCAD University"
+msgstr ""
+"l’Université de l’École d’art et de design de l’Ontario (OCAD University)"
+
+#: locales/messages.js:22
+msgid "https://www.ocadu.ca/"
+msgstr ""
+
+#: locales/messages.js:24
+msgid "Language"
+msgstr "Langues"
diff --git a/src/locales/messages.js b/src/locales/messages.js
new file mode 100644
index 0000000..4144f64
--- /dev/null
+++ b/src/locales/messages.js
@@ -0,0 +1,23 @@
+// WARNING! This file is generated by a tool.
+// It exists only to allow PO editors to get translation keys from source code.
+_("Breadcrumb")
+_("Home")
+_i("${categoryName} contents")
+_("Edit this Page on GitHub")
+_i("Created by the ${communityLink}community members${closeLink} of ${org} at ${ocad}, and supported by")
+_i("Hosted with ${netlify}.")
+_i("This documentation is licensed under a ${license}.")
+_("Skip to Content")
+_i("Home: ${siteName}")
+_("activities")
+_("insights")
+_("practices")
+_("tools")
+_("The Inclusive Design Guide")
+_("Creative Commons CC BY 3.0")
+_("https://creativecommons.org/licenses/by/3.0/")
+_("Inclusive Design Research Centre")
+_("https://idrc.ocad.ca/")
+_("OCAD University")
+_("https://www.ocadu.ca/")
+_("Language")
\ No newline at end of file
diff --git a/src/shortcodes/generateLocaleLinks.js b/src/shortcodes/generateLocaleLinks.js
index 2d8f6be..898c46f 100644
--- a/src/shortcodes/generateLocaleLinks.js
+++ b/src/shortcodes/generateLocaleLinks.js
@@ -1,11 +1,12 @@
"use strict";
const config = require("../_data/config.json");
+const i18n = require("eleventy-plugin-i18n-gettext");
-module.exports = (lang, translationKey, category, collection) => {
+module.exports = (locale, translationKey, category, collection) => {
let output = "";
for (let language in config.languages) {
- if (lang && lang !== language) {
+ if (locale && locale !== language) {
let langProps = config.languages[language];
if (category && collection) {
let matchedPage = collection[`${category}_${language}`].find(page => page.fileSlug === translationKey);
@@ -18,5 +19,5 @@ module.exports = (lang, translationKey, category, collection) => {
}
}
- return output ? `` : output;
+ return output ? `` : output;
};
diff --git a/src/shortcodes/translate.js b/src/shortcodes/translate.js
deleted file mode 100644
index a18f96e..0000000
--- a/src/shortcodes/translate.js
+++ /dev/null
@@ -1,22 +0,0 @@
-"use strict";
-
-const config = require("../_data/config.json");
-const translations = require("../_data/translations.json");
-
-const get = (obj, path) => {
- path = typeof(path) === "string" ? path.split(".") : path;
-
- if (!obj) {
- return;
- }
-
- if (!path || !path[0]) {
- return obj;
- } else {
- return get(obj[path[0]], path.slice(1));
- }
-};
-
-module.exports = (path, lang) => {
- return get(translations[lang], path) || get(translations[config.defaultLanguage], path) || "";
-};
diff --git a/src/utils/generatePermalink.js b/src/utils/generatePermalink.js
index c327b5b..2638cae 100644
--- a/src/utils/generatePermalink.js
+++ b/src/utils/generatePermalink.js
@@ -1,26 +1,29 @@
"use strict";
const config = require("../_data/config.json");
-const getLang = require("./getLang.js");
const slugFilter = require("../../node_modules/eleventy-plugin-fluid/src/filters/slug-filter.js");
-const translations = require("../_data/translations.json");
+const i18n = require("eleventy-plugin-i18n-gettext");
-module.exports = (data, collectionType) => {
+module.exports = (data) => {
/* If this page is a "stub" with no localized title, we assume it does not exist and prevent it from building. */
if (!Object.prototype.hasOwnProperty.call(data, "title")) {
return false;
}
- const lang = getLang(data.page.filePathStem, collectionType);
- const langSlug = config.languages[lang].slug || lang;
+ const locale = data.locale;
+ const localeSlug = config.languages[locale].slug || locale;
const slug = slugFilter(data.title);
- const collectionSlug = slugFilter(translations[lang][collectionType] || "");
+ const collection = data.category && data.category.toLowerCase() || "";
+ const collectionSlug = slugFilter(i18n._(locale, collection) || "");
+ const root = (locale === config.defaultLanguage) ? "/" : `/${localeSlug}/`;
- if (collectionType === "pages" && data.page.fileSlug === lang) {
- return (lang === config.defaultLanguage) ? "/" : `/${langSlug}/`;
- } else if (data.eleventyNavigation && data.eleventyNavigation.key === data.category) {
- return (lang === config.defaultLanguage) ? `/${collectionSlug}/` : `/${langSlug}/${collectionSlug}/`;
- } else {
- return (lang === config.defaultLanguage) ? `/${collectionSlug}/${slug}/` : `/${langSlug}/${collectionSlug}/${slug}/`;
+ if (!collection && locale === data.page.fileSlug) {
+ return root;
}
+
+ if (data.eleventyNavigation && data.eleventyNavigation.key === data.category) {
+ return `${root}/${collectionSlug}/`;
+ }
+
+ return `${root}/${collectionSlug}/${slug}/`;
};
diff --git a/src/utils/getLang.js b/src/utils/getLang.js
deleted file mode 100644
index 53df9db..0000000
--- a/src/utils/getLang.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = (filePathStem, collection) => {
- return [...filePathStem.matchAll(new RegExp(`\/documents\/${collection}\/([A-Za-z-]*)\/[a-z0-9-]*`, "g"))][0][1];
-};