Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit afbcb89

Browse files
JustinBear99JustinBear99
committed
Revert "Merge branch 'python:3.12' into string-meetup1125"
This reverts commit 52277b8, reversing changes made to f59bce3.
1 parent 52277b8 commit afbcb89

38 files changed

+3174
-3320
lines changed

‎.scripts/summarize_progress/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_github_issues() -> list:
7777
match = re.search("(?P<dirname>[^\s`][a-zA-z-]+)/(?P<filename>[a-zA-Z0-9._-]+(.po)?)", title)
7878
if not match:
7979
continue
80-
80+
8181
dirname, filename = match.group('dirname', 'filename')
8282
if not filename.endswith('.po'):
8383
filename += '.po'
@@ -98,7 +98,7 @@ def format_line_directory(dirname: str) -> str:
9898
issue_list = get_github_issues()
9999

100100
'''
101-
Search all the po file in the directory,
101+
Search all the po file in the directory,
102102
and record the translation progress of each files.
103103
'''
104104
BASE_DIR = Path("../")

‎Makefile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,14 @@ $(VENV)/bin/activate:
6969
$(VENV)/bin/sphinx-build: $(VENV)/bin/activate
7070
. $(VENV)/bin/activate; python3 -m pip install sphinx python-docs-theme
7171

72-
$(VENV)/bin/sphinx-lint: $(VENV)/bin/activate
73-
. $(VENV)/bin/activate; python3 -m pip install sphinx-lint
7472

7573
$(VENV)/bin/blurb: $(VENV)/bin/activate
7674
. $(VENV)/bin/activate; python3 -m pip install blurb
7775

7876

7977
.PHONY: upgrade_venv
8078
upgrade_venv: $(VENV)/bin/activate ## Upgrade the venv that compiles the doc
81-
. $(VENV)/bin/activate; python3 -m pip install --upgrade sphinx python-docs-theme blurb sphinx-lint
79+
. $(VENV)/bin/activate; python3 -m pip install --upgrade sphinx python-docs-theme blurb
8280

8381

8482
.PHONY: progress
@@ -129,7 +127,3 @@ fuzzy: ## Find fuzzy strings
129127
.PHONY: rm_cpython
130128
rm_cpython: ## Remove cloned cpython repo
131129
rm -rf $(CPYTHON_CLONE)
132-
133-
.PHONY: lint
134-
lint: $(VENV)/bin/sphinx-lint ## Run sphinx-lint
135-
$(VENV)/bin/sphinx-lint --enable default-role

‎README.rst

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ the PSF for inclusion in the documentation.
123123
.. _GitHub Flow: https://guides.github.com/introduction/flow/
124124

125125
首先，`新增一個 issue <https://github.com/python/python-docs-zh-tw/issues>`_\
126-
，如：「翻譯 tutorial/introduction.po」，讓大家知道你正在翻譯這個檔案。可以使用 ``make todo`` 列出尚待翻譯的檔案。
126+
，如：「翻譯 tutorial/introduction.po」，讓大家知道你正在翻譯這個檔案。可以使用 `make todo` 列出尚待翻譯的檔案。
127127

128128
接著在 terminal 裡按照以下步驟：
129129

@@ -138,18 +138,12 @@ the PSF for inclusion in the documentation.
138138

139139
poedit glossary.po
140140

141-
3. 存檔以後，執行以下列指令編譯輸出完整文件，以確保你的修改沒有 reST 的語法錯誤或警告 ::
141+
3. 存檔以後，執行以下列指令編譯輸出文件，以確保你的修改沒有 rST 的語法錯誤或警告 ::
142142

143143
VERSION=3.12 make all
144144

145-
或者只想快速檢查是否有 reST 語法錯誤 ::
146-
147-
VERSION=3.12 make lint
148-
149-
確保輸出中沒有任何關於正在翻譯的檔案的警告訊息。
150-
151145
如果你還沒有執行 `維護、預覽`_ 的 clone CPython 的動作，此指令會自動幫你 clone CPython，\
152-
並且會使用 Sphinx 幫你檢查 reST 語法錯誤，我們盡量保持沒有 warning \
146+
並且會使用 Sphinx 幫你檢查 rST 語法錯誤，我們盡量保持沒有 warning \
153147
的狀態，因此如果有出現 warning 的話請修復它。另外也記得檢查是否符合\
154148
`翻譯守則`_
155149

@@ -258,11 +252,11 @@ po 檔皆為首要的翻譯對象。你也可以幫忙校對已經翻譯過的
258252
- 在本情況使用 ``zip(*[iter(x)]*n)`` 是很常見的情況（Python 慣例）。
259253
- 在超文件標示語言 (HTML) 中應注意跳脫符號。
260254

261-
reST 語法注意事項
255+
rST 語法注意事項
262256
----------------
263257

264-
- ``:xxx:`...``` 即為 reST 的語法，應該在譯文中保留。
265-
- reST 諸多語法需要保留前後的空白。在中文裡，該空白可以用 :literal:`\\\ \ `
258+
- ``:xxx:`...``` 即為 rST 的語法，應該在譯文中保留。
259+
- rST 諸多語法需要保留前後的空白。在中文裡，該空白可以用 :literal:`\\\ \ `
266260
來取代，製造一個沒有寬度的分隔符號。
267261

268262
例如：
@@ -328,8 +322,8 @@ reST 語法注意事項
328322
術語表 Glossary
329323
===============
330324

331-
為了讓翻譯保持統一，我們整理了一份 \
332-
`術語列表 <https://github.com/python/python-docs-zh-tw/wiki/%E8%A1%93%E8%AA%9E%E5%88%97%E8%A1%A8>`_ \
325+
為了讓翻譯保持統一，我們整理了一份 `術語列表
326+
<https://github.com/python/python-docs-zh-tw/wiki/%E8%A1%93%E8%AA%9E%E5%88%97%E8%A1%A8>`_ \
333327
如果翻譯過程中你覺得需要術語列表有所缺漏，請至 `Discussion \
334328
<https://github.com/python/python-docs-zh-tw/discussions>`_ 開啟新的討論補充術語。\
335329
新增的術語，將會於每次 Sprint 中共同討論是否合併進術語列表。

‎c-api/function.po

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgid ""
1010
msgstr ""
1111
"Project-Id-Version: Python 3.12\n"
1212
"Report-Msgid-Bugs-To: \n"
13-
"POT-Creation-Date: 2023-12-07 00:03+0000\n"
13+
"POT-Creation-Date: 2023-07-17 17:39+0800\n"
1414
"PO-Revision-Date: 2022-11-12 15:45+0800\n"
1515
"Last-Translator: Matt Wang <[email protected]>\n"
1616
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -66,24 +66,22 @@ msgid ""
6666
"The function's docstring and name are retrieved from the code object. "
6767
"*__module__* is retrieved from *globals*. The argument defaults, annotations "
6868
"and closure are set to ``NULL``. *__qualname__* is set to the same value as "
69-
"the code object's :attr:`~codeobject.co_qualname` field."
69+
"the code object's ``co_qualname`` field."
7070
msgstr ""
7171
"函式的文件字串 (docstring) 和名稱是從程式碼物件所取得，*__module__* 是自 "
7272
"*globals* 所取得。引數預設值、標註 (annotation) 和閉包 (closure) 被設為 "
73-
"``NULL``，*__qualname__* 被設為和程式碼物件 :attr:`~codeobject.co_qualname` "
74-
"欄位相同的值。"
73+
"``NULL``，*__qualname__* 被設為和程式碼物件 ``co_qualname`` 欄位相同的值。"
7574

7675
#: ../../c-api/function.rst:45
7776
msgid ""
7877
"As :c:func:`PyFunction_New`, but also allows setting the function object's "
7978
"``__qualname__`` attribute. *qualname* should be a unicode object or "
8079
"``NULL``; if ``NULL``, the ``__qualname__`` attribute is set to the same "
81-
"value as the code object's :attr:`~codeobject.co_qualname` field."
80+
"value as the code object's ``co_qualname`` field."
8281
msgstr ""
8382
"和 :c:func:`PyFunction_New` 相似，但也允許函式物件 ``__qualname__`` 屬性的設"
8483
"定，*qualname* 應為一個 unicode 物件或是 ``NULL``；如為 ``NULL``，"
85-
"``__qualname__`` 屬性會被設為與程式碼物件 :attr:`~codeobject.co_qualname` 欄"
86-
"位相同的值。"
84+
"``__qualname__`` 屬性會被設為與程式碼物件 ``co_qualname`` 欄位相同的值。"
8785

8886
#: ../../c-api/function.rst:55
8987
msgid "Return the code object associated with the function object *op*."

‎c-api/import.po

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.12\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2023-12-07 00:03+0000\n"
11+
"POT-Creation-Date: 2023-07-29 00:03+0000\n"
1212
"PO-Revision-Date: 2018-05-23 14:06+0000\n"
1313
"Last-Translator: Adrian Liaw <[email protected]>\n"
1414
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -154,8 +154,7 @@ msgstr ""
154154
#: ../../c-api/import.rst:140
155155
msgid ""
156156
"The module's :attr:`__file__` attribute will be set to the code object's :"
157-
"attr:`~codeobject.co_filename`. If applicable, :attr:`__cached__` will also "
158-
"be set."
157+
"attr:`!co_filename`. If applicable, :attr:`__cached__` will also be set."
159158
msgstr ""
160159

161160
#: ../../c-api/import.rst:144

‎c-api/iterator.po

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,17 @@ msgid ""
3131
"value, calling the callable for each item in the sequence, and ending the "
3232
"iteration when the sentinel value is returned."
3333
msgstr ""
34-
"Python 提供了兩種通用的疊代器 (iterator) 物件，第一種是序列疊代器 (sequence "
35-
"iterator)，適用於支援 :meth:`~object.__getitem__` 方法的任意序列，第二種是與"
36-
"可呼叫 (callable) 物件和哨兵值 (sentinel value) 一起使用，會呼叫序列中的每個"
37-
"可呼叫物件，當回傳哨兵值時就結束疊代。"
34+
"Python 提供了兩種通用的疊代器 (Iterator) 物件，第一種是序列 (sequence)。疊代"
35+
"器能夠與有支援 :meth:`~object.__getitem__` 方法的任意序列使用，第二種是與可呼"
36+
"叫 (callable) 物件和哨兵值 (sentinel value) 一起使用，會呼叫序列中的每個可呼"
37+
"叫物件，當回傳哨兵值時就結束疊代。"
3838

3939
#: ../../c-api/iterator.rst:17
4040
msgid ""
4141
"Type object for iterator objects returned by :c:func:`PySeqIter_New` and the "
4242
"one-argument form of the :func:`iter` built-in function for built-in "
4343
"sequence types."
4444
msgstr ""
45-
"此型別物件用於由 :c:func:`PySeqIter_New` 所回傳的疊代器物件以及用於內建序列型"
46-
"別的內建函式 :func:`iter` 的單引數形式。"
4745

4846
#: ../../c-api/iterator.rst:24
4947
msgid ""

‎c-api/typeobj.po

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.12\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2023-12-07 00:03+0000\n"
10+
"POT-Creation-Date: 2023-08-29 12:27+0000\n"
1111
"PO-Revision-Date: 2018-05-23 14:33+0000\n"
1212
"Last-Translator: Adrian Liaw <[email protected]>\n"
1313
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -417,13 +417,12 @@ msgstr ":c:member:`~PyTypeObject.tp_dict`"
417417
#: ../../c-api/typeobj.rst:0 ../../c-api/typeobj.rst:113
418418
#: ../../c-api/typeobj.rst:132 ../../c-api/typeobj.rst:134
419419
#: ../../c-api/typeobj.rst:136 ../../c-api/typeobj.rst:140
420-
#: ../../c-api/typeobj.rst:341 ../../c-api/typeobj.rst:346
421-
#: ../../c-api/typeobj.rst:356 ../../c-api/typeobj.rst:368
422-
#: ../../c-api/typeobj.rst:370 ../../c-api/typeobj.rst:381
423-
#: ../../c-api/typeobj.rst:392 ../../c-api/typeobj.rst:404
424-
#: ../../c-api/typeobj.rst:406 ../../c-api/typeobj.rst:412
425-
#: ../../c-api/typeobj.rst:414 ../../c-api/typeobj.rst:416
426-
#: ../../c-api/typeobj.rst:429 ../../c-api/typeobj.rst:431
420+
#: ../../c-api/typeobj.rst:341 ../../c-api/typeobj.rst:356
421+
#: ../../c-api/typeobj.rst:368 ../../c-api/typeobj.rst:370
422+
#: ../../c-api/typeobj.rst:381 ../../c-api/typeobj.rst:392
423+
#: ../../c-api/typeobj.rst:404 ../../c-api/typeobj.rst:406
424+
#: ../../c-api/typeobj.rst:412 ../../c-api/typeobj.rst:414
425+
#: ../../c-api/typeobj.rst:416 ../../c-api/typeobj.rst:431
427426
#: ../../c-api/typeobj.rst:435 ../../c-api/typeobj.rst:440
428427
#: ../../c-api/typeobj.rst:446
429428
msgid ":c:type:`PyObject` *"
@@ -534,7 +533,8 @@ msgid "[:c:member:`~PyTypeObject.tp_subclasses`]"
534533
msgstr "[:c:member:`~PyTypeObject.tp_subclasses`]"
535534

536535
#: ../../c-api/typeobj.rst:0 ../../c-api/typeobj.rst:138
537-
#: ../../c-api/typeobj.rst:279 ../../c-api/typeobj.rst:348
536+
#: ../../c-api/typeobj.rst:279 ../../c-api/typeobj.rst:346
537+
#: ../../c-api/typeobj.rst:348 ../../c-api/typeobj.rst:429
538538
msgid "void *"
539539
msgstr "void *"
540540

0 commit comments

Comments
 (0)