diff --git a/README.md b/README.md index 741dc5b..221e8ff 100644 --- a/README.md +++ b/README.md @@ -53,23 +53,11 @@ list_pages = true The theme has a built-in feature that allows you to use multiple languages. For detailed instructions on how to use this feature, you can refer to the [Zola Multilingual documentation](https://www.getzola.org/documentation/content/multilingual/). This documentation provides additional information on how to make the most out of this multilingual capability. ```toml -[languages.en] -weight = 1 -title = "anemone" -languageName = "English" -languageCode = "en" -relativeURL = false - [languages.fr] weight = 2 title = "anemone" languageName = "Français" languageCode = "fr" -relativeURL = false - -taxonomies = [ - {name = "tags", feed = true}, -] ``` #### Multilanguage-Ready Navigation Bar @@ -78,21 +66,12 @@ Customize the header navigation links with the following code in the `extra` sec ```toml [extra] -[[extra.header_nav]] -en = { name = "/home/", url = "/" } -fr = { name = "/accueil/", url = "/fr" } - -[[extra.header_nav]] -en = { name = "/about/", url = "/about" } -fr = { name = "/concernant/", url = "/about" } - -[[extra.header_nav]] -en = { name = "/journal/", url = "/journal" } -fr = { name = "/journal/", url = "/journal" } - -[[extra.header_nav]] -en = { name = "/blog/", url = "/blog" } -fr = { name = "/blog/", url = "/blog" } +header_nav = [ + { url = "/", name_en = "/home/", name_fr = "/accueil/" }, + { url = "/about", name_en = "/about/", name_fr = "/concernant/" }, + { url = "/journal", name_en = "/journal/", name_fr = "/journal/" }, + { url = "/blog", name_en = "/blog/", name_fr = "/blog/" } +] ``` #### Default Theme diff --git a/config.toml b/config.toml index 5b8a0d7..284b43e 100644 --- a/config.toml +++ b/config.toml @@ -3,30 +3,16 @@ description = "A minimalist Zola theme that prioritizes clean CSS and avoids hea compile_sass = false minify_html = true generate_feed = true - default_language = "en" taxonomies = [ {name = "tags", feed = true}, ] -[languages.en] -weight = 1 -title = "anemone" -languageName = "English" -languageCode = "en" -relativeURL = false - [languages.fr] weight = 2 -title = "anemone" languageName = "Français" languageCode = "fr" -relativeURL = false - -taxonomies = [ - {name = "tags", feed = true}, -] [markdown] render_emoji = true @@ -54,18 +40,9 @@ default_theme = "light" list_pages = false twitter_card = true -[[extra.header_nav]] -en = { name = "/home/", url = "/" } -fr = { name = "/accueil/", url = "/fr" } - -[[extra.header_nav]] -en = { name = "/about/", url = "/about" } -fr = { name = "/concernant/", url = "/about" } - -[[extra.header_nav]] -en = { name = "/journal/", url = "/journal" } -fr = { name = "/journal/", url = "/journal" } - -[[extra.header_nav]] -en = { name = "/blog/", url = "/blog" } -fr = { name = "/blog/", url = "/blog" } +header_nav = [ + { url = "/", name_en = "/home/", name_fr = "/accueil/" }, + { url = "/about", name_en = "/about/", name_fr = "/concernant/" }, + { url = "/journal", name_en = "/journal/", name_fr = "/journal/" }, + { url = "/blog", name_en = "/blog/", name_fr = "/blog/" } +] \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index f408544..86691df 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,19 +1,18 @@ - - - + + + {% include "head.html" %} - - -
-
+ + +
{% include "header.html" %} -
-
- {% block content %}{% endblock content %} -
-
+
+
+ {% block content %} + {% endblock content %} +
+ -
- - + + + \ No newline at end of file diff --git a/templates/head.html b/templates/head.html index 179c11c..0bf38fd 100644 --- a/templates/head.html +++ b/templates/head.html @@ -92,4 +92,5 @@ {% block css %} {% endblock css %} - \ No newline at end of file + + diff --git a/templates/header.html b/templates/header.html index a65b254..1a12378 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,12 +1,17 @@ +{% set current_lang = config.default_language %} +{% if page %} + {% set current_lang = page.lang %} +{% elif section %} + {% set current_lang = section.lang %} +{% endif %} {% if config.extra.header_nav %} -