diff --git a/CHANGELOG b/CHANGELOG index 003129891e0fc880d7519c9f55d0af4485559a0e..2b7be762363f7d961cfc1d1f8f71f89e3f98cf61 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +mkdocs-material-2.6.0 (2017-xx-xx) + + * Added permalink to main headline + * Added English as a fallback for missing translations + * Improved accessibility with skip-to-content link + mkdocs-material-2.5.0 (2017-01-13) * Added support for right-to-left languages diff --git a/docs/extensions/metadata.md b/docs/extensions/metadata.md index 1493fc0e598b0a0b6a6de50e3275ef6a9f7d56af..179b80eb9ef4e9a6dbe9da549c9133939dee65ac 100644 --- a/docs/extensions/metadata.md +++ b/docs/extensions/metadata.md @@ -1,4 +1,4 @@ -hero: Yes, this is set via Metadata +hero: Metadata enables hero teaser texts path: tree/master/docs/extensions source: metadata.md @@ -46,7 +46,7 @@ Material exposes a simple text-only page-local hero via Metadata, as you can see on the current page when you scroll to the top. It's as simple as: ``` markdown -hero: Yes, this is set via Metadata +hero: Metadata enables hero teaser texts ``` ### Overriding the title diff --git a/docs/index.md b/docs/index.md index e615ae62b19ef9820c57e03bcd6a4a6129dfa32e..331b66d1002f66988198c3083661cd117baa70b2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # Material <small>for MkDocs</small> -## Beautiful project documentation +## Create beautiful project documentation Material is a theme for [MkDocs][1], an excellent static site generator geared towards project documentation. It is built using Google's [Material Design][2] diff --git a/material/partials/language.html b/material/partials/language.html index 278339b74a8a193da15b6ce7f53402d136bafa43..e29c46b1d411f18e72b79ed4058d63aea1278c8a 100644 --- a/material/partials/language.html +++ b/material/partials/language.html @@ -1,4 +1,5 @@ {% import "partials/language/" + config.theme.language + ".html" as lang %} +{% import "partials/language/en.html" as oops %} {% macro t(key) %}{{ { "search.language": ( config.extra.search | default({}) @@ -6,4 +7,4 @@ "search.tokenizer": ( config.extra.search | default({}) ).tokenizer | default("", true), -}[key] or lang.t(key) }}{% endmacro %} +}[key] or lang.t(key) or oops.t(key) }}{% endmacro %} diff --git a/material/partials/language/de.html b/material/partials/language/de.html index e5bbe53dfd066fcd00786ccd4da3f005d7de35d0..afa1ca18c739447a2915ca25aa176ef41a4c6366 100644 --- a/material/partials/language/de.html +++ b/material/partials/language/de.html @@ -13,6 +13,7 @@ "search.result.one": "1 Suchergebnis", "search.result.other": "# Suchergebnisse", "search.tokenizer": "[\s\-]+", + "skip.link.title": "Zum Inhalt", "source.link.title": "Quellcode", "toc.title": "Inhaltsverzeichnis" }[key] }}{% endmacro %} diff --git a/src/partials/language.html b/src/partials/language.html index ca37268c8ea0c7f3f0d8f6a5e422b61c0ffa32d5..9837461fbfa5ba920109ebf1d081bd6a2aa26d37 100644 --- a/src/partials/language.html +++ b/src/partials/language.html @@ -23,6 +23,9 @@ <!-- Import translations for given language --> {% import "partials/language/" + config.theme.language + ".html" as lang %} +<!-- Import fallback translations --> +{% import "partials/language/en.html" as oops %} + <!-- Re-export translations --> {% macro t(key) %}{{ { "search.language": ( @@ -31,4 +34,4 @@ "search.tokenizer": ( config.extra.search | default({}) ).tokenizer | default("", true), -}[key] or lang.t(key) }}{% endmacro %} +}[key] or lang.t(key) or oops.t(key) }}{% endmacro %} diff --git a/src/partials/language/de.html b/src/partials/language/de.html index 73284298ed60290fac6498a6e17ae6e4ec251d40..6c35493fe16a4d2dec31093afd72c77f24754504 100644 --- a/src/partials/language/de.html +++ b/src/partials/language/de.html @@ -36,6 +36,7 @@ "search.result.one": "1 Suchergebnis", "search.result.other": "# Suchergebnisse", "search.tokenizer": "[\s\-]+", + "skip.link.title": "Zum Inhalt", "source.link.title": "Quellcode", "toc.title": "Inhaltsverzeichnis" }[key] }}{% endmacro %}