diff --git a/.githooks/pre-commit/branch.sh b/.githooks/pre-commit/branch.sh deleted file mode 100755 index 1662799fe..000000000 --- a/.githooks/pre-commit/branch.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2016-2018 Martin Donath - -# 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. - -# Determine current branch -BRANCH=$(git rev-parse --abbrev-ref HEAD) -MESSAGE="Commits on master are only allowed via Pull Requests. Aborting." - -# If we're on master, abort commit -if [[ "$BRANCH" == "master" ]]; then - echo -e "\x1B[31m✗\x1B[0m Branch: $BRANCH - \x1B[31m$MESSAGE\x1B[0m" - exit 1 -else - echo -e "\x1B[32m✓\x1B[0m Branch: $BRANCH" -fi - -# We're good -exit 0 diff --git a/docs/release-notes.md b/docs/release-notes.md index c1baf6216..8f57a6fa0 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -2,7 +2,7 @@ ## Upgrading -To upgrade Material to the latest version, use pip: +To upgrade Material to the latest version, use `pip`: ``` sh pip install --upgrade mkdocs-material diff --git a/material/partials/language/vi.html b/material/partials/language/vi.html new file mode 100644 index 000000000..c9f3082b7 --- /dev/null +++ b/material/partials/language/vi.html @@ -0,0 +1,18 @@ +{% macro t(key) %}{{ { + "language": "vi", + "clipboard.copy": "Sao chép vào bộ nhớ", + "clipboard.copied": "Sao chép xong", + "edit.link.title": "Chỉnh sửa", + "footer.previous": "Trước", + "footer.next": "Sau", + "meta.comments": "Bình luận", + "meta.source": "Mã nguồn", + "search.placeholder": "Tìm kiếm", + "search.result.placeholder": "Nhập để bắt đầu tìm kiếm", + "search.result.none": "Không tìm thấy tài liệu liên quan", + "search.result.one": "1 tài liệu liên quan", + "search.result.other": "# tài liệu liên quan", + "skip.link.title": "Vào thẳng nội dung", + "source.link.title": "Đến kho lưu trữ mã nguồn", + "toc.title": "Mục lục" +}[key] }}{% endmacro %} diff --git a/src/partials/language/vi.html b/src/partials/language/vi.html new file mode 100644 index 000000000..7826b5e76 --- /dev/null +++ b/src/partials/language/vi.html @@ -0,0 +1,41 @@ + + + +{% macro t(key) %}{{ { + "language": "vi", + "clipboard.copy": "Sao chép vào bộ nhớ", + "clipboard.copied": "Sao chép xong", + "edit.link.title": "Chỉnh sửa", + "footer.previous": "Trước", + "footer.next": "Sau", + "meta.comments": "Bình luận", + "meta.source": "Mã nguồn", + "search.placeholder": "Tìm kiếm", + "search.result.placeholder": "Nhập để bắt đầu tìm kiếm", + "search.result.none": "Không tìm thấy tài liệu liên quan", + "search.result.one": "1 tài liệu liên quan", + "search.result.other": "# tài liệu liên quan", + "skip.link.title": "Vào thẳng nội dung", + "source.link.title": "Đến kho lưu trữ mã nguồn", + "toc.title": "Mục lục" +}[key] }}{% endmacro %}