Skip to content
Snippets Groups Projects
Commit 9f513d64 authored by squidfunk's avatar squidfunk Committed by Martin Donath
Browse files

Added support for default localization and German translations

parent 9005ae23
Branches
Tags
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 151 additions and 53 deletions
CHANGELOG
+ 5
− 1
View file @ 9f513d64
master
* Fixed #374: Search bar misalignment on big screens
mkdocs-material-1.11.0 (2017-10-19) mkdocs-material-1.11.0 (2017-10-19)
* Added localization to clipboard * Added localization to clipboard
* Refactored i18n localization logic * Refactored localization logic
mkdocs-material-1.10.4 (2017-10-18) mkdocs-material-1.10.4 (2017-10-18)
......
docs/release-notes.md
+ 2
− 2
View file @ 9f513d64
...@@ -20,7 +20,7 @@ pip show mkdocs-material | grep -E ^Version ...@@ -20,7 +20,7 @@ pip show mkdocs-material | grep -E ^Version
### 1.11.0 <small>_ October 19, 2017</small> ### 1.11.0 <small>_ October 19, 2017</small>
* Added localization to clipboard * Added localization to clipboard
* Refactored i18n localization logic * Refactored localization logic
### 1.10.4 <small>_ October 18, 2017</small> ### 1.10.4 <small>_ October 18, 2017</small>
...@@ -28,7 +28,7 @@ pip show mkdocs-material | grep -E ^Version ...@@ -28,7 +28,7 @@ pip show mkdocs-material | grep -E ^Version
* Improved search UX (don't close on enter if no selection) * Improved search UX (don't close on enter if no selection)
* Fixed [#495][495]: Vertical scrollbar on short pages * Fixed [#495][495]: Vertical scrollbar on short pages
[495]: https://github.com/squidfunk/mkdocs-material/issues/484 [495]: https://github.com/squidfunk/mkdocs-material/issues/495
### 1.10.3 <small>_ October 11, 2017</small> ### 1.10.3 <small>_ October 11, 2017</small>
......
material/base.html
+ 2
− 2
View file @ 9f513d64
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ lang.t('language') }}" class="no-js"> <html lang="{{ lang.t('language') }}" class="no-js">
<head> <head>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<script src="{{ base_url }}/assets/javascripts/modernizr-e826f8942a.js"></script> <script src="{{ base_url }}/assets/javascripts/modernizr-e826f8942a.js"></script>
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-6062816a07.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-04ea671600.css">
{% if config.extra.palette %} {% if config.extra.palette %}
<link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-23f75ab9c7.palette.css"> <link rel="stylesheet" href="{{ base_url }}/assets/stylesheets/application-23f75ab9c7.palette.css">
{% endif %} {% endif %}
......
material/partials/footer.html
+ 1
− 1
View file @ 9f513d64
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<footer class="md-footer"> <footer class="md-footer">
{% if page.previous_page or page.next_page %} {% if page.previous_page or page.next_page %}
<div class="md-footer-nav"> <div class="md-footer-nav">
......
material/partials/language.html
+ 3
− 19
View file @ 9f513d64
{% macro t(key) %}{{ { {% set code = config.extra.language | default("en") %}
"language": "en", {% import "partials/language/" + code + ".html" as lang %}
"clipboard.copy": "Copy to clipboard", {% macro t(key) %}{{ lang.t(key) }}{% endmacro %}
"clipboard.copied": "Copied to clipboard",
"edit.link.title": "Edit this page",
"footer.previous": "Previous",
"footer.next": "Next",
"meta.comments": "Comments",
"meta.source": "Source",
"search.languages": "",
"search.placeholder": "Search",
"search.result.placeholder": "Type to start searching",
"search.result.none": "No matching documents",
"search.result.one": "1 matching document",
"search.result.other": "# matching documents",
"search.tokenizer": "[\s\-]+",
"source.link.title": "Go to repository",
"toc.title": "Table of contents"
}[key] }}{% endmacro %}
material/partials/language/de.html 0 → 100644
+ 19
− 0
View file @ 9f513d64
{% macro t(key) %}{{ {
"language": "de",
"clipboard.copy": "In Zwischenablage kopieren",
"clipboard.copied": "In Zwischenablage kopiert",
"edit.link.title": "Seite editieren",
"footer.previous": "Vorherige Seite",
"footer.next": "Nächste Seite",
"meta.comments": "Kommentare",
"meta.source": "Quellcode",
"search.languages": "de",
"search.placeholder": "Suche",
"search.result.placeholder": "Suchbegriff eingeben",
"search.result.none": "Keine Suchergebnisse",
"search.result.one": "1 Suchergebnis",
"search.result.other": "# Suchergebnisse",
"search.tokenizer": "[\s\-]+",
"source.link.title": "Quellcode",
"toc.title": "Inhaltsverzeichnis"
}[key] }}{% endmacro %}
material/partials/language/en.html 0 → 100644
+ 19
− 0
View file @ 9f513d64
{% macro t(key) %}{{ {
"language": "en",
"clipboard.copy": "Copy to clipboard",
"clipboard.copied": "Copied to clipboard",
"edit.link.title": "Edit this page",
"footer.previous": "Previous",
"footer.next": "Next",
"meta.comments": "Comments",
"meta.source": "Source",
"search.languages": "",
"search.placeholder": "Search",
"search.result.placeholder": "Type to start searching",
"search.result.none": "No matching documents",
"search.result.one": "1 matching document",
"search.result.other": "# matching documents",
"search.tokenizer": "[\s\-]+",
"source.link.title": "Go to repository",
"toc.title": "Table of contents"
}[key] }}{% endmacro %}
material/partials/search.html
+ 1
− 1
View file @ 9f513d64
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<div class="md-search" data-md-component="search" role="dialog"> <div class="md-search" data-md-component="search" role="dialog">
<label class="md-search__overlay" for="search"></label> <label class="md-search__overlay" for="search"></label>
<div class="md-search__inner"> <div class="md-search__inner">
......
material/partials/source.html
+ 1
− 1
View file @ 9f513d64
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
{% set platform = config.extra.repo_icon or config.repo_url %} {% set platform = config.extra.repo_icon or config.repo_url %}
{% if "github" in platform %} {% if "github" in platform %}
{% set repo_type = "github" %} {% set repo_type = "github" %}
......
material/partials/toc.html
+ 1
− 1
View file @ 9f513d64
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<nav class="md-nav md-nav--secondary"> <nav class="md-nav md-nav--secondary">
{% set toc_ = page.toc %} {% set toc_ = page.toc %}
{% if toc_ | first is defined and "\x3ch1 id=" in page.content %} {% if toc_ | first is defined and "\x3ch1 id=" in page.content %}
......
mkdocs.yml
+ 1
− 0
View file @ 9f513d64
...@@ -36,6 +36,7 @@ theme_dir: material ...@@ -36,6 +36,7 @@ theme_dir: material
# Options # Options
extra: extra:
language: en
feature: feature:
tabs: false tabs: false
palette: palette:
......
src/assets/stylesheets/layout/_search.scss
+ 1
− 0
View file @ 9f513d64
...@@ -155,6 +155,7 @@ $md-toggle__search--checked: ...@@ -155,6 +155,7 @@ $md-toggle__search--checked:
@include break-from-device(tablet landscape) { @include break-from-device(tablet landscape) {
position: relative; position: relative;
width: 23rem; width: 23rem;
float: right;
transition: width 0.25s cubic-bezier(0.1, 0.7, 0.1, 1); transition: width 0.25s cubic-bezier(0.1, 0.7, 0.1, 1);
} }
......
src/base.html
+ 1
− 1
View file @ 9f513d64
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
IN THE SOFTWARE. IN THE SOFTWARE.
--> -->
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ lang.t('language') }}" class="no-js"> <html lang="{{ lang.t('language') }}" class="no-js">
......
src/partials/footer.html
+ 1
− 1
View file @ 9f513d64
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
IN THE SOFTWARE. IN THE SOFTWARE.
--> -->
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<!-- Application footer --> <!-- Application footer -->
<footer class="md-footer"> <footer class="md-footer">
......
src/partials/language.html
+ 6
− 20
View file @ 9f513d64
...@@ -20,23 +20,9 @@ ...@@ -20,23 +20,9 @@
IN THE SOFTWARE. IN THE SOFTWARE.
--> -->
<!-- Translations --> <!-- Import translations for given language -->
{% macro t(key) %}{{ { {% set code = config.extra.language | default("en") %}
"language": "en", {% import "partials/language/" + code + ".html" as lang %}
"clipboard.copy": "Copy to clipboard",
"clipboard.copied": "Copied to clipboard", <!-- Re-export translations -->
"edit.link.title": "Edit this page", {% macro t(key) %}{{ lang.t(key) }}{% endmacro %}
"footer.previous": "Previous",
"footer.next": "Next",
"meta.comments": "Comments",
"meta.source": "Source",
"search.languages": "",
"search.placeholder": "Search",
"search.result.placeholder": "Type to start searching",
"search.result.none": "No matching documents",
"search.result.one": "1 matching document",
"search.result.other": "# matching documents",
"search.tokenizer": "[\s\-]+",
"source.link.title": "Go to repository",
"toc.title": "Table of contents"
}[key] }}{% endmacro %}
src/partials/language/de.html 0 → 100644
+ 42
− 0
View file @ 9f513d64
<!--
Copyright (c) 2016-2017 Martin Donath <martin.donath@squidfunk.com>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
-->
<!-- Translations: German -->
{% macro t(key) %}{{ {
"language": "de",
"clipboard.copy": "In Zwischenablage kopieren",
"clipboard.copied": "In Zwischenablage kopiert",
"edit.link.title": "Seite editieren",
"footer.previous": "Vorherige Seite",
"footer.next": "Nächste Seite",
"meta.comments": "Kommentare",
"meta.source": "Quellcode",
"search.languages": "de",
"search.placeholder": "Suche",
"search.result.placeholder": "Suchbegriff eingeben",
"search.result.none": "Keine Suchergebnisse",
"search.result.one": "1 Suchergebnis",
"search.result.other": "# Suchergebnisse",
"search.tokenizer": "[\s\-]+",
"source.link.title": "Quellcode",
"toc.title": "Inhaltsverzeichnis"
}[key] }}{% endmacro %}
src/partials/language/en.html 0 → 100644
+ 42
− 0
View file @ 9f513d64
<!--
Copyright (c) 2016-2017 Martin Donath <martin.donath@squidfunk.com>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
-->
<!-- Translations: English -->
{% macro t(key) %}{{ {
"language": "en",
"clipboard.copy": "Copy to clipboard",
"clipboard.copied": "Copied to clipboard",
"edit.link.title": "Edit this page",
"footer.previous": "Previous",
"footer.next": "Next",
"meta.comments": "Comments",
"meta.source": "Source",
"search.languages": "",
"search.placeholder": "Search",
"search.result.placeholder": "Type to start searching",
"search.result.none": "No matching documents",
"search.result.one": "1 matching document",
"search.result.other": "# matching documents",
"search.tokenizer": "[\s\-]+",
"source.link.title": "Go to repository",
"toc.title": "Table of contents"
}[key] }}{% endmacro %}
src/partials/search.html
+ 1
− 1
View file @ 9f513d64
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
IN THE SOFTWARE. IN THE SOFTWARE.
--> -->
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<!-- Search interface --> <!-- Search interface -->
<div class="md-search" data-md-component="search" role="dialog"> <div class="md-search" data-md-component="search" role="dialog">
......
src/partials/source.html
+ 1
− 1
View file @ 9f513d64
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
IN THE SOFTWARE. IN THE SOFTWARE.
--> -->
{% import "partials/language.html" as lang %} {% import "partials/language.html" as lang with context %}
<!-- <!--
Check whether the repository is hosted on one of the supported code hosting Check whether the repository is hosted on one of the supported code hosting
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment