8000 Merge branch '3.12' into ssl · python/python-docs-zh-tw@0333647 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0333647

Browse files
authored
Merge branch '3.12' into ssl
2 parents 57722d3 + cbc3bcf commit 0333647
  • reference
  • tutorial
  • using
  • whatsnew
  • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    169 files changed

    +9517
    -8706
    lines changed

    Makefile

    Lines changed: 33 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -53,6 +53,35 @@ all: $(VENV)/bin/sphinx-build $(VENV)/bin/blurb clone ## Automatically build an
    5353
    for file in *.po */*.po; do ln -f $$file $(LC_MESSAGES)/$$file; done
    5454
    . $(VENV)/bin/activate; $(MAKE) -C $(CPYTHON_CLONE)/Doc/ SPHINXOPTS='-j$(JOBS) -D locale_dirs=locales -D language=$(LANGUAGE) -D gettext_compact=0' $(MODE)
    5555

    56+
    .PHONY: build
    57+
    build: $(VENV)/bin/sphinx-build $(VENV)/bin/blurb clone ## Automatically build an html local version
    58+
    @$(eval target=$(filter-out $@,$(MAKECMDGOALS)))
    59+
    @if [ -z $(target) ]; then \
    60+
    echo "\x1B[1;31m""Please provide a file argument.""\x1B[m"; \
    61+
    exit 1; \
    62+
    fi
    63+
    @if [ "$(suffix $(target))" != ".po" ]; then \
    64+
    echo "\x1B[1;31m""Incorrect file extension. Only '.po' files are allowed.""\x1B[m"; \
    65+
    exit 1; \
    66+
    fi
    67+
    @if [[ ! -f "$(target)" ]] ; then \
    68+
    echo "\x1B[1;31m""ERROR: $(target) not exist.""\x1B[m"; \
    69+
    exit 1; \
    70+
    fi
    71+
    @mkdir -p $(LC_MESSAGES)
    72+
    @$(eval dir=`echo $(target) | xargs -n1 dirname`) ## Get dir
    73+
    # If the build target is in under directory
    74+
    # We should make direcotry in $(LC_MESSAGES) and link the file.
    75+
    @if [ $(dir) != "." ]; then \
    76+
    echo "mkdir -p $(LC_MESSAGES)/$(dir)"; \
    77+
    mkdir -p $(LC_MESSAGES)/$(dir); \
    78+
    echo "ln -f ./$(target) $(LC_MESSAGES)/$(target)"; \
    79+
    ln -f ./$(target) $(LC_MESSAGES)/$(target); \
    80+
    fi
    81+
    # Build
    82+
    @echo "----"
    83+
    @. $(VENV)/bin/activate; $(MAKE) -C $(CPYTHON_CLONE)/Doc/ SPHINXOPTS='-j$(JOBS) -D language=$(LANGUAGE) -D locale_dirs=locales -D gettext_compact=0' SOURCES='$(basename $(target)).rst' html
    84+
    5685
    help:
    5786
    @python3 -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
    5887

    @@ -133,3 +162,7 @@ rm_cpython: ## Remove cloned cpython repo
    133162
    .PHONY: lint
    134163
    lint: $(VENV)/bin/sphinx-lint ## Run sphinx-lint
    135164
    $(VENV)/bin/sphinx-lint --enable default-role
    165+
    166+
    # This allows us to accept extra arguments (by doing nothing when we get a job that doesn't match, rather than throwing an error)
    167+
    %:
    168+
    @:

    bugs.po

    Lines changed: 6 additions & 6 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,7 +13,7 @@ msgid ""
    1313
    msgstr ""
    1414
    "Project-Id-Version: Python 3.12\n"
    1515
    "Report-Msgid-Bugs-To: \n"
    16-
    "POT-Creation-Date: 2023-11-05 09:50+0000\n"
    16+
    "POT-Creation-Date: 2024-04-18 00:04+0000\n"
    1717
    "PO-Revision-Date: 2022-08-31 12:34+0800\n"
    1818
    "Last-Translator: Steven Hsu <hsuhaochun@gmail.com>\n"
    1919
    "Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
    @@ -82,7 +82,7 @@ msgstr ""
    8282
    "(程式碼執行的錯誤可以寄到 python-list@python.org)。「docs@」是一個由志工們"
    8383
    "所運行的郵寄清單;您的請求會被注意到,但可能需要一些時間才會被處理。"
    8484

    85-
    #: ../../bugs.rst:33
    85+
    #: ../../bugs.rst:32
    8686
    msgid "`Documentation bugs`_"
    8787
    msgstr "`說明文件錯誤`_"
    8888

    @@ -92,7 +92,7 @@ msgid ""
    9292
    "tracker."
    9393
    msgstr "一系列已被提交至 Python 問題追蹤系統的有關說明文件的錯誤。"
    9494

    95-
    #: ../../bugs.rst:36
    95+
    #: ../../bugs.rst:35
    9696
    msgid "`Issue Tracking <https://devguide.python.org/tracker/>`_"
    9797
    msgstr "`問題追蹤系統 <https://devguide.python.org/tracker/>`_"
    9898

    @@ -101,7 +101,7 @@ msgid ""
    101101
    "Overview of the process involved in reporting an improvement on the tracker."
    102102
    msgstr "在追蹤系統上回報改進建議的過程簡介。"
    103103

    104-
    #: ../../bugs.rst:39
    104+
    #: ../../bugs.rst:38
    105105
    msgid ""
    106106
    "`Helping with Documentation <https://devguide.python.org/docquality/#helping-"
    107107
    "with-documentation>`_"
    @@ -209,7 +209,7 @@ msgstr ""
    209209
    "每一份問題報告都會被一位開發人員查核,並由他決定要做出什麼變更來修正這個問"
    210210
    "題。每當該問題有修正動作時,您會收到更新回報。"
    211211

    212-
    #: ../../bugs.rst:89
    212+
    #: ../../bugs.rst:87
    213213
    msgid ""
    214214
    "`How to Report Bugs Effectively <https://www.chiark.greenend.org.uk/"
    215215
    "~sgtatham/bugs.html>`_"
    @@ -225,7 +225,7 @@ msgstr ""
    225225
    "這篇文章詳細說明如何建立一份有用的錯誤報告。它描述了什麼樣的資訊是有用的,以"
    226226
    "及這些資訊為什麼有用。"
    227227

    228-
    #: ../../bugs.rst:92
    228+
    #: ../../bugs.rst:91
    229229
    msgid ""
    230230
    "`Bug Writing Guidelines <https://bugzilla.mozilla.org/page.cgi?id=bug-"
    231231
    "writing.html>`_"

    0 commit comments

    Comments
     (0)
    0