Merge branch 'main' into assign-async-await

# Conflicts:
#	README.md

Author: rosekc

.github/pull_request_template.md

@@ -1,22 +1,23 @@
 <!--
-Before opening a PR, make sure you have claimed to translate a file by
-adding your username after the file entry in the README.
+如果这个 PR 是认领某个要翻译的章节，那么可以删除这个 PR 模板的所有内容。
 -->
 
 <!--
-Link to relevant issues or previous PRs, one per line. Use "fixes" to
-automatically close an issue.
+如果有不确定的翻译，请在这里逐条注明并替换这个注释。你也可以在 Discussion 创建讨论。
 -->
 
-- fixes #<issue number>
 
 <!--
-Ensure each step in the "Contrubuting Guide" of the README is complete by
-adding an "x" to each box below.
+如果你的 PR 是要处理某个 issue，请把下面的 `<issue number>` 替换为对应的 issue 编号。如果没有的话，可以删除下面这一行。
 -->
 
-Checklist:
+- fixes #<issue number>
+
+<!--
+对于翻译 PR，确保你已经完整阅读 README.md 里的《Contrubuting Guide》小节和置顶 issue《翻译要求与建议》。完成并勾选下面的检查清单（把方括号里的空格替换为 `x`）。
+-->
 
-- [ ] Fill the checkbox of the related file entry in the README with an "x".
-- [ ] Run `pre-commit` hooks and fix any issues.
-- [ ] Build docs locally, no warnings or errors.
+- [ ] 在 README.md 中勾选翻译的章节条目（把方括号里的空格替换为 `x`）.
+- [ ] 在本地生成文档并预览输出，处理所有错误和异常。
+- [ ] 运行 `pre-commit` 钩子，处理所有问题。
+- [ ] 更新 `.po` 文件顶部的 `Last-Translator` 字段。

.github/workflows/sync.yaml

@@ -0,0 +1,66 @@
+name: Sync
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 19 * * *" # Run at 3am UTF+8 every day
+
+jobs:
+  sync:
+    name: Sync with upstream docs
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Fetch upstream changes
+        id: fetch-changes
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "GitHub Action"
+          git remote add upstream https://github.com/pallets/flask.git
+          git fetch upstream
+          git merge upstream/2.0.x -m "Merge upstream changes into 'main' by GitHub Actions"
+          # If docs/ has changes, continue below steps otherwise abort
+          git diff --name-only origin/main HEAD | grep -q -e '^docs/'
+
+      - name: Generate Translation
+        run: |
+          pip install -r requirements/docs.txt
+          pip install PyGithub
+          pip install -e .
+          cd docs
+          make gettext
+          sphinx-intl update -p _build/gettext
+          cd ..
+          git add docs/
+          git commit -m "Update po files by GitHub Actions"
+
+      - name: Push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create issue
+        shell: python
+        run: |
+          import subprocess, os
+          from datetime import datetime
+          from github import Github
+          current_date = datetime.today().strftime(' %Y-%m-%d')
+          g = Github(os.getenv('GITHUB_TOKEN'))
+          changed = subprocess.check_output("git diff --name-only HEAD~1 HEAD | grep -e '^docs/locales/'", shell=True, text=True)
+          body = "## Changed po files\n\n" + "\n".join(f"- [ ] {line}" for line in changed.splitlines() if line.strip())
+          repo = g.get_repo(os.getenv('REPO'))
+          label = repo.get_label('sync')
+          issue = repo.create_issue(title=os.getenv('ISSUE_TITLE') + current_date, body=body, labels=[label])
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          ISSUE_TITLE: Sync translation for upstream updates

.gitignore

@@ -24,3 +24,6 @@ htmlcov/
 .coverage
 .coverage.*
 *,cover
+
+# Translation
+*.mo

CHANGES.rst

@@ -13,6 +13,12 @@ Version 2.0.2
 
 Unreleased
 
+-   Fix type annotation for ``teardown_request``. :issue:`4093`
+-   Fix type annotation for ``before_request`` and ``before_app_request``
+    decorators. :issue:`4104`
+-   Fixed the issue where typing requires template global
+    decorators to accept functions with no arguments. :issue:`4098`
+
 
 Version 2.0.1
 -------------

CONTRIBUTING.md

@@ -0,0 +1,139 @@
+## Contributing Guide
+
+
+### Installation
+
+- Click the [Fork](https://github.com/greyli/flask-docs-zh/fork) button to fork this repository on GitHub.
+- Clone your fork repository locally (replace `{username}` with your username):
+
+```
+$ git clone https://github.com/{username}/flask-docs-zh
+$ cd flask-docs-zh
+$ git remote add upstream https://github.com/greyli/flask-docs-zh
+```
+
+- Create a virtual environment and install requirements:
+
+For Linux/macOS:
+
+```
+$ python3 -m venv env
+$ source env/bin/activate
+$ python -m pip install --upgrade pip setuptools
+$ pip install -r requirements/dev.txt
+$ pip install -e .
+$ pre-commit install
+```
+
+For Windows:
+
+```
+> python -m venv env
+> env\Scripts\activate
+> python -m pip install --upgrade pip setuptools
+> pip install -r .\requirements\dev.txt
+> pip install -e .
+> pre-commit install
+```
+
+
+### Self-Assignment
+
+- Open your fork repository on GitHub.
+- Click the "Fetch upstream" button to update your fork.
+- Click the edit button (a pencil icon in the upper right corner of the README)
+to edit the README.
+- Find the "Translation To-do List" section, mark the chapter you want to
+translate in following format:
+
+```
+- [ ] example @your_username Your Name
+```
+
+You can link the username to your GitHub profile:
+
+```
+- [ ] example [@your_username](https://github.com/your_username) Your Name
+```
+
+- Leave a commit message (e.g., "Assign example to @your_username"), then select
+"Create a new branch for this commit and start a pull request" and click the
+"Commit changes" button to create a PR.
+
+
+### Translation
+
+- When the self-assignment PR is merged, create a new branch locally
+(be sure to update the example branch name, for example, `translate-cli`):
+
+```
+$ git fetch upstream
+$ git checkout -b your-branch-name upstream/main
+```
+
+- Translate the `.po` file in the `docs/locales/zh_CN/LC_MESSAGES` directory.
+
+An example of one such file, from docs/.../index.po, is given below.
+
+```po
+#: ../../index.rst:4
+msgid "Welcome to Flask"
+msgstr "欢迎来到 Flask 的世界"
+```
+
+Another case, msgid is multi-line text and contains reStructuredText syntax:
+
+```po
+#: ../../index.rst:11
+msgid ""
+"Welcome to Flask's documentation. Get started with :doc:`installation` "
+"and then get an overview with the :doc:`quickstart`."
+msgstr ""
+"欢迎来到 Flask 的文档。你可以从 :doc:`installation` 入手"
+"然后阅读 :doc:`quickstart` 来了解基本概念。"
+```
+
+Please be careful not to break reST notation. Most
+[po-editors](https://www.gnu.org/software/trans-coord/manual/web-trans/html_node/PO-Editors.html) will help you with that.
+
+- Mark the chapter as finished (fill the checkbox with "x"):
+
+```
+- [x] example @your_username Your Name
+```
+
+- Update the `Last-Translator` field at the top of the `.po` file.
+- Commit the changes:
+
+```
+$ git add docs/locales/zh_CN/LC_MESSAGES/example.po README.md
+$ git commit -m "Translate docs/example"
+```
+
+- Build the docs and preview the changes:
+
+For Linux/macOS:
+
+```
+$ cd docs
+$ make html
+```
+
+For Windows:
+
+```
+> cd docs
+> .\make.bat html
+```
+
+Open `{project_location}/docs/_build/html/index.html` in your browser to view the docs.
+
+- If everything is working as expected, push the changes to GitHub:
+
+```
+$ git push origin your-branch-name
+```
+
+- Open the home page of your forked repository, you will see a notice about
+the new branch. Click the "Compare & pull request" button to create a PR.
+- The translation coordinator will review your PR very soon. Thank you!